1

mer_uniapp/pages/merchant/home/index.vue

@@ -445,7 +445,7 @@
 				return this.cart.reduce((acc, cur) => acc + cur.number, 0)
 			},
 			getCartGoodsPrice() { //计算购物车总价
-				return this.cart.reduce((acc, cur) => acc + cur.number * cur.price, 0)
+				return this.cart.reduce((acc, cur) =>( acc + cur.number * cur.price).toFixed(2), 0)
 			},
 			disabledPay() { //是否达到起送价
 				return this.orderType == 'takeout' &&  (this.getCartGoodsPrice==0 || this.getCartGoodsPrice < this.store.min_price) ? true : false

mer_uniapp/pages/rider_index/order/detail.vue

@@ -15,7 +15,7 @@
 				<view v-if="[0].includes(orderInfo.status)&&info.refundStatus != 3" class="data">等待骑手接单～</view>
 				<view v-if="[1].includes(orderInfo.status)&&info.refundStatus != 3" class="data">您已接单，请及时到店取货哦～</view>
 				<view v-if="[2].includes(orderInfo.status)&&info.refundStatus != 3" class="data">订单配送中，正在努力赶往用户所在地！</view>
-				<view v-if="[3].includes(orderInfo.status)&&info.refundStatus != 3" class="data">订单已送达，等待用户收货确认！</view>
+				<view v-if="[3].includes(orderInfo.status)&&info.refundStatus != 3" class="data">订单已送达</view>
 				<view v-if="[4,5,6].includes(orderInfo.status)&&info.refundStatus != 3" class="data">订单已经完成，您可以提现啦～</view>
 				<!-- <view v-if="[1,2].includes(info.status)&&info.refundStatus != 3" class="data">您已接单，请及时到店取货哦～</view> -->
 <!-- 				<view v-if="info.refundStatus != 3&&info.status == 3" class="data">用户已下单，您可以联系用户到店自提！</view>