优惠卷调整

pages/coupon/details/details.vue

@@ -2,14 +2,14 @@
 	<view class="coupondetailsStyle" :style="{ height: contentHeight }">
 		<view class="cd_box">
 			<Text class='cd_name'>
-				{{g.Name}}
+				{{g.couponName}}
 			</Text>
 			<view style="display: flex;align-items: flex-end;">
-				<Text style='font-size: 32px;'>{{ g.DiscountsPrice }} </Text>
-				<Text style='font-size: 14px;'>{{g.CouponType==2?'折':""}}</Text>
+				<Text style='font-size: 32px;'>{{ g.denomination }} </Text>
+				<Text style='font-size: 14px;'>{{g.couponsType!=1?'折':""}}</Text>
 			</view>
 			<Text class='condition'>
-				满{{g.MinConsumePrice }}可用
+				满{{g.useCondition }}可用
 			</Text>
 
 			<view v-if='type==2 && g.IsReceive==0' class="receive" :style="{'background':mainColor}" @click="receive(g.CouponId)">
@@ -24,9 +24,9 @@
 			</view>
 			<view style="width: 100%;border-top: 1px dashed #f5f5f5;margin: 10px 0;"></view>
 			<Text class='c_name' style='margin-top: 25px;'>有效期</Text>
-
-			<Text class='cd_content' v-if='g.IndateType==1'>领取后{{g.IndateDay}}天内有效</Text>
-			<Text class='cd_content' v-if='g.IndateType==2'>{{g.StartDate}}-{{g.EndDate}}</Text>
+			<Text class='cd_content'>{{g.expirationDate}} 失效</Text>
+			<!-- <Text class='cd_content' v-if='g.IndateType==1'>领取后{{g.IndateDay}}天内有效</Text>
+			<Text class='cd_content' v-if='g.IndateType==2'>{{g.StartDate}}-{{g.EndDate}}</Text> -->
 			<!-- <Text class='cd_content' >{{g.StartDate}}-{{g.EndDate}}</Text> -->
 			<Text class='c_name' style='margin-top: 1px;'>使用规则</Text>
 
@@ -78,7 +78,7 @@
 			this.type = option.type
 			let item = JSON.parse(decodeURIComponent(option.item))
 			this.g = item;
-			console.log("this.g",this.g);
+			console.log("this.g", this.g);
 		},
 		methods: {
 			receive(id) {
@@ -99,6 +99,8 @@
 					}
 				);
 			},
+
+
 			gouseUrl(g) {
 				uni.redirectTo({
 					url: '/pages/index/index'

pages/coupon/index/index.vue

@@ -156,8 +156,9 @@
 			gbAuth() {
 				uni.navigateBack();
 			},
+			//优惠劵详情
 			godetails(item) {
-				if (this.msg.UseState == 0) {
+				if (this.msg.CouponStatus == 1) {
 					uni.navigateTo({
 						url: "/pages/coupon/details/details?item=" +
 							encodeURIComponent(JSON.stringify(item)) +