diff --git a/.env b/.env index 94cb38ef..debb75c8 100644 --- a/.env +++ b/.env @@ -9,7 +9,7 @@ SHOPRO_API_PATH=/app-api SHOPRO_DEV_BASE_URL = http://chatapi.zianxin.com # 后端接口 - 正式环境(通过 process.env.NODE_ENV != development) -SHOPRO_BASE_URL=http://api-dashboard.yudao.iocoder.cn +SHOPRO_BASE_URL=http://chatapi.zianxin.com # 文件上传类型:server - 后端上传, client - 前端直连上传,仅支持 S3 服务 SHOPRO_UPLOAD_TYPE=server diff --git a/src/App.vue b/src/App.vue index 1126b19a..3682fedb 100644 --- a/src/App.vue +++ b/src/App.vue @@ -388,7 +388,7 @@ return group; }, exit() { - console.log('1exit'); + console.log('exit'); this.isExit = true; wsApi.close(3099); uni.removeStorageSync('loginInfo'); diff --git a/src/chat-env.js b/src/chat-env.js index 353b4a4c..6cb74667 100644 --- a/src/chat-env.js +++ b/src/chat-env.js @@ -1,12 +1,11 @@ -const ENV = 'DEV'; //设置环境(打包前修改此变量) +const ENV = process.env.NODE_ENV === 'development' ? 'DEV' : 'PROD'; const CHAT_ENV = {}; +// 开发 if (ENV == 'DEV') { CHAT_ENV.BASE_URL = 'http://chatsever.zianxin.com'; - // CHAT_ENV.BASE_URL = "https://www.boxim.online/api"; CHAT_ENV.WS_URL = 'ws://chatapp.zianxin.com/im'; - // CHAT_ENV.WS_URL = "wss://www.boxim.online/im"; // H5 走本地代理解决跨域问题 // #ifdef H5 @@ -14,9 +13,10 @@ if (ENV == 'DEV') { // #endif } +// 生产 if (ENV == 'PROD') { - CHAT_ENV.BASE_URL = 'https://www.boxim.online/api'; - CHAT_ENV.WS_URL = 'wss://www.boxim.online/im'; + CHAT_ENV.BASE_URL = 'http://chatsever.zianxin.com'; + CHAT_ENV.WS_URL = 'ws://chatapp.zianxin.com/im'; } export default CHAT_ENV; diff --git a/src/components/chat-item/chat-item.vue b/src/components/chat-item/chat-item.vue index 8e77b29b..4d7915d1 100644 --- a/src/components/chat-item/chat-item.vue +++ b/src/components/chat-item/chat-item.vue @@ -113,7 +113,7 @@ align-items: center; background-color: $im-bg; white-space: nowrap; - border-bottom: 1px solid $im-border; + border-top: 1px solid $im-border; &:hover { background-color: $im-bg-active; diff --git a/src/pages/home/detail.vue b/src/pages/home/detail.vue index 2d4d9fbd..a7920895 100644 --- a/src/pages/home/detail.vue +++ b/src/pages/home/detail.vue @@ -18,7 +18,12 @@ {{ userDetail.member?.memberCity ? userDetail.member?.memberCity + ' · ' : '' }} {{ userDetail.distance?.toFixed(2) }}km - + @@ -117,38 +122,46 @@ /> - - - - - 私聊 + + + + 私聊 + + + + 喜欢 + - - - 喜欢 - - + + +