From b36be16f381ec3a53f55743de5af575763e6e049 Mon Sep 17 00:00:00 2001 From: yeliang-king <2244255345@qq.com> Date: Tue, 16 May 2023 17:10:48 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BC=9A=E5=91=98=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=88=B7=E6=96=B0=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manager/src/views/member/list/index.vue | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/manager/src/views/member/list/index.vue b/manager/src/views/member/list/index.vue index 04890d8c..cfc86f2f 100644 --- a/manager/src/views/member/list/index.vue +++ b/manager/src/views/member/list/index.vue @@ -466,7 +466,6 @@ export default { // 提交修改数据 handleSubmitModal() { - debugger const { nickName, sex, username, face, newPassword,id } = this.form; let time = new Date(this.form.birthday); let birthday = this.form.birthday=== undefined?'': @@ -491,7 +490,7 @@ export default { API_Member.updateMember(submit).then((res) => { if (res.result) { this.$Message.success("修改成功！"); - this.init(); + this.getData(); } }); }, From 1ef8dd26cfea06abd83099812f0d153177a25768 Mon Sep 17 00:00:00 2001 From: Yer <17633066053@163.com> Date: Fri, 26 May 2023 16:54:26 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix:=20:bug:=20=E4=BF=AE=E6=94=B9=E5=BA=97?= =?UTF-8?q?=E9=93=BA=E8=AF=A6=E6=83=85bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- buyer/src/pages/Merchant.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/buyer/src/pages/Merchant.vue b/buyer/src/pages/Merchant.vue index 621f3ad5..a1ae5ca0 100644 --- a/buyer/src/pages/Merchant.vue +++ b/buyer/src/pages/Merchant.vue @@ -60,7 +60,6 @@
{{ cateName }}
-
+
- +
@@ -254,7 +254,7 @@ export default { goodsList(this.params) .then((res) => { if (res.success) { - this.goodsList = res.result; + this.goodsList = res.result.records; this.total = res.result.total; } }) From 5b58d1de5ea69bba61721fcd83e03b5ed0082fff Mon Sep 17 00:00:00 2001 From: Chopper711 Date: Wed, 31 May 2023 15:04:46 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix:=E4=B9=8B=E5=89=8D=E7=9A=84=E9=83=A8?= =?UTF-8?q?=E5=88=86=E5=94=AE=E5=90=8E=E9=80=BB=E8=BE=91=E8=A1=A5=E8=B6=B3?= =?UTF-8?q?=EF=BC=8C=E4=B8=8D=E8=BF=87=E4=BB=A3=E7=A0=81=E5=88=A4=E5=AE=9A?= =?UTF-8?q?=E5=AD=98=E5=9C=A8=E9=97=AE=E9=A2=98=EF=BC=8C=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E6=9C=AA=E6=9D=A5=E8=BF=9B=E8=A1=8C=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- buyer/src/pages/home/orderCenter/MyOrder.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/buyer/src/pages/home/orderCenter/MyOrder.vue b/buyer/src/pages/home/orderCenter/MyOrder.vue index c390427a..a0293c1e 100644 --- a/buyer/src/pages/home/orderCenter/MyOrder.vue +++ b/buyer/src/pages/home/orderCenter/MyOrder.vue @@ -70,7 +70,8 @@ - +
@@ -206,7 +207,7 @@ export default { applyAfterSale (goodsItem) { // 申请售后 let arr = [] goodsItem.forEach(e => { - if (e.afterSaleStatus === 'NOT_APPLIED') { + if (e.afterSaleStatus === 'NOT_APPLIED'|| e.afterSaleStatus === 'PART_AFTER_SALE') { arr.push(e) } }); From 09ce16dc95e3ea447532f40ae015176a6927c7b1 Mon Sep 17 00:00:00 2001 From: chc <1501738723@qq.com> Date: Thu, 1 Jun 2023 10:10:51 +0800 Subject: [PATCH 4/4] =?UTF-8?q?IM=E6=90=BA=E5=B8=A6=E5=95=86=E5=93=81?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- buyer/src/components/mixes/talkIm.vue | 16 ++++++++++++---- buyer/src/pages/GoodsDetail.vue | 2 +- buyer/src/pages/Merchant.vue | 2 +- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/buyer/src/components/mixes/talkIm.vue b/buyer/src/components/mixes/talkIm.vue index a50e3cab..ab7c5df1 100644 --- a/buyer/src/components/mixes/talkIm.vue +++ b/buyer/src/components/mixes/talkIm.vue @@ -15,16 +15,24 @@ export default { }, methods: { // 跳转im客服 - async IMService(id) { + async IMService(id, goodsId, skuId) { // 获取访问Token let accessToken = Storage.getItem("accessToken"); await this.getIMDetailMethods(); const userInfo = await getMemberMsg(); if (userInfo.success) { - window.open( - this.IMLink + "?token=" + accessToken + "&id=" + id || this.storeMsg.storeId - ); + //携带商品Id,在IM可以发送商品信息 + if(goodsId && skuId){ + window.open( + this.IMLink + "?token=" + accessToken + "&id=" + id || this.storeMsg.storeId + "&goodsId=" + goodsId + "&skuId=" + skuId + ); + }else{ + window.open( + this.IMLink + "?token=" + accessToken + "&id=" + id || this.storeMsg.storeId + ); + } + } else { this.$Message.error("请登录后再联系客服"); return; diff --git a/buyer/src/pages/GoodsDetail.vue b/buyer/src/pages/GoodsDetail.vue index 89685d2c..22820f71 100644 --- a/buyer/src/pages/GoodsDetail.vue +++ b/buyer/src/pages/GoodsDetail.vue @@ -22,7 +22,7 @@ {{ storeCollected? "已收藏店铺": "收藏店铺" }} - 联系客服 + 联系客服
diff --git a/buyer/src/pages/Merchant.vue b/buyer/src/pages/Merchant.vue index a1ae5ca0..d773cdfe 100644 --- a/buyer/src/pages/Merchant.vue +++ b/buyer/src/pages/Merchant.vue @@ -14,7 +14,7 @@ type="ios-heart"/>{{ storeCollected ? '已收藏店铺' : '收藏店铺' }} - 联系客服