美团相关优化

hdPad/src/pages/home/cash.vue

@@ -18,7 +18,7 @@
 			</view>
 			<!-- 分类和花材图片 -->
 			<view class="all-item-area">
-				<rightGoods v-if="currentProperty == 0" :customId.sync="customId" :changeCurrentJobType.sync="currentJobType" :changeCurrentJobId.sync="currentJobId" :changeFlower="changeFlower"> </rightGoods>
+				<rightGoods v-if="currentProperty == 0" ref="rightItemRef" :customId.sync="customId" :changeCurrentJobType.sync="currentJobType" :changeCurrentJobId.sync="currentJobId" :changeFlower="changeFlower"> </rightGoods>
 				<rightItem v-else ref="rightItemRef" :customId.sync="customId" :changeCurrentJobType.sync="currentJobType" :changeCurrentJobId.sync="currentJobId"> </rightItem>
 			</view>
 			<!-- 按钮操作 -->

hdPad/src/pages/home/components/nav.vue

@@ -76,7 +76,7 @@ export default {
     color: white;
     text-align: center;
     width: 32upx;
-    height:50upx;
+    height:40upx;
     display:flex;
     & .name{
       width:28upx;

hdPad/src/pages/home/components/orderInfo.vue

@@ -153,6 +153,24 @@ export default {
 
 	},
   methods:{
+    confirmLock(){
+
+    },
+    confirmCancel(){
+
+    },
+    confirmWastageSelectNum(){
+
+    },
+    cancelWastageSelectNum(){
+
+    },
+    confirmFinish(){
+
+    },
+    confirmFinish(){
+
+    },
     printFn(item){
       onlinePrintOrder({id:item.id}).then(res=>{
         if(res.code == 1){

hdPad/src/pages/home/components/orderList.vue

@@ -6,8 +6,7 @@
             <view @tap="changeStatus(1)" :class="[{'checked':status===1}]">待完成</view>
             <view @tap="changeStatus(4)" :class="[{'checked':status===4}]">已完成</view>
         </view>
-        <scroll-view class="itemList-item_box" scroll-y="true" @scrolltolower="reachBottom" lower-threshold="50" refresher-enabled="true" 
-        :refresher-triggered="triggered" @refresherrefresh="onRefresh" @refresherrestore="onRestore">
+        <scroll-view class="itemList-item_box" scroll-y="true" @scrolltolower="reachBottom" lower-threshold="50">
             <view v-for="item in list.data" :key="item.id" class="show-item_box" @click="getOrderInfo(item,1)">
                 <view :class="[selectOrderId==item.id ? 'active' : 'not-active', 'item-body_box']">
                     <view class="flower-name_box">

hdPad/src/pages/home/components/rightGoods.vue

@@ -120,6 +120,8 @@ export default {
         }
     },
     methods:{
+        itemRefresh(){
+        },
         addToClear(){
             this.$msg('请扫码打开')
         },

hdPad/src/pages/home/components/workInfo.vue

@@ -11,8 +11,8 @@
       <view class="order-item">
 
         <view v-if="beginCount > 0 && orderInfo.fromType == 4" style="min-height:35upx;height:auto;">
-          <text class="left">开始制作</text>
-          <text class="right" style="color:red;font-weight:bold;font-size:20upx;">{{beginCount}} 秒后</text>
+          <text class="left">请</text>
+          <text class="right" style="color:red;font-weight:bold;font-size:20upx;">{{beginCount}} 秒后制作</text>
         </view>
 
         <view>
@@ -42,7 +42,7 @@
         </view>
 
         <view><text class="left">数量</text>
-        <text class="right" style="color:red;font-weight:bold;">{{orderInfo.num}}</text>
+        <text class="right" style="font-weight:bold;">{{orderInfo.num}}</text>
         </view>
 
         <view v-if="orderInfo.anonymity == 1">
@@ -50,6 +50,11 @@
           <text class="right" style="color:red;font-weight:bold;text-align:right;">匿名派送！！</text>
         </view>
 
+        <view v-if="orderInfo.manyType && orderInfo.manyType == 1">
+          <text class="left">注意</text>
+          <text class="right" style="color:red;font-weight:bold;text-align:right;">此单有多个不同商品</text>
+        </view>
+
         <view v-if="Number(orderInfo.orderDebtPrice)>0">
           <text class="left">尾款</text>
           <text class="right" style="color:red;font-weight:bold;">¥{{orderInfo.orderDebtPrice?parseFloat(orderInfo.orderDebtPrice):0}}</text>

hdPad/src/pages/home/components/workList.vue

@@ -6,8 +6,7 @@
             <view @tap="changeStatus(1)" :class="[{'checked':status===1}]">已完成</view>
             <view @tap="changeStatus(-1)" :class="[{'checked':status===-1}]">全部</view>
         </view>
-        <scroll-view class="itemList-item_box" scroll-y="true" @scrolltolower="reachBottom" lower-threshold="50" refresher-enabled="true" 
-        :refresher-triggered="triggered" @refresherrefresh="onRefresh" @refresherrestore="onRestore">
+        <scroll-view class="itemList-item_box" scroll-y="true" @scrolltolower="reachBottom" lower-threshold="50">
             <view v-for="item in list.data" :key="item.id" class="show-item_box" @click="getOrderInfo(item,1)">
                 <view :class="[selectOrderId==item.id ? 'active' : 'not-active', 'item-body_box']">
                     <view class="flower-name_box">
@@ -57,8 +56,8 @@ export default {
 			default: 'no'
 		},
         sh:{
-            type:Number,
-            default:0
+            type:String,
+            default:'no'
         }
     },
     data(){
@@ -91,6 +90,9 @@ export default {
         if(this.mt == 'yes'){
             this.snTitle = '美团编号'
         }
+        if(this.sh == 'yes'){
+            this.snTitle = '美团编号'
+        }
         this.listenWork()
     },
     destroyed(){
@@ -112,6 +114,8 @@ export default {
             this.resetList()
             if(this.mt == 'yes'){
                 this.thirdSn = val
+            }else if(this.sh == 'yes'){
+                this.thirdSn = val
             }else{
                 this.sn = val
             }

hdPad/src/pages/home/sh.vue

@@ -6,7 +6,7 @@
                 <casherNav navType="sh"></casherNav>
             </view>
             <view class="work-list">
-                <workList ref="workListRef" @getOrderInfo="getOrderInfo" sh="1"></workList>
+                <workList ref="workListRef" @getOrderInfo="getOrderInfo" sh="yes"></workList>
             </view>
             <view class="work-info">
                 <workInfo ref="workInfoRef" :selectOrderId="selectOrderId" @calcFn="calcFn" @finishNotice="finishNotice"></workInfo>