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

Bug list updated

Browse Source
This commit is contained in:
Vion 2022-01-22 21:34:50 +08:00
parent c6267a73ee
commit 0833e998ea
7 changed files with 45 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rc-busness/components/address.vue
View File

@ -88,13 +88,13 @@ export default {
message: "手机号码输入有误", message: "手机号码输入有误",
}); });
return; return;
} else if (this.alladdress === "") { } else if (!this.alladdress || this.alladdress === "") {
this.$message({ this.$message({
type: "warning", type: "warning",
message: "请输入详细地址", message: "请输入详细地址",
}); });
return; return;
} else if (this.userpeople === "") { } else if (!this.userpeople || this.userpeople === "") {
this.$message({ this.$message({
type: "warning", type: "warning",
message: "请输入姓名", message: "请输入姓名",

11
rc-busness/components/addressInput.vue
View File

@ -169,7 +169,7 @@ export default {
break; break;
case 1: case 1:
//Checking City //Checking City
if(obj.id.indexOf(provinceId)<0) if(obj.id.toString().indexOf(provinceId)<0)
{ {
console.log('500 : error via checking validatePickedValues'); console.log('500 : error via checking validatePickedValues');
_self.returnValueArr.splice(index,1); _self.returnValueArr.splice(index,1);
@ -183,7 +183,7 @@ export default {
break; break;
case 2: case 2:
//Checking Area //Checking Area
if(areaId && obj.id.indexOf(areaId)<0) if(areaId && obj.id.toString().indexOf(areaId)<0)
{ {
console.log('501 : error via checking validatePickedValues'); console.log('501 : error via checking validatePickedValues');
_self.returnValueArr.splice(index,1); _self.returnValueArr.splice(index,1);
@ -226,7 +226,7 @@ export default {
stringStartWith=stringStartWith+"-"; stringStartWith=stringStartWith+"-";
let result=[]; let result=[];
dataColArea.forEach(function(ele){ dataColArea.forEach(function(ele){
if(ele.id.indexOf(stringStartWith)===0) if(ele.id.toString().indexOf(stringStartWith)===0)
{ {
result.push(ele); result.push(ele);
} }
@ -462,6 +462,9 @@ export default {
padding-bottom:.25rem; padding-bottom:.25rem;
background:url("../assets/image/ico-location.png") no-repeat 98% center; background:url("../assets/image/ico-location.png") no-repeat 98% center;
background-size:16px; background-size:16px;
position:relative;
top:.5rem;
padding-left:.875rem;
} }
.ts-area-picker-mobile{ .ts-area-picker-mobile{
display:flex; display:flex;
@ -485,7 +488,7 @@ export default {
display:none; display:none;
} }
.ts-area-picker-container,.ts-area-picker-value-displayer{ .ts-area-picker-container,.ts-area-picker-value-displayer{
width:42.5rem; width:42.25rem;
} }
.ts-area-picker-value-displayer{ .ts-area-picker-value-displayer{
padding-left:1rem; padding-left:1rem;

24
rc-busness/components/header.vue
View File

@ -44,7 +44,7 @@
<a class="rc-xl-up rc-btn rc-btn--icon rc-icon ts-login--xs rc-iconography rc-interactive" aria-label="login" @click="turnlogin"> <a class="rc-xl-up rc-btn rc-btn--icon rc-icon ts-login--xs rc-iconography rc-interactive" aria-label="login" @click="turnlogin">
<span class="rc-screen-reader-text"> <span class="rc-screen-reader-text">
登录 个人中心
</span> </span>
<em class="rc-screen-reader" v-show="loginornot"></em> <em class="rc-screen-reader" v-show="loginornot"></em>
</a> </a>
@ -306,7 +306,7 @@
<li class="rc-list__item"> <li class="rc-list__item">
<a class="rc-list__link rc-icon ts-login--xs rc-iconography--xs" role="menuitem" href="javascript:void();" @click="turnlogin"> <a class="rc-list__link rc-icon ts-login--xs rc-iconography--xs" role="menuitem" href="javascript:void();" @click="turnlogin">
个人中心 个人中心
<em class="rc-screen-reader"></em> <em class="rc-screen-reader" v-if="loginornot"></em>
</a> </a>
</li> </li>
<li class="rc-list__item"> <li class="rc-list__item">
@ -362,9 +362,9 @@ export default {
let usernot=this.$store.state.userInfo; let usernot=this.$store.state.userInfo;
//console.log(usernot); //console.log(usernot);
if(usernot){ if(usernot){
this.loginornot=true
}else{
this.loginornot=false this.loginornot=false
}else{
this.loginornot=true
this.usermessage=usernot; this.usermessage=usernot;
} }
if(isInitialized) if(isInitialized)
@ -402,14 +402,16 @@ export default {
}, },
//判断有无登录跳转不同页面 //判断有无登录跳转不同页面
turnlogin(){ turnlogin(){
if(this.usermessage==null||this.usermessage==undefined){ let userInfo = this.$store.state.userInfo;
this.$router.push({ name: "userlogin-login", if(!userInfo){
params:{id:12,key:'222'} this.$router.push({
}) name: "userlogin-login",
params:{}
})
}else{ }else{
this.$router.push({ name: "personal-mypersonal", this.$router.push({
name: "personal-mypersonal",
}) })
} }
} }

2
rc-busness/pages/personal/settlement.less
View File

@ -155,8 +155,6 @@ ul li ol li em strong i {
span { span {
display: block; display: block;
margin-left: 3px;
} }
i { i {

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

@ -40,7 +40,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="rc_contline">1</div> <div class="rc_contline"></div>
<div class="rc-main" v-for="(item, index) in goldmedal" :key="index"> <div class="rc-main" v-for="(item, index) in goldmedal" :key="index">
<div class="rc-usermain"> <div class="rc-usermain">
<div class="rc-image"> <div class="rc-image">

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

@ -135,7 +135,7 @@
<i class="ts-row-title">商品规格：</i> <i class="ts-row-title">商品规格：</i>
</div> </div>
<div class="ts-tag-list"> <div class="ts-tag-list">
<em v-for="(item, index) in newlist" :key="index" @click="selectsearch(item, index)" :class="[activeIndexa==index?'active':'unactive',item.leftAllotment?'':'disabled']"> <em v-for="(item, index) in newlist" :key="index" @click="selectsearch(item, index)" :class="[activeIndexa==index?'active':'unactive',item.leftAllotment>0?'':'disabled']">
{{ item.specifications }} {{ item.specifications }}
</em> </em>
</div> </div>
@ -218,7 +218,7 @@
<img :src="userimage" alt="" /> <img :src="userimage" alt="" />
<div class="rc-contair"> <div class="rc-contair">
<div class="rc-left"> <div class="rc-left">
<div> <div v-if="item.couponAmount">
<i>￥</i><span>{{ item.couponAmount }}</span> <i>￥</i><span>{{ item.couponAmount }}</span>
</div> </div>
</div> </div>
@ -313,13 +313,13 @@ export default {
let data = await goodsmessage(singleCode); let data = await goodsmessage(singleCode);
if (data && data.data.length>0) { if (data && data.data.length>0) {
newlist.push(data.data[0]); newlist.push(data.data[0]);
if(data.data[0].leftAllotment && !stopLeftAllotmentChecking) { if(data.data[0].leftAllotment>0 && !stopLeftAllotmentChecking) {
activeIndexa = stopIndex; activeIndexa = stopIndex;
curItem = data.data[0]; curItem = data.data[0];
stopLeftAllotmentChecking=true; stopLeftAllotmentChecking=true;
} }
stopIndex++;
} }
stopIndex++;
} }
productAttachmentList = newlist[0].productAttachmentList; productAttachmentList = newlist[0].productAttachmentList;
userbuy = true; userbuy = true;
@ -452,11 +452,14 @@ export default {
//获取用户领取的优惠券 //获取用户领取的优惠券
async getconf(memberId, couponId) { async getconf(memberId, couponId) {
let data = await getConfig(memberId, couponId); let data = await getConfig(memberId, couponId);
let msg = '领取成功';
if (data) { if (data) {
this.$message({ if(data.code!='0')
type: "warning", msg = data.msg;
message: data.msg, this.$message({
}); type: "warning",
message: msg,
});
} }
}, },
@ -535,7 +538,14 @@ export default {
}, },
plus(num, index) { 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) { sub(num, index) {
@ -551,7 +561,7 @@ export default {
// let mobile=JSON.parse(location.getItem('userInfo')); // let mobile=JSON.parse(location.getItem('userInfo'));
// console.log(userid,mobile); // console.log(userid,mobile);
let data = await postCourseId( let data = await postCourseId(
this.productCode, item.productCode,
this.sales_num, this.sales_num,
this.usermessage.data.id, this.usermessage.data.id,
this.usermessage.data.mobile, this.usermessage.data.mobile,
@ -614,7 +624,7 @@ export default {
} }
}, },
selectsearch(item, index) { selectsearch(item, index) {
if(!item.leftAllotment) if(!item.leftAllotment || item.leftAllotment<=0)
return; return;
this.activeIndexa = index; this.activeIndexa = index;
this.curItem = item; this.curItem = item;

1
rc-busness/pages/usersearch/search.vue
View File

@ -104,6 +104,7 @@
<div class="rc-max-width--xl rc-margin-bottom--lg"> <div class="rc-max-width--xl rc-margin-bottom--lg">
<div class="usersearch"> <div class="usersearch">
<div class="rc-contair"> <div class="rc-contair">
<div class="ts-no-data" v-if="!rccontair.length">暂未发现相关记录</div>
<ul class="ts-product-list"> <ul class="ts-product-list">
<li <li
v-for="(item, index) in rccontair" v-for="(item, index) in rccontair"