1

src/views/sys/order-manage/logisticsAddress.vue

@@ -66,10 +66,14 @@
 					<div style="flex:1;color:#ff6f2c;font-weight:700;">锦鲤免单</div>
 					<div class="price" style="color:#ff6f2c;font-weight:700;">¥{{orderData.freeAmount}}</div>
 				</div>
-				<div class="box" v-if="orderData.userCouponNum != null && orderData.userCouponNum > 0">
+				<div class="box" v-if="orderData.userCoupon.length > 0">
+					<div style="flex:1;color:#ff6f2c;font-weight:700;">优惠券</div>
+					<div class="price" style="color:#ff6f2c;font-weight:700;">¥{{orderData.userCoupon[0].discountAmount}}</div>
+				</div>
+				<!-- <div class="box" v-if="orderData.userCouponNum != null && orderData.userCouponNum > 0">
 					<div style="flex:1;">优惠券</div>
 					<div class="price">-¥{{orderData.userCouponNum}}</div>
-				</div>
+				</div> -->
 				<div class="zong">{{orderData.status == 0 ? '待支付' : '实付'}}：<span style="color:#11cd6e;">¥{{orderData.totalAmount}}</span></div>
 				<div v-if="orderData.chouyong" class="zong">平台服务费：<span class="blue-color">¥{{(orderData.chouyong).toFixed(2)}}</span> </div>
 				<div v-if="orderData.yujishouru" class="zong">商家预计收入：<span class="blue-color">¥{{(orderData.yujishouru).toFixed(2)}}</span> </div>

src/views/sys/order-manage/orderManage.vue

@@ -492,6 +492,18 @@
 						width: 200,
 						align: "center",
 					},
+					{
+						title: "预计送达时间",
+						key: "mustFinishTime",
+						width: 200,
+						align: "center",
+						render: (h, params) => {
+							return h(
+								"div",
+								this.formatDateTime(params.row.deliveryInfo.mustFinishTime)
+							);
+						}
+					},
 					{
 						title: "用户账号",
 						key: "receiverPhone",