diff --git a/pages/detail/index.js b/pages/detail/index.js index 5184de6..76b6145 100644 --- a/pages/detail/index.js +++ b/pages/detail/index.js @@ -1762,7 +1762,7 @@ Page({ }, showFee () { let that = this - if (!this.data.isAgency) return false + // if (!this.data.isAgency) return false console.log('that.data.bclr', that.data.bclr); wx.showModal({ title: that.data.isAgency ? '佣金: ' + that.data.fuWuFei : '', diff --git a/pages/detail/index.wxml b/pages/detail/index.wxml index cda6cde..feef86b 100644 --- a/pages/detail/index.wxml +++ b/pages/detail/index.wxml @@ -175,7 +175,7 @@ - 基本信息 + 职位详情 @@ -197,7 +197,7 @@ - 职位描述 + 通告分享 diff --git a/pages/merchantManagement/index.wxml b/pages/merchantManagement/index.wxml index 19a299e..c0896ee 100644 --- a/pages/merchantManagement/index.wxml +++ b/pages/merchantManagement/index.wxml @@ -31,13 +31,13 @@ - + + 配置通告 - + --> diff --git a/pages/mine/index.js b/pages/mine/index.js index 90fe702..01099a2 100644 --- a/pages/mine/index.js +++ b/pages/mine/index.js @@ -15,7 +15,6 @@ Page({ // user:app.globalData.user, serviceInfo: {}, map: { num10: "0", num20: "0", num25: "0", num30: "0", num40: "0", num999: "0", user999: "0", user40: "0", user48: "0", user50: "0", billStatus10Salary: "0", billStatus30Salary: "0" }, - townsMnaNum:{}, // 老乡数量 motto: "Hello World", userInfo: {}, hasUserInfo: false, @@ -88,18 +87,20 @@ Page({ onShow: function () { console.log("isshow"); let that = this; - wx.setStorageSync("comeFromPage", "me"); - if (wx.getStorageSync("configInfo")) { - this.setData({ - configInfo: { ...wx.getStorageSync("configInfo"), biao: false }, - }); - } + if (typeof this.getTabBar === "function" && this.getTabBar()) { this.getTabBar().setData({ selected: 3, isShow: true }); } + wx.setStorageSync("comeFromPage", "me"); + if (wx.getStorageSync("configInfo")) { + this.setData({ + configInfo: { ...wx.getStorageSync("configInfo"), biao: false }, + }); + console.log('configInfo',this.data.configInfo); + } wx.setStorageSync('BILLFROM', 'mine') // wx.showTabBar({ @@ -128,7 +129,6 @@ Page({ corpUserFlag: app.globalData.loginUserInfo.corpUserFlag, }); that.getDataNum(); - that.getTownsmanDataNum(); } else { // 由于 userLogin 是网络请求,可能会在 Page.onLoad 之后才返回 // 所以此处加入 callback 以防止这种情况 @@ -388,22 +388,6 @@ Page({ } }, - /** - * 获取老乡状态数量 - * - * - */ - getTownsmanDataNum () { - let that = this; - customRequest("/yishoudan/agency/user/listStatistics", { header: 'headers', method: 'GET', data: {} }).then((res) => { - if (res.data.status == 200) { - that.setData({ - townsMnaNum: res.data.data, - }); - console.log('getDataNum',res.data.data); - } - }) - }, /** * 获取各个数量 * diff --git a/pages/mine/index.wxml b/pages/mine/index.wxml index 94ff007..a74fa08 100644 --- a/pages/mine/index.wxml +++ b/pages/mine/index.wxml @@ -196,7 +196,7 @@ - + 我的老乡 @@ -208,11 +208,11 @@ - {{townsMnaNum.num0 || '0'}} + {{map.user0 || '0'}} 全部 - {{townsMnaNum.num3 || '0'}} + {{map.user3 || '0'}} 在职中 - {{townsMnaNum.num0 || '0'}} + {{map.user50 || '0'}} 已离职