From ed4f78bf6a335e76b6f80b08cfb18785d1ea4b56 Mon Sep 17 00:00:00 2001 From: 15386982806 Date: Wed, 8 Feb 2023 18:18:09 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E7=94=A8=E6=88=B7PC=E7=AB=AF=EF=BC=8C?= =?UTF-8?q?=E6=88=91=E7=9A=84=E8=AE=A2=E5=8D=95=EF=BC=8C=E6=A0=B9=E6=8D=AE?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=8F=B7=E6=90=9C=E7=B4=A2=E6=A1=86=E5=B1=95?= =?UTF-8?q?=E7=A4=BA=E4=B8=8D=E5=85=A8=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- buyer/src/assets/styles/global.scss | 13 +++++++++++++ buyer/src/pages/home/orderCenter/MyOrder.vue | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/buyer/src/assets/styles/global.scss b/buyer/src/assets/styles/global.scss index 8a74a333..ccd8c15d 100644 --- a/buyer/src/assets/styles/global.scss +++ b/buyer/src/assets/styles/global.scss @@ -170,6 +170,19 @@ $dark_content_color: #d5d5d5; margin-right: 20px; } +.mb_24 { + margin-bottom: 24px; +} +.mt_24 { + margin-top: 24px; +} +.ml_24 { + margin-left: 24px; +} +.mr_24 { + margin-right: 24px; +} + .mb_10 { margin-bottom: 10px; } diff --git a/buyer/src/pages/home/orderCenter/MyOrder.vue b/buyer/src/pages/home/orderCenter/MyOrder.vue index f7da6acd..c390427a 100644 --- a/buyer/src/pages/home/orderCenter/MyOrder.vue +++ b/buyer/src/pages/home/orderCenter/MyOrder.vue @@ -4,7 +4,7 @@ -
+
Date: Thu, 9 Feb 2023 03:21:07 +0000 Subject: [PATCH 2/7] update README.md. Signed-off-by: Chopper711 <1814994716@qq.com> --- README.md | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 17a91599..62fda1fb 100644 --- a/README.md +++ b/README.md @@ -2,19 +2,14 @@ #### 欢迎交流需求，交流业务，交流技术（基础问题自行解决，其他问题先看文档后提问） +#### 不用削尖脑袋往老群里加，老群活跃度较低，很多潜水党，新群相对而言活跃一些 :tw-1f606: :tw-1f606: :tw-1f606: :tw-1f606: :tw-1f606: :tw-1f606: + +#### PS： **演示站点所有环境均部署master分支。如果有演示站点问题，可以反馈，如果演示站点没问题本地运行有问题，需自行处理** ##### 交流 qq 1群 961316482（已满） -Lilishop交流群点击快捷加群 - ##### 交流 qq 2群 875294241（已满） - -Lilishop交流群2群点击快捷加群 - - -##### 交流 qq 3群 263785057 - -Lilishop交流群3群点击快捷加群 - +##### 交流 qq 3群 263785057（已满） +##### 交流 qq 4群 674617534 ##### 体验 公众号/小程序/APP 体验，扫描二维码 @@ -166,6 +161,7 @@ PS：手机验证码为 ‘111111’ ### 交流群 -##### 官方qq 1群 961316482（已满） -##### 官方qq 2群 875294241（已满） -##### 官网qq 3群 263785057 +##### 交流 qq 1群 961316482（已满） +##### 交流 qq 2群 875294241（已满） +##### 交流 qq 3群 263785057（已满） +##### 交流 qq 4群 674617534 From 70757e8adfcc211cc89b7146085d702ba3bdde6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A8=8B?= <994041296@163.com> Date: Thu, 9 Feb 2023 15:13:55 +0800 Subject: [PATCH 3/7] =?UTF-8?q?IM=E5=95=86=E5=AE=B6=E7=AB=AF=E4=B8=8D?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- im/.env | 2 +- im/.env.development | 2 +- im/src/api/user.js | 8 ++++---- im/src/utils/auth.js | 42 +++++++++++++++++++++--------------------- 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/im/.env b/im/.env index b65f6811..070b82b5 100644 --- a/im/.env +++ b/im/.env @@ -4,7 +4,7 @@ VUE_APP_API_BASE_URL=https://im-api.pickmall.cn VUE_APP_WEB_SOCKET_URL=wss://im-api.pickmall.cn/lili/webSocket VUE_APP_COMMON=https://common-api.pickmall.cn VUE_APP_BUYER=https://buyer-api.pickmall.cn -VUE_APP_SELLER=https://seller-api.pickmall.cn +VUE_APP_SELLER=https://store-api.pickmall.cn VUE_APP_WEBSITE_NAME="LiLi IM" VUE_APP_PC_URL=https://pc-b2b2c.pickmall.cn/ VUE_APP_PC_STORE=https://store-b2b2c.pickmall.cn/ \ No newline at end of file diff --git a/im/.env.development b/im/.env.development index 1018d37c..2b51a5e6 100644 --- a/im/.env.development +++ b/im/.env.development @@ -4,7 +4,7 @@ VUE_APP_API_BASE_URL=https://im-api.pickmall.cn VUE_APP_WEB_SOCKET_URL=wss://im-api.pickmall.cn/lili/webSocket VUE_APP_COMMON=https://common-api.pickmall.cn VUE_APP_BUYER=https://buyer-api.pickmall.cn -VUE_APP_SELLER=https://seller-api.pickmall.cn +VUE_APP_SELLER=https://store-api.pickmall.cn VUE_APP_WEBSITE_NAME="LiLi IM" VUE_APP_PC_URL=https://pc-b2b2c.pickmall.cn/ VUE_APP_PC_STORE=https://store-b2b2c.pickmall.cn/ \ No newline at end of file diff --git a/im/src/api/user.js b/im/src/api/user.js index 93f7b8f3..44ef3fd8 100644 --- a/im/src/api/user.js +++ b/im/src/api/user.js @@ -23,22 +23,22 @@ export const ServeGetStoreDetail = (storeId) => { // 获取用户历史足迹 export const ServeGetFootPrint = (params) => { - return get(`${config.BASE_BUYER}/buyer/member/footprint`,params); + return get(`${config.BASE_BUYER}/buyer/member/footprint`, params); }; // 商家获取用户历史足迹 export const ServeStoreGetFootPrint = (params) => { - return get(`${config.BASE_SELLER}/store/member/footprint`,params); + return get(`${config.BASE_SELLER}/store/member/footprint`, params); }; // 获取用户订单列表信息 export const ServeGetOrderPrint = (params) => { - return get(`${config.BASE_BUYER}/buyer/order/order`,params); + return get(`${config.BASE_BUYER}/buyer/order/order`, params); }; // 商家获取用户订单列表信息 export const ServeStoreGetOrderPrint = (params) => { - return get(`${config.BASE_SELLER}/store/order/order`,params); + return get(`${config.BASE_SELLER}/store/order/order`, params); }; // 获取商品信息 diff --git a/im/src/utils/auth.js b/im/src/utils/auth.js index 487f40f0..39a81fa5 100644 --- a/im/src/utils/auth.js +++ b/im/src/utils/auth.js @@ -9,18 +9,18 @@ const USER_SETTING = 'LILI-SETTING' * * @param {String} token */ -export function setToken(token) { - return localStorage.setItem( - USER_TOKEN, - token - ) +export function setToken (token) { + return localStorage.setItem( + USER_TOKEN, + token + ) } /** * 获取授权token */ -export function getToken() { - return localStorage.getItem(USER_TOKEN) +export function getToken () { + return localStorage.getItem(USER_TOKEN) } /** @@ -28,24 +28,24 @@ export function getToken() { * * @param {Object} data */ -export function setUserInfo(data) { - localStorage.setItem(USER_INFO, JsBase64.Base64.encode(JSON.stringify(data))) +export function setUserInfo (data) { + localStorage.setItem(USER_INFO, JsBase64.Base64.encode(JSON.stringify(data))) } /** * 获取用户信息 */ -export function getUserInfo() { - const data = JsBase64.Base64.decode(localStorage.getItem(USER_INFO) || '') - return data ? JSON.parse(data) : {} +export function getUserInfo () { + const data = JsBase64.Base64.decode(localStorage.getItem(USER_INFO) || '') + return data ? JSON.parse(data) : {} } /** * 获取用户本地缓存的设置信息 */ -export function getUserSettingCache() { - const data = localStorage.getItem(USER_SETTING) - return data ? JSON.parse(data) : {} +export function getUserSettingCache () { + const data = localStorage.getItem(USER_SETTING) + return data ? JSON.parse(data) : {} } /** @@ -53,15 +53,15 @@ export function getUserSettingCache() { * * @param {Object} state 用户设置相关信息 */ -export function setUserSettingCache(state) { - localStorage.setItem(USER_SETTING, JSON.stringify(state)) +export function setUserSettingCache (state) { + localStorage.setItem(USER_SETTING, JSON.stringify(state)) } /** * 删除用户相关缓存信息 */ -export function removeAll() { - localStorage.removeItem(USER_TOKEN) - localStorage.removeItem(USER_INFO) - localStorage.removeItem(USER_SETTING) +export function removeAll () { + localStorage.removeItem(USER_TOKEN) + localStorage.removeItem(USER_INFO) + localStorage.removeItem(USER_SETTING) } From cc31b6232fa5391989b0c90531a2a22e14af60ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A8=8B?= <994041296@163.com> Date: Thu, 9 Feb 2023 15:59:08 +0800 Subject: [PATCH 4/7] =?UTF-8?q?im=E8=81=8A=E5=A4=A9=E5=8F=91=E9=80=81?= =?UTF-8?q?=E4=B8=AD=E6=96=87=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- im/src/plugins/ws-socket.js | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/im/src/plugins/ws-socket.js b/im/src/plugins/ws-socket.js index e7516700..69a3ac8b 100644 --- a/im/src/plugins/ws-socket.js +++ b/im/src/plugins/ws-socket.js @@ -222,17 +222,22 @@ class WsSocket { */ onMessage (evt) { let result = this.onParse(evt); - console.log("接收消息", result, "color:red"); - // 判断消息事件是否被绑定 - // event_talk; - let params = { - ...this.onParse(evt), - text: JSON.parse(this.onParse(evt).text) + if (this.onParse(evt).text.includes('goodsName') || this.onParse(evt).text.includes('groupName')) { + let params = { + ...this.onParse(evt), + text: JSON.parse(this.onParse(evt).text) + } + this.onCallBacks["event_talk"](params); + } else { + let params = { + ...this.onParse(evt), + text: this.onParse(evt).text + } + this.onCallBacks["event_talk"](params); } // 指定推送消息 - this.onCallBacks["event_talk"](params); - } + } /** * WebSocket心跳检测 */ From 42a24d854b64ee2c1c85a81850a8e64133859c32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A8=8B?= <994041296@163.com> Date: Thu, 9 Feb 2023 16:34:01 +0800 Subject: [PATCH 5/7] =?UTF-8?q?im=E8=B7=AF=E5=BE=84=E8=B7=B3=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- im/src/main.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/im/src/main.js b/im/src/main.js index 045a82fe..f3d031fc 100644 --- a/im/src/main.js +++ b/im/src/main.js @@ -28,7 +28,7 @@ Vue.prototype.linkToGoods = function (goodsId, skuId) { // 跳转买家端商 if (localStorage.getItem('storeFlag') == 'false') { window.open(`${config.PC_STORE}goods-operation-edit?id=${goodsId}`, '_blank') } else { - window.open(`${config.PC_URL}/goodsDetail?skuId=${skuId}&goodsId=${goodsId}`, '_blank') + window.open(`${config.PC_URL}goodsDetail?skuId=${skuId}&goodsId=${goodsId}`, '_blank') } }; Vue.prototype.linkToStore = function (storeId) { // 跳转商家端商品 @@ -42,7 +42,7 @@ Vue.prototype.linkToOrders = function (sn) { window.open(`${config.PC_STORE}order-detail?sn=${sn}`, '_blank') } else { // 用户 - window.open(`${config.PC_URL}/OrderDetail?sn=${sn}`, '_blank') + window.open(`${config.PC_URL}home/OrderDetail?sn=${sn}`, '_blank') } }; From 9375ba9e316e8ff280cd3c35432c53097f3204db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A8=8B?= <994041296@163.com> Date: Mon, 13 Feb 2023 09:24:30 +0800 Subject: [PATCH 6/7] =?UTF-8?q?im=E9=87=91=E9=A2=9D=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- im/src/components/chat/panel/TalkPanel.vue | 9 +- .../chat/panel/template/footPrint.vue | 87 +++++--- .../chat/panel/template/goodsLink.vue | 2 +- im/src/main.js | 4 + im/src/plugins/Foundation.js | 200 ++++++++++++++++++ im/src/plugins/filters.js | 20 ++ 6 files changed, 283 insertions(+), 39 deletions(-) create mode 100644 im/src/plugins/Foundation.js create mode 100644 im/src/plugins/filters.js diff --git a/im/src/components/chat/panel/TalkPanel.vue b/im/src/components/chat/panel/TalkPanel.vue index 3f88838c..7b4c5b21 100644 --- a/im/src/components/chat/panel/TalkPanel.vue +++ b/im/src/components/chat/panel/TalkPanel.vue @@ -84,7 +84,7 @@
- ￥{{ item.text.price }} + {{ item.text.price | unitPrice('￥') }}
@@ -103,7 +103,7 @@ {{ item.text.groupName }} {{ item.text.paymentTime }} - 订单金额：￥{{ item.text.flowPrice }} + 订单金额：{{ item.text.flowPrice | unitPrice('￥') }} {{ @@ -171,7 +171,7 @@ - +