From acda88ee721c345915f4d239cf249d15827b6abe Mon Sep 17 00:00:00 2001 From: "Mr.jiang" <714156421@qq.com> Date: Mon, 12 Aug 2024 20:55:54 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/config.js | 20 ++++++++++---------- my/wallet/index.vue | 3 +++ utils/websocketUtils.js | 2 +- uview-ui/libs/request/index.js | 4 ++-- 4 files changed, 16 insertions(+), 13 deletions(-) diff --git a/common/config.js b/common/config.js index dae712e..c6fc01f 100644 --- a/common/config.js +++ b/common/config.js @@ -1,12 +1,12 @@ //生产环境 -// const PROT = "https://"//生产需替换 -// const ROOTHOST = "admin.sjajk.com";//生产需替换 +const PROT = "https://"//生产需替换 +const ROOTHOST = "admin.sjajk.com";//生产需替换 //测试环境 -const PROT = "http://" +// const PROT = "http://" // const ROOTHOST = "47.75.182.93:8090"; // const ROOTHOST = "1.92.152.160"; -const ROOTHOST = "1.92.152.160"; -const ROOTHOST1 = "sausers.blxinchuang.com"; +// const ROOTHOST = "1.92.152.160"; +// const ROOTHOST1 = "sausers.blxinchuang.com"; // const ROOTHOST = "192.168.2.15:8187"; // const ROOTHOST = "120.46.52.165"; // const ROOTHOST = "192.168.0.115:8187"; @@ -33,9 +33,9 @@ const checkdomain = (ROOTHOST) => { //验证是否是域名后判断http/https const ROOTPATH = (checkdomain(ROOTHOST) ? "https://" : "http://") + ROOTHOST + "/sqx_fast"; const ROOTPATH1 = (checkdomain(ROOTHOST) ? "https://" : "http://") + ROOTHOST + "/sqx_fast"; -const ROOTPATH2 = "wss://" + ROOTHOST + "/wss/websocket/"; //联系客服 -const ROOTPATH3 = "wss://" + ROOTHOST1 + "/wss/chatSocket/"; //聊天 -const WEBSOCKETADDRESS = "ws://" + ROOTHOST + "/sqx_fast/ws/"; //退出软件后台后将用户状态置为离线 +const ROOTPATH2 = "wss://" + ROOTHOST + "/wss/chatSocket/"; //联系客服 +// const ROOTPATH3 = "wss://" + ROOTHOST1 + "/wss/chatSocket/"; //聊天 +const WEBSOCKETADDRESS = "wss://" + ROOTHOST + "/wss/chatSocket/"; //退出软件后台后将用户状态置为离线 const UPLOAD_PATH = ROOTPATH1 + '/alioss/upload'; // const ROOTPATH = "http://192.168.0.131:8187/sqx_fast"; @@ -61,12 +61,12 @@ const WS_UPLOAD_RECORDER_PATH = WS_BASE_PATH + 'monitorWebSocket/'; module.exports = { PROT, ROOTHOST, - ROOTHOST1, + // ROOTHOST1, APIHOST: ROOTPATH, APIHOST1: ROOTPATH1, WSHOST: ROOTPATH2, UPLOAD_PATH, - WSHOST1: ROOTPATH3, + // WSHOST1: ROOTPATH3, TX_MAP_KEY, WS_BASE_PATH, WS_UPLOAD_MAP_PATH, diff --git a/my/wallet/index.vue b/my/wallet/index.vue index 5a40b50..366fbe0 100644 --- a/my/wallet/index.vue +++ b/my/wallet/index.vue @@ -391,6 +391,9 @@ }, // 我的余额 getMoney() { + var data={ + userType:'2' + } this.$Request.get("/app/userMoney/selectMyMoney").then(res => { if (res.code == 0 && res.data) { console.log(res.data.money) diff --git a/utils/websocketUtils.js b/utils/websocketUtils.js index c30d2bd..9fa6d98 100644 --- a/utils/websocketUtils.js +++ b/utils/websocketUtils.js @@ -597,7 +597,7 @@ export function uploadFileUrl() { } export function getWsBaseUrl() { - return config('WSHOST1'); + return config('WSHOST'); } diff --git a/uview-ui/libs/request/index.js b/uview-ui/libs/request/index.js index a4259b4..3fd6fba 100644 --- a/uview-ui/libs/request/index.js +++ b/uview-ui/libs/request/index.js @@ -101,11 +101,11 @@ class Request { constructor() { this.config = { - // baseUrl: 'https://admin.sjajk.com/', // 请求的根域名//生产需替换 + baseUrl: 'https://admin.sjajk.com/', // 请求的根域名//生产需替换 // baseUrl: 'http://47.75.182.93:8090/', // 请求的根域名 // baseUrl: 'http://120.46.52.165/', // 请求的根域名 // baseUrl: 'http://192.168.2.15:8187/', // 请求的根域名 - baseUrl: 'http://1.92.152.160/', // 请求的根域名 + // baseUrl: 'http://1.92.152.160/', // 请求的根域名 // 默认的请求头 header: {}, method: 'POST',