diff --git a/rc-busness/components/address.vue b/rc-busness/components/address.vue index 6aad0bf2..debd1f9a 100644 --- a/rc-busness/components/address.vue +++ b/rc-busness/components/address.vue @@ -88,13 +88,13 @@ export default { message: "手机号码输入有误", }); return; - } else if (this.alladdress === "") { + } else if (!this.alladdress || this.alladdress === "") { this.$message({ type: "warning", message: "请输入详细地址", }); return; - } else if (this.userpeople === "") { + } else if (!this.userpeople || this.userpeople === "") { this.$message({ type: "warning", message: "请输入姓名", diff --git a/rc-busness/components/addressInput.vue b/rc-busness/components/addressInput.vue index 67fbfaa6..a4178f7a 100644 --- a/rc-busness/components/addressInput.vue +++ b/rc-busness/components/addressInput.vue @@ -169,7 +169,7 @@ export default { break; case 1: //Checking City - if(obj.id.indexOf(provinceId)<0) + if(obj.id.toString().indexOf(provinceId)<0) { console.log('500 : error via checking validatePickedValues'); _self.returnValueArr.splice(index,1); @@ -183,7 +183,7 @@ export default { break; case 2: //Checking Area - if(areaId && obj.id.indexOf(areaId)<0) + if(areaId && obj.id.toString().indexOf(areaId)<0) { console.log('501 : error via checking validatePickedValues'); _self.returnValueArr.splice(index,1); @@ -226,7 +226,7 @@ export default { stringStartWith=stringStartWith+"-"; let result=[]; dataColArea.forEach(function(ele){ - if(ele.id.indexOf(stringStartWith)===0) + if(ele.id.toString().indexOf(stringStartWith)===0) { result.push(ele); } @@ -462,6 +462,9 @@ export default { padding-bottom:.25rem; background:url("../assets/image/ico-location.png") no-repeat 98% center; background-size:16px; + position:relative; + top:.5rem; + padding-left:.875rem; } .ts-area-picker-mobile{ display:flex; @@ -485,7 +488,7 @@ export default { display:none; } .ts-area-picker-container,.ts-area-picker-value-displayer{ - width:42.5rem; + width:42.25rem; } .ts-area-picker-value-displayer{ padding-left:1rem; diff --git a/rc-busness/components/header.vue b/rc-busness/components/header.vue index a5fab9b5..8ed8b2f9 100644 --- a/rc-busness/components/header.vue +++ b/rc-busness/components/header.vue @@ -44,7 +44,7 @@ - 登录 + 个人中心 @@ -306,7 +306,7 @@
  • 个人中心 - +
  • @@ -362,9 +362,9 @@ export default { let usernot=this.$store.state.userInfo; //console.log(usernot); if(usernot){ - this.loginornot=true - }else{ this.loginornot=false + }else{ + this.loginornot=true this.usermessage=usernot; } if(isInitialized) @@ -402,14 +402,16 @@ export default { }, //判断有无登录跳转不同页面 turnlogin(){ - if(this.usermessage==null||this.usermessage==undefined){ - this.$router.push({ name: "userlogin-login", - params:{id:12,key:'222'} - }) + let userInfo = this.$store.state.userInfo; + if(!userInfo){ + this.$router.push({ + name: "userlogin-login", + params:{} + }) }else{ - this.$router.push({ name: "personal-mypersonal", - - }) + this.$router.push({ + name: "personal-mypersonal", + }) } } diff --git a/rc-busness/pages/personal/settlement.less b/rc-busness/pages/personal/settlement.less index 37391bc2..964f78c3 100644 --- a/rc-busness/pages/personal/settlement.less +++ b/rc-busness/pages/personal/settlement.less @@ -155,8 +155,6 @@ ul li ol li em strong i { span { display: block; - margin-left: 3px; - } i { diff --git a/rc-busness/pages/personal/settlement.vue b/rc-busness/pages/personal/settlement.vue index 319fae73..f3d7880d 100644 --- a/rc-busness/pages/personal/settlement.vue +++ b/rc-busness/pages/personal/settlement.vue @@ -40,7 +40,7 @@ -
    1
    +
    diff --git a/rc-busness/pages/productdetails/producted.vue b/rc-busness/pages/productdetails/producted.vue index ec0a5bb9..ec672f88 100644 --- a/rc-busness/pages/productdetails/producted.vue +++ b/rc-busness/pages/productdetails/producted.vue @@ -135,7 +135,7 @@ 商品规格：
    - + {{ item.specifications }}
    @@ -218,7 +218,7 @@
    -
    +
    ￥{{ item.couponAmount }}
    @@ -313,13 +313,13 @@ export default { let data = await goodsmessage(singleCode); if (data && data.data.length>0) { newlist.push(data.data[0]); - if(data.data[0].leftAllotment && !stopLeftAllotmentChecking) { + if(data.data[0].leftAllotment>0 && !stopLeftAllotmentChecking) { activeIndexa = stopIndex; curItem = data.data[0]; stopLeftAllotmentChecking=true; } + stopIndex++; } - stopIndex++; } productAttachmentList = newlist[0].productAttachmentList; userbuy = true; @@ -452,11 +452,14 @@ export default { //获取用户领取的优惠券 async getconf(memberId, couponId) { let data = await getConfig(memberId, couponId); + let msg = '领取成功'; if (data) { - this.$message({ - type: "warning", - message: data.msg, - }); + if(data.code!='0') + msg = data.msg; + this.$message({ + type: "warning", + message: msg, + }); } }, @@ -535,7 +538,14 @@ export default { }, plus(num, index) { - this.sales_num = parseInt(this.sales_num) + 1; + if(this.sales_num >= this.curItem.leftAllotment) { + this.$message({ + type: "warning", + message: '已达到本品最大购买上限', + }); + } else { + this.sales_num = parseInt(this.sales_num) + 1; + } }, // 数量减方法 sub(num, index) { @@ -551,7 +561,7 @@ export default { // let mobile=JSON.parse(location.getItem('userInfo')); // console.log(userid,mobile); let data = await postCourseId( - this.productCode, + item.productCode, this.sales_num, this.usermessage.data.id, this.usermessage.data.mobile, @@ -614,7 +624,7 @@ export default { } }, selectsearch(item, index) { - if(!item.leftAllotment) + if(!item.leftAllotment || item.leftAllotment<=0) return; this.activeIndexa = index; this.curItem = item; diff --git a/rc-busness/pages/usersearch/search.vue b/rc-busness/pages/usersearch/search.vue index 79fcd322..5583b652 100644 --- a/rc-busness/pages/usersearch/search.vue +++ b/rc-busness/pages/usersearch/search.vue @@ -104,6 +104,7 @@
    +
    暂未发现相关记录