diff --git a/.env b/.env index b4ae1fd264c6c01dc909ce4e5a084f2cd99a1cc4..4860a552974f54f1c0aa0a6bd0a82b4e0c85235e 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 e0a75df13f11a4a99bca057ef0827fb82698dd78..66674c1c3fede8837f77647f2ebbaa0bdcaaeb4d 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 d83ca3a717a0b6facffc1f746b7be44ec17a8770..8f8a1006623331aea0ccb482e0841c44cb38184f 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 1e14b74f8de8bb88a4b600841c16287183591952..72d5009144a061d7678902e196953fc6c355a581 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 7fbc95c755fd1fc274a54b8cd3bcaf402135f895..eabdd21832b055765cc74af24ddf0a45cc576449 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 0000000000000000000000000000000000000000..1714ac55a8b31b8a2e6898f6f5596043be323b89 --- /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 0000000000000000000000000000000000000000..d08fd83858b24618e33c2147df31a580865edbda --- /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 0000000000000000000000000000000000000000..0634878b921f3d23373f0a6ff64eb5170ce6ac66 --- /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 cf57f63b408c652edba854b43885dbdf6d419ab9..15f27208ba34fa387e3369be557ddc5745703acf 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 cd829a1dc0f8e06f248bece7c5cd07efc919f2d8..6c70144121d0bd0af4223e47884c80bd110bf2d6 100644 --- a/pages/chat/components/select-popup.vue +++ b/pages/chat/components/select-popup.vue @@ -14,11 +14,11 @@