shish 2 месяцев назад
Родитель
Сommit
f56a34bd68

+ 6 - 6
ghsPad/src/pages/home/components/console.vue

@@ -32,7 +32,7 @@
 				<view class="hand-order-item" v-for="(order,index) in globalHandOrderList" :key="order.id">
 					<view class="hand-order-main" @click="confirmTakeHandOrder(order.id)">
 						<view class="hand-order-name">{{ order.customName || '快捷开单' }}</view>
-						<view class="hand-order-meta">{{ formatHandOrderTime(order) }} · {{ order.selectList.length }}项 · {{ getHandOrderTotalNum(order) }}件</view>
+						<view class="hand-order-meta">{{ formatHandOrderTime(order) }} · {{ order.selectList.length }}种 · {{ getHandOrderTotalNum(order) }}扎</view>
 					</view>
 					<view class="hand-order-price">¥{{ getHandOrderTotalPrice(order) }}</view>
 					<view class="hand-order-actions">
@@ -506,19 +506,19 @@ export default {
 		background-color:#3385FF;color:white;border-color:#3385FF;position:fixed;left:135upx;bottom:13upx;width:84upx;height:50upx;line-height:30upx;font-size:16upx;
 	}
 	& .hand-fast{
-		position:fixed;left:33upx;bottom:13upx;width:50upx;height:50upx;box-sizing:border-box;padding:0;display:flex;align-items:center;justify-content:center;line-height:1;font-size:18upx;color: #3385FF;border-color: #3385FF;background-color:#fff;
+		position:fixed;left:33upx;bottom:13upx;width:50upx;height:50upx;box-sizing:border-box;padding:0;display:flex;align-items:center;justify-content:center;line-height:1;font-weight:normal;font-size:16upx;color: #3385FF;border-color: #3385FF;background-color:#fff;
 	}
 	& .out-fast{
-		position:fixed;left:84upx;bottom:13upx;width:50upx;height:50upx;box-sizing:border-box;padding:0;display:flex;align-items:center;justify-content:center;line-height:1;font-size:18upx;color: #3385FF;border-color: #3385FF;background-color:#fff;
+		position:fixed;left:84upx;bottom:13upx;width:50upx;height:50upx;box-sizing:border-box;padding:0;display:flex;align-items:center;justify-content:center;line-height:1;font-weight:normal;font-size:16upx;color: #3385FF;border-color: #3385FF;background-color:#fff;
 	}
 	& .clear{
-		background-color:orange;color:white;border-color:orange;position:fixed;left:142upx;bottom:13upx;width:84upx;height:50upx;line-height:30upx;font-size:16upx;
+		background-color:orange;color:white;border-color:orange;position:fixed;left:135upx;bottom:13upx;width:84upx;height:50upx;line-height:30upx;font-size:16upx;
 	}
 	& .hand{
-		position:fixed;left:36upx;bottom:13upx;width:50upx;height:50upx;box-sizing:border-box;padding:0;display:flex;align-items:center;justify-content:center;line-height:1;font-size:18upx;color: orange;border-color: orange;background-color:#fff;
+		position:fixed;left:33upx;bottom:13upx;width:50upx;height:50upx;box-sizing:border-box;padding:0;display:flex;align-items:center;justify-content:center;line-height:1;font-weight:normal;font-size:16upx;color: orange;border-color: orange;background-color:#fff;
 	}
 	& .out{
-		position:fixed;left:90upx;bottom:13upx;width:50upx;height:50upx;box-sizing:border-box;padding:0;display:flex;align-items:center;justify-content:center;line-height:1;font-size:18upx;color: orange;border-color: orange;background-color:#fff;
+		position:fixed;left:84upx;bottom:13upx;width:50upx;height:50upx;box-sizing:border-box;padding:0;display:flex;align-items:center;justify-content:center;line-height:1;font-weight:normal;font-size:16upx;color: orange;border-color: orange;background-color:#fff;
 	}
 	& .custom-fast{
 		position:fixed;left:32upx;bottom:66upx;width:189upx;height:20upx;line-height:5upx;font-size:13upx;background-color:white;color:#3385FF;font-weight:bold;border:none;

+ 6 - 6
hdPad/src/pages/home/components/console.vue

@@ -35,7 +35,7 @@
 				<view class="hand-order-item" v-for="(order,index) in globalHandOrderList" :key="order.id">
 					<view class="hand-order-main" @click="confirmTakeHandOrder(order.id)">
 						<view class="hand-order-name">{{ order.customName || '快捷开单' }}</view>
-						<view class="hand-order-meta">{{ formatHandOrderTime(order) }} · {{ order.selectList.length }}项 · {{ getHandOrderTotalNum(order) }}件</view>
+						<view class="hand-order-meta">{{ formatHandOrderTime(order) }} · {{ order.selectList.length }}种 · {{ getHandOrderTotalNum(order) }}扎</view>
 					</view>
 					<view class="hand-order-price">¥{{ getHandOrderTotalPrice(order) }}</view>
 					<view class="hand-order-actions">
@@ -569,22 +569,22 @@ export default {
 		background-color:#09C567;color:white;border-color:#09C567;position:fixed;left:137upx;bottom:13upx;width:84upx;height:50upx;line-height:30upx;font-size:16upx;
 	}
 	& .hand-fast{
-		position:fixed;left:34upx;bottom:13upx;width:50upx;height:50upx;box-sizing:border-box;padding:0;display:flex;align-items:center;justify-content:center;line-height:1;font-size:18upx;color: #09C567;border-color: #09C567;background-color:#fff;
+		position:fixed;left:34upx;bottom:13upx;width:50upx;height:50upx;box-sizing:border-box;padding:0;display:flex;align-items:center;justify-content:center;line-height:1;font-weight:normal;font-size:16upx;color: #09C567;border-color: #09C567;background-color:#fff;
 	}
 	& .out-fast{
-		position:fixed;left:85upx;bottom:13upx;width:50upx;height:50upx;box-sizing:border-box;padding:0;display:flex;align-items:center;justify-content:center;line-height:1;font-size:18upx;color: #09C567;border-color: #09C567;background-color:#fff;
+		position:fixed;left:85upx;bottom:13upx;width:50upx;height:50upx;box-sizing:border-box;padding:0;display:flex;align-items:center;justify-content:center;line-height:1;font-weight:normal;font-size:16upx;color: #09C567;border-color: #09C567;background-color:#fff;
 	}
 	& .custom{
 		position:fixed;left:32upx;bottom:66upx;width:189upx;height:20upx;line-height:5upx;font-size:13upx;background-color:white;color:orange;font-weight:bold;border:none;
 	}
 	& .clear{
-		background-color:orange;color:white;border-color:orange;position:fixed;left:148upx;bottom:13upx;width:84upx;height:50upx;line-height:30upx;font-size:16upx;
+		background-color:orange;color:white;border-color:orange;position:fixed;left:137upx;bottom:13upx;width:84upx;height:50upx;line-height:30upx;font-size:16upx;
 	}
 	& .hand{
-		position:fixed;left:36upx;bottom:13upx;width:50upx;height:50upx;box-sizing:border-box;padding:0;display:flex;align-items:center;justify-content:center;line-height:1;font-size:18upx;color: orange;border-color: orange;background-color:#fff;
+		position:fixed;left:34upx;bottom:13upx;width:50upx;height:50upx;box-sizing:border-box;padding:0;display:flex;align-items:center;justify-content:center;line-height:1;font-weight:normal;font-size:16upx;color: orange;border-color: orange;background-color:#fff;
 	}
 	& .out{
-		position:fixed;left:90upx;bottom:13upx;width:50upx;height:50upx;box-sizing:border-box;padding:0;display:flex;align-items:center;justify-content:center;line-height:1;font-size:18upx;color: orange;border-color: orange;background-color:#fff;
+		position:fixed;left:85upx;bottom:13upx;width:50upx;height:50upx;box-sizing:border-box;padding:0;display:flex;align-items:center;justify-content:center;line-height:1;font-weight:normal;font-size:16upx;color: orange;border-color: orange;background-color:#fff;
 	}
 }
 .hand-order-pop{