diff --git a/common/config.js b/common/config.js index 5966278..2334191 100644 --- a/common/config.js +++ b/common/config.js @@ -1,44 +1,12 @@ -// const ROOTPATH = "http://120.46.52.165/sqx_fast"; -// const ROOTPATH1 = "http://120.46.52.165/sqx_fast"; -// const ROOTPATH3 = "wss://120.46.52.165/wss/websocket/"; -// const ROOTPATH3 = "wss://192.168.2.15:8187/wss/websocket/"; -// const ROOTPATH = "http://192.168.2.15:8187/sqx_fast"; -// const ROOTPATH1 = "http://192.168.2.15:8187/sqx_fast"; - -// const ROOTPATH3 = "wss://1.92.152.160/wss/websocket/"; -// const ROOTPATH = "http://1.92.152.160/sqx_fast"; -// const ROOTPATH1 = "http://1.92.152.160/sqx_fast"; +// const ROOTPATH3 = "wss://192.168.2.222:8187/wss/chatSocket/"; +// const ROOTPATH = "http://192.168.2.222:8187/sqx_fast"; +// const ROOTPATH1 = "http://192.168.2.222:8187/sqx_fast"; // const ROOTPATH3 = "wss://sausers.blxinchuang.com/wss/chatSocket/"; // const ROOTPATH = "https://sausers.blxinchuang.com/sqx_fast"; // const ROOTPATH1 = "https://sausers.blxinchuang.com/sqx_fast"; -// const ROOTPATH3 = "wss://47.75.182.93:8090/wss/websocket/"; -// const ROOTPATH = "http://47.75.182.93:8090/sqx_fast"; -// const ROOTPATH1 = "http://47.75.182.93:8090/sqx_fast"; - -// const ROOTPATH3 = "wss://120.46.52.165/wss/websocket/"; -// const ROOTPATH = "http://120.46.52.165/sqx_fast"; -// const ROOTPATH1 = "http://120.46.52.165/sqx_fast"; - - -// const ROOTPATH = "http://192.168.2.13:8187/sqx_fast"; -// const ROOTPATH1 = "http://192.168.2.13:8187/sqx_fast"; -// const ROOTPATH3 = "wss://192.168.2.13:8187/wss/websocket/"; - -// const ROOTPATH = "http://192.168.1.169:8187/sqx_fast"; -// const ROOTPATH1 = "http://192.168.1.169:8187/sqx_fast"; -//客户现场 -// const ROOTPATH = "http://192.168.110.85:8187/sqx_fast"; -// const ROOTPATH1 = "http://192.168.110.85:8187/sqx_fast"; -//后台本地张聪 -// const ROOTPATH = "http://192.168.1.48:8187/sqx_fast"; -// const ROOTPATH1 = "http://192.168.1.48:8187/sqx_fast"; -// 后台本地韩玉东 -// const ROOTPATH = "http://192.168.1.50:8187/sqx_fast"; -// const ROOTPATH1 = "http://192.168.1.50:8187/sqx_fast"; -// const ROOTPATH3 = "wss://wx.sjajk.com/wss/websocket/";//联系客服 //生产环境 const ROOTPATH = "https://admin.sjajk.com/sqx_fast";//生产需替换 const ROOTPATH1 = "https://admin.sjajk.com/sqx_fast";//生产需替换 @@ -47,20 +15,14 @@ const ROOTPATH3 = "wss://admin.sjajk.com/wss/chatSocket/"; //联系客服//生 //上传地址 const UPLOAD_PATH = ROOTPATH1 + '/alioss/upload'; -// const ROOTPATH = "http://192.168.0.131:8187/sqx_fast"; -// const ROOTPATH1 = "http://192.168.0.131:8187/sqx_fast"; -// const ROOTPATH3 = "wss://anmo.xianmxkj.com/wss/websocket/";//联系客服 - //腾讯地图key const TX_MAP_KEY = 'VIWBZ-5OM3F-CV7JZ-NLKJY-AXSYV-TMFM6'; //const TX_MAP_KEY = '55UBZ-STNK4-DSNUM-F4A75-Q7BC5-FRBMS'; //ws基础连接地址 -// const WS_BASE_PATH = 'ws://47.75.182.93:8090/sqx_fast/'; -// const WS_BASE_PATH = 'ws://192.168.2.15:8187/sqx_fast/'; + +// const WS_BASE_PATH = 'ws://192.168.2.222:8187/sqx_fast/'; // const WS_BASE_PATH = 'ws://sausers.blxinchuang.com/sqx_fast/'; -// const WS_BASE_PATH = 'ws://1.92.152.160/sqx_fast/'; -// const WS_BASE_PATH = 'ws://120.46.52.165/sqx_fast/'; const WS_BASE_PATH = 'wss://admin.sjajk.com/sqx_fast/';//生产需替换 //地图ws接口 @@ -79,4 +41,4 @@ module.exports = { WS_BASE_PATH, WS_UPLOAD_MAP_PATH, WS_UPLOAD_RECORDER_PATH -}; \ No newline at end of file +}; diff --git a/common/queue.js b/common/queue.js index ee6294b..359f768 100644 --- a/common/queue.js +++ b/common/queue.js @@ -1,5 +1,5 @@ /** - * + * * @author maxd * @date 2019.8.1 */ @@ -19,20 +19,14 @@ module.exports = { //全局域名 部分html中需要单独替换 需要修改config中的网络请求域名 publicYuMing() { return 'https://admin.sjajk.com'//生产需替换 - // return 'http://120.46.52.165'1.92.152.160 - // return 'http://192.168.2.15:8187' + // return 'http://192.168.2.222:8187' // return 'https://sausers.blxinchuang.com' - // return 'http://1.92.152.160' - // return 'http://47.75.182.93:8090:8187' }, //全局域名 部分html中需要单独替换 需要修改config中的网络请求域名 publicYuMingApp() { return 'https://admin.sjajk.com'//生产需替换 - // return 'http://120.46.52.165' // return 'https://sausers.blxinchuang.com' - // return 'http://1.92.152.160' - // return 'http://192.168.2.15:8187' - // return 'http://47.75.182.93:8090:8187' + // return 'http://192.168.2.222:8187' }, logout() { this.remove("token"); diff --git a/uview-ui/libs/request/index.js b/uview-ui/libs/request/index.js index 371f479..1bb29d0 100644 --- a/uview-ui/libs/request/index.js +++ b/uview-ui/libs/request/index.js @@ -77,7 +77,7 @@ class Request { // 判断用户传递的URL是否/开头,如果不是,加上/，这里使用了uView的test.js验证库的url()方法 options.url = validate.url(options.url) ? options.url : (this.config.baseUrl + (options.url.indexOf('/') == 0 ? options.url : '/' + options.url)); - + // 是否显示loading // 加一个是否已有timer定时器的判断，否则有两个同时请求的时候，后者会清除前者的定时器id // 而没有清除前者的定时器，导致前者超时，一直显示loading @@ -103,10 +103,7 @@ class Request { this.config = { baseUrl: 'https://admin.sjajk.com/', // 请求的根域名//生产需替换 // baseUrl: 'http://192.168.2.222:8187/', - // baseUrl: 'https://sausers.blxinchuang.com/', // 请求的根域名 - // baseUrl: 'http://1.92.152.160/', // 请求的根域名 - // baseUrl: 'http://120.46.52.165/', // 请求的根域名 - // baseUrl: 'http://47.75.182.93:8090/', + // baseUrl: 'https://sausers.blxinchuang.com/', // 请求的根域名 // 默认的请求头 header: {}, method: 'POST', @@ -121,7 +118,7 @@ class Request { originalData: false, // 是否在拦截器中返回服务端的原始数据，见文档说明 loadingMask: true, // 展示loading的时候，是否给一个透明的蒙层，防止触摸穿透 } - + // 拦截器 this.interceptor = { // 请求前的拦截 @@ -149,7 +146,7 @@ class Request { data }) } - + // put请求，不支持支付宝小程序(HX2.6.15) this.put = (url, data = {}, header = {}) => { return this.request({ @@ -159,7 +156,7 @@ class Request { data }) } - + // delete请求，不支持支付宝和头条小程序(HX2.6.15) this.delete = (url, data = {}, header = {}) => { return this.request({