diff --git a/manifest.json b/manifest.json index e0a75df1..39a3c45e 100644 --- a/manifest.json +++ b/manifest.json @@ -1,239 +1,227 @@ { - "name": "芋道商城", - "appid": "__UNI__460BC4C", - "description": "基于 uni-app + Vue3 技术驱动的在线商城系统,内含诸多功能与丰富的活动,期待您的使用和反馈。", - "versionName": "2.1.0", - "versionCode": 183, - "transformPx": false, - "app-plus": { - "usingComponents": true, - "nvueCompiler": "uni-app", - "nvueStyleCompiler": "uni-app", - "compilerVersion": 3, - "nvueLaunchMode": "fast", - "splashscreen": { - "alwaysShowBeforeRender": true, - "waiting": true, - "autoclose": true, - "delay": 0 - }, - "safearea": { - "bottom": { - "offset": "none" - } - }, - "modules": { - "Payment": {}, - "Share": {}, - "VideoPlayer": {}, - "OAuth": {} - }, - "distribute": { - "android": { - "permissions": [ - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "" - ], - "minSdkVersion": 21, - "schemes": "shopro" - }, - "ios": { - "urlschemewhitelist": [ - "baidumap", - "iosamap" - ], - "dSYMs": false, - "privacyDescription": { - "NSPhotoLibraryUsageDescription": "需要同意访问您的相册选取图片才能完善该条目", - "NSPhotoLibraryAddUsageDescription": "需要同意访问您的相册才能保存该图片", - "NSCameraUsageDescription": "需要同意访问您的摄像头拍摄照片才能完善该条目", - "NSUserTrackingUsageDescription": "开启追踪并不会获取您在其它站点的隐私信息,该行为仅用于标识设备,保障服务安全和提升浏览体验" + "name" : "芋道商城", + "appid" : "__UNI__460BC4C", + "description" : "基于 uni-app + Vue3 技术驱动的在线商城系统,内含诸多功能与丰富的活动,期待您的使用和反馈。", + "versionName" : "2.1.0", + "versionCode" : 183, + "transformPx" : false, + "app-plus" : { + "usingComponents" : true, + "nvueCompiler" : "uni-app", + "nvueStyleCompiler" : "uni-app", + "compilerVersion" : 3, + "nvueLaunchMode" : "fast", + "splashscreen" : { + "alwaysShowBeforeRender" : true, + "waiting" : true, + "autoclose" : true, + "delay" : 0 }, - "urltypes": "shopro", - "capabilities": { - "entitlements": { - "com.apple.developer.associated-domains": [ - "applinks:shopro.sheepjs.com" - ] - } + "safearea" : { + "bottom" : { + "offset" : "none" + } }, - "idfa": true - }, - "sdkConfigs": { - "speech": { - "ifly": {} + "modules" : { + "Payment" : {}, + "Share" : {}, + "VideoPlayer" : {}, + "OAuth" : {} }, - "ad": {}, - "oauth": { - "apple": {}, - "weixin": { - "appid": "wxae7a0c156da9383b", - "UniversalLinks": "https://shopro.sheepjs.com/uni-universallinks/__UNI__082C0BA/" - } - }, - "payment": { - "weixin": { - "__platform__": [ - "ios", - "android" - ], - "appid": "wxae7a0c156da9383b", - "UniversalLinks": "https://shopro.sheepjs.com/uni-universallinks/__UNI__082C0BA/" - }, - "alipay": { - "__platform__": [ - "ios", - "android" - ] - } - }, - "share": { - "weixin": { - "appid": "wxae7a0c156da9383b", - "UniversalLinks": "https://shopro.sheepjs.com/uni-universallinks/__UNI__082C0BA/" - } + "distribute" : { + "android" : { + "permissions" : [ + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "" + ], + "minSdkVersion" : 21, + "schemes" : "shopro" + }, + "ios" : { + "urlschemewhitelist" : [ "baidumap", "iosamap" ], + "dSYMs" : false, + "privacyDescription" : { + "NSPhotoLibraryUsageDescription" : "需要同意访问您的相册选取图片才能完善该条目", + "NSPhotoLibraryAddUsageDescription" : "需要同意访问您的相册才能保存该图片", + "NSCameraUsageDescription" : "需要同意访问您的摄像头拍摄照片才能完善该条目", + "NSUserTrackingUsageDescription" : "开启追踪并不会获取您在其它站点的隐私信息,该行为仅用于标识设备,保障服务安全和提升浏览体验" + }, + "urltypes" : "shopro", + "capabilities" : { + "entitlements" : { + "com.apple.developer.associated-domains" : [ "applinks:shopro.sheepjs.com" ] + } + }, + "idfa" : true + }, + "sdkConfigs" : { + "speech" : { + "ifly" : {} + }, + "ad" : {}, + "oauth" : { + "apple" : {}, + "weixin" : { + "appid" : "wxae7a0c156da9383b", + "UniversalLinks" : "https://shopro.sheepjs.com/uni-universallinks/__UNI__082C0BA/" + } + }, + "payment" : { + "weixin" : { + "__platform__" : [ "ios", "android" ], + "appid" : "wxae7a0c156da9383b", + "UniversalLinks" : "https://shopro.sheepjs.com/uni-universallinks/__UNI__082C0BA/" + }, + "alipay" : { + "__platform__" : [ "ios", "android" ] + } + }, + "share" : { + "weixin" : { + "appid" : "wxae7a0c156da9383b", + "UniversalLinks" : "https://shopro.sheepjs.com/uni-universallinks/__UNI__082C0BA/" + } + } + }, + "orientation" : [ "portrait-primary" ], + "splashscreen" : { + "androidStyle" : "common", + "iosStyle" : "common", + "useOriginalMsgbox" : true + }, + "icons" : { + "android" : { + "hdpi" : "unpackage/res/icons/72x72.png", + "xhdpi" : "unpackage/res/icons/96x96.png", + "xxhdpi" : "unpackage/res/icons/144x144.png", + "xxxhdpi" : "unpackage/res/icons/192x192.png" + }, + "ios" : { + "appstore" : "unpackage/res/icons/1024x1024.png", + "ipad" : { + "app" : "unpackage/res/icons/76x76.png", + "app@2x" : "unpackage/res/icons/152x152.png", + "notification" : "unpackage/res/icons/20x20.png", + "notification@2x" : "unpackage/res/icons/40x40.png", + "proapp@2x" : "unpackage/res/icons/167x167.png", + "settings" : "unpackage/res/icons/29x29.png", + "settings@2x" : "unpackage/res/icons/58x58.png", + "spotlight" : "unpackage/res/icons/40x40.png", + "spotlight@2x" : "unpackage/res/icons/80x80.png" + }, + "iphone" : { + "app@2x" : "unpackage/res/icons/120x120.png", + "app@3x" : "unpackage/res/icons/180x180.png", + "notification@2x" : "unpackage/res/icons/40x40.png", + "notification@3x" : "unpackage/res/icons/60x60.png", + "settings@2x" : "unpackage/res/icons/58x58.png", + "settings@3x" : "unpackage/res/icons/87x87.png", + "spotlight@2x" : "unpackage/res/icons/80x80.png", + "spotlight@3x" : "unpackage/res/icons/120x120.png" + } + } + } } - }, - "orientation": [ - "portrait-primary" - ], - "splashscreen": { - "androidStyle": "common", - "iosStyle": "common", - "useOriginalMsgbox": true - }, - "icons": { - "android": { - "hdpi": "unpackage/res/icons/72x72.png", - "xhdpi": "unpackage/res/icons/96x96.png", - "xxhdpi": "unpackage/res/icons/144x144.png", - "xxxhdpi": "unpackage/res/icons/192x192.png" + }, + "quickapp" : {}, + "quickapp-native" : { + "icon" : "/static/logo.png", + "package" : "com.example.demo", + "features" : [ + { + "name" : "system.clipboard" + } + ] + }, + "quickapp-webview" : { + "icon" : "/static/logo.png", + "package" : "com.example.demo", + "minPlatformVersion" : 1070, + "versionName" : "1.0.0", + "versionCode" : 100 + }, + "mp-weixin" : { + "appid" : "wx98df718e528399d2", + "setting" : { + "urlCheck" : false, + "minified" : true, + "postcss" : true }, - "ios": { - "appstore": "unpackage/res/icons/1024x1024.png", - "ipad": { - "app": "unpackage/res/icons/76x76.png", - "app@2x": "unpackage/res/icons/152x152.png", - "notification": "unpackage/res/icons/20x20.png", - "notification@2x": "unpackage/res/icons/40x40.png", - "proapp@2x": "unpackage/res/icons/167x167.png", - "settings": "unpackage/res/icons/29x29.png", - "settings@2x": "unpackage/res/icons/58x58.png", - "spotlight": "unpackage/res/icons/40x40.png", - "spotlight@2x": "unpackage/res/icons/80x80.png" - }, - "iphone": { - "app@2x": "unpackage/res/icons/120x120.png", - "app@3x": "unpackage/res/icons/180x180.png", - "notification@2x": "unpackage/res/icons/40x40.png", - "notification@3x": "unpackage/res/icons/60x60.png", - "settings@2x": "unpackage/res/icons/58x58.png", - "settings@3x": "unpackage/res/icons/87x87.png", - "spotlight@2x": "unpackage/res/icons/80x80.png", - "spotlight@3x": "unpackage/res/icons/120x120.png" - } + "optimization" : { + "subPackages" : true + }, + "plugins" : {}, + "lazyCodeLoading" : "requiredComponents", + "usingComponents" : {}, + "permission" : {}, + "requiredPrivateInfos" : [ "chooseAddress" ] + }, + "mp-alipay" : { + "usingComponents" : true + }, + "mp-baidu" : { + "usingComponents" : true + }, + "mp-toutiao" : { + "usingComponents" : true + }, + "mp-jd" : { + "usingComponents" : true + }, + "h5" : { + "template" : "index.html", + "router" : { + "mode" : "history", + "base" : "./" + }, + "sdkConfigs" : { + "maps" : {} + }, + "async" : { + "timeout" : 20000 + }, + "title" : "芋道商城", + "optimization" : { + "treeShaking" : { + "enable" : true + } + }, + "devServer" : { + "port" : 8383 } - } - } - }, - "quickapp": {}, - "quickapp-native": { - "icon": "/static/logo.png", - "package": "com.example.demo", - "features": [ - { - "name": "system.clipboard" - } - ] - }, - "quickapp-webview": { - "icon": "/static/logo.png", - "package": "com.example.demo", - "minPlatformVersion": 1070, - "versionName": "1.0.0", - "versionCode": 100 - }, - "mp-weixin": { - "appid": "wx98df718e528399d2", - "setting": { - "urlCheck": false, - "minified": true, - "postcss": true }, - "optimization": { - "subPackages": true - }, - "plugins": {}, - "lazyCodeLoading": "requiredComponents", - "usingComponents": {}, - "permission": {}, - "requiredPrivateInfos": [ - "chooseAddress" - ] - }, - "mp-alipay": { - "usingComponents": true - }, - "mp-baidu": { - "usingComponents": true - }, - "mp-toutiao": { - "usingComponents": true - }, - "mp-jd": { - "usingComponents": true - }, - "h5": { - "template": "index.html", - "router": { - "mode": "hash", - "base": "./" - }, - "sdkConfigs": { - "maps": {} - }, - "async": { - "timeout": 20000 - }, - "title": "芋道商城", - "optimization": { - "treeShaking": { - "enable": true - } - } - }, - "vueVersion": "3", - "_spaceID": "192b4892-5452-4e1d-9f09-eee1ece40639", - "locale": "zh-Hans", - "fallbackLocale": "zh-Hans" -} \ No newline at end of file + "vueVersion" : "3", + "_spaceID" : "192b4892-5452-4e1d-9f09-eee1ece40639", + "locale" : "zh-Hans", + "fallbackLocale" : "zh-Hans" +} diff --git a/pages/chat/components/chatBox.vue b/pages/chat/components/chatBox.vue index 5ca5980d..84124e54 100644 --- a/pages/chat/components/chatBox.vue +++ b/pages/chat/components/chatBox.vue @@ -1,275 +1,262 @@ + - - + + 查看最新消息 - diff --git a/pages/chat/index.vue b/pages/chat/index.vue index ab27c44f..25b4a54e 100644 --- a/pages/chat/index.vue +++ b/pages/chat/index.vue @@ -2,12 +2,12 @@
- {{ socketState.isConnect ? customerServiceInfo.title : '网络已断开,请检查网络后刷新重试' }} + {{ socketState.isConnect ? "连接客服成功" : '网络已断开,请检查网络后刷新重试' }}
- + @@ -28,88 +28,50 @@ diff --git a/sheep/api/promotion/kefu.js b/sheep/api/promotion/kefu.js index 12786f81..ae3610e5 100644 --- a/sheep/api/promotion/kefu.js +++ b/sheep/api/promotion/kefu.js @@ -15,10 +15,11 @@ const KeFuApi = { }, }); }, - getConversation: () => { + getMessageListPage: (params) => { return request({ - url: '/promotion/kefu-conversation/get', + url: '/promotion/kefu-message/page', method: 'GET', + params, custom: { auth: true, showLoading: false, diff --git a/sheep/hooks/useWebSocket.js b/sheep/hooks/useWebSocket.js index b43ebe53..e436a3d6 100644 --- a/sheep/hooks/useWebSocket.js +++ b/sheep/hooks/useWebSocket.js @@ -1,7 +1,4 @@ -import { reactive, ref, unref } from 'vue'; -import sheep from '@/sheep'; -// import chat from '@/sheep/api/chat'; -import dayjs from 'dayjs'; +import { reactive, ref } from 'vue'; import io from '@hyoga/uni-socket.io'; import { baseUrl, websocketPath } from '@/sheep/config'; export function useWebSocket() {