diff --git a/common/config.js b/common/config.js index 7a1adea..5f3c817 100644 --- a/common/config.js +++ b/common/config.js @@ -1,26 +1,11 @@ //生产环境 const PROT = "https://"//生产需替换 -// const ROOTHOST = "admin.sjajk.com";//生产需替换 -// const PROT = "http://" -const ROOTHOST = "192.168.2.22:8187"; +const ROOTHOST = "admin.sjajk.com";//生产需替换 //测试环境 // const PROT = "http://" -// const ROOTHOST = "47.75.182.93:8090"; -// const ROOTHOST = "1.92.152.160"; -// const ROOTHOST = "1.92.152.160"; -// const ROOTHOST = "sausers.blxinchuang.com"; -// const ROOTHOST = "192.168.2.222:8187"; -// const ROOTHOST = "120.46.52.165"; -// const ROOTHOST = "192.168.0.115:8187"; -// const ROOTHOST = "192.168.1.169:8187"; -// 后端本地张聪 -// const ROOTHOST = "192.168.1.48:8187"; -// 后端韩玉东 -// const ROOTHOST = "192.168.1.50:8187"; -// 客户现场 -// const ROOTHOST = "192.168.110.85:8187"; +// const ROOTHOST = "192.168.2.29:8187"; //验证是否是域名 const checkdomain = (ROOTHOST) => { @@ -37,23 +22,16 @@ const checkdomain = (ROOTHOST) => { //验证是否是域名后判断http/https const ROOTPATH = (checkdomain(ROOTHOST) ? "https://" : "http://") + ROOTHOST + "/sqx_fast"; const ROOTPATH1 = (checkdomain(ROOTHOST) ? "https://" : "http://") + ROOTHOST + "/sqx_fast"; -// const ROOTPATH3 = "wss://" + ROOTHOST1 + "/wss/chatSocket/"; //聊天 const ROOTPATH2 = "wss://" + ROOTHOST + "/wss/chatSocket/"; //联系客服 const WEBSOCKETADDRESS = "wss://" + ROOTHOST + "/wss/chatSocket/"; //退出软件后台后将用户状态置为离线 const UPLOAD_PATH = ROOTPATH1 + '/alioss/upload'; const UPLOAD_AVATAR = ROOTPATH1 + '/alioss/uploadAvatar'; -// const ROOTPATH = "http://192.168.0.131:8187/sqx_fast"; -// const ROOTPATH1 = "http://192.168.0.131:8187/sqx_fast"; -// const ROOTPATH2 = "ws://192.168.0.131:8187/sqx_fast/websocket/";//联系客服 -// const ROOTPATH3 = "ws://192.168.0.131:8187/sqx_fast/chatSocket/";//聊天 //腾讯地图key const TX_MAP_KEY = 'VIWBZ-5OM3F-CV7JZ-NLKJY-AXSYV-TMFM6'; //ws基础连接地址 -//const WS_BASE_PATH = 'ws://192.168.31.21:8187/sqx_fast/'; -//const WS_BASE_PATH = 'ws://192.168.1.20:8187/sqx_fast/'; const WS_BASE_PATH = "wss://" + ROOTHOST + "/sqx_fast/"; //地图ws接口 diff --git a/manifest.json b/manifest.json index 91f56a3..c5c2ed9 100644 --- a/manifest.json +++ b/manifest.json @@ -1,9 +1,9 @@ { - "name" : "盛安小象", - "appid" : "__UNI__B37C795", + "name" : "盛安到家", + "appid" : "__UNI__37CAF65", "description" : "", - "versionName" : "2.1.5", - "versionCode" : 160, + "versionName" : "2.2.5", + "versionCode" : 225, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { @@ -162,7 +162,7 @@ "platforms" : "Android,iOS", "url" : "https://ext.dcloud.net.cn/plugin?id=7482", "android_package_name" : "com.shengan.anmo", - "ios_bundle_id" : "", + "ios_bundle_id" : "com.shengan.anmo", "isCloud" : true, "bought" : 1, "pid" : "7482", diff --git a/pages/my/user.vue b/pages/my/user.vue index c249bcd..f5efea4 100644 --- a/pages/my/user.vue +++ b/pages/my/user.vue @@ -28,7 +28,7 @@ - + 出行方式 @@ -55,6 +55,8 @@ tripWayNum:'', tripWay: 0, show: false, + adjustWay: 2, + isDisabled: true, renzheng: 0, cxList: [{ text: '公交', @@ -84,7 +86,9 @@ this.$Request.getT("/app/artificer/selectArtificer").then(res => { if (res.code == 0) { this.tripWay = res.data.tripWay ? res.data.tripWay : 0; - this.tripWayNum=res.data.tripWayNum + this.tripWayNum=res.data.tripWayNum; + this.adjustWay = res.data.adjustWay; + this.isDisabled = this.adjustWay==2 ? true : false; } }); }, @@ -171,4 +175,9 @@ font-weight: bold; font-family: PingFang SC; } + + .disabled-view { + pointer-events: none; /* 禁止点击事件 */ + opacity: 0.6; /* 改变透明度,表示禁用状态 */ + } diff --git a/uview-ui/libs/request/index.js b/uview-ui/libs/request/index.js index da20628..6e61894 100644 --- a/uview-ui/libs/request/index.js +++ b/uview-ui/libs/request/index.js @@ -102,8 +102,7 @@ class Request { constructor() { this.config = { baseUrl: 'https://admin.sjajk.com/', // 请求的根域名//生产需替换 - // baseUrl: 'http://192.168.2.222:8187/', // 请求的根域名 - // baseUrl: 'https://sausers.blxinchuang.com', // 请求的根域名 + // baseUrl: 'http://192.168.2.29:8187/', // 请求的根域名 // 默认的请求头 header: {}, method: 'POST',