1

pages/shop/orderDetail.vue

@@ -22,7 +22,7 @@
 			</view>
 			<view class="box1" style="display: flex;height: 100rpx;line-height: 100rpx;padding: 0 20rpx;">
 				<view style="border: 1px solid #48D1CC;height: 50rpx;line-height: 50rpx;padding: 0 20rpx;border-radius: 20rpx;margin-top: auto;margin-bottom: auto;color: #48D1CC;font-weight: 700;">
-					{{data.deliveryType == 2?'自取订单':'配送订单'}}
+					{{data.deliveryType == 1?'配送订单':data.isPack == 1?'自取-打包':data.isPack == 0?'自取-堂食':'自取'}}
 				</view>
 				<view v-if="data.deliveryType == 1" style="display: flex;flex: 1;padding-left: 20rpx;">
 					<text style="flex: 1;">配送员：{{data.deliveryInfo.workerName}}</text>
@@ -139,7 +139,7 @@
 					预计收入
 				</view>
 				<view style="color: red;font-weight: 700;">
-					￥{{(data.yujishouru).toFixed(2)}}
+					￥{{data.yujishouru?data.yujishouru:0}}
 				</view>
 			</view>
 			<view style="margin-top: 20rpx;">