Browse Source

v1.6.9;党群列表修改名称;修复无法跳转积分规则的BUG;

feature/point
ZhaoTongYao 5 years ago
parent
commit
cb1e527a35
  1. 35
      pages/indexNew/indexNew.js
  2. 2
      pages/toRegister/toRegister.js
  3. 4
      subpages/associationNew/pages/associationlist/associationlist.js
  4. 2
      subpages/integralCentre/pages/index/index.js
  5. 2
      utils/config.js

35
pages/indexNew/indexNew.js

@ -563,40 +563,7 @@ Page({
extraData: {
scrip: res.data
},
envVersion: "trial",//trial //develop
success (res) {
console.log(res)
},
fail (err) {
console.log(err)
}
})
}
})
}
},
// 我有事做 7.08 ->工作端
wysz() {
if(this.data.departmentId != this.data.workGridId){//工作网格处理
wx.showToast({
title: '无法使用该板块',
icon: 'none',
duration: 3000
})
}else{
if (this.verifyCompleteInfo()) {
return false
}
api.getScrip().then(res => {
if (res.code === 0 && res.msg === 'success') {
console.log('getScrip',res.data)
wx.navigateToMiniProgram({
appId: 'wx826a8435db9e0947',
path: 'pages/login/login?scrip='+res.data,
extraData: {
scrip: res.data
},
envVersion: 'release',//trial //develop
envVersion: "release",//trial //develop
success (res) {
console.log(res)
},

2
pages/toRegister/toRegister.js

@ -21,7 +21,7 @@ Page({
// }
// })
let that = this
const versionNum = "1.6.7"
const versionNum = "1.6.9"
api.getScanSwitch(versionNum).then(function (res) {
console.log(res.data)
let state = res.data.scanFlag

4
subpages/associationNew/pages/associationlist/associationlist.js

@ -52,9 +52,9 @@ Page({
getPartyGroupList () {
getPartyGroupList().then(res => {
console.log("获取党群列表", res)
const groupNameList = ["进入玫瑰苑社群", "进入玫瑰湖社群", "进入锦水园社群", "进入锦祥园社群"]
const groupNameList = ["进入玫瑰苑社群", "进入玫瑰湖社群", "进入锦水园社群", "进入锦祥园社群", "进入城西社群", "进入子顺社群", "进入土楼社群"]
res.data.forEach((item, index) => {
if (index <= 3) {
if (index <= 6) {
item.groupName = groupNameList[index]
} else {
item.groupName = "进入社群"

2
subpages/integralCentre/pages/index/index.js

@ -267,7 +267,7 @@ Page({
bindtapIntegralRule () {
console.log('获取积分规则')
wx.navigateTo({
url: `/subpages/understandJs/pages/noticeDetail/noticeDetail?modulecode=notice_points_rule`
url: `/subpages/oneKeyService/pages/noticeDetail/noticeDetail?categorycode=notice_points_rule&categoryname=积分规则`
})
},
/**

2
utils/config.js

@ -6,7 +6,7 @@ module.exports = {
};
function BASEURL() {
// return 'https://eug-test.elinkit.com.cn/js/epdc-api/api/' // 锦水测试环境
// return 'https://epdc-jinan-test.elinkservice.cn/js/epdc-api/api/' // 锦水测试环境
return 'https://epdc-jinshui.elinkservice.cn/epdc-api/api/' // 锦水正式环境接口地址
// return 'http://192.168.43.8:9094/epdc-api/api/'
}

Loading…
Cancel
Save