shish 7 ماه پیش
والد
کامیت
ef927eb0ec
2فایلهای تغییر یافته به همراه4 افزوده شده و 4 حذف شده
  1. 3 3
      hdApp/src/admin/home/order.vue
  2. 1 1
      hdApp/src/admin/order/detail.vue

+ 3 - 3
hdApp/src/admin/home/order.vue

@@ -82,11 +82,11 @@
               <view class="admin-button-com default" v-else @click.stop="">打印</view>
               <view class="admin-button-com default" v-else @click.stop="">打印</view>
 
 
               <block v-if="item.payStatus == 0">
               <block v-if="item.payStatus == 0">
-                <!-- <view class="admin-button-com middle default" @click.stop="">呼叫跑腿</view> -->
+                <view class="admin-button-com middle default" @click.stop="">呼叫跑腿</view>
               </block>
               </block>
               <block v-else>
               <block v-else>
-                <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="[-1, -2].includes(Number(item.sendStatus))" @click.stop="openExpressPage(item.id)">重叫跑腿</view>
+                <view class="admin-button-com middle" v-if="item.sendStatus == -4 && item.status == 2" @click.stop="openExpressPage(item.id)">呼叫跑腿</view>
+                <view class="admin-button-com middle" v-else-if="[-1, -2].includes(Number(item.sendStatus)) && item.status == 2" @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 == 5">跑腿完成</view>
                 <view class="admin-button-com default" v-else-if="[0, 1, 2, 3, 4, 10, 20, 30].includes(Number(item.sendStatus)) && item.payStatus == 1">已发跑腿</view>
                 <view class="admin-button-com default" v-else-if="[0, 1, 2, 3, 4, 10, 20, 30].includes(Number(item.sendStatus)) && item.payStatus == 1">已发跑腿</view>
               </block>
               </block>

+ 1 - 1
hdApp/src/admin/order/detail.vue

@@ -369,7 +369,7 @@
         <button class="admin-button-com middle" @click.stop="sendWork(orderInfo)" v-if="orderInfo.payStatus == 1 && (orderInfo.hasWork == 0 || orderInfo.hasWork == 2)">通知制作</button>
         <button class="admin-button-com middle" @click.stop="sendWork(orderInfo)" v-if="orderInfo.payStatus == 1 && (orderInfo.hasWork == 0 || orderInfo.hasWork == 2)">通知制作</button>
         <button class="admin-button-com middle" @click.stop="cancelFn(orderInfo)" v-if="orderInfo.status == 1"> 取消 </button>
         <button class="admin-button-com middle" @click.stop="cancelFn(orderInfo)" v-if="orderInfo.status == 1"> 取消 </button>
         <button class="admin-button-com middle" @click.stop="goScan(orderInfo)" v-if="orderInfo.status == 1"> 扫码收款 </button>
         <button class="admin-button-com middle" @click.stop="goScan(orderInfo)" v-if="orderInfo.status == 1"> 扫码收款 </button>
-        <button class="admin-button-com middle" v-if="orderInfo.sendStatus == -4 && orderInfo.payStatus == 1" @click.stop="openExpressPage(orderInfo.id)">呼叫跑腿</button>
+        <button class="admin-button-com middle" v-if="orderInfo.sendStatus == -4 && orderInfo.status == 2" @click.stop="openExpressPage(orderInfo.id)">呼叫跑腿</button>
         <button class="admin-button-com middle" @click.stop="printOrder(orderInfo)" v-if="orderInfo.payStatus == 1"> 打印 </button>
         <button class="admin-button-com middle" @click.stop="printOrder(orderInfo)" v-if="orderInfo.payStatus == 1"> 打印 </button>
       </view>
       </view>
     </view>
     </view>