完成订单详情

pages/order/components/orderInfoAfter.vue

@@ -162,23 +162,13 @@
 					</view>
 				</block>
 				<block v-else>
-					<block v-for="(item,index) in listinfo.couponInfoList" :key="index">
-						<view class="cell-item" v-if="item.type == 1">
-							<view class="label">优惠券</view>
-							<view class="val">
-								<view></view>
-								<view style="font-size: 28rpx;">-￥</view>
-								<view>{{item.discountAmount}}</view>
-							</view>
-						</view>
-					</block>
-					<view class="cell-item column" v-if="listinfo.couponInfoList.length > 0">
-						<view class="label">商品券</view>
+					<view class="cell-item column" v-if="listinfo.discountInfo.length > 0">
+						<view class="label">优惠折扣</view>
 						<view class="val column">
-							<view class="productCoupon" v-for="(item,index) in listinfo.couponInfoList" :key="index">
+							<view class="productCoupon" v-for="(item,index) in listinfo.discountInfo" :key="index">
 								<view class="name">{{item.name}}</view>
-								<view class="num">X{{item.finalUseNum}}</view>
-								<view class="amount">-￥{{item.finalDiscountAmount}}</view>
+								<!-- <view class="num">{{item.amount}}</view> -->
+								<view class="amount" style="margin-left: 10rpx;">{{item.amount}}元</view>
 							</view>
 						</view>
 					</view>
@@ -258,7 +248,7 @@
 	} from '@/common/api/shop/index.js'
 
 	// 定义自定义事件
-	const emits = defineEmits(['customevent', 'istype']);
+	const emits = defineEmits(['customevent', 'istype', 'learcoupons']);
 
 	// teb  切换送餐和打包
 	const tebtypeList = reactive([{
@@ -344,6 +334,8 @@
 			case 'coupon':
 				// 清空积分
 				IntegralInputclose()
+				favorablelist[1].value = ''
+				emits('learcoupons', 'coupon')
 				uni.pro.navigateTo('/pages/order/coupon', {
 					type: "confirm_order_coupon",
 					shopId: uni.cache.get('orderVIP').shopId,
@@ -356,8 +348,9 @@
 				// 清空积分
 				IntegralInputclose()
 				// 清空优惠卷
-				props.listinfo.coupondiscountAmount = 0
 				favorablelist[1].value = ''
+				favorablelist[0].value = ''
+				emits('learcoupons', 'product')
 				uni.pro.navigateTo('/pages/order/coupon', {
 					type: "confirm_order_product",
 					shopId: uni.cache.get('orderVIP').shopId,
@@ -369,7 +362,8 @@
 			case 'points':
 				if (calcUsablePointsData.usable == 0) {
 					uni.showToast({
-						title: '此次订单不可用积分!'
+						title: calcUsablePointsData.unusableReason,
+						icon: 'none'
 					})
 					return false;
 				}
@@ -672,7 +666,7 @@
 				.head {
 					display: flex;
 					justify-content: space-between;
-					padding: 32rpx 0;
+					// padding: 32rpx 0;
 
 					.head_left {
 						display: flex;