1

components/discount/index.vue

@@ -2,11 +2,17 @@
 	<view class="discount">
 		<view class="pre_one">优惠劵({{couponList.length}}张)</view>
 		<view class="pre_two" v-for="(item,index) in couponList" :key="index">
-			<view class="left">
+			<view class="left" v-if="item.discount_type=='min'">
 				<view class="money">￥{{item.discount_config.min||'0'}}</view>
 				<view v-if="item.discount_config.limit=='nolimit'" class="man">不限</view>
 				<view v-else class="man">满{{item.discount_config.limit||'0'}}可用</view>
 			</view>
+			<view class="left" v-else-if="item.discount_type=='discount'">
+				<view class="money">{{item.discount_config.min||'0'}}折</view>
+				<view v-if="item.discount_config.limit=='nolimit'" class="man">不限</view>
+				<view v-else class="man">满{{item.discount_config.limit||'0'}}可用，最多减{{item.discount_config.max||'0'}}元
+				</view>
+			</view>
 			<view class="right">
 				<view class="other">
 					<view class="type"><text>{{item.discount_type_label||'暂无'}}</text>
@@ -101,7 +107,6 @@
 				display: flex;
 				justify-content: space-between;
 				align-items: center;
-				flex-grow: 1;
 				border-radius: 3vw;
 				padding: 1.5vw 3vw;
 				background-color: var(--mainColor);

pagesHome/exchange/index.vue

@@ -40,23 +40,31 @@
 			// 领取优惠劵
 			async toReceive(e) {
 				const that = this;
-				const arr = await that.$api(`/userCoupon/getCoupon/${e._id}`, 'POST');
-				if (arr.errcode == '0') {
-					uni.showToast({
-						title: `领取成功`,
-						icon: 'none',
-						duration: 3000
-					})
-					uni.navigateBack({
-						detail: 1
-					})
-				} else {
-					uni.showToast({
-						title: arr.errmsg,
-						icon: 'none',
-						duration: 2000
-					});
-				}
+				uni.showModal({
+					title: '提示',
+					content: '确定领取该优惠券?',
+					success: async function(res) {
+						if (res.confirm) {
+							const arr = await that.$api(`/userCoupon/getCoupon/${e._id}`, 'POST');
+							if (arr.errcode == '0') {
+								uni.showToast({
+									title: `领取成功`,
+									icon: 'none',
+									duration: 3000
+								})
+								uni.navigateBack({
+									detail: 1
+								})
+							} else {
+								uni.showToast({
+									title: arr.errmsg,
+									icon: 'none',
+									duration: 2000
+								});
+							}
+						}
+					}
+				});
 			},
 			// 监听用户是否登录
 			watchLogin() {

pagesHome/order/order.vue

@@ -166,7 +166,7 @@
 			// 使用优惠劵
 			toDiscount(e) {
 				const that = this;
-				that.$set(that, 'coupon_name', e.coupon.name)
+				that.$set(that, 'coupon_name', e.name)
 				that.coupon.push(e._id)
 				that.$refs.popup.close();
 			},