From dc8b3cc481437646df9597674f87a108e95707b9 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Tue, 10 Oct 2023 12:27:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.js                          |   6 +--
 pages/index/index.wxml                        |   9 ++--
 pages/index/index.wxss                        |  27 ++++++++--
 pages/login/login.wxml                        |   4 +-
 pages/login/login.wxss                        |   4 +-
 pages/mine/mine.wxml                          |   2 +-
 pages/mine/mine.wxss                          |  20 ++++++-
 pages/work/work.js                            |   9 ++--
 pages/work/work.wxml                          |  16 +++---
 pages/work/work.wxss                          |  32 +++++++----
 project.private.config.json                   |  14 ++---
 subpages/addResi/pages/addResi/addResi.wxml   |   2 +-
 subpages/addResi/pages/addResi/addResi.wxss   |   4 +-
 .../pages/followUpDetail/followUpDetail.js    |   8 ++-
 .../pages/followUpDetail/followUpDetail.wxml  |  20 ++++---
 .../pages/followUpDetail/followUpDetail.wxss  |  51 +++++++++++++++---
 .../pages/historyQuery/historyQuery.js        |   3 +-
 .../pages/historyQuery/historyQuery.wxml      |   2 +-
 .../pages/historyQuery/historyQuery.wxss      |   9 +++-
 .../pages/synthesis/synthesis.wxml            |   2 +-
 .../dissatisfied/demandCheck/demandCheck.wxss |  13 +++--
 .../gatherInformation/gatherInformation.wxml  |   5 +-
 .../gatherInformation/gatherInformation.wxss  |   9 +++-
 .../gatherInformation/pages/images/down.png   | Bin 418 -> 0 bytes
 .../gatherInformation/pages/images/downG.png  | Bin 0 -> 393 bytes
 .../pages/punchCard/punchCard.wxml            |   4 +-
 .../pages/punchCard/punchCard.wxss            |  10 ++--
 .../pages/searchResult/searchResult.wxss      |  10 ++--
 utils/config.js                               |   4 +-
 29 files changed, 209 insertions(+), 90 deletions(-)
 delete mode 100644 subpages/gatherInformation/pages/images/down.png
 create mode 100644 subpages/gatherInformation/pages/images/downG.png

