Explorar el Código

fix bug: 类型不统一

shizhongqi hace 7 meses
padre
commit
d45d10e96a

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

@@ -134,7 +134,7 @@
         <block v-else-if="[0, 1, 2, 3, 4, 10, 20, 30].includes(Number(item.sendStatus))">
         <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>
           <view class="text-center"><button class="admin-button-com" @click="cancelExpressOrder(item)">取消跑腿</button></view>
         </block>
         </block>
-        <block v-else-if="[-1, -2].includes(item.sendStatus) && item.status == 2">
+        <block v-else-if="[-1, -2].includes(Number(item.sendStatus)) && item.status == 2">
           <view class="text-center"><button class="admin-button-com" @click="callIntraCity(item)">重叫跑腿</button></view>
           <view class="text-center"><button class="admin-button-com" @click="callIntraCity(item)">重叫跑腿</button></view>
         </block>
         </block>
         <!--
         <!--

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

@@ -40,7 +40,7 @@
 						</view>
 						</view>
 						<view class="express-actions">
 						<view class="express-actions">
 							<button class="admin-button-com mini-btn btn-danger" v-if="canCancelExpress(detailInfo.sendStatus)" @click.stop="cancelMyExpress(detailInfo.id, detailInfo.deliveryId)">取消跑腿</button>
 							<button class="admin-button-com mini-btn btn-danger" v-if="canCancelExpress(detailInfo.sendStatus)" @click.stop="cancelMyExpress(detailInfo.id, detailInfo.deliveryId)">取消跑腿</button>
-							<button class="admin-button-com mini-btn" v-if="[-1, -2].includes(detailInfo.sendStatus)" @click.stop="openExpressPage()">重叫跑腿</button>
+							<button class="admin-button-com mini-btn" v-if="[-1, -2].includes(Number(detailInfo.sendStatus))" @click.stop="openExpressPage()">重叫跑腿</button>
 						</view>
 						</view>
 					</view>
 					</view>
 <!--
 <!--
@@ -454,7 +454,7 @@
 			<button class="admin-button-com middle blue" @click="shareOrder()">分享</button>
 			<button class="admin-button-com middle blue" @click="shareOrder()">分享</button>
 			<!-- #endif -->
 			<!-- #endif -->
 			<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="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" v-if="[-1, -2].includes(Number(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>
 			<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">
 			<template v-for="s in detailInfo.buttonList">