美团完成

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

@@ -10,7 +10,12 @@
       </view>
       <view class="order-item">
         <view v-if="orderInfo.hasReachTime == 1"><text class="left">配送</text>
-          <text class="right" style="color:red;font-weight:bold;">{{orderInfo.reachDate == today ? '今天' : orderInfo.reachDate.substr(5,9)}} {{orderInfo.reachPeriod}}</text>
+          <text class="right" style="color:red;font-weight:bold;">
+            <text v-if="orderInfo.reachDate == orderInfo.today">今天</text>
+            <text v-else-if="orderInfo.reachDate == orderInfo.tomorrow">明天</text>
+            <text v-else>{{orderInfo.reachDate.substr(5,9)}}</text>
+            <text style="margin-left:5upx;">{{orderInfo.reachPeriod}} 前</text>
+          </text>
         </view>
         <view v-if="!$util.isEmpty(orderInfo.remark)" style="height:35upx;">
           <text class="right" style="color:red;font-weight:bold;width:190upx;">{{orderInfo.remark}}</text>
@@ -147,7 +152,6 @@ export default {
       totalUseItem:{bigNum:0,smallNum:0},
       customData:{},
       workItemId:0,
-      today:'',
       currentJobType:'modify',
       currentJobId:0
     }
@@ -303,7 +307,6 @@ export default {
       getFullInfo({id}).then(res=>{
         if(res.code == 1){
           this.orderInfo = res.data.info
-          this.today = res.data.today
           let bigNum = 0
           let smallNum = 0
           this.orderItem = res.data.item

hdPad/src/pages/home/mt.vue

@@ -6,10 +6,10 @@
                 <casherNav navType="mt"></casherNav>
             </view>
             <view class="work-list">
-                <workList @getOrder="getOrder" mt="yes"></workList>
+                <workList ref="workListRef" @getOrder="getOrder" mt="yes"></workList>
             </view>
             <view class="work-info">
-                <workInfo ref="workInfoRef" :selectOrderId="selectOrderId" @calcFn="calcFn"></workInfo>
+                <workInfo ref="workInfoRef" :selectOrderId="selectOrderId" @calcFn="calcFn" @finishNotice="finishNotice"></workInfo>
             </view>
         </view>
     </view>
@@ -57,6 +57,9 @@ export default {
 		// #endif
 	},
 	methods: {
+		finishNotice(){
+			this.$refs.workListRef.refreshList()
+		},
 		calcFn(val){
 			this.calc = val
 		},