From d4ca5020a0529c8a71012d075180a4415eba13e2 Mon Sep 17 00:00:00 2001 From: "952108534@qq.com" <952108534@qq.com> Date: Sat, 22 Jan 2022 21:00:10 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- rc-busness/pages/personal/useraddress.vue | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/rc-busness/pages/personal/useraddress.vue b/rc-busness/pages/personal/useraddress.vue index 28dd88a6..9ad14587 100644 --- a/rc-busness/pages/personal/useraddress.vue +++ b/rc-busness/pages/personal/useraddress.vue @@ -287,6 +287,7 @@ export default { let data = await userindent(mobile); this.activeIndex = stype; this.goldmedal = data; + this.alllist=[]; for (let i = 0; i < this.goldmedal.length; i++) { this.useralllist.push(this.goldmedal[i].orderDetailList[0]); this.alllist.push(this.goldmedal[i].orderDetailList[0]) @@ -294,7 +295,6 @@ export default { if(this.goldmedal[i].status==0){ console.log("+++++++++++++"); this.obligation.push(this.goldmedal[i].orderDetailList[0]); - }else if(this.goldmedal[i].status==1){ this.receiving.push(this.goldmedal[i].orderDetailList[0]); } @@ -383,6 +383,8 @@ export default { }); setTimeout(() => { this.indet(); + this.activeIndex=0; + this.useralllist=[]; }, 500); } @@ -391,6 +393,15 @@ export default { userpay(item, index) { if (item.status == 0) { 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 == "立即支付") { this.$router.push({ @@ -411,8 +422,9 @@ export default { }, selectGoods(item, index) { let list=[] - this.activeIndex = index; + console.log(this.obligation) + debugger if(item.title=='待付款'){ list=this.obligation } @@ -427,7 +439,8 @@ export default { else if(item.title=='全部'){ list=this.alllist } - console.log(this.useralllist); + this.useralllist=[]; + console.log(this.useralllist,list); for (var i = 0; i < this.useralllist.length; i++) { this.useralllist[i].orderNumber =this.goldmedal[i].orderNumber; this.useralllist[i].status = this.goldmedal[i].status @@ -437,7 +450,7 @@ export default { this.useralllist[i].lengthnum=this.goldmedal[i].orderDetailList.length } this.useralllist=list - + }, userfind(item) { if(item.status==0){ From faa6511d6e8bba3b3d71aa4a0dffac5ccf32f5b9 Mon Sep 17 00:00:00 2001 From: "952108534@qq.com" <952108534@qq.com> Date: Sat, 22 Jan 2022 21:05:00 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E5=9C=B0=E5=9D=80=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- rc-busness/pages/personal/useraddress.vue | 1 - rc-busness/pages/useraddress/openaddress.vue | 6 ++++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/rc-busness/pages/personal/useraddress.vue b/rc-busness/pages/personal/useraddress.vue index 9ad14587..3924d13c 100644 --- a/rc-busness/pages/personal/useraddress.vue +++ b/rc-busness/pages/personal/useraddress.vue @@ -424,7 +424,6 @@ export default { let list=[] this.activeIndex = index; console.log(this.obligation) - debugger if(item.title=='待付款'){ list=this.obligation } diff --git a/rc-busness/pages/useraddress/openaddress.vue b/rc-busness/pages/useraddress/openaddress.vue index 60fabf15..32894653 100644 --- a/rc-busness/pages/useraddress/openaddress.vue +++ b/rc-busness/pages/useraddress/openaddress.vue @@ -155,6 +155,12 @@ export default { async userdelete(item) { console.log(item.memberId); let data = await editdelete(this.userid, item.id); + if(data){ + this.$message({ + type: 'warning', + message: '删除成功' + }); + } this.editaddress(); console.log(data); }, From 2abc052087eee20d998e15c480fae293e751b3d2 Mon Sep 17 00:00:00 2001 From: "952108534@qq.com" <952108534@qq.com> Date: Sat, 22 Jan 2022 21:40:23 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- rc-busness/pages/personal/discount.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rc-busness/pages/personal/discount.vue b/rc-busness/pages/personal/discount.vue index 0fdc6204..cf467876 100644 --- a/rc-busness/pages/personal/discount.vue +++ b/rc-busness/pages/personal/discount.vue @@ -44,7 +44,7 @@
- 立即使用 +
From 09ed52dcfc9e6438f4be4fe2c9d253b4b6392fc3 Mon Sep 17 00:00:00 2001 From: "952108534@qq.com" <952108534@qq.com> Date: Sat, 22 Jan 2022 21:40:38 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- rc-busness/pages/personal/useraddress.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/rc-busness/pages/personal/useraddress.vue b/rc-busness/pages/personal/useraddress.vue index 3924d13c..df070707 100644 --- a/rc-busness/pages/personal/useraddress.vue +++ b/rc-busness/pages/personal/useraddress.vue @@ -288,6 +288,7 @@ export default { this.activeIndex = stype; this.goldmedal = data; this.alllist=[]; + this.useralllist=[]; for (let i = 0; i < this.goldmedal.length; i++) { this.useralllist.push(this.goldmedal[i].orderDetailList[0]); this.alllist.push(this.goldmedal[i].orderDetailList[0]) @@ -429,6 +430,7 @@ export default { } else if(item.title=='待收货'){ list=this.receiving + console.log(this.receiving); }else if(item.title=='待发货'){ this.useralllist=this.pending From bfa62a1cd9a43b5be154caa039648160e7ac0890 Mon Sep 17 00:00:00 2001 From: "952108534@qq.com" <952108534@qq.com> Date: Sat, 22 Jan 2022 21:58:34 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- rc-busness/pages/myorder/usertion.vue | 17 ++++++++++++++++- rc-busness/pages/personal/useraddress.vue | 2 +- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/rc-busness/pages/myorder/usertion.vue b/rc-busness/pages/myorder/usertion.vue index 078eebc3..fe588980 100644 --- a/rc-busness/pages/myorder/usertion.vue +++ b/rc-busness/pages/myorder/usertion.vue @@ -146,6 +146,7 @@ \ No newline at end of file diff --git a/rc-busness/pages/personal/userpay.vue b/rc-busness/pages/personal/userpay.vue index 9f98275c..01a39aec 100644 --- a/rc-busness/pages/personal/userpay.vue +++ b/rc-busness/pages/personal/userpay.vue @@ -113,7 +113,8 @@ export default { computed: {}, mounted() { this.userPayData = JSON.parse(this.$route.query.userPayData); - this.qrtext=this.userPayData.wxPay + this.qrtext=this.userPayData.wxPay; + this.payOrderWX() }, methods: { closeDialogSuccess() { @@ -141,15 +142,15 @@ export default { } }, //支付监听 - async updateOrderWX() { + async payOrderWX() { let res = await updateOrderWX(); if (res.success) { this.qrtext = '成功加入群的二维码'; this.dialogSuccess = true; - clearInterval(this.time); - } else { + } else if (res.fail) { this.dialogFail = true; - clearInterval(this.time); + }else{ + this.payOrderWX() } }, }, diff --git a/rc-busness/pages/productdetails/producted.vue b/rc-busness/pages/productdetails/producted.vue index ec672f88..ef4ba19b 100644 --- a/rc-busness/pages/productdetails/producted.vue +++ b/rc-busness/pages/productdetails/producted.vue @@ -568,7 +568,8 @@ export default { item.picFile, item.productName, item.basePrice, - item.specifications + item.specifications, + item.leftAllotment ); if (data) { this.productlist = data;