From ae9f2e34e64937b6070cfcea3ea1b763cbf092b4 Mon Sep 17 00:00:00 2001
From: Vion <leung@waynetechs.com>
Date: Fri, 11 Mar 2022 18:53:44 +0800
Subject: [PATCH 1/2] minQuantity minPrice checked via settlement.vue

---
 rc-busness/pages/personal/settlement.vue | 18 ++++++++++--------
 rc-busness/pages/userlogin/login.vue     |  1 -
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/rc-busness/pages/personal/settlement.vue b/rc-busness/pages/personal/settlement.vue
index 34188db1..a6ad005f 100644
--- a/rc-busness/pages/personal/settlement.vue
+++ b/rc-busness/pages/personal/settlement.vue
@@ -408,16 +408,16 @@ export default {
 		let avaliableCouponNum = 0;
 	  if (data) {
 		this.drawlist=[];
-		avaliableCouponNum = data.length;
-		this.drawlist = data.data;
-		/*
+		//avaliableCouponNum = data.length;
+		//this.drawlist = data.data;
+		
 		for(let itemInCart of this.goldmedal) {
 			let tmpIndex=0;
 			for(let myCoupon of data.data) {
 				valDateFromTime=0;
 				valDateToTime=0;
 				dateChecked=true;
-				
+				/*
 				if(myCoupon.fValidFrom) {
 					//Fix ios date issue
 					myCoupon.fValidFrom = myCoupon.fValidFrom.replace(/-/g, '/');
@@ -435,6 +435,7 @@ export default {
 				if(valDateToTime && curTime > valDateToTime) {
 					dateChecked=false;
 				}
+				*/
 				if(myCoupon.minQuantity && myCoupon.minQuantity>itemInCart.buyCount) {
 					dateChecked=false;
 				}
@@ -444,16 +445,17 @@ export default {
 				if(myCoupon.udf2!='H5') {
 					dateChecked=false;
 				}
-				//TODO add more checking
-				if(dateChecked && myCoupon.activityId != 10 && myCoupon.status == 0 && (!myCoupon.productCodes || myCoupon.productCodes.indexOf(itemInCart.productCode)>-1)) {
-					data.data.splice(tmpIndex,1);
+				
+				//if(dateChecked && myCoupon.activityId != 10 && myCoupon.status == 0 && (!myCoupon.productCodes || myCoupon.productCodes.indexOf(itemInCart.productCode)>-1)) {
+				if(dateChecked) {
+					//data.data.splice(tmpIndex,1);
 					_self.drawlist.push(myCoupon);
 					avaliableCouponNum++;
 				}
 				tmpIndex++;
 			}
 		}
-		*/
+		
 		if(avaliableCouponNum > 0) {
 			this.curCoupon.couponName = '有 '+avaliableCouponNum+' 张优惠券可以使用';
 		}
diff --git a/rc-busness/pages/userlogin/login.vue b/rc-busness/pages/userlogin/login.vue
index a8d0fd0b..7d491632 100644
--- a/rc-busness/pages/userlogin/login.vue
+++ b/rc-busness/pages/userlogin/login.vue
@@ -407,7 +407,6 @@ export default {
 			this.checkIsLogin();
 			let returnMessage='';
 			if(data.type==1) {
-				debugger;
 				if(data.data.memberName===undefined){
 					returnMessage = '欢迎回来';
 				}

From 3201a6ee2e4aa6c71d6f452865a40dfe42c20a8c Mon Sep 17 00:00:00 2001
From: Vion <leung@waynetechs.com>
Date: Mon, 14 Mar 2022 11:06:58 +0800
Subject: [PATCH 2/2] Product detail ajax api data structure updated

---
 rc-busness/pages/productdetails/producted.vue | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/rc-busness/pages/productdetails/producted.vue b/rc-busness/pages/productdetails/producted.vue
index 57be62a2..8ee9d22e 100644
--- a/rc-busness/pages/productdetails/producted.vue
+++ b/rc-busness/pages/productdetails/producted.vue
@@ -344,12 +344,13 @@ export default {
 			let stopIndex = 0;
 			for(let singleCode of productCode) {
 				let data = await goodsmessage(singleCode);
-				if (data && data.data.length>0) {
-					newlist.push(data.data[0]);
+				console.log(data);
+				if (data && data.length>0) {
+					newlist.push(data[0]);
 
-					if(data.data[0].leftAllotment>0 && !stopLeftAllotmentChecking) {
+					if(data[0].leftAllotment>0 && !stopLeftAllotmentChecking) {
 						activeIndexa = stopIndex;
-						curItem = data.data[0];
+						curItem = data[0];
 						stopLeftAllotmentChecking=true;
 					}
 					stopIndex++;