Merge branch 'data-paga-xiaowang' into data-page

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 () {
@@ -65,7 +66,6 @@ onScrollToLower(e){
         }
         return item;
       }); 
-        
       this.setData({
         loadMoreType: res.data.list.length === this.data.pageSize ? 'more' : 'none',
         tableData: this.data.tableData.concat(res.data.list),
@@ -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);
     })
-  }
+  },
+
 })
 
 

subpages/morenews/pages/morenews/morenews.wxml

@@ -13,12 +13,14 @@
     <scroll-view class="scroll" scroll-y="{{true}}" lower-threshold="{{ lowerThreshold }}" bindscrolltolower="onScrollToLower">
       <view class="box">
         <view class="card" wx:for="{{tableData}}" wx:key="index" data-item="{{item}}" data-index="{{index}}" bind:tap="toDetail">
-            <view class="left">{{item.createdByName}}</view>
+            <view class="left">{{item.createdByName!=null&&item.msgType!='resident_category'?item.createdByName:'系统'}}</view>
             <view class="right">
-                <view class="top"><text class="title" >{{item.content}}</text>  <text class="{{item.readFlag != '1'?'':'gray'}}" style="font-size: 26rpx;">{{item.readFlag != '1'?'未读':'已读'}}</text></view>
+                <view class="top"><text class="title" >{{item.content}}</text> 
+                 <text class="{{item.readFlag != '1'?'':'gray'}}" style="font-size: 26rpx;">{{item.readFlag != '1'?'未读':'已读'}}</text></view>
                 <view class="bottom">
                     <view class="flex_box">
-                        <view wx:if="{{item.msgType == '2'}}">测评打分:</view><view class="{{item.msgType == '2'?'blue':''}}" class="textOver">{{item.deptName || '--'}}</view><view wx:if="{{item.msgType == '2'}}">分</view>
+                        <view wx:if="{{item.msgType == '2'}}">测评打分:</view><view class="{{item.msgType == '2'?'blue':''}}" class="textOver">
+                        {{item.deptName || agencyName}}</view><view wx:if="{{item.msgType == '2'}}">分</view>
                     </view> 
                     <text>{{item.createdTime}}</text>
                 </view>

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/' // 演示环境