Explorar el Código

fix: 开发优惠券

wuguojie hace 3 meses
padre
commit
43eecf32b6
Se han modificado 2 ficheros con 23 adiciones y 19 borrados
  1. 1 1
      src/pages/my/coupon.vue
  2. 22 18
      src/pages/my/record.vue

+ 1 - 1
src/pages/my/coupon.vue

@@ -35,7 +35,7 @@
 							<text class="val">{{ item.discountValue }}</text>
 						</view>
 						<view class="amount-box" v-else-if="item.couponType == '2'">
-							<text class="val">{{ item.rebValue }}</text>
+							<text class="val">{{ item.ruleDiscountRate }}</text>
 							<text class="unit">折</text>
 						</view>
 						<view class="amount-box" v-else>

+ 22 - 18
src/pages/my/record.vue

@@ -9,17 +9,19 @@
 				<view class="coupon-card">
 					<view class="left-content">
 						<view class="coupon-title">
-							<view>仅项目费用满499可使用</view>
+							<view>{{ item.couponName }}</view>
 							<!-- <view v-if="item.discountType == 3">满{{ item.thresholdAmount }}减{{ item.discountValue }}</view>
 							<view v-else>满{{ item.thresholdAmount }}可用</view> -->
 						</view>
 						<view class="coupon-time">
-							<view>有效期至2026-01-24 23:59:59</view>
+							<view v-if="item.validityType == 2">领券{{item.validDays }}天后失效</view>
+							<view v-else-if="item.validityType == 3">长期有效</view>
+							<view v-else>有效期至{{ item.expirationTimeString }}</view>
 						</view>
 						<view class="coupon-msg">
-							<view v-if="item.discountType== 1">满减券*1</view>
-							<view v-if="item.discountType== 2">折扣券*1</view>
-							<view v-if="item.discountType== 3">兑换券*1</view>
+							<view v-if="item.couponType== 1">满减券*1</view>
+							<view v-if="item.couponType== 2">折扣券*1</view>
+							<view v-if="item.couponType== 3">兑换券*1</view>
 							<view class="icon-circle" @click="item.showMsg = !item.showMsg">
 								详细信息
 								<view :class="{ 'circle': item.showMsg, 'default': !item.showMsg }"></view>
@@ -28,12 +30,12 @@
 					</view>
 
 					<view class="right-action">
-						<view class="amount-box" v-if="item.discountType == 1">
+						<view class="amount-box" v-if="item.couponType == 1">
 							<text class="unit">¥</text>
 							<text class="val">{{ item.discountValue }}</text>
 						</view>
-						<view class="amount-box" v-else-if="item.discountType == 2">
-							<text class="val">{{ item.rebValue }}</text>
+						<view class="amount-box" v-else-if="item.couponType == 2">
+							<text class="val">{{ item.ruleDiscountRate }}</text>
 							<text class="unit">折</text>
 						</view>
 						<view class="amount-box" v-else>
@@ -62,17 +64,19 @@
 				<view class="coupon-card">
 					<view class="left-content">
 						<view class="coupon-title">
-							<view>仅项目费用满499可使用</view>
+							<view>{{ item.couponName }}</view>
 							<!-- <view v-if="item.discountType == 3">满{{ item.thresholdAmount }}减{{ item.discountValue }}</view>
 							<view v-else>满{{ item.thresholdAmount }}可用</view> -->
 						</view>
 						<view class="coupon-time">
-							<view>有效期至2026-01-24 23:59:59</view>
+							<view v-if="item.validityType == 2">领券{{item.validDays }}天后失效</view>
+							<view v-else-if="item.validityType == 3">长期有效</view>
+							<view v-else>有效期至{{ item.expirationTimeString }}</view>
 						</view>
 						<view class="coupon-msg">
-							<view v-if="item.discountType== 1">满减券*1</view>
-							<view v-if="item.discountType== 2">折扣券*1</view>
-							<view v-if="item.discountType== 3">兑换券*1</view>
+							<view v-if="item.couponType== 1">满减券*1</view>
+							<view v-if="item.couponType== 2">折扣券*1</view>
+							<view v-if="item.couponType== 3">兑换券*1</view>
 							<view class="icon-circle" @click="item.showMsg = !item.showMsg">
 								详细信息
 								<view :class="{ 'circle': item.showMsg, 'default': !item.showMsg }"></view>
@@ -81,12 +85,12 @@
 					</view>
 
 					<view class="right-action-lose">
-						<view class="amount-box" v-if="item.discountType == 1">
+						<view class="amount-box" v-if="item.couponType == 1">
 							<text class="unit">¥</text>
 							<text class="val">{{ item.discountValue }}</text>
 						</view>
-						<view class="amount-box" v-else-if="item.discountType == 2">
-							<text class="val">{{ item.rebValue }}</text>
+						<view class="amount-box" v-else-if="item.couponType == 2">
+							<text class="val">{{ item.ruleDiscountRate }}</text>
 							<text class="unit">折</text>
 						</view>
 						<view class="amount-box" v-else>
@@ -153,10 +157,10 @@
 			},
 			changeType(type) {
 				if(!type) {
-					this.couponList = this.list.filter(item => item.couponStatus == 2)
+					this.couponList = this.list.filter(item => item.couponStatus == 0)
 				}
 				if(type==1) {
-					this.couponList = this.list.filter(item => item.couponStatus == 3)
+					this.couponList = this.list.filter(item => item.couponStatus == 0)
 				}
 			},
 			handleIndex(item, index) {