From 4da64fd41401a99daf9d99667ad9fa12d586331b Mon Sep 17 00:00:00 2001
From: Vion <leung@waynetechs.com>
Date: Thu, 24 Feb 2022 14:32:15 +0800
Subject: [PATCH] Coupon displaying issue updated

---
 rc-busness/pages/personal/discount.vue | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/rc-busness/pages/personal/discount.vue b/rc-busness/pages/personal/discount.vue
index b4959407..f250be31 100644
--- a/rc-busness/pages/personal/discount.vue
+++ b/rc-busness/pages/personal/discount.vue
@@ -48,13 +48,14 @@
                 </i>
                 <div class="rc-userfont" :style="(item.validTo?'visibility:visible':'visibility:hidden')">
                     <strong>有效期</strong>
-                  <span>{{item.validFrom}}至</span>
+                  <span>{{item.validFrom}}</span>
+				  <span>至</span>
                   <em>{{item.validTo}}</em>
                 </div>
-                   <nuxt-link :to="`/productdetails/productlist`" v-if="activeIndex==0">
-                <div class="ts-standard-btn">
-                        立即使用
-                </div>
+                <nuxt-link :to="`/productdetails/productlist`" v-if="item.canUse">
+					<div class="ts-standard-btn">
+						立即使用
+					</div>
                 </nuxt-link>
               </div>
 
@@ -153,6 +154,7 @@ export default {
 				}
 			});
 			this.fullCouponList = list;
+			this.selectGoods('',UNUSE);
 		}
     },
 	selectGoods(item, index) {
@@ -197,6 +199,7 @@ export default {
 							valDateToTime = new Date(coupon.fValidTo).getTime();
 						}
 						if(curTime > valDateToTime && coupon.status==0) {
+							coupon.canUse=false;
 							this.newlist.push(coupon);
 						}
 					}
@@ -209,11 +212,13 @@ export default {
 						valDateToTime = new Date(coupon.fValidTo).getTime();
 					}
 					if(valDateFromTime && valDateToTime && curTime >= valDateFromTime && curTime <= valDateToTime && coupon.status == 0) {
+						coupon.canUse=true;
 						this.newlist.push(coupon);
 					}
 					break;
 				case USED:
 					if(coupon.status == 1) {
+						coupon.canUse=false;
 						this.newlist.push(coupon);
 					}
 					break;
@@ -243,7 +248,6 @@ export default {
 		this.$router.push({ path: "/userlogin/login"})
 	}
 	this.userdraw(this.usermessage.data.mobile);
-	this.selectGoods('',0);
   },
   components: {
     Myheader,