diff --git a/subpages/addResi/pages/addResi/addResi.wxml b/subpages/addResi/pages/addResi/addResi.wxml index 90805f9..9c9c7d7 100644 --- a/subpages/addResi/pages/addResi/addResi.wxml +++ b/subpages/addResi/pages/addResi/addResi.wxml @@ -1,6 +1,6 @@ - + diff --git a/subpages/addResi/pages/addResi/addResi.wxss b/subpages/addResi/pages/addResi/addResi.wxss index cbc735c..5d40600 100644 --- a/subpages/addResi/pages/addResi/addResi.wxss +++ b/subpages/addResi/pages/addResi/addResi.wxss @@ -30,7 +30,7 @@ page { padding: 0 30rpx; margin-top: 20rpx; box-sizing: border-box; - + } /* .form_height{ diff --git a/subpages/morenews/pages/morenews/morenews.js b/subpages/morenews/pages/morenews/morenews.js index 9d77d98..c23c585 100644 --- a/subpages/morenews/pages/morenews/morenews.js +++ b/subpages/morenews/pages/morenews/morenews.js @@ -10,7 +10,8 @@ Page({ lowerThreshold:'5', loadMoreVisible:false, loadMoreType: "none", - nodata:false + nodata:false, + agencyName:'' }, // 事件处理函数 onLoad: async function () { @@ -64,13 +65,12 @@ onScrollToLower(e){ item.createdByName = item.createdByName.slice(1,3); } return item; - }); - + }); this.setData({ loadMoreType: res.data.list.length === this.data.pageSize ? 'more' : 'none', tableData: this.data.tableData.concat(res.data.list), }) - if (this.data.tableData.length == 0) { + if (this.data.tableData.length == 0) { this.setData({ loadMoreVisible: false, nodata: true @@ -98,7 +98,7 @@ onScrollToLower(e){ success: (res) => { parm.wxCode = res.code getToken(parm).then(res=>{ - console.log(res); + wx.hideLoading() if(res.code === 0){ wx.setStorageSync('token', res.data.token) @@ -115,7 +115,11 @@ onScrollToLower(e){ }, getStaffbasicinfo(){ getStaffbasicinfo().then(res=>{ + console.log(res) app.globalData.user = res.data + this.setData({ + agencyName:res.data.agencyName + }) }).catch(err=>{ console.log(err); wx.redirectTo({ @@ -167,7 +171,8 @@ onScrollToLower(e){ }).catch(err=>{ console.log(err); }) - } + }, + }) diff --git a/subpages/morenews/pages/morenews/morenews.wxml b/subpages/morenews/pages/morenews/morenews.wxml index e78f098..8228b3c 100644 --- a/subpages/morenews/pages/morenews/morenews.wxml +++ b/subpages/morenews/pages/morenews/morenews.wxml @@ -13,12 +13,14 @@ - {{item.createdByName}} + {{item.createdByName!=null&&item.msgType!='resident_category'?item.createdByName:'系统'}} - {{item.content}} {{item.readFlag != '1'?'未读':'已读'}} + {{item.content}} + {{item.readFlag != '1'?'未读':'已读'}} - 测评打分:{{item.deptName || '--'}} + 测评打分: + {{item.deptName || agencyName}} {{item.createdTime}} diff --git a/utils/config.js b/utils/config.js index 06ba8aa..dce6c12 100644 --- a/utils/config.js +++ b/utils/config.js @@ -5,8 +5,8 @@ module.exports = { }; function BASEURL() { - // return 'https://epmet-preview.elinkservice.cn/api/' // 演示环境 - return 'http://192.168.1.144/api/' //测试环境 + return 'https://epmet-preview.elinkservice.cn/api/' // 演示环境 + // return 'http://192.168.1.144/api/' //测试环境 // return 'http://219.146.91.110:30801/api/' // return 'https://epmet-preview.elinkservice.cn/api/' // 演示环境