diff --git a/pages/index/index.js b/pages/index/index.js
index 3db7543..fbae979 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -9,7 +9,7 @@ Page({
     pageSize:10,
     pageNo:1,
     tableData:[],
-    lowerThreshold:'10',
+    lowerThreshold:'20',
     loadMoreVisible:false,
     loadMoreType: "none",
     nodata:false
@@ -59,8 +59,8 @@ onScrollToLower(e){
     if(!parm.type) delete parm.type
     getIntelligentMessage(parm).then(res=>{
       res.data.list = res.data.list.map(item => {
-        if (item.createdByName && item.createdByName.length === 3) {
-          item.createdByName = item.createdByName.slice(1);
+        if (item.createdByName && item.createdByName.length >= 3) {
+          item.createdByName = item.createdByName.slice(1,3);
         }
         return item;
       });
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 8aa50d8..3e2920b 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -12,26 +12,29 @@
 
 <view class="select">
     <view class="bgBule">
-    <picker mode="selector" range="{{selectList}}" value="{{selectValue}}" bindchange="handleChangeFilter" >
-        <view  >{{selectValue == 1?'居民信息采集':selectValue == 2?'房屋信息采集':selectValue == 3?'社区满意度自查':'全部信息'}}</view>
+    <picker mode="selector" style="display: inline-block;" range="{{selectList}}" value="{{selectValue}}" bindchange="handleChangeFilter" >
+    <view>{{selectValue == 1?'居民信息采集':selectValue == 2?'房屋信息采集':selectValue == 3?'社区满意度自查':'全部信息'}}</view>
     </picker>
+
     <image src="../../images/select.png" mode=""/></view>
     <view class="delete" bind:tap="handelClickClear"> <image src="../../images/delete.png" mode="" /> 全部已读</view>
 </view>
 <view class="content">
     <scroll-view class="scroll" scroll-y="{{true}}" lower-threshold="{{ lowerThreshold }}" bindscrolltolower="onScrollToLower">
+      <view class="box">
         <view class="card" wx:for="{{tableData}}" wx:key="index" >
             <view class="left">{{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="bottom">
                     <view class="flex_box">
-                        <view wx:if="{{item.msgType == '2'}}">测评打分:</view><view class="{{item.msgType == '2'?'blue':''}}">{{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 || '--'}}</view><view wx:if="{{item.msgType == '2'}}">分</view>
                     </view> 
                     <text>{{item.createdTime}}</text>
                 </view>
             </view>
     </view>
+      </view>
     <load-more loadVisible="{{loadMoreVisible}}" loadType="{{loadMoreType}}" ></load-more>
     <no-data isShow="{{nodata}}" wx:if="{{nodata}}"></no-data>
     </scroll-view>
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index c9e506e..3f7f731 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -46,20 +46,33 @@ page {
     box-sizing: border-box;
 }
 .content .scroll {
-    height: calc(100vh - 120rpx);
-    overflow-y: scroll;
+    height: calc(100vh - 130rpx);
+}
+
+.content .scroll .box{
+    border-radius: 20rpx;
+    overflow-y: auto;
 }
 .content .card{
     width: 100%;
     background-color: #fff;
     display: flex;
     height: 168rpx;
-    border-radius: 20rpx;
     padding: 34rpx 30rpx;
     box-sizing: border-box;
-    border-bottom:  1px solid #EAEAEA;
     overflow: hidden;
+    position: relative;
+}
+
+.content .card::before{
+    content: "";
+    position: absolute;
+    left: 30rpx;  /* 调整间距 */
+    right: 30rpx; /* 调整间距 */
+    bottom: 0;
+    border-bottom: 2rpx solid #EAEAEA;
 }
+
 .blue{
     color:#5693EE;
 }
@@ -127,6 +140,12 @@ page {
     font-family: PingFang SC;
     color: #999999;
 }
+.textOver{
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    max-width: 250rpx;
+}
 .content .card  .right .bottom .flex_box{
     display: flex;
     justify-content: left;
diff --git a/pages/login/login.wxml b/pages/login/login.wxml
index 1f3749f..28dfb8c 100644
--- a/pages/login/login.wxml
+++ b/pages/login/login.wxml
@@ -2,7 +2,7 @@
 <view class="header">
        <view class="left">
         <image src="../../images/login/hi.png" mode=""/>
-        <view->欢迎加入e联社区</view->
+        <view style="margin-top: 30rpx;">欢迎加入e联社区</view>
        </view>
        <view class="right">
           <image src="../../images/login/right_bg.png" mode=""/>
@@ -16,5 +16,5 @@
                 <input type="text" confirm-type="go"  password="true" placeholder="请输入密码" bindinput="handelBlurPassword" bindblur="handelBlurPassword" value="{{formData.password}}" />
         </view>
         <text wx:if="{{false}}">忘记密码</text> 
-        <button bind:tap="handelClickSubmit">登录</button>
+        <button bind:tap="handelClickSubmit" style="font-weight: 600;">登录</button>
 </view>
diff --git a/pages/login/login.wxss b/pages/login/login.wxss
index bad6c8a..986645b 100644
--- a/pages/login/login.wxss
+++ b/pages/login/login.wxss
@@ -24,9 +24,9 @@ page {
   }
   .header .right image {
     width: 280rpx;
-    height: 280rpx;
+    height: 232rpx;
     position: relative;
-    top: -60rpx;
+    top: -30rpx;
     left: 100rpx;
 }
   .header view {
diff --git a/pages/mine/mine.wxml b/pages/mine/mine.wxml
index af2d416..cad9529 100644
--- a/pages/mine/mine.wxml
+++ b/pages/mine/mine.wxml
@@ -45,7 +45,7 @@
                 </view>
                 <view class="right"> <image src="../../images/right.png" mode=""/></view>
             </view>
-            <view class="item" bind:tap="toSettings"> 
+            <view class="item no-pseudo" bind:tap="toSettings" > 
                 <view class="left">
                         <image src="../../images/mine/sz.png" mode=""/>
                         <view>设置</view>
diff --git a/pages/mine/mine.wxss b/pages/mine/mine.wxss
index 9489e24..34688cf 100644
--- a/pages/mine/mine.wxss
+++ b/pages/mine/mine.wxss
@@ -88,23 +88,41 @@ page{
     padding: 0 20rpx;
     height: auto;
     position: relative;
-    top: -100rpx;
+    top: -120rpx;
 }
 .body .card {
     background-color: #ffffff;
     border-radius: 20rpx;
     height: auto;
 }
+
 .body .card .item{
+    position: relative;
     height: 100rpx;
     display: flex;
     align-items: center;
     padding: 0 30rpx;
     box-sizing: border-box;
 }
+
+.body .card .item::before{
+    content: "";
+    position: absolute;
+    left: 30rpx; 
+    right: 30rpx; 
+    bottom: 0;
+    border-bottom: 2rpx solid #EAEAEA;
+}
+
+.no-pseudo::before {
+    display: none;
+}
+
 .body .card .item .left {
     flex: 1;
     display: flex;
+    align-items: center;
+    font-size: 32rpx;
 }
 .body .card .item .left image{
     width: 40rpx;
diff --git a/pages/work/work.js b/pages/work/work.js
index e26adc1..7458a10 100644
--- a/pages/work/work.js
+++ b/pages/work/work.js
@@ -49,12 +49,14 @@ Page({
             console.log(err);
         })
     },  
+    //
     getInspRecord(){
         let parm ={
-            pageSize:20,
+            pageSize:1000,
             pageNo:1
         }
         getInspRecord(parm).then(res=>{
+            res.data.list = res.data.list.reverse();
             this.setData({
                 communitySelfInspTop:res.data.list.splice(0,1)[0],
                 communitySelfInspList:res.data.list.splice(0,2),
@@ -202,11 +204,6 @@ Page({
             url: `/subpages/communitySelfInsp/pages/synthesis/synthesis?inspRecordId=${this.data.communitySelfInspTop.id}&qrCodeImgUrl=${this.data.communitySelfInspTop.qrCodeImgUrl}&agencyName=${this.data.communitySelfInspTop.agencyName}&monthName=${this.data.communitySelfInspTop.monthName}&questionnaireUrl=${this.data.communitySelfInspTop.questionnaireUrl}`,
         })
     },
-    toWebView(){
-        wx.navigateTo({
-            url: `/subpages/communitySelfInsp/pages/synthesis/synthesis?inspRecordId=${this.data.communitySelfInspTop.id}`,
-        })
-    },
     toDetail(e){
         wx.navigateTo({
             url: `/subpages/communitySelfInsp/pages/synthesis/synthesis?inspRecordId=${e.currentTarget.dataset.item.id}&qrCodeImgUrl=${e.currentTarget.dataset.item.qrCodeImgUrl}&agencyName=${e.currentTarget.dataset.item.agencyName}&monthName=${e.currentTarget.dataset.item.monthName}&questionnaireUrl=${e.currentTarget.dataset.item.questionnaireUrl}`,
diff --git a/pages/work/work.wxml b/pages/work/work.wxml
index ff5ebfc..c8aa02e 100644
--- a/pages/work/work.wxml
+++ b/pages/work/work.wxml
@@ -5,7 +5,7 @@
     </view>
     <view class="content">
          <view class="tab"> 
-            <text bind:tap="handelTab" data-value="resi">查询居民</text>
+            <text bind:tap="handelTab" data-value="resi" >查询居民</text>
             <text bind:tap="handelTab" data-value="house">查询房屋</text>
             <image  class="{{setlectVal == 'resi'?'tab_resi':'tab_house'}}" src="../../images/work/select.png" mode=""/>
          </view>
@@ -28,10 +28,12 @@
          </view>
     </view>
 </view>
-<view class="body">
+
+
+<view class="body {{ (SearchRecordsList.length == 0 && setlectVal != 'resi') ? 'top-90' : '' }}">
     <view class="top">
         <view class="title">
-            <view>信息采集</view>
+            <view style="font-size: 34rpx; font-weight: 500;">信息采集</view>
             <text bind:tap="toGatherInformation">采集记录 ></text>
         </view>
         <view class="tip ">
@@ -60,13 +62,13 @@
     <image src="../../images/work/sqmp.png" bind:tap="toDemandCheck" class="center_img" mode=""/>
     <view class="bto">
         <view class="title">
-            <view>满意度自查</view>
-            <text bind:tap="toHistoryQuery">历史自查 ></text>
+            <view style="font-size: 34rpx;  font-weight: 500;">满意度自查</view>
+            <text bind:tap="toHistoryQuery" style="font-size: 28rpx;">历史自查 ></text>
         </view>
         <view class="content">
             <view class="bg_box">
                 <view class="bg_left">
-                    <view class="h2" bind:tap="toWebView" >
+                    <view class="h2" bind:tap="toSynthesis" >
                         {{communitySelfInspTop.agencyName}}{{communitySelfInspTop.monthName}}月份满意度自查
                     </view>
                     <view class="submit">已提交 <b>{{communitySelfInspTop.personQty?communitySelfInspTop.personQty:'--'}}</b> 人</view>
@@ -86,7 +88,7 @@
                     <view class="submit">已提交:{{item.personQty}}人</view>
                 </view>
                 <view class="right">
-                        <b>{{item.synthesisScore}}</b>分
+                        <text>{{item.synthesisScore}}</text>分
                 </view>
             </view>
         </view>
diff --git a/pages/work/work.wxss b/pages/work/work.wxss
index 1670615..4bfb0ab 100644
--- a/pages/work/work.wxss
+++ b/pages/work/work.wxss
@@ -22,6 +22,9 @@ page {
   .blue{
       color: #5F9BD4 ;
   }
+  .top-90{
+      top:-90rpx !important;
+  }
   .font_size_44{
       font-size: 44rpx;
   }
@@ -76,6 +79,11 @@ page {
    text-align: center;
    position: relative;
    color: #fff;
+   font-family: PingFang SC;
+   font-weight: bold;
+   font-size: 34rpx;
+   padding: 0 60rpx;
+   box-sizing: border-box;
 }
 .header .content .tab image{
     position: absolute;
@@ -84,11 +92,11 @@ page {
 }
 .header .content  .tab_resi{
     top: 50rpx;
-    left: 109rpx;
+    left: 137rpx;
 }
 .header .content  .tab_house{
     top: 50rpx;
-    left: 462rpx;
+    left: 434rpx;
 }
 .header .content .inout_box {
     position: relative;
@@ -199,7 +207,7 @@ page {
 .body{
     padding: 0 20rpx 20rpx;
     position: relative;
-    top: -20rpx;
+    top: -10rpx;
     box-sizing: border-box;
     overflow: hidden;
 }
@@ -261,12 +269,15 @@ page {
     padding-left: 17rpx;
     font-family: PingFang SC;
     font-weight: 600;
+    margin-top: 28rpx;
 }
 .big_box .left .left_body {
     flex: 1;
     display: flex;
     flex-direction: column;
     justify-content: space-around;
+    padding-bottom: 40rpx;
+    box-sizing: border-box;
 }
 .big_box .left .left_body view {
     display: flex;
@@ -284,7 +295,7 @@ page {
     position: absolute;
     width: 352rpx;
     height: 352rpx;
-    left: 50%;
+    left: 49%;
     top: 50%;
     transform: translateX(-170rpx) translateY(-170rpx);
 }
@@ -302,12 +313,15 @@ page {
     padding-left: 55rpx;
     font-family: PingFang SC;
     font-weight: 600;
+    margin-top: 28rpx;
 }
 .big_box .right .right_body {
     flex: 1;
     display: flex;
     flex-direction: column;
     justify-content: space-around;
+    padding-bottom: 40rpx;
+    box-sizing: border-box;
 }
 .big_box .right .right_body view {
     display: flex;
@@ -329,7 +343,7 @@ page {
     box-sizing: border-box;
     margin-top:20rpx ;
     margin-bottom: 100rpx;
-    padding: 0 30rpx 20rpx;
+    padding: 0 30rpx 0rpx;
 }
 .body .bto .content{
     border-radius: 20rpx;
@@ -392,6 +406,7 @@ page {
     margin-right:31rpx ;
     padding: 0 !important;
     color: #fff;
+    margin-left: 0;
  }
  .body .bto .content .bg_box .bg_left .btn_Box .btn_tj{
     width: 160rpx;
@@ -416,7 +431,7 @@ page {
     width: 160rpx;
     height: 160rpx;
     position: relative;
-    top: 20rpx;
+    top: 80rpx;
 }
 .body .bto .content .bg_box .bg_right .tag{
     display: inline-block;
@@ -443,7 +458,7 @@ page {
     padding: 30rpx 0;
     align-items: center;
     color: #333333;
-    border-bottom: 1px solid #EAEAEA;
+    border-bottom: 1px solid #f7f7f7;
 }
 .body .bto .list .list_card .left{
     flex: 1;
@@ -473,9 +488,8 @@ page {
     width: 100%;
     margin-top: 20rpx;
 }
-.list_card .right b{
+.list_card .right text{
     font-size: 40rpx;
     font-family: DIN Alternate;
-    font-weight: bold;
     color: #FF783C;
 }
\ No newline at end of file
diff --git a/project.private.config.json b/project.private.config.json
index 865cbda..78a0c74 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -8,6 +8,13 @@
     "condition": {
         "miniprogram": {
             "list": [
+                {
+                    "name": "回访记录详情",
+                    "pathName": "subpages/communitySelfInsp/pages/followUpDetail/followUpDetail",
+                    "query": "resiInfo={\"periodStart\":\"2023-09-01\",\"createdTime\":\"2023-09-11\",\"reporterName\":\"老王5\",\"reporterMobile\":\"18500000005\",\"followUpWay\":\"0\",\"followUpStatus\":1,\"evaCulturalFacility\":\"veryGood\",\"evaSportsFacility\":\"veryGood\",\"evaEcologicalEnv\":\"bad\",\"evaSocialSecurity\":\"bad\",\"evaSocialAssistance\":\"good\",\"evaOldPeopleProvide\":\"good\",\"evaBasicEducation\":\"veryGood\",\"evaMedical\":\"veryGood\",\"reason\":\"aa\",\"id\":\"1701199625473716226\",\"status\":1,\"addressDetail\":null}&type=edit",
+                    "launchMode": "default",
+                    "scene": null
+                },
                 {
                     "name": "",
                     "pathName": "pages/index/index",
@@ -43,13 +50,6 @@
                     "launchMode": "default",
                     "scene": null
                 },
-                {
-                    "name": "回访记录详情",
-                    "pathName": "subpages/communitySelfInsp/pages/followUpDetail/followUpDetail",
-                    "query": "resiInfo={\"periodStart\":\"2023-09-01\",\"createdTime\":\"2023-09-11\",\"reporterName\":\"老王5\",\"reporterMobile\":\"18500000005\",\"followUpWay\":\"0\",\"followUpStatus\":1,\"evaCulturalFacility\":\"veryGood\",\"evaSportsFacility\":\"veryGood\",\"evaEcologicalEnv\":\"bad\",\"evaSocialSecurity\":\"bad\",\"evaSocialAssistance\":\"good\",\"evaOldPeopleProvide\":\"good\",\"evaBasicEducation\":\"veryGood\",\"evaMedical\":\"veryGood\",\"reason\":\"aa\",\"id\":\"1701199625473716226\",\"status\":1,\"addressDetail\":null}&type=add",
-                    "launchMode": "default",
-                    "scene": null
-                },
                 {
                     "name": "回访记录",
                     "pathName": "subpages/communitySelfInsp/pages/followUpList/followUpList",
diff --git a/subpages/addResi/pages/addResi/addResi.wxml b/subpages/addResi/pages/addResi/addResi.wxml
index cd4435f..f7aad6a 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: 50rpx;height: 50rpx;"  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'?'修改居民信息':'新增居民信息'}}
+        {{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 17b07ec..9b72ce8 100644
--- a/subpages/addResi/pages/addResi/addResi.wxss
+++ b/subpages/addResi/pages/addResi/addResi.wxss
@@ -47,7 +47,7 @@ page {
     z-index: 100;
 }
 .header .content{
-    margin: 140rpx 0 0 69rpx;
+    margin: 160rpx 0 0 50rpx;
 }
 .header .content .h2{
     font-size: 44rpx;
@@ -84,7 +84,7 @@ page {
     padding: 0 20rpx;
     box-sizing: border-box;
     position: relative;
-    top: -60rpx;
+    top: -30rpx;
 }
 .form_card {
     background-color: #fff;
diff --git a/subpages/communitySelfInsp/pages/followUpDetail/followUpDetail.js b/subpages/communitySelfInsp/pages/followUpDetail/followUpDetail.js
index 070f050..71ec9c3 100644
--- a/subpages/communitySelfInsp/pages/followUpDetail/followUpDetail.js
+++ b/subpages/communitySelfInsp/pages/followUpDetail/followUpDetail.js
@@ -20,6 +20,7 @@ Page({
                 value:'2'
             }
         ],
+        showAll:false,
         inspResultId:'',
         form:{
             riskFlag:null,//风险标识 0无风险 1有风险
@@ -34,7 +35,6 @@ Page({
     onLoad(options) {
         console.log(options);
         let temp = JSON.parse(options.resiInfo);
-        console.log(temp);
         this.setData({
             statusHeight: app.globalData.deviceInfo.statusHeight,
             navigationHeight: app.globalData.deviceInfo.navigationHeight,
@@ -49,7 +49,6 @@ Page({
         }else{
            this.setData({
             resiInfo:temp,
-            'resiInfo.reason':temp.reason,
             inspResultId:temp.inspResultId,
             "form.followUpWay":temp.followUpWay,
             "form.description":temp.description,
@@ -187,6 +186,11 @@ Page({
               console.log(err);
           })
     },
+    handleClickDown(){
+        this.setData({
+            showAll: !this.data.showAll  
+        })
+    },
     back(){
         wx.navigateBack({
             delta: 1
diff --git a/subpages/communitySelfInsp/pages/followUpDetail/followUpDetail.wxml b/subpages/communitySelfInsp/pages/followUpDetail/followUpDetail.wxml
index c61d623..fee6508 100644
--- a/subpages/communitySelfInsp/pages/followUpDetail/followUpDetail.wxml
+++ b/subpages/communitySelfInsp/pages/followUpDetail/followUpDetail.wxml
@@ -6,19 +6,27 @@
 </view>
 <view class="content">
     <view class="content_header">
-        <view class="{{formType == 'add'?'bto_bor':''}}">
-                <view> {{resiInfo.reporterName}} {{resiInfo.reporterMobile}}</view>
-                <view class="gray font28" style="margin: 20rpx 0;">{{resiInfo.addressDetail?resiInfo.addressDetail:'--'}}</view>
+        <view class="{{formType == 'add'?'bto_bor':''}} {{ showAll?'heightAuto':'height200'}}">
+                <view class="title"> {{resiInfo.reporterName}} {{resiInfo.reporterMobile}}</view>
+                <view wx:for="{{resiInfo.reasons}}" wx:key="index">
+                    <!--  -->
+                    <view class="reason">不满意原因：{{item.reason}}</view>
+                    <view class="gray" style="font-size: 28rpx;margin-top: 20rpx;">不满意类别：{{item.categoryName}}</view>
+                </view>
+               
+        </view>
+        <view class="down" wx:if="{{formType != 'add'}}">
+            <image class="{{showAll?'down_image':'up_image'}}" src="../../../../images/back.png" mode="" bind:tap="handleClickDown"/>
         </view>
         <view style="margin-top: 20rpx;" wx:if="{{formType == 'add'}}">
               不满意原因：{{resiInfo.reason?resiInfo.reason:'--'}}
         </view>
     </view>
     <view class="content_form">
-        <view class="bto_bor form_item" style="color:#333;font-weight: bold;">填写回访记录</view>
+        <view class="bto_bor form_item" style="color:#333;font-weight: bold; font-size: 34rpx;">填写回访记录</view>
         <view class="form_item bto_bor">
             <view class="label">
-                        <view class="title" style="color: #333333">回访方式</view>
+                        <view  style="color: #333333">回访方式</view>
             </view>
             <view class="input">
                 <picker bindchange="bindPickerChangefollowUpWay" range-key="label"  value="{{index}}"  range="{{followUpWayList}}">
@@ -40,7 +48,7 @@
                 <view>
                 <radio-group bindchange="handleChangeRisk" value="{{form.riskFlag}}" style="margin-top: 20rpx;">
                         <radio color="#70acfc" checked="{{form.riskFlag === 1}}" style="margin-left: 20rpx;" value="1"/>是
-                        <radio color="#70acfc" checked="{{form.riskFlag === 0}}" value="0"/>否
+                        <radio color="#70acfc" checked="{{form.riskFlag === 0}}" value="0" style="margin-left: 80rpx;"/>否
                 </radio-group>
                       
                 </view>
diff --git a/subpages/communitySelfInsp/pages/followUpDetail/followUpDetail.wxss b/subpages/communitySelfInsp/pages/followUpDetail/followUpDetail.wxss
index d3607b2..c8bdf3f 100644
--- a/subpages/communitySelfInsp/pages/followUpDetail/followUpDetail.wxss
+++ b/subpages/communitySelfInsp/pages/followUpDetail/followUpDetail.wxss
@@ -8,8 +8,33 @@ page {
 	width: 100%;
     height: 532rpx;
     background: linear-gradient(180deg, #7DB5FF 0%, #E8F2FF 66%, #F7F7F7 100%);
-}
-
+  }
+  .title{
+      height:80rpx;
+      border-bottom: 2rpx solid #EAEAEA;
+      line-height: 60rpx;
+      font-size: 34rpx;
+  }
+  textarea{
+      width: 100%;
+      box-sizing: border-box;
+  }
+  .reason{
+      height: 80rpx;
+      overflow: hidden;
+      display: -webkit-box;
+     -webkit-line-clamp: 2;
+     -webkit-box-orient: vertical;
+     color: #333333;
+     margin-top: 30rpx;
+  }
+  .heightAuto{
+      height: auto;
+  }
+  .height200{
+      max-height: 250rpx;
+      overflow: hidden;
+  }
 .header .header-bg {
 	width: 100%;
 	height: 100%;
@@ -21,10 +46,22 @@ page {
 	height: 100%;
 	z-index: -999;
 }
-
+.down{
+    display: flex;
+    justify-content: center;
+}
+.down .down_image{
+    transform: rotate(91deg);
+    width: 30rpx;
+    height: 30rpx;
+}
+.down .up_image{
+    transform: rotate(-91deg);
+    width: 30rpx;
+    height: 30rpx;
+}
 .gray{
     color: #666666;
-
 }
 
 .font28{
@@ -57,7 +94,7 @@ page {
     width: 100%;
     overflow: hidden;
     position: relative;
-    top: -380rpx;
+    top: -350rpx;
     padding: 0 20rpx;
     box-sizing: border-box;
 }
@@ -134,10 +171,10 @@ page {
     position: fixed;
     bottom: 30rpx;
     left: 50%;
-    transform: translateX(-184rpx);
+    transform: translateX(-300rpx);
 }
 .fixed_btn button{
-    width: 360rpx;
+    width: 600rpx;
     height: 76rpx;
     background: linear-gradient(87deg, #81B5FB 0%, #3E92FF 100%);
     border-radius: 76rpx !important;
diff --git a/subpages/communitySelfInsp/pages/historyQuery/historyQuery.js b/subpages/communitySelfInsp/pages/historyQuery/historyQuery.js
index e946ccc..99ba234 100644
--- a/subpages/communitySelfInsp/pages/historyQuery/historyQuery.js
+++ b/subpages/communitySelfInsp/pages/historyQuery/historyQuery.js
@@ -13,7 +13,7 @@ Page({
         loadMoreType: "none",
         nodata:false,
         pageNo:1,
-        pageSize:10,
+        pageSize:1000,
         type:''
     },
 
@@ -104,6 +104,7 @@ Page({
         }
       
         getInspRecord(parm).then(res=>{
+          res.data.list = res.data.list.reverse()
                 this.setData({
                     loadMoreType: res.data.list.length === this.data.pageSize ? 'more' : 'none',
                     tableData: this.data.tableData.concat(res.data.list),
diff --git a/subpages/communitySelfInsp/pages/historyQuery/historyQuery.wxml b/subpages/communitySelfInsp/pages/historyQuery/historyQuery.wxml
index 3d89ab8..eb6f67c 100644
--- a/subpages/communitySelfInsp/pages/historyQuery/historyQuery.wxml
+++ b/subpages/communitySelfInsp/pages/historyQuery/historyQuery.wxml
@@ -10,7 +10,7 @@
         <view class="card">
             <view class="list_card {{index == 0?'bgc':''}}" wx:for="{{tableData}}" wx:key="index" data-item="{{item}}" bind:tap="handelClickedit">
                 <view class="left">
-                    <view> {{item.agencyName}}{{item.monthName}}月份满意度自查</view>
+                    <view class="{{item.status == 1?'bold':''}}"> {{item.agencyName}}{{item.monthName}}月份满意度自查</view>
                     <view class="left_bto_box">
                         <view class="{{item.status == 1?'bule':'gray'}}">{{item.status == 1?'进行中':'已结束'}}</view>
                         <view>测评人数：{{item.personQty}}</view>
diff --git a/subpages/communitySelfInsp/pages/historyQuery/historyQuery.wxss b/subpages/communitySelfInsp/pages/historyQuery/historyQuery.wxss
index bbb31f0..22db215 100644
--- a/subpages/communitySelfInsp/pages/historyQuery/historyQuery.wxss
+++ b/subpages/communitySelfInsp/pages/historyQuery/historyQuery.wxss
@@ -9,7 +9,12 @@ page {
     height: 532rpx;
     background: linear-gradient(180deg, #7DB5FF 0%, #E8F2FF 66%, #F7F7F7 100%);
 }
-
+.bold{
+    font-size: 32rpx;
+    font-family: PingFang SC;
+    font-weight: bold;
+    color: #333333;
+}
 .header .header-bg {
 	width: 100%;
 	height: 100%;
@@ -45,7 +50,7 @@ page {
     width: 100%;
     overflow: hidden;
     position: relative;
-    top: -380rpx;
+    top: -350rpx;
     padding: 0 20rpx;
     box-sizing: border-box;
 }
diff --git a/subpages/communitySelfInsp/pages/synthesis/synthesis.wxml b/subpages/communitySelfInsp/pages/synthesis/synthesis.wxml
index 8ab8126..020c097 100644
--- a/subpages/communitySelfInsp/pages/synthesis/synthesis.wxml
+++ b/subpages/communitySelfInsp/pages/synthesis/synthesis.wxml
@@ -64,7 +64,7 @@
 <view class="mask" wx:if="{{maskStatus}}">
     <view class="bg-box">
         <image src="../../../../images/cancle.png" class="cancle" mode="" bind:tap="hideCodeImg"/>
-        <image src="{{qrCodeImgUrl}}" style="width: 100%;" mode="" class="qrCodeImg" 	show-menu-by-longpress="true"/>
+        <image src="{{qrCodeImgUrl}}" style="width: 100%;" mode="" class="qrCodeImg" show-menu-by-longpress="true"/>
         <view class="top20 font32">{{agencyName}}</view>
         <view class="gray top20">2023年{{monthName}}月份满意度自查二维码</view>
         <view class="mask_btn" bind:tap="downImage">下载二维码</view>
diff --git a/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.wxss b/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.wxss
index 92c0aeb..d5a0855 100644
--- a/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.wxss
+++ b/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.wxss
@@ -86,6 +86,8 @@ page {
   color: #333;
   line-height: 50rpx;
   position: relative;
+  box-sizing: border-box;
+
 }
 .add-issue .issue-content textarea .textarea-placeholder {
   font-size: 32rpx;
@@ -391,12 +393,11 @@ page {
   padding: 25rpx 0;
   line-height: 60rpx;
   display: flex;
-  justify-content: space-between;
 }
 .item .field {
 position: relative;
 box-sizing: border-box;
-width: 300rpx;
+width: 180rpx;
 padding-left: 25rpx;
 }
 
@@ -438,7 +439,6 @@ color: #333;
 
 .item .value-dl {
   position: relative;
-  width: 410rpx;
   display: flex;
   font-size: 32rpx;
   font-family: Source Han Serif SC;
@@ -446,6 +446,9 @@ color: #333;
   color: #333;
   line-height: 60rpx;
   align-items: center;
+  display: flex;
+  justify-content: space-between;
+  flex: 1;
 }
 
 .di-name{
@@ -934,8 +937,8 @@ background: rgb(175, 1, 1);
     font-family: PingFang SC;
   }
   .mkf-img image{
-    width: 50rpx;
-    height: 50rpx;
+    width: 91rpx;
+    height: 80rpx;
   }
   .audio-play{
     display: flex;
diff --git a/subpages/gatherInformation/pages/gatherInformation/gatherInformation.wxml b/subpages/gatherInformation/pages/gatherInformation/gatherInformation.wxml
index 514720a..bc18c20 100644
--- a/subpages/gatherInformation/pages/gatherInformation/gatherInformation.wxml
+++ b/subpages/gatherInformation/pages/gatherInformation/gatherInformation.wxml
@@ -6,18 +6,19 @@
             <image src="../images/down.png" mode=""/>
     </view>
    <view class="box">
-        <view class="date" bind:tap="openCalendar2">
+        <view class="date {{form.collectEndDate?'':'gray'}}" bind:tap="openCalendar2">
             <view class="text">
                 <text wx:if="{{form.collectEndDate}}">{{form.collectStartDate}} {{form.collectEndDate}}</text> 
                 <text wx:else>请选择时间</text>
             </view> 
-        <image src="../images/down.png" mode="" wx:if="{{!form.collectEndDate}}"/>
+        <image src="../images/downG.png" mode="" wx:if="{{!form.collectEndDate}}"/>
         <image src="../images/del.png" catch:tap="handelDel" style="width: 35rpx;height: 35rpx;" mode="" wx:else />
     </view>
      </view>
     <view class="btn" bind:tap="handleClickfilter">筛选</view>
 </view>
 <view class="body">
+
     <scroll-view class="scroll" scroll-y="{{true}}" lower-threshold="{{ lowerThreshold }}" bindscrolltolower="onScrollToLower">
     <view class="content">
         <view class="item" wx:for="{{tableData}}" wx:key="index">
diff --git a/subpages/gatherInformation/pages/gatherInformation/gatherInformation.wxss b/subpages/gatherInformation/pages/gatherInformation/gatherInformation.wxss
index f8a2884..a601662 100644
--- a/subpages/gatherInformation/pages/gatherInformation/gatherInformation.wxss
+++ b/subpages/gatherInformation/pages/gatherInformation/gatherInformation.wxss
@@ -16,8 +16,13 @@ page{
     color: #FF783C;
     background-color: #ffece3;
 }
+.gray{
+    background: rgba(245, 245, 245) !important;
+    border: 1px solid #c1c1c1 !important;
+    color: #c1c1c1 !important;
+}
 .search{
-    height: 90rpx;
+    height: 110rpx;
     width: 100%;
     padding:0 22rpx;
     box-sizing: border-box;
@@ -25,6 +30,8 @@ page{
     display: flex;
     align-items: center;
     justify-content: space-between;
+    padding-top: 20rpx;
+    box-sizing: border-box;
 }
 .search image{
     width: 16rpx;
diff --git a/subpages/gatherInformation/pages/images/down.png b/subpages/gatherInformation/pages/images/down.png
deleted file mode 100644
index 34d3e7af7db6376d1bfa332c51de2c5eabcd78f8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 418
zcmV;T0bTxyP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px$TuDShRA@u(m(6VgQ4EBiqci|C0G*_Yh#TS_kf;DsK@K!PZV4%ZQb+?44WKpJ
z8zND5{KihSlJ~l{-+VLH{z&QhB|X<)65ziR%mgw4(t%td(m=XB6QC_52V?@IfpmK&
zKwC%-$OK3O>2^~B)9vX&rJ2>7+Ng}7K9$#x<zNTZmV*BeOkYmp=3bBJV5aWwER(m@
z;1ihvC-AuaT9+alWGGvsDswai7@%FBrs#nchxG3kLs%DF*dF{BDOlWZHJJdSA*|x7
z0HPpj#8(4&L)40=0K6a=@iYJn!HRbQsD<zl?*?Fp(9M1^dPd#}T{Y&%=x+m&_k@V<
z-k(PEE@9|>SAec0yv4h&(6wVfB@rP$4B&ebemj4=TJ9@!dqDdcj(!@Wdw*RQ4p1Y?
z(vtudw<2mYfe2SEGcy5;TM@OHK!mH7nVEpat%%x8Ai`D4%-$z(0V%(7F$S1fCIA2c
M07*qoM6N<$f@AKi8UO$Q

diff --git a/subpages/gatherInformation/pages/images/downG.png b/subpages/gatherInformation/pages/images/downG.png
new file mode 100644
index 0000000000000000000000000000000000000000..1a3454d7ba57d9b3928dc661c5098026d4ccfa26
GIT binary patch
literal 393
zcmV;40e1e0P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px$LrFwIRA@u(m)#A*FbsqfPXdcH?IegvfK6bMsFT1XE$SOWh@NvcsFM3y+qv(~
z>Q7D^zw*ZQrvUhOf{{QZKspdBL>fr9M*_5k<bX(kG>~qO1ZWG%0g(V{Al<G?pw`;w
zoDVIhipUP^yLDZ61#9vDfm-WMMDFNdrf!<1{V)s<WConTIF6^3(is`b*5sUzXbLdE
zvOXeGS#d~zDFxOA7cK|?A_a~6izXF-H-uJv6Mz>)i}+>$Ylv3y6o3^3Bc29eAz1My
z0Id)f;>`dWAkL+f3-V4_t5H8jzYRp*6Z1S@`@TP}2}AFj0<0xrE#7p6ULE_Cgok)H
zfDcKS?fm;{nXl0M0n2AN`e}^r{cD{&K#M3%PXK7#@~DjjJY3bxj07}pdDKP%9<FL;
nMgkhQJZd8W4_7raH=n>0K>uGc(9H0y00000NkvXXu0mjf$9JG9

literal 0
HcmV?d00001

diff --git a/subpages/searchResult/pages/punchCard/punchCard.wxml b/subpages/searchResult/pages/punchCard/punchCard.wxml
index 18c8eac..49744c0 100644
--- a/subpages/searchResult/pages/punchCard/punchCard.wxml
+++ b/subpages/searchResult/pages/punchCard/punchCard.wxml
@@ -32,7 +32,7 @@
 <view class="card ">
     <view class="title">走访打卡</view>
     <view class="punch {{animationClass}}" bind:tap="handlePunch">
-        <view class="{{animationClass}}">{{!punchFlag ? '开始打卡' : '更新打卡'}}</view>
+        <view class="{{animationClass}}" style="font-size: 36rpx;">{{!punchFlag ? '开始打卡' : '更新打卡'}}</view>
         <view class="{{animationClass}}" style="font-family:PingFang-SC-Regular;font-size: 28rpx;opacity: 0.72;">{{currentTime}}</view>
     </view>
     <view class="address">当前位置：{{addressContent}}</view>
@@ -40,7 +40,7 @@
 <!-- 相关操作 -->
 <view class="card">
     <view class="title">相关操作</view>
-    <view class="blue btn" bind:tap="toAddResi">修改居民信息</view>
+    <view class="blue btn" bind:tap="toAddResi" style="margin-top: 40rpx ; ">修改居民信息</view>
     <view class="yellow btn">满意度调查</view>
     <view class="green btn" bind:tap="toEvent">上报居民诉求</view>
 </view>
\ No newline at end of file
diff --git a/subpages/searchResult/pages/punchCard/punchCard.wxss b/subpages/searchResult/pages/punchCard/punchCard.wxss
index 2979958..e5783ca 100644
--- a/subpages/searchResult/pages/punchCard/punchCard.wxss
+++ b/subpages/searchResult/pages/punchCard/punchCard.wxss
@@ -14,13 +14,14 @@ page {
     border-radius: 20rpx;
     display: flex;
     flex-direction: column;
-    min-height: 400rpx;
+    min-height: 350rpx;
     margin-top: 20rpx;
     padding: 30rpx;
 }
 
 .card .title{
     position: relative;
+    font-size: 34rpx;
 }
 .card .title::after{
     position: absolute;
@@ -32,11 +33,10 @@ page {
     background-color: #3A80E7;
 }
 .info{
-    margin-top: 40rpx;
+    margin-top: 38rpx;
 }
 .info .item{
     display: flex;
-    margin-top: 20rpx;
 }
 .info .item .label{
     width: fit-content;
@@ -52,12 +52,12 @@ page {
     justify-content: center;
     align-items: center;
     border-radius: 50%;
-    margin: 0 auto;
+    margin: 38rpx auto;
 }
 
 .address{
     color: #666666;
-    font-size: 28rpx;
+    font-size: 28rpx ;
     margin: 0 auto;
     margin-top: 40rpx;
 }
diff --git a/subpages/searchResult/pages/searchResult/searchResult.wxss b/subpages/searchResult/pages/searchResult/searchResult.wxss
index 3518d1b..c1dd80f 100644
--- a/subpages/searchResult/pages/searchResult/searchResult.wxss
+++ b/subpages/searchResult/pages/searchResult/searchResult.wxss
@@ -46,7 +46,7 @@ page {
     width: 100%;
     overflow: hidden;
     position: relative;
-    top: -380rpx;
+    top: -350rpx;
     padding: 0 20rpx;
     box-sizing: border-box;
 }
@@ -92,7 +92,7 @@ page {
     font-family: PingFang SC;
     font-weight: 500;
     color: #999999;
-    margin-top: 29rpx;
+    margin-top: 20rpx;
 }
 .list_card .right image{
     width: 20rpx;
@@ -100,13 +100,13 @@ page {
 }
 .content  .content_header{
     height:162rpx;
-    background:linear-gradient(531deg, #cfe5f7 0%, #E8F2FF 66%, #F7F7F7 100%);
+    background: linear-gradient(180deg, #EBF5FE 0%, #FFFFFF 100%);
     padding: 30rpx;
     border-radius:20rpx 20rpx 0 0;
 }
 
 .content  .content_header .title{
-    font-size: 30rpx;
+    font-size: 32rpx;
     font-family: PingFang SC;
     font-weight: bold;
     color: #333333;
@@ -116,7 +116,7 @@ page {
     font-family: PingFang SC;
     font-weight: 400;
     color: #666666;
-    margin: 30rpx 0;
+    margin: 30rpx 0 0;
    
 }
 
diff --git a/utils/config.js b/utils/config.js
index 112bfab..0820c06 100644
--- a/utils/config.js
+++ b/utils/config.js
@@ -6,8 +6,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/' //测试环境
   }
   
   function WEBROOT() {