shish 7 месяцев назад
Родитель
Сommit
25fba29af2

+ 2 - 2
ghsApp/src/admin/home/components/OrderItem.vue

@@ -128,13 +128,13 @@
 
     <uni-popup ref="morePopup" background-color="#fff" type="center" :animation="true" class="class-popup-style">
       <view class="more-popup-body">
-        <block v-if="item.sendStatus == -4">
+        <block v-if="item.sendStatus == -4 && item.status == 2">
           <view class="text-center"><button class="admin-button-com" @click="callIntraCity(item)">呼叫跑腿</button></view>
         </block>
         <block v-else-if="[0, 1, 2, 3, 4, 10, 20, 30].includes(Number(item.sendStatus))">
           <view class="text-center"><button class="admin-button-com" @click="cancelExpressOrder(item)">取消跑腿</button></view>
         </block>
-        <block v-else-if="[-1, -2].includes(item.sendStatus)">
+        <block v-else-if="[-1, -2].includes(item.sendStatus) && item.status == 2">
           <view class="text-center"><button class="admin-button-com" @click="callIntraCity(item)">重叫跑腿</button></view>
         </block>
         <!--

+ 2 - 2
ghsApp/src/pagesOrder/detail.vue

@@ -453,8 +453,8 @@
 			<!-- #ifdef APP-PLUS -->
 			<button class="admin-button-com middle blue" @click="shareOrder()">分享</button>
 			<!-- #endif -->
-			<button class="admin-button-com middle blue" v-if="detailInfo.sendStatus == -4 && detailInfo.payStatus == 1" @click.stop="openExpressPage()">呼叫跑腿</button>
-			<button class="admin-button-com middle blue" v-if="[-1, -2].includes(detailInfo.sendStatus)" @click.stop="openExpressPage()">重叫跑腿</button>
+			<button class="admin-button-com middle blue" v-if="detailInfo.sendStatus == -4 && detailInfo.status== 2 && detailInfo.payStatus == 1" @click.stop="openExpressPage()">呼叫跑腿</button>
+			<button class="admin-button-com middle blue" v-if="[-1, -2].includes(detailInfo.sendStatus) && detailInfo.status== 2" @click.stop="openExpressPage()">重叫跑腿</button>
 			<button class="admin-button-com middle blue" style="background-color: green;border-color: green;" v-if="detailInfo.status != 1 && detailInfo.status != 5" @click="printOrder(detailInfo)">打印(无价格)</button>
 
 			<template v-for="s in detailInfo.buttonList">