diff --git a/epdc-resident-mp-yushan/pages/index/index.wxss b/epdc-resident-mp-yushan/pages/index/index.wxss index 83092da..9b1090f 100644 --- a/epdc-resident-mp-yushan/pages/index/index.wxss +++ b/epdc-resident-mp-yushan/pages/index/index.wxss @@ -318,9 +318,6 @@ image { .community-news { width: 100%; - min-height: 100vh; - overflow-y: auto; - background: #f7f7f7; margin-top: 16rpx; } diff --git a/epdc-resident-mp-yushan/pages/toRegister/toRegister.js b/epdc-resident-mp-yushan/pages/toRegister/toRegister.js index fe108da..2acd95b 100644 --- a/epdc-resident-mp-yushan/pages/toRegister/toRegister.js +++ b/epdc-resident-mp-yushan/pages/toRegister/toRegister.js @@ -20,15 +20,15 @@ Page({ timingFunc: 'easeIn' } }) - let that = this - const versionNum = '1.2.15' + let that = this + const versionNum = '1.2.16' api.getScanSwitch(versionNum).then(function (res) { console.log(res.data) let state = res.data ? res.data.scanFlag : '1' that.setData({ experience: state }) - + // if (state == '0') { // 跳过扫码 // // app.globalData.tempGridId = '1169158285790900226' //'1191534416067149825' // wx.reLaunch({ @@ -50,10 +50,10 @@ Page({ scan() { wx.scanCode({ success: (res) => { - console.log("扫码结果",res); - console.log('/'+decodeURIComponent(res.path)); + console.log("扫码结果", res); + console.log('/' + decodeURIComponent(res.path)); wx.reLaunch({ - url: '/'+decodeURIComponent(res.path) + url: '/' + decodeURIComponent(res.path) }) }, fail: (res) => { diff --git a/epdc-resident-mp-yushan/project.private.config.json b/epdc-resident-mp-yushan/project.private.config.json index 0cb0907..f861de6 100644 --- a/epdc-resident-mp-yushan/project.private.config.json +++ b/epdc-resident-mp-yushan/project.private.config.json @@ -52,28 +52,10 @@ "scene": null }, { - "name": "subpages/discussion/pages/societyOrgActiveApply/societyOrgActiveApply", - "pathName": "subpages/discussion/pages/societyOrgActiveApply/societyOrgActiveApply", + "name": "pages/toRegister/toRegister", + "pathName": "pages/toRegister/toRegister", "query": "", "scene": null - }, - { - "name": "subpages/societyOrg/pages/joinOrg/joinOrg", - "pathName": "subpages/societyOrg/pages/joinOrg/joinOrg", - "query": "", - "scene": null - }, - { - "name": "subpages/discussion/pages/activeApply/activeApply", - "pathName": "subpages/discussion/pages/activeApply/activeApply", - "query": "", - "scene": null - }, - { - "name": "subpages/societyOrg/pages/joinOrg/joinOrg", - "pathName": "subpages/societyOrg/pages/joinOrg/joinOrg", - "query": "id=1431620837756125186&volunteerOrgName=%E4%BA%BF%E8%81%94%E5%BF%97%E6%84%BF%E7%BB%84%E7%BB%87", - "scene": null } ] } diff --git a/epdc-resident-mp-yushan/subpages/societyOrg/pages/memberDetail/memberDetail.wxss b/epdc-resident-mp-yushan/subpages/societyOrg/pages/memberDetail/memberDetail.wxss index 7227c66..bf66f4b 100644 --- a/epdc-resident-mp-yushan/subpages/societyOrg/pages/memberDetail/memberDetail.wxss +++ b/epdc-resident-mp-yushan/subpages/societyOrg/pages/memberDetail/memberDetail.wxss @@ -28,6 +28,10 @@ page { line-height: 100rpx; } +.member-detail .info-item .label.long { + width: 165rpx; +} + .member-detail .info-item .label::after { content: ''; width: 100%; diff --git a/epdc-resident-mp-yushan/utils/config.js b/epdc-resident-mp-yushan/utils/config.js index a235be8..0918b71 100644 --- a/epdc-resident-mp-yushan/utils/config.js +++ b/epdc-resident-mp-yushan/utils/config.js @@ -7,8 +7,8 @@ module.exports = { function BASEURL() { // return 'http://192.168.51.31:9094/epdc-api/api/' // 测试环境 接口地址 - return "https://epdc-api-test.elinkservice.cn/epdc-api/api/" // 测试环境 ip接口地址 - // return 'https://epdc-yushan.elinkservice.cn/epdc-api/api/' // 现代榆山正式环境 + // return "https://epdc-api-test.elinkservice.cn/epdc-api/api/" // 测试环境 ip接口地址 + return 'https://epdc-yushan.elinkservice.cn/epdc-api/api/' // 现代榆山正式环境 } function WEBROOT() {