新制作单提示

hdApp/src/admin/work/components/workItem.vue

@@ -52,9 +52,7 @@ export default {
       this.$emit('printWork',item)
     },
 		previewImage(url){
-			uni.previewImage({
-				urls: [url]
-			})
+			uni.previewImage({urls:[url]})
 		},
     cancel(item){
       this.$emit('cancel', item)

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

@@ -6,9 +6,10 @@
   <view class="work-info" v-else>
     <view class="work-detail">
       <view class="order-img">
-        <image :src="orderInfo.cover"></image>
+        <image :src="orderInfo.cover" @click.stop="previewImage(orderInfo.bigCover)"></image>
       </view>
       <view class="order-item">
+
         <view v-if="orderInfo.hasReachTime == 1"><text class="left">配送</text>
           <text class="right" style="color:red;font-weight:bold;">
             <text v-if="orderInfo.reachDate == orderInfo.today">今天</text>
@@ -17,6 +18,7 @@
             <text style="margin-left:5upx;">{{orderInfo.reachPeriod}} 前</text>
           </text>
         </view>
+
         <view v-if="!$util.isEmpty(orderInfo.remark)" style="min-height:35upx;height:auto;">
           <text class="right" style="color:red;">[备注] {{orderInfo.remark}}</text>
         </view>
@@ -36,8 +38,9 @@
         <text class="right" style="color:red;font-weight:bold;">{{orderInfo.num}}</text>
         </view>
 
-        <view><text class="left" v-if="orderInfo.anonymity == 1">要求</text>
-        <text class="right" style="color:red;font-weight:bold;">匿名派送！！！</text>
+        <view v-if="orderInfo.anonymity == 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">
@@ -49,6 +52,7 @@
           <text class="left">类型</text>
           <text class="right" style="color:red;font-weight:bold;">到店自取</text>
         </view>
+
         <view v-if="orderInfo.fromType == 4">
           <text class="left">美团编号</text>
           <text class="right" style="color:black;font-weight:bold;">{{orderInfo.thirdSn}}</text>
@@ -199,6 +203,9 @@ export default {
     	this.removeFromSaveDirect()
 	},
   methods:{
+		previewImage(url){
+			uni.previewImage({urls:[url]})
+		},
 		calcFn(){
 			this.calc = this.calc == 'add' ? 'sub' : 'add'
       		this.$emit('calcFn',this.calc)

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

@@ -8,12 +8,12 @@
         </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">
-            <view v-for="item in list.data" :key="item.id" class="show-item_box" @click="getOrder(item,1)">
+            <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">
                         <view class="current-item-title">
                             <text v-if="item.fromType==4">美团 {{item.thirdSn}}</text>
-                            <text v-else>{{item.fromType==2 ? '商城' : item.staffName}} {{item.name}}</text>                            
+                            <text v-else>{{item.fromType==2 ? '商城' : item.staffName}}</text>                            
                         </view>
                         <image class="flower-image" :src="item.cover"></image>
                         <text style="position:absolute;top:2upx;left:90upx;font-size:11upx;">{{item.sn}}</text>
@@ -86,6 +86,11 @@ export default {
         if(this.mt == 'yes'){
             this.snTitle = '美团编号'
         }
+
+        let that = this
+        setInterval(function () {
+            that.getWorkInfoList(1)
+        },5000)
     },
     methods:{
         refreshList(){
@@ -124,12 +129,12 @@ export default {
         onRestore(){
             console.log('onRestore')
         },
-        getOrder(item,click=0){
+        getOrderInfo(item,click=0){
             if(click == 1){
                 this.$util.hitVoice()
             }
             this.selectOrderId = item.id
-            this.$emit('getOrder',item)
+            this.$emit('getOrderInfo',item)
         },
         changeStatus(status){
             this.status = status
@@ -145,16 +150,20 @@ export default {
                 uni.stopPullDownRefresh();
             }
         },
-        getWorkInfoList(){
-            let params = {page: this.list.page,status:this.status,sn:this.sn,thirdSn:this.thirdSn,isCashier:1}
+        getWorkInfoList(type=0){
+            let params = {page: this.list.page,pageSize:50,status:this.status,sn:this.sn,thirdSn:this.thirdSn,isCashier:1}
             if(this.mt == 'yes'){
                 params = {...params,fromType:4}
             }
             return getWorkList(params).then(res=>{
                 if(res.code == 1){
+                    if(type == 1){
+                        this.list.data = res.data.list
+                        return
+                    }
                     this.completes(res)
                     if(this.list.data && this.list.data[0]){
-                        this.getOrder(this.list.data[0])
+                        this.getOrderInfo(this.list.data[0])
                     }
                 }
             })

hdPad/src/pages/home/mt.vue

@@ -6,7 +6,7 @@
                 <casherNav navType="mt"></casherNav>
             </view>
             <view class="work-list">
-                <workList ref="workListRef" @getOrder="getOrder" mt="yes"></workList>
+                <workList ref="workListRef" @getOrderInfo="getOrderInfo" mt="yes"></workList>
             </view>
             <view class="work-info">
                 <workInfo ref="workInfoRef" :selectOrderId="selectOrderId" @calcFn="calcFn" @finishNotice="finishNotice"></workInfo>
@@ -63,7 +63,7 @@ export default {
 		calcFn(val){
 			this.calc = val
 		},
-		getOrder(item){
+		getOrderInfo(item){
 			this.selectOrderId = Number(item.id)
 			this.currentJobId = Number(item.id)
 			this.$refs.workInfoRef.getOrderDetail(this.selectOrderId)

hdPad/src/pages/home/work.vue

@@ -6,7 +6,7 @@
                 <casherNav navType="work"></casherNav>
             </view>
             <view class="work-list">
-                <workList ref="workListRef" @getOrder="getOrder"></workList>
+                <workList ref="workListRef" @getOrderInfo="getOrderInfo"></workList>
             </view>
             <view class="work-info">
                 <workInfo ref="workInfoRef" :selectOrderId="selectOrderId" @calcFn="calcFn" @finishNotice="finishNotice"></workInfo>
@@ -63,7 +63,7 @@ export default {
 		calcFn(val){
 			this.calc = val
 		},
-		getOrder(item){
+		getOrderInfo(item){
 			this.selectOrderId = Number(item.id)
 			this.currentJobId = Number(item.id)
 			this.$refs.workInfoRef.getOrderDetail(this.selectOrderId)