From 4fd99c04dc34aec73132d10a88e3929ec707c5b9 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Mon, 28 Aug 2023 17:12:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E9=A1=B5=E9=9D=A2=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E9=87=87=E9=9B=86=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.js                        |  2 +-
 pages/index/index.wxml                      |  2 +-
 pages/work/work.js                          | 21 ++++++++++++++++--
 pages/work/work.wxml                        | 24 ++++++++++-----------
 subpages/addResi/pages/addResi/addResi.js   |  3 +++
 subpages/addResi/pages/addResi/addResi.wxml |  2 +-
 subpages/addResi/pages/addResi/addResi.wxss |  2 +-
 utils/api.js                                |  7 +++++-
 8 files changed, 44 insertions(+), 19 deletions(-)

diff --git a/pages/index/index.js b/pages/index/index.js
index 1a4c5f8..0d073ef 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -4,7 +4,7 @@ const app = getApp()
 import {getIntelligentMessage,getToken,getStaffbasicinfo} from "../../utils/api"
 Page({
   data: {
-    selectList:['全部信息','居民信息采集','房屋信息采集','社区满意度自评'],
+    selectList:['全部信息','居民信息采集','房屋信息采集','社区满意度自查'],
     selectValue:0,
     pageSize:10,
     pageNo:1,
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 23d86bf..d442b35 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -11,7 +11,7 @@
 <view class="select">
     <view>
     <picker mode="selector" range="{{selectList}}" value="{{selectValue}}" bindchange="handleChangeFilter" >
-        <view  >{{selectValue == 1?'居民信息采集':selectValue == 2?'房屋信息采集':selectValue == 3?'社区满意度自评':'全部信息'}}</view>
+        <view  >{{selectValue == 1?'居民信息采集':selectValue == 2?'房屋信息采集':selectValue == 3?'社区满意度自查':'全部信息'}}</view>
     </picker>
     <image src="../../images/select.png" mode=""/></view>
     <view class="delete"> <image src="../../images/delete.png" mode=""/> 全部已读</view>
diff --git a/pages/work/work.js b/pages/work/work.js
index aedf3bf..bae6387 100644
--- a/pages/work/work.js
+++ b/pages/work/work.js
@@ -1,5 +1,6 @@
 // pages/work/work.js
 const app = getApp()
+import {getSituation} from '../../utils/api'
 Page({
 
     /**
@@ -17,10 +18,26 @@ Page({
         this.setData({
             statusHeight: app.globalData.deviceInfo.statusHeight,
             navigationHeight: app.globalData.deviceInfo.navigationHeight,
-            share:app.globalData.share
+            share:app.globalData.share,
+            agencyName:app.globalData.user.agencyName
           })
+          this.getSituation()
     },
-
+    getSituation(){
+        getSituation().then(res=>{
+            this.setData({
+                collectedHouseCount:res.data.collectedHouseCount,
+                collectedPopulationCount:res.data.collectedPopulationCount,
+                pendingHouseCount:res.data.pendingHouseCount,
+                pendingPopulationCount:res.data.pendingPopulationCount,
+                populationCount:res.data.populationCount,
+                realEstateCount:res.data.realEstateCount,
+              
+            })
+        }).catch(err=>{
+            console.log(err);
+        })
+    },  
     /**
      * 生命周期函数--监听页面初次渲染完成
      */
diff --git a/pages/work/work.wxml b/pages/work/work.wxml
index 2503f37..3ffd38f 100644
--- a/pages/work/work.wxml
+++ b/pages/work/work.wxml
@@ -1,7 +1,7 @@
 <!--pages/work/work.wxml-->
 <view class="header">
     <view class="navigation" style="height: {{navigationHeight}}px; top: {{statusHeight}}px;">
-       <image src="../../images/work/header_left.png" mode=""/> 亿星社区
+       <image src="../../images/work/header_left.png" mode=""/> {{agencyName}}
     </view>
     <view class="content">
          <view class="tab"> 
@@ -35,17 +35,17 @@
             <view class="left">
                 <view class="left_title"><image src="../../images/work/house.png" mode=""/><text class="blue">房屋采集情况</text></view>
                 <view class="left_body">
-                    <view><text class="yellow font_size_44">2,503</text><text class="font_size_26">实有房屋数</text></view>
-                    <view><text class="font_size_44 gray">2,503</text><text class="font_size_26">待采集</text></view>
-                    <view><text class="green font_size_44">2,503</text><text class="font_size_26">采集房屋数</text></view>
+                    <view><text class="yellow font_size_44">{{realEstateCount}}</text><text class="font_size_26">实有房屋数</text></view>
+                    <view><text class="font_size_44 gray">{{pendingHouseCount}}</text><text class="font_size_26">待采集</text></view>
+                    <view><text class="green font_size_44">{{collectedHouseCount}}</text><text class="font_size_26">采集房屋数</text></view>
                 </view>
             </view>
             <view class="right">
                 <view class="right_title"><text class="yellow_T">人口采集情况</text><image src="../../images/work/resi.png" mode=""/></view>
                 <view class="right_body">
-                    <view><text class="yellow font_size_44">2,503</text><text class="font_size_26">实有房屋数</text></view>
-                    <view><text class="font_size_44 gray">2,503</text><text class="font_size_26">待采集</text></view>
-                    <view><text class="green font_size_44">2,503</text><text class="font_size_26">采集房屋数</text></view>
+                    <view><text class="yellow font_size_44">{{populationCount}}</text><text class="font_size_26">辖区人口数</text></view>
+                    <view><text class="font_size_44 gray">{{pendingPopulationCount}}</text><text class="font_size_26">待采集</text></view>
+                    <view><text class="green font_size_44">{{collectedPopulationCount}}</text><text class="font_size_26">采集人口数</text></view>
                 </view>
             </view>
             <image src="../../images/work/center.png" mode="" class="center_image"/>
@@ -53,13 +53,13 @@
     </view>
     <view class="bto">
         <view class="title">
-            <view>满意度自评</view>
-            <text>历史自评></text>
+            <view>满意度自查</view>
+            <text>历史自查></text>
         </view>
         <view class="content">
             <view class="bg_box">
                 <view class="bg_left">
-                    <view class="h2">亿星社区8月份满意度自评</view>
+                    <view class="h2">{{agencyName}}8月份满意度自查</view>
                     <view class="submit">已提交 <b>178</b> 人</view>
                     <view class="btn_Box"> <view class="btn_fx">一键分享</view> <view class="btn_tj">查看统计</view>
                  </view>
@@ -73,7 +73,7 @@
         <view class="list">
             <view class="list_card">
             <view class="left">
-                <view>亿星社区7月份满意度自评</view>
+                <view>{{agencyName}}7月份满意度自查</view>
                 <view class="submit">已提交:152人</view>
             </view>
             <view class="right">
@@ -82,7 +82,7 @@
             </view>
             <view class="list_card">
             <view class="left">
-                <view>亿星社区7月份满意度自评</view>
+                <view>{{agencyName}}7月份满意度自查</view>
                 <view class="submit">已提交:152人</view>
             </view>
             <view class="right">
diff --git a/subpages/addResi/pages/addResi/addResi.js b/subpages/addResi/pages/addResi/addResi.js
index 97cfbca..ce2cdb4 100644
--- a/subpages/addResi/pages/addResi/addResi.js
+++ b/subpages/addResi/pages/addResi/addResi.js
@@ -135,6 +135,9 @@ Page({
             await this.getEducationDictList()
             await this.getmarriageDict()
             if(options.resiId){
+                wx.setNavigationBarTitle({
+                  title: '修改人口信息',
+                })
                 await this.getResiDetail()
                 await this.getResidentResideInfo()
                 await this.getResidentReligion()
diff --git a/subpages/addResi/pages/addResi/addResi.wxml b/subpages/addResi/pages/addResi/addResi.wxml
index 0a1ee93..dd6081e 100644
--- a/subpages/addResi/pages/addResi/addResi.wxml
+++ b/subpages/addResi/pages/addResi/addResi.wxml
@@ -3,7 +3,7 @@
     <image src="../../../../images/back.png" class="back" style=" top: {{statusHeight}}px;width: 30rpx;height: 30rpx;"  bindtap="back" mode=""/>
     <image class="header-bg" src="../images/header.png" mode="widthFix" />
     <view class="navigation"  style="height: {{navigationHeight}}px; top: {{statusHeight}}px;">
-        新增人口信息
+        {{formType == 'edit'?'修改居民信息':'填写居民信息'}}
     </view>
     <view class="content">
             <view class="h2">填写居民信息</view>
diff --git a/subpages/addResi/pages/addResi/addResi.wxss b/subpages/addResi/pages/addResi/addResi.wxss
index 8dd5fd2..17b07ec 100644
--- a/subpages/addResi/pages/addResi/addResi.wxss
+++ b/subpages/addResi/pages/addResi/addResi.wxss
@@ -34,7 +34,7 @@ page {
 	position: absolute;
 	margin-top: 20rpx;
 	border-radius: 0rpx;
-	z-index: 2;
+	z-index: 101;
 }
 .header .navigation {
     width: 100%;
diff --git a/utils/api.js b/utils/api.js
index caa7e68..c6feda2 100644
--- a/utils/api.js
+++ b/utils/api.js
@@ -20,7 +20,8 @@ module.exports = {
   getResidentReligion,
   getResidentEduInfo,
   getFamilyInfoDetailById,
-  resiEdit
+  resiEdit,
+  getSituation
 }
 // 消息列表
 function getIntelligentMessage(param){
@@ -103,6 +104,10 @@ function getResidentEduInfo (id) {
 function getFamilyInfoDetailById (id) {
     return fly.post(`actual/base/residentFamilyInfo/getFamilyInfoDetailById/${id}`)
 }
+// 居民修改
 function resiEdit (parm) {
     return fly.post(`actual/base/residentBaseInfo/update`,parm)
 }
+function getSituation () {
+    return fly.get(`actual/base/wxcollect/situation`)
+}
\ No newline at end of file