Merge branch 'zhongqi-delivery' of http://git.huaml.com/zhh/front-end into zhongqi-delivery

hdApp/src/admin/delivery/allDelivery.vue

@@ -415,6 +415,7 @@ export default {
       }).then(res => {
         if (res && res.code === 1) {
           this.$msg('下单成功');
+          uni.$emit('updateOrderStatus', this.orderId);
           //this.pageTo({url: '/pagesOrder/detail?id=' + this.orderId, type: 2 }); 
           // 为了能正常返回，需要使用navigateBack
           uni.navigateBack({ delta: 1 });

hdApp/src/admin/home/order.vue

@@ -88,7 +88,7 @@
                 <view class="admin-button-com middle" v-if="item.sendStatus == '-4'" @click.stop="openExpressPage(item.id)">呼叫跑腿</view>
                 <view class="admin-button-com middle" v-else-if="item.sendStatus == '-1'" @click.stop="openExpressPage(item.id)">重叫跑腿</view>
                 <view class="admin-button-com default" v-else-if="item.sendStatus == '5'">跑腿完成</view>
-                <view class="admin-button-com default" v-else-if="item.sendStatus.includes(['0', '1', '2', '3', '4', '10', '20', '30']) && item.payStatus == 1">已发跑腿</view>
+                <view class="admin-button-com default" v-else-if="['0', '1', '2', '3', '4', '10', '20', '30'].includes(item.sendStatus) && item.payStatus == 1">已发跑腿</view>
               </block>
 
             </view>
@@ -222,6 +222,12 @@ export default {
       return this.repeat !== -1 || this.shopAdminId !== 0;
     }
   },
+  onLoad() {
+    uni.$on('updateOrderStatus', this.updateOrderStatus);
+  },
+  onUnload() {
+    uni.$off('updateOrderStatus', this.updateOrderStatus);
+  },
   onPullDownRefresh () {
     this.resetList();
     this.getOrderList().then(res => {
@@ -308,7 +314,6 @@ export default {
       if(this.searchStyle == 0){
         // 首次点击搜索框：searchText 为空，lastSearchText 也为空 → 跳过搜索
         if (this.$util.isEmpty(this.searchText) && this.$util.isEmpty(this.lastSearchText)) {
-          // console.log('000001')
           return;
         } else {
           // console.log('000002')
@@ -317,9 +322,7 @@ export default {
         if(that.$util.isEmpty(e)){
           that.showSearch = false
           that.searchList = []
-          // console.log('111 空 111')
         }else{
-          // console.log('222222')
           this.lastSearchText = this.searchText;
           getList({ page:1, name:e, type:0}).then((res) => {
               if (!that.$util.isEmpty(res.data) && !that.$util.isEmpty(res.data.list)){
@@ -332,15 +335,12 @@ export default {
           })
         }
       }else{
-        // console.log('333333')
         // 首次点击搜索框：searchText 为空，lastSearchText 也为空 → 跳过搜索
         if (this.$util.isEmpty(this.searchText) && this.$util.isEmpty(this.lastSearchText)) {
-          // console.log('33333-空')
           return;
         }
 
         if (this.searchText === this.lastSearchText) {
-          // console.log('33333-111')
           return;
         }
 
@@ -477,6 +477,15 @@ export default {
         this.getOrderList();
       }
     },
+    updateOrderStatus(orderId) {
+      if (this.list && this.list.data) {
+        const item = this.list.data.find(item => item.id == orderId);
+        if (item) {
+          item.status = 3;
+          item.sendStatus = 0;
+        }
+      }
+    },
     /**
      * 打开配送页面
      */