Merge branch 'feature/hcd' into develop

src/views/goods/order-detail.vue

@@ -22,7 +22,8 @@
                 <p class="trade-status1">
                   <i class="el-icon-truck" style="font-size: 18px"></i>
                   <span class="send-status" v-if="storeType == 1">已发货</span>
-                  <span class="send-status" v-if="storeType == 2">{{expressType == 1 ? '已发货':'云鹊配送中'}}</span>
+                  <span class="send-status" v-if="storeType == 2  && showStatus == 2">{{expressType == 1 ? '已发货':'云鹊配送中'}}</span>
+                  <span class="send-status" v-if="storeType == 2  && showStatus == 1">{{expressType == 1 ? '已收货':'云鹊配送完成'}}</span>
                   <span class="send-status" v-if="storeType == 3">已收货</span>
                 </p>
                 <p v-if="storeType == 1 || storeType == 2">收货地址：{{orderDetailData.receiverAddr}}，{{orderDetailData.receiver}}，{{orderDetailData.receiverMobile}}</p>

src/views/goods/order-manage.vue

@@ -541,7 +541,8 @@
         center
       >
         <div class="offline-content">
-          <p class="offline-title">云鹊配送中</p>
+          <p class="offline-title" v-if="offlinedata.showStatus == 1">云鹊配送完成</p>
+          <p class="offline-title" v-if="offlinedata.showStatus == 2">云鹊配送中</p>
           <div class="offline-main">
             <p class="offline-msg">配送员： {{offlinedata.sender || '--'}} </p>
             <p class="offline-msg">手机号： {{offlinedata.senderMobile || '--'}}</p>
@@ -924,6 +925,7 @@ export default {
       disCompleteDialog: false,
       offlineDialog: false, // 线下配送
       offlinedata:{ //线下配送的物流信息
+        showStatus: 0,
         sender: '',
         senderMobile: '',
         remark: ''
@@ -1352,8 +1354,8 @@ export default {
     },
     // 展示线下物流信息
     showOffline(row) {
-      const {sender, senderMobile, remark} = row; 
-      this.offlinedata = {sender, senderMobile, remark};
+      const {sender, senderMobile, remark, showStatus} = row; 
+      this.offlinedata = {sender, senderMobile, remark, showStatus};
       this.offlineDialog = true
     },
     cancelView() {