!82 2022-1-22 Jiamin

Merge pull request !82 from Admin/sit-jiamin-v2
This commit is contained in:
Admin 2022-01-22 13:54:35 +00:00 committed by Gitee
commit df498f597a
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 25 additions and 5 deletions

View File

@ -44,7 +44,7 @@
</div> </div>
<nuxt-link :to="`/productdetails/productlist`"> <nuxt-link :to="`/productdetails/productlist`">
<div v-if="userload" class="ts-stand"> <div v-if="userload" class="ts-stand">
<span @click="usertiao()" class="ts-standard-btn">立即使用</span>
</div> </div>
</nuxt-link> </nuxt-link>
</div> </div>

View File

@ -287,6 +287,8 @@ export default {
let data = await userindent(mobile); let data = await userindent(mobile);
this.activeIndex = stype; this.activeIndex = stype;
this.goldmedal = data; this.goldmedal = data;
this.alllist=[];
this.useralllist=[];
for (let i = 0; i < this.goldmedal.length; i++) { for (let i = 0; i < this.goldmedal.length; i++) {
this.useralllist.push(this.goldmedal[i].orderDetailList[0]); this.useralllist.push(this.goldmedal[i].orderDetailList[0]);
this.alllist.push(this.goldmedal[i].orderDetailList[0]) this.alllist.push(this.goldmedal[i].orderDetailList[0])
@ -294,7 +296,6 @@ export default {
if(this.goldmedal[i].status==0){ if(this.goldmedal[i].status==0){
console.log("+++++++++++++"); console.log("+++++++++++++");
this.obligation.push(this.goldmedal[i].orderDetailList[0]); this.obligation.push(this.goldmedal[i].orderDetailList[0]);
}else if(this.goldmedal[i].status==1){ }else if(this.goldmedal[i].status==1){
this.receiving.push(this.goldmedal[i].orderDetailList[0]); this.receiving.push(this.goldmedal[i].orderDetailList[0]);
} }
@ -383,6 +384,8 @@ export default {
}); });
setTimeout(() => { setTimeout(() => {
this.indet(); this.indet();
this.activeIndex=0;
this.useralllist=[];
}, 500); }, 500);
} }
@ -391,6 +394,15 @@ export default {
userpay(item, index) { userpay(item, index) {
if (item.status == 0) { if (item.status == 0) {
this.canceldanhao(item.orderNumber); this.canceldanhao(item.orderNumber);
setTimeout(() => {
this.indet(this.userdata);
this.useralllist=[];
this.alllist=[];
this.allmessage=[];
this.obligation=[];
this.receiving=[];
this.pending=[];
}, 500);
} }
if (item.buttontitle == "立即支付") { if (item.buttontitle == "立即支付") {
this.$router.push({ this.$router.push({
@ -411,13 +423,14 @@ export default {
}, },
selectGoods(item, index) { selectGoods(item, index) {
let list=[] let list=[]
this.activeIndex = index; this.activeIndex = index;
console.log(this.obligation)
if(item.title=='待付款'){ if(item.title=='待付款'){
list=this.obligation list=this.obligation
} }
else if(item.title=='待收货'){ else if(item.title=='待收货'){
list=this.receiving list=this.receiving
console.log(this.receiving);
}else if(item.title=='待发货'){ }else if(item.title=='待发货'){
this.useralllist=this.pending this.useralllist=this.pending
@ -427,7 +440,8 @@ export default {
else if(item.title=='全部'){ else if(item.title=='全部'){
list=this.alllist list=this.alllist
} }
console.log(this.useralllist); this.useralllist=[];
console.log(this.useralllist,list);
for (var i = 0; i < this.useralllist.length; i++) { for (var i = 0; i < this.useralllist.length; i++) {
this.useralllist[i].orderNumber =this.goldmedal[i].orderNumber; this.useralllist[i].orderNumber =this.goldmedal[i].orderNumber;
this.useralllist[i].status = this.goldmedal[i].status this.useralllist[i].status = this.goldmedal[i].status

View File

@ -155,6 +155,12 @@ export default {
async userdelete(item) { async userdelete(item) {
console.log(item.memberId); console.log(item.memberId);
let data = await editdelete(this.userid, item.id); let data = await editdelete(this.userid, item.id);
if(data){
this.$message({
type: 'warning',
message: '删除成功'
});
}
this.editaddress(); this.editaddress();
console.log(data); console.log(data);
}, },