xinyin025/smart-admin
1
0
Fork 0
mirror of https://gitee.com/lab1024/smart-admin.git synced 2025-10-01 17:56:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

!221 modify debugger

Browse Source 
Merge pull request !221 from Admin/sit-Leung-v3
This commit is contained in:
Admin 2022-03-14 03:09:23 +00:00 committed by Gitee
commit 07ff8ef23f
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
rc-busness/pages/personal/settlement.vue
View File

@ -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+' 张优惠券可以使用';
}

9
rc-busness/pages/productdetails/producted.vue
View File

@ -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++;

1
rc-busness/pages/userlogin/login.vue
View File

@ -407,7 +407,6 @@ export default {
this.checkIsLogin();
let returnMessage='';
if(data.type==1) {
debugger;
if(data.data.memberName===undefined){
returnMessage = '欢迎回来';
}