diff --git a/pages/toRegister/toRegister.js b/pages/toRegister/toRegister.js index 0454721..bf63b84 100644 --- a/pages/toRegister/toRegister.js +++ b/pages/toRegister/toRegister.js @@ -21,7 +21,7 @@ Page({ } }) let that = this - const versionNum = '1.2.4' + const versionNum = '1.0.0' api.getScanSwitch(versionNum).then(function (res) { console.log(res.data) let state = res.data.scanFlag @@ -42,9 +42,9 @@ Page({ // }) }, experience() { - app.globalData.tempGridId = '1191534416067149825' + app.globalData.tempGridId = '1215152928323555330' wx.reLaunch({ - url: '/pages/index/index?scene=1191534416067149825' + url: '/pages/index/index?scene=1215152928323555330' }) }, scan() { diff --git a/project.config.json b/project.config.json index 655f0cd..839f2b5 100644 --- a/project.config.json +++ b/project.config.json @@ -49,7 +49,7 @@ "id": 0, "name": "带参数二维码", "pathName": "pages/index/index", - "query": "scene=1191534416067149825&inviteUserId=12345", + "query": "scene=1215152928323555330&inviteUserId=12345", "scene": 1011 }, { diff --git a/utils/config.js b/utils/config.js index 1fedad6..1c1be4b 100644 --- a/utils/config.js +++ b/utils/config.js @@ -6,13 +6,12 @@ module.exports = { }; function BASEURL() { - // return 'http://10.10.10.225:9094/epdc-api/api/' // 本地测试 接口地址 - return 'https://epdc-shibei.elinkit.com.cn/epdc-api/api/' // 测试环境 接口地址 - // return 'https://eug-test.elinkit.com.cn/epdc-api/api/' + // return 'https://eug-test.elinkit.com.cn/epdc-api/api/' // 测试环境 接口地址 // return "http://219.146.91.110:9094/epdc-api/api/" // 测试环境 ip接口地址 // return "https://epdc.elinkservice.cn/epdc-api/api/" // 正式环境 接口地址 // return 'https://epdc-app.qingdaoshibei.cn/epdc-api/api/' // 电政办 正式环境 接口地址 // return 'https://epdc-shibei.elinkservice.cn/epdc-api/api/' // 电政办 正式环境 接口地址 + return 'https://epdc-jinshui.elinkservice.cn/epdc-api/api/' // 锦水接口地址 } function WEBROOT() { diff --git a/utils/request.js b/utils/request.js index df5b6a0..ba70d66 100644 --- a/utils/request.js +++ b/utils/request.js @@ -31,7 +31,7 @@ const request = function (url, options) { } } else { wx.showToast({ - title: '接口请求失败', + title: '网络问题,请稍后再试~', icon: 'none', duration: 2000 }) @@ -40,7 +40,7 @@ const request = function (url, options) { }, fail (error) { wx.showToast({ - title: '接口请求失败', + title: '网络问题,请稍后再试~', icon: 'none', duration: 2000 })