From 25677ced9788b58b7a1980ae141444b31d953a41 Mon Sep 17 00:00:00 2001 From: Chopper711 Date: Wed, 8 Nov 2023 14:47:49 +0800 Subject: [PATCH 01/13] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E6=B3=A8=E9=87=8A?= =?UTF-8?q?=E7=9B=B4=E6=92=AD=E6=8F=92=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manifest.json | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/manifest.json b/manifest.json index 27092fc..e51eea0 100644 --- a/manifest.json +++ b/manifest.json @@ -207,10 +207,12 @@ } }, "plugins" : { - "live-player-plugin" : { - "version" : "1.3.0", - "provider" : "wx2b03c6e691cd7370" - } + + // 直播插件注释 + // "live-player-plugin" : { + // "version" : "1.3.0", + // "provider" : "wx2b03c6e691cd7370" + // } }, "requiredPrivateInfos" : [ "chooseLocation", "getLocation" ] }, From 20b2ca04f05c7dc2c31fb02e837426e0e32850e7 Mon Sep 17 00:00:00 2001 From: lele0521 Date: Mon, 4 Dec 2023 17:19:07 +0800 Subject: [PATCH 02/13] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E4=BC=9A?= =?UTF-8?q?=E5=91=98=E7=BB=91=E5=AE=9A=E6=89=8B=E6=9C=BA=E5=8F=B7=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/login.js | 11 + pages.json | 10 + pages/mine/set/personMsg.vue | 19 +- pages/mine/set/securityCenter/bindMobile.vue | 218 +++++++++++++++++++ 4 files changed, 257 insertions(+), 1 deletion(-) create mode 100644 pages/mine/set/securityCenter/bindMobile.vue diff --git a/api/login.js b/api/login.js index af9a1a0..9b062fa 100644 --- a/api/login.js +++ b/api/login.js @@ -14,6 +14,17 @@ export function resetByMobile(params) { }); } +/** + * 绑定手机号码 + * @param mobile + */ +export function bindMobile(params) { + return http.request({ + url: `/passport/member/bindMobile`, + method: "POST", + params, + }); +} //获取自动发券 export function getAutoCoup(){ diff --git a/pages.json b/pages.json index eca83d4..bbce918 100644 --- a/pages.json +++ b/pages.json @@ -275,6 +275,16 @@ } } }, + + { + "path": "set/securityCenter/bindMobile", + "style": { + "navigationBarTitleText": "绑定手机号", + "app-plus": { + + } + } + }, { "path": "im/list", diff --git a/pages/mine/set/personMsg.vue b/pages/mine/set/personMsg.vue index e9c477e..fbe56b3 100644 --- a/pages/mine/set/personMsg.vue +++ b/pages/mine/set/personMsg.vue @@ -22,6 +22,15 @@
{{ form.___path || '请选择城市' }}
 + + + + {{form.mobile}} + + + 绑定手机号码 + +
@@ -32,7 +41,7 @@ + From 7148b32c43e305bfe43fb6710fc645e5d8189aeb Mon Sep 17 00:00:00 2001 From: 15386982806 Date: Fri, 5 Jan 2024 14:17:16 +0800 Subject: [PATCH 03/13] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=B4=A7=E7=89=A9?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E9=80=80=E6=AC=BE=E7=8A=B6=E6=80=81=E4=B8=8E?= =?UTF-8?q?=E5=AE=9E=E9=99=85=E9=80=80=E6=AC=BE=E9=87=91=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/order/orderDetail.vue | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pages/order/orderDetail.vue b/pages/order/orderDetail.vue index 12be924..e4c0793 100644 --- a/pages/order/orderDetail.vue +++ b/pages/order/orderDetail.vue @@ -83,6 +83,7 @@ ￥{{ sku.goodsPrice | unitPrice }} + {{refundPriceList(sku.isRefund)}} ({{ sku.refundPrice | unitPrice("￥") }}) @@ -314,6 +315,21 @@ export default { this.sn = options.sn; }, methods: { + // 退款状态枚举 + refundPriceList(status) { + switch (status) { + case 'ALL_REFUND': + return "全部退款"; + case 'PART_REFUND': + return "部分退款"; + case 'NO_REFUND': + return "未退款"; + case 'REFUNDING': + return "退款中"; + default: + return "未退款"; + } + }, callPhone(){ this.$options.filters.callPhone(this.order.storeAddressMobile ) }, From 2d0b78af5212e308caa47cc9a94bfdf9c6717ee4 Mon Sep 17 00:00:00 2001 From: 15386982806 Date: Wed, 10 Jan 2024 18:56:18 +0800 Subject: [PATCH 04/13] =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=A4=9A=E5=8C=85?= =?UTF-8?q?=E8=A3=B9=E5=BF=AB=E9=80=92=E5=B1=95=E7=A4=BA=E7=89=A9=E6=B5=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 --- api/trade.js | 9 +++++++++ pages.json | 6 ++++++ pages/order/orderDetail.vue | 29 ++++++++++++++++++++++++++--- 3 files changed, 41 insertions(+), 3 deletions(-) diff --git a/api/trade.js b/api/trade.js index 40b740f..5d2b1a7 100644 --- a/api/trade.js +++ b/api/trade.js @@ -319,3 +319,12 @@ export function reBuy(sn) { params, }); } + +// 查看包裹列表 +export function getPackage(orderSn) { + return http.request({ + url: `/order/order/getPackage/${orderSn}`, + method: Method.GET, + needToken: true, + }); +} \ No newline at end of file diff --git a/pages.json b/pages.json index bbce918..3e324e6 100644 --- a/pages.json +++ b/pages.json @@ -718,6 +718,12 @@ "navigationBarTitleText": "订单详情" } }, + { + "path": "deliverDetail", + "style": { + "navigationBarTitleText": "物流详情" + } + }, { "path": "evaluate/evaluateDetail", "style": { diff --git a/pages/order/orderDetail.vue b/pages/order/orderDetail.vue index e4c0793..ff79680 100644 --- a/pages/order/orderDetail.vue +++ b/pages/order/orderDetail.vue @@ -10,7 +10,7 @@
- + {{ logisticsList.traces[logisticsList.traces.length - 1].AcceptStation }} @@ -23,6 +23,14 @@ 券码： {{ order.orderStatus == 'CANCELLED' ? '已失效' : order.verificationCode }} + + + 当前订单有 {{ orderPackage.length }} 个包裹快递 + +
+ 点击此处查看 +
+ {{ '暂无物流信息' }} @@ -250,7 +258,7 @@ + + \ No newline at end of file From 8f49dce8f07f147a7a478cfb676a2747d78fbaf9 Mon Sep 17 00:00:00 2001 From: Yer <17633066053@163.com> Date: Wed, 17 Jan 2024 15:46:13 +0800 Subject: [PATCH 06/13] =?UTF-8?q?style:=20=E8=A7=A3=E5=86=B3=E5=88=86?= =?UTF-8?q?=E7=B1=BB=E6=90=9C=E7=B4=A2=E6=A1=86=E9=A1=B5=E9=9D=A2h5?= =?UTF-8?q?=E4=B8=8D=E8=83=BD=E7=82=B9=E5=87=BB=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/tabbar/category/category.vue | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pages/tabbar/category/category.vue b/pages/tabbar/category/category.vue index bad5bd8..a1a9f4b 100644 --- a/pages/tabbar/category/category.vue +++ b/pages/tabbar/category/category.vue @@ -2,7 +2,12 @@
商品分类
+ + + + + From 52bf47e3587977f21a51c7281a99b76d1c450a57 Mon Sep 17 00:00:00 2001 From: misworga831 Date: Mon, 22 Jan 2024 15:36:07 +0800 Subject: [PATCH 07/13] =?UTF-8?q?fix:=20=E5=85=BC=E5=AE=B9=E6=97=A7?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=9B=BE=E7=89=87=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/product/goods.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/product/goods.vue b/pages/product/goods.vue index bca6f38..bb88575 100644 --- a/pages/product/goods.vue +++ b/pages/product/goods.vue @@ -594,7 +594,7 @@ export default { } }); // 轮播图 - this.imgList = this.goodsDetail.goodsGalleryList; + this.imgList = this.goodsDetail.goodsGalleryList.filter(i => i.indexOf("\"url\":") === -1 && i.indexOf("\"status\":") === -1); // 获取店铺基本信息 this.getStoreBaseInfoFun(this.goodsDetail.storeId); From 863315eaed6cd459d61e6d795a8027d5a1b0ce92 Mon Sep 17 00:00:00 2001 From: misworga831 Date: Thu, 25 Jan 2024 10:15:11 +0800 Subject: [PATCH 08/13] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E8=99=9A?= =?UTF-8?q?=E6=8B=9F=E5=95=86=E5=93=81=E8=AE=A2=E5=8D=95=E4=B8=8D=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E6=94=B6=E8=B4=A7=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/order/orderDetail.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pages/order/orderDetail.vue b/pages/order/orderDetail.vue index ff79680..f572b2e 100644 --- a/pages/order/orderDetail.vue +++ b/pages/order/orderDetail.vue @@ -9,7 +9,7 @@ - + {{ logisticsList.traces[logisticsList.traces.length - 1].AcceptStation }} @@ -38,7 +38,7 @@ - + @@ -52,7 +52,7 @@ - + @@ -114,7 +114,7 @@ 商品总价： ￥{{ order.goodsPrice | unitPrice }} - + 运费： ￥{{ order.freightPrice | unitPrice }} From 992bb760721e7d738526629eb3c882faa46ce50b Mon Sep 17 00:00:00 2001 From: misworga831 Date: Fri, 26 Jan 2024 10:12:23 +0800 Subject: [PATCH 09/13] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=B7=B2?= =?UTF-8?q?=E8=AF=BB=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3=E4=B8=8D=E6=AD=A3?= =?UTF-8?q?=E7=A1=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/message.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/message.js b/api/message.js index 9b8a4f2..b46a606 100644 --- a/api/message.js +++ b/api/message.js @@ -42,7 +42,7 @@ export function getMessages(params) { */ export function messageMarkAsRead(ids) { return http.request({ - url: `members/member-nocice-logs/${ids}/read`, + url: `/message/member/${ids}`, method: Method.PUT, needToken: true, }); From b51caa91356386a7d641b5d9abd99bc4cecb3bd0 Mon Sep 17 00:00:00 2001 From: misworga831 Date: Sat, 27 Jan 2024 10:50:42 +0800 Subject: [PATCH 10/13] =?UTF-8?q?fix:=20=E6=96=B0=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=8B=E5=8D=95=E6=97=B6=EF=BC=8C=E6=97=A0?= =?UTF-8?q?=E5=9C=B0=E5=9D=80=E6=97=A0=E6=B3=95=E4=B8=8B=E5=8D=95=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/order/fillorder.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/order/fillorder.vue b/pages/order/fillorder.vue index 673a234..d3e94e7 100644 --- a/pages/order/fillorder.vue +++ b/pages/order/fillorder.vue @@ -651,7 +651,7 @@ export default { }); return false; } - } else if (this.shippingText === "LOGISTICS" && this.orderMessage.cartTypeEnum != 'VIRTUAL') { + } else if (this.shippingText === "LOGISTICS" && this.orderMessage.cartTypeEnum !== 'VIRTUAL') { if (!this.address.id) { uni.showToast({ title: "请选择地址", From e61222928ed8a826138a36b7320899f8bef2ed3f Mon Sep 17 00:00:00 2001 From: Yer <17633066053@163.com> Date: Mon, 29 Jan 2024 17:32:22 +0800 Subject: [PATCH 11/13] =?UTF-8?q?fix:=20:bug:=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E9=80=80=E5=87=BA=E7=99=BB=E5=BD=95=E5=90=8Ehaslogin=E6=B2=A1?= =?UTF-8?q?=E6=B8=85=E7=A9=BAbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- utils/filters.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/utils/filters.js b/utils/filters.js index 5ea4136..e80d0d7 100644 --- a/utils/filters.js +++ b/utils/filters.js @@ -1,8 +1,8 @@ -import Foundation from "./Foundation.js"; -import storage from "@/utils/storage.js"; import { logout } from "@/api/login"; import { getUserInfo } from "@/api/members"; +import storage from "@/utils/storage.js"; import Vue from "vue"; +import Foundation from "./Foundation.js"; /** * 金钱单位置换 2999 --> 2,999.00 * @param val @@ -353,6 +353,7 @@ export function quiteLoginOut () { storage.setAccessToken(""); storage.setRefreshToken(""); storage.setUserInfo({}); + storage.setHasLogin(false) navigateToLogin("redirectTo"); await logout(); } From 393c60200f24af9da5db54111ef62110256d926a Mon Sep 17 00:00:00 2001 From: 15386982806 Date: Tue, 30 Jan 2024 17:24:37 +0800 Subject: [PATCH 12/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=80=80=E6=AC=BE=E7=8A=B6=E6=80=81=E5=B1=95?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/order/orderDetail.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pages/order/orderDetail.vue b/pages/order/orderDetail.vue index f572b2e..e98476f 100644 --- a/pages/order/orderDetail.vue +++ b/pages/order/orderDetail.vue @@ -91,7 +91,9 @@ ￥{{ sku.goodsPrice | unitPrice }} - {{refundPriceList(sku.isRefund)}} ({{ sku.refundPrice | unitPrice("￥") }}) + + {{refundPriceList(sku.isRefund)}} ({{ sku.refundPrice | unitPrice("￥") }}) + From fe9060073f437e782029f3d166a810c6a1b6bb45 Mon Sep 17 00:00:00 2001 From: 15386982806 Date: Tue, 30 Jan 2024 17:25:55 +0800 Subject: [PATCH 13/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=80=80=E6=AC=BE=E7=8A=B6=E6=80=81=E5=B1=95?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/order/orderDetail.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/order/orderDetail.vue b/pages/order/orderDetail.vue index e98476f..a460793 100644 --- a/pages/order/orderDetail.vue +++ b/pages/order/orderDetail.vue @@ -351,7 +351,7 @@ export default { case 'REFUNDING': return "退款中"; default: - return "未退款"; + return ""; } }, callPhone(){