This commit is contained in:
952108534@qq.com 2022-01-23 11:32:06 +08:00
parent 9df46a5ab3
commit 0617f2461c

View File

@ -302,10 +302,11 @@ export default {
}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]);
} }
else if(this.goldmedal[i].status==4){ else if(this.useralllist[i].status==2){
this.pending.push(this.goldmedal[i].orderDetailList[0]); this.pending.push(this.goldmedal[i].orderDetailList[0]);
} }
} }
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;
@ -349,7 +350,7 @@ export default {
// addressDetailInfo: orderAddress[0].detailAddress, // addressDetailInfo: orderAddress[0].detailAddress,
// }, // },
// }; // };
postData.push(oneProduct); // postData.push(oneProduct);
let res = await generateOrderWX(postData); let res = await generateOrderWX(postData);
let userPayData = { let userPayData = {
orderId: res.data, orderId: res.data,