diff --git a/epdc-resident-mp-yushan/app.js b/epdc-resident-mp-yushan/app.js index 4068315..e994360 100644 --- a/epdc-resident-mp-yushan/app.js +++ b/epdc-resident-mp-yushan/app.js @@ -50,4 +50,14 @@ App({ navigationHeight: 40 } } -}) \ No newline at end of file +}) + + +/** + * { + "pagePath": "pages/heart/heart", + "text": "初心互助", + "iconPath": "images/mutual.png", + "selectedIconPath": "images/mutualSelected.png" + }, + */ \ No newline at end of file diff --git a/epdc-resident-mp-yushan/app.json b/epdc-resident-mp-yushan/app.json index 5995141..c64bbec 100644 --- a/epdc-resident-mp-yushan/app.json +++ b/epdc-resident-mp-yushan/app.json @@ -135,12 +135,6 @@ "iconPath": "images/association.png", "selectedIconPath": "images/association-select.png" }, - { - "pagePath": "pages/heart/heart", - "text": "初心互助", - "iconPath": "images/mutual.png", - "selectedIconPath": "images/mutualSelected.png" - }, { "pagePath": "pages/mine/mine", "text": "我的", diff --git a/epdc-resident-mp-yushan/pages/toRegister/toRegister.js b/epdc-resident-mp-yushan/pages/toRegister/toRegister.js index 4f3c292..cdcc238 100644 --- a/epdc-resident-mp-yushan/pages/toRegister/toRegister.js +++ b/epdc-resident-mp-yushan/pages/toRegister/toRegister.js @@ -21,7 +21,7 @@ Page({ } }) let that = this - const versionNum = '1.2.11' + 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 = '1192004624745586689' + app.globalData.tempGridId = '1258587880499798017' wx.reLaunch({ - url: '/pages/index/index?scene=1192004624745586689' + url: '/pages/index/index?scene=1258587880499798017' }) }, scan() { diff --git a/epdc-resident-mp-yushan/project.config.json b/epdc-resident-mp-yushan/project.config.json index 001ad78..3d1c52c 100644 --- a/epdc-resident-mp-yushan/project.config.json +++ b/epdc-resident-mp-yushan/project.config.json @@ -54,7 +54,7 @@ "list": [] }, "miniprogram": { - "current": 7, + "current": -1, "list": [ { "id": 0, @@ -91,20 +91,6 @@ "query": "", "scene": null }, - { - "id": -1, - "name": "subpages/heart/pages/signed/signed", - "pathName": "subpages/heart/pages/signed/signed", - "query": "", - "scene": null - }, - { - "id": -1, - "name": "subpages/heart/pages/heartDetail/heartDetail", - "pathName": "subpages/heart/pages/heartDetail/heartDetail", - "query": "", - "scene": null - }, { "id": 7, "name": "pages/index/index", diff --git a/epdc-resident-mp-yushan/utils/config.js b/epdc-resident-mp-yushan/utils/config.js index 8c7be6c..6619db7 100644 --- a/epdc-resident-mp-yushan/utils/config.js +++ b/epdc-resident-mp-yushan/utils/config.js @@ -13,8 +13,9 @@ function BASEURL() { // 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-test.elinkservice.cn/epdc-api/api/' // 先锋市北正式环境 + // return 'https://epdc-shibei.elinkservice.cn/epdc-api/api/' // 电政办 正式环境 接口地址 + // return 'https://epdc-test.elinkservice.cn/epdc-api/api/' // 先锋市北正式环境 + return 'https://epdc-yushan.elinkservice.cn/epdc-api/api/' // 微笑榆山正式环境 } function WEBROOT() {