diff --git a/config/config.js b/config/config.js index 5689f4f..74bd335 100755 --- a/config/config.js +++ b/config/config.js @@ -1,9 +1,7 @@ var config = { - // url: "http://10.11.207.233:7000/C/api", // url: "https://ciformall.youlane.cn/C/api", - // url:"https://c.malls.iformall.com/C/api", - // url: "http://31adc9ce.ngrok.io/C/api", - url:'https://ctest.malls.iformall.com/C/api', + url:"https://c.malls.iformall.com/C/api", + // url:'https://ctest.malls.iformall.com/C/api', api: { /** * 接口用途:login @@ -168,7 +166,7 @@ var config = { }, weapp: { - AppId: "wx649b3be73c1afe47" + AppId: "wx026ee7f6290aa336" }, ErrorCode: { NICK_NOT_AUTH: 11004, diff --git a/pages/edit/edit.js b/pages/edit/edit.js index 719a3aa..97601ec 100644 --- a/pages/edit/edit.js +++ b/pages/edit/edit.js @@ -50,8 +50,7 @@ Page({ wx.chooseLocation({ success: function (res) { that.setData({ - name: res.name+'('+res.address+')', - address: JSON.stringify(res), + address: res.name + '(' + res.address + ')', }) }, fail: function (error) { @@ -147,15 +146,10 @@ Page({ url: config.api.getScore, data: {} }).then(res => { - if (res.data.address && JSON.parse(res.data.address).name) { + console.log(res); + if (res.data.address) { that.setData({ address: res.data.address, - name: JSON.parse(res.data.address).name +'('+JSON.parse(res.data.address).address+')', - }) - } - if (!JSON.parse(res.data.address).name) { - that.setData({ - name: null, }) } if (res.data.name) { diff --git a/pages/edit/edit.wxml b/pages/edit/edit.wxml index 3573d03..bcb0fa2 100644 --- a/pages/edit/edit.wxml +++ b/pages/edit/edit.wxml @@ -21,8 +21,8 @@ 住址 - {{name}} - 请选择地址 + {{address}} + 请选择地址 \ No newline at end of file diff --git a/pages/index/index.js b/pages/index/index.js index a3bca82..1320217 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -62,7 +62,7 @@ Page({ }); } else { wx.showToast({ - title: err.errMsg, + title: err.message, icon: 'none', duration: 2000, mask: false @@ -111,14 +111,14 @@ Page({ }) .catch(err => { console.log(err); - if (err.errMsg == '请求超时,请检查您的网络设置!') { + if (err.message == '请求超时,请检查您的网络设置!') { that.setData({ loading: false, loadingtext: "请求超时,请检查您的网络设置!" }) } wx.showToast({ - title: err.errMsg, + title: err.message, icon: 'none', duration: 2000, mask: false diff --git a/pages/passCar/passCar.js b/pages/passCar/passCar.js index a7f60e1..b2a9581 100644 --- a/pages/passCar/passCar.js +++ b/pages/passCar/passCar.js @@ -48,18 +48,18 @@ Page({ }, gotoetcp:function(){ console.log(this.data.extraData) - wx.navigateToMiniProgram({ - appId:'wx192b7d2e8dcbefd0', - extraData: this.data.extraData, - envVersion:'release', - path:"pages/main/main", - }) // wx.navigateToMiniProgram({ - // appId:'wxc07f9d67923d676d', + // appId:'wx192b7d2e8dcbefd0', // extraData: this.data.extraData, // envVersion:'release', - // path: "pages/main/main", + // path:"pages/main/main", // }) + wx.navigateToMiniProgram({ + appId:'wxc07f9d67923d676d', + extraData: this.data.extraData, + envVersion:'release', + path: "pages/main/main", + }) }, showquan: function() { wx.navigateTo({ diff --git a/pages/passCar/passCar.wxml b/pages/passCar/passCar.wxml index 3d2ba98..cc256b8 100644 --- a/pages/passCar/passCar.wxml +++ b/pages/passCar/passCar.wxml @@ -61,12 +61,12 @@ - - 立即支付 - - + + 立即支付 + 立即支付 diff --git a/pages/user/index.wxml b/pages/user/index.wxml index 1c73130..9085216 100644 --- a/pages/user/index.wxml +++ b/pages/user/index.wxml @@ -70,7 +70,7 @@ - 版本号:2.2.8 + 版本号:2.2.7 diff --git a/project.config.json b/project.config.json index f1d8f90..92230bf 100644 --- a/project.config.json +++ b/project.config.json @@ -12,7 +12,7 @@ }, "compileType": "miniprogram", "libVersion": "2.0.9", - "appid": "wx649b3be73c1afe47", + "appid": "wx026ee7f6290aa336", "projectname": "C", "isGameTourist": false, "condition": {