diff --git a/.env b/.env index b4ae1fd2..4860a552 100644 --- a/.env +++ b/.env @@ -11,6 +11,9 @@ SHOPRO_DEV_BASE_URL = http://127.0.0.1:48080 # 后端接口前缀(一般不建议调整) SHOPRO_API_PATH = /app-api +# 后端 websocket 接口前缀 +SHOPRO_WEBSOCKET_PATH = /infra/ws + # 开发环境运行端口 SHOPRO_DEV_PORT = 3000 diff --git a/manifest.json b/manifest.json index e0a75df1..66674c1c 100644 --- a/manifest.json +++ b/manifest.json @@ -184,7 +184,7 @@ "versionCode": 100 }, "mp-weixin": { - "appid": "wx98df718e528399d2", + "appid": "wx63c280fe3248a3e7", "setting": { "urlCheck": false, "minified": true, @@ -236,4 +236,4 @@ "_spaceID": "192b4892-5452-4e1d-9f09-eee1ece40639", "locale": "zh-Hans", "fallbackLocale": "zh-Hans" -} \ No newline at end of file +} diff --git a/package.json b/package.json index d83ca3a7..8f8a1006 100644 --- a/package.json +++ b/package.json @@ -88,7 +88,6 @@ } }, "dependencies": { - "@hyoga/uni-socket.io": "^1.0.1", "dayjs": "^1.11.7", "lodash": "^4.17.21", "luch-request": "^3.0.8", diff --git a/pages.json b/pages.json index 1e14b74f..72d50091 100644 --- a/pages.json +++ b/pages.json @@ -652,4 +652,4 @@ } ] } -} \ No newline at end of file +} diff --git a/pages/chat/components/goods.vue b/pages/chat/components/goods.vue index 7fbc95c7..eabdd218 100644 --- a/pages/chat/components/goods.vue +++ b/pages/chat/components/goods.vue @@ -1,23 +1,15 @@ - diff --git a/pages/chat/components/messageInput.vue b/pages/chat/components/messageInput.vue new file mode 100644 index 00000000..1714ac55 --- /dev/null +++ b/pages/chat/components/messageInput.vue @@ -0,0 +1,102 @@ + + + + + diff --git a/pages/chat/components/messageList.vue b/pages/chat/components/messageList.vue new file mode 100644 index 00000000..d08fd838 --- /dev/null +++ b/pages/chat/components/messageList.vue @@ -0,0 +1,94 @@ + + + diff --git a/pages/chat/components/messageListItem.vue b/pages/chat/components/messageListItem.vue new file mode 100644 index 00000000..0634878b --- /dev/null +++ b/pages/chat/components/messageListItem.vue @@ -0,0 +1,296 @@ + + + + + diff --git a/pages/chat/components/order.vue b/pages/chat/components/order.vue index cf57f63b..15f27208 100644 --- a/pages/chat/components/order.vue +++ b/pages/chat/components/order.vue @@ -1,49 +1,36 @@ diff --git a/pages/chat/components/select-popup.vue b/pages/chat/components/select-popup.vue index cd829a1d..6c701441 100644 --- a/pages/chat/components/select-popup.vue +++ b/pages/chat/components/select-popup.vue @@ -14,11 +14,11 @@