From 32f4acdd796a8e2c265a1d18e2f93632fc135cf8 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Thu, 9 May 2024 19:18:08 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=8F=90=E9=86=92?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E5=88=B0=E5=B1=85=E6=B0=91=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?,=E6=88=BF=E5=B1=8B=E6=90=9C=E7=B4=A2=E6=96=87=E5=AD=97?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9,=E6=88=BF=E5=B1=8B=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E7=9A=84=E8=8E=B7=E5=8F=96=E5=B0=8F=E5=8C=BA=E5=85=A5=E5=8F=82?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.js                         | 2 +-
 pages/resiAndHouse/resiAndHouse.wxml         | 2 +-
 subpages/addhouse/pages/addhouse/addhouse.js | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pages/index/index.js b/pages/index/index.js
index 80b82dc..d0e5d4c 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -217,7 +217,7 @@ onScrollToLower(e){
    this.clearOneMessage(e.currentTarget.dataset.item.id)
     if(e.currentTarget.dataset.item.msgType == 'resident_base_info'){
       wx.navigateTo({
-        url: `/subpages/addResi/pages/addResi/addResi?type=edit&resiId=${e.currentTarget.dataset.item.targetId}`,
+        url: `/subpages/searchResult/pages/resiInfo/resiInfo?resiId=${e.currentTarget.dataset.item.targetId}`,
       })
     }else if(e.currentTarget.dataset.item.msgType == 'community_house'){
       wx.navigateTo({
diff --git a/pages/resiAndHouse/resiAndHouse.wxml b/pages/resiAndHouse/resiAndHouse.wxml
index 368f096..80aeac1 100644
--- a/pages/resiAndHouse/resiAndHouse.wxml
+++ b/pages/resiAndHouse/resiAndHouse.wxml
@@ -20,7 +20,7 @@
         </view>
         <view class="inout_box">
             <image src="../../images/work/search.png" mode="" class="search_img" />
-            <input type="text" placeholder="姓名/手机/身份证" bindinput="handelBlurKeyWord" bindblur="handelBlurKeyWord" value="{{keyWord}}" />
+            <input type="text" placeholder="{{selectVale === 'resi'?'姓名/手机/身份证':'小区/楼栋/单元'}}" bindinput="handelBlurKeyWord" bindblur="handelBlurKeyWord" value="{{keyWord}}" />
             <view class="btn_box" bind:tap="handelClickSearch">
                 <image src="../../images/cardIcon.png" mode="" wx:if="{{selectVale == 'resi'}}" class="OCR_img" bind:tap="handelClickToOcr" />
                 <text>搜索</text>
diff --git a/subpages/addhouse/pages/addhouse/addhouse.js b/subpages/addhouse/pages/addhouse/addhouse.js
index daa51eb..7b448a3 100644
--- a/subpages/addhouse/pages/addhouse/addhouse.js
+++ b/subpages/addhouse/pages/addhouse/addhouse.js
@@ -167,7 +167,7 @@ Page({
     getQuartersOptions(gridId){
         let parm = {
             gridId,
-            agencyId:this.data.agecyId
+            agencyId:app.globalData.user.agencyId
         }
         api.getQuartersOptions(parm).then(res=>{
             this.setData({

From e73e7202ba22b987e591c94c2ecb93e59ec3cf57 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Fri, 10 May 2024 11:10:09 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=AE=B0=E5=BD=95,?=
 =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../searchResult/pages/resiInfo/resiInfo.js   | 185 +++++++++++++++++-
 .../searchResult/pages/resiInfo/resiInfo.json |   3 +-
 .../searchResult/pages/resiInfo/resiInfo.wxml |  50 +++++
 .../searchResult/pages/resiInfo/resiInfo.wxss |  78 ++++++++
 utils/api.js                                  |   8 +-
 5 files changed, 320 insertions(+), 4 deletions(-)

diff --git a/subpages/searchResult/pages/resiInfo/resiInfo.js b/subpages/searchResult/pages/resiInfo/resiInfo.js
index a854f38..65a8655 100644
--- a/subpages/searchResult/pages/resiInfo/resiInfo.js
+++ b/subpages/searchResult/pages/resiInfo/resiInfo.js
@@ -1,6 +1,7 @@
 // subpages/searchResult/pages/resiInfo/resiInfo.js
 
 import api from "../../../../utils/api"
+import { getComplainList, getShengList, getShequList, getshijianList, getxuqiuList, getfuwuList, getMultiLogList } from "../../../../utils/businessRecords.js";
 var http = require('../../../../utils/request.js')
 const QQMapWX = require('../../../../utils/qqmap-wx-jssdk')
 const app = getApp()
@@ -531,7 +532,8 @@ Page({
             householdSituationArr:[],
             houseHolderRelArr:[]
         },
-        password:''
+        password:'',
+        ywData: { "12345": [], "provinceSurvey": [], "selfSurvey": [], "event": [], "need": [], "serve": [], "punchRecord": [] }
     },
 
     /**
@@ -549,6 +551,8 @@ Page({
             })
       
            await this.getResiInfo()
+           this.getChangeRecordsById()
+           this.getTabData()
         }
         // this.data.qqMapWX = new QQMapWX({
         //     key: 'CMJBZ-4DECI-JXGGN-5B4WU-QLV2H-B5BEJ'
@@ -634,7 +638,9 @@ Page({
             ensure_house: "保障房信息",
             chronic_disease: "慢病信息",
             base: "基本信息",
-            graph:"关系图谱"
+            graph:"关系图谱",
+            update:"更新记录",
+            business:"业务记录"
         };
         let list = Object.entries(
                 value
@@ -649,6 +655,12 @@ Page({
             list.push({
                 name:'关系图谱',
                 id:"graph"
+            },{
+                name:'业务记录',
+                id:"business"
+            },{
+                name:'更新记录',
+                id:"update"
             },
            )
         this.setData({
@@ -774,6 +786,175 @@ Page({
             console.log(err);
         })
     },
+    // 获取业务记录
+    async getTabData() {
+       
+        let params1 = {
+            "residList": [this.data.resiId],
+            "eventType": "3"
+        }
+        await getComplainList(params1).then(res => {
+            this.data.ywData['12345'] = res.data.list.map(item => {
+                return {
+                    ...item,
+                    categorycode: item.categorycode || '--',
+                    eventcontent: item.eventcontent || '--'
+                }
+            });
+            this.setData({
+                data: this.data.ywData
+            })
+        })
+        let params = {
+            "residList": [this.data.resiId]
+        }
+        await getShengList(params).then(res => {
+            if (res.data && res.data.length > 0) {
+                let renamedArray = [];
+                res.data.forEach(item => {
+                    let renamedItem = {
+                        categorycode: item.scope || '--',
+                        eventcontent: item.problemDesc || '--'
+                    };
+                    renamedArray.push(renamedItem);
+                });
+                this.data.ywData['provinceSurvey'] = renamedArray;
+                this.setData({
+                    ywData: this.data.ywData
+                })
+            } else {
+                this.data.ywData['provinceSurvey'] = [];
+                this.setData({
+                    ywData: this.data.ywData
+                })
+            }
+        })
+        await getShequList(params).then(res => {
+            if (res.data && res.data.length > 0) {
+                let renamedArray = [];
+                res.data.forEach(item => {
+                    let renamedItem = {
+                        categorycode: item.scope || '--',
+                        eventcontent: item.problemDesc || '--'
+                    };
+                    renamedArray.push(renamedItem);
+                });
+                this.data.ywData['selfSurvey'] = renamedArray;
+                this.setData({
+                    ywData: this.data.ywData
+                })
+            } else {
+                this.data.ywData['selfSurvey'] = [];
+                this.setData({
+                    ywData: this.data.ywData
+                })
+            }
+        })
+        await getshijianList(params).then(res => {
+            if (res.data && res.data.length > 0) {
+                let renamedArray = [];
+                res.data.forEach(item => {
+                    let renamedItem = {
+                        categorycode: item.categorycode || '--',
+                        eventcontent: item.eventcontent || '--'
+                    };
+                    renamedArray.push(renamedItem);
+                });
+                this.data.ywData['event'] = renamedArray;
+                this.setData({
+                    ywData: this.data.ywData
+                })
+            } else {
+                this.data.ywData['event'] = [];
+                this.setData({
+                    ywData: this.data.ywData
+                })
+            }
+        })
+        await getxuqiuList(params).then(res => {
+            if (res.data && res.data.length > 0) {
+                let renamedArray = [];
+                res.data.forEach(item => {
+                    let renamedItem = {
+                        categorycode: item.parentName || '--',
+                        eventcontent: item.content || '--'
+                    };
+                    renamedArray.push(renamedItem);
+                });
+                this.data.ywData['need'] = renamedArray;
+                this.setData({
+                    ywData: this.data.ywData
+                })
+            } else {
+                this.data.ywData['need'] = [];
+                this.setData({
+                    ywData: this.data.ywData
+                })
+            }
+        })
+       
+        await getfuwuList(params).then(res => {
+            if (res.data && res.data.length > 0) {
+                let renamedArray = [];
+                res.data.forEach(item => {
+                    let renamedItem = {
+                        categorycode: item.serviceCategoryKey || '--',
+                        eventcontent: item.serviceName || '--'
+                    };
+                    renamedArray.push(renamedItem);
+                });
+                this.data.ywData['serve'] = renamedArray;
+                this.setData({
+                    ywData: this.data.ywData
+                })
+            } else {
+                this.data.ywData['serve'] = [];
+                this.setData({
+                    ywData: this.data.ywData
+                })
+            }
+        })
+        
+        const params2 = {
+            "resiIdList": [this.data.resiId],
+            pageNo: 1,
+            pageSize: 1000,
+        }
+        await getMultiLogList(params2).then(res => {
+            if (res.data && res.data.length > 0) {
+                let arr = [];
+                res.data.forEach(item => {
+                    item.list.forEach(item1=>{
+                        arr.push(item1)
+                    })
+                })
+                this.data.ywData['punchRecord'] = arr;
+                this.setData({
+                    ywData: this.data.ywData,
+                })
+            } else {
+                this.data.ywData['punchRecord'] = [];
+                this.setData({
+                    ywData: this.data.ywData
+                })
+            }
+        })
+
+        this.setData({
+            ywVisible: true
+        })
+    },
+    // 获取更新记录
+    getChangeRecordsById() {
+        api.getChangeRecordsById(this.data.resiId).then(res => {
+            console.log(res);
+            this.setData({
+                logs:res.data
+            })
+        }).catch(err => {
+            console.log(err);
+        })
+    },
     toAddResi() {
         this.setData({
             checkPassword:true
diff --git a/subpages/searchResult/pages/resiInfo/resiInfo.json b/subpages/searchResult/pages/resiInfo/resiInfo.json
index b454563..1b49899 100644
--- a/subpages/searchResult/pages/resiInfo/resiInfo.json
+++ b/subpages/searchResult/pages/resiInfo/resiInfo.json
@@ -1,7 +1,8 @@
 {
     "usingComponents": {
         "van-dialog": "@vant/weapp/dialog/index",
-        "resi-graph":"./component/graph/graph"
+        "resi-graph":"./component/graph/graph",
+        "BusinessRecord": "../../../businessRecord/businessRecord"
     },
     "navigationBarTitleText": "详情"
 }
\ No newline at end of file
diff --git a/subpages/searchResult/pages/resiInfo/resiInfo.wxml b/subpages/searchResult/pages/resiInfo/resiInfo.wxml
index e6bdb89..2529ce9 100644
--- a/subpages/searchResult/pages/resiInfo/resiInfo.wxml
+++ b/subpages/searchResult/pages/resiInfo/resiInfo.wxml
@@ -314,6 +314,56 @@
     <resi-graph resiId="{{resiId}}" bind:clickGraphNode="clickGraphNode" wx:if="{{resiId}}"></resi-graph>
 </view>
 
+<view class="card" id="business">
+        <view class="title">
+            <text>业务记录</text>
+        </view>
+        <BusinessRecord wx:if="{{ywVisible}}" ywData="{{ywData}}" />
+    </view>
+
+<view class="card" id="update">
+        <view class="title">
+            <text>更新记录</text>
+        </view>
+        <view style="margin-top: 32rpx; padidng:0 12rpx;">
+            <view class="logsBox" wx:for="{{logs}}" wx:key="{{item.changeTime}}">
+                <view class="item-dian {{index!=0?'item-dian1':''}}">
+                    <view class="neidian"></view>
+                </view>
+                <view class="logs-top">
+                    <view class="logs-top-title">{{item.typeName}}-{{item.operatorName}}</view>
+                    <view class="logs-top-time">{{item.changeTime}}</view>
+                </view>
+                <view class="logs-content">
+                    <view class="logs-content-left">
+                        <view>
+                            <text class="logs-content-title">变更信息：</text>
+                            <text class="logs-content-txt">{{item.fieldName}}</text>
+                        </view>
+                        <view>
+                            <text class="logs-content-title">变更后：</text>
+                            <text class="logs-content-txt">{{item.beforeChangeName}}</text>
+                        </view>
+                          <view>
+                            <text class="logs-content-title">备注：</text>
+                            <text class="logs-content-txt">{{item.remark||'--'}}</text>
+                        </view>
+                    </view>
+                    <view class="logs-content-right">
+                        <view>
+                            <text class="logs-content-title">变更前：</text>
+                            <text class="logs-content-txt">{{item.afterChangeName}}</text>
+                        </view>
+                        <view>
+                            <text class="logs-content-title">操作人：</text>
+                            <text class="logs-content-txt">{{item.operatorName}}</text>
+                        </view>
+                    </view>
+                </view>
+            </view>
+        </view>
+        <no-data isShow="{{logs.length===0}}" wx:if="{{logs.length===0}}"></no-data>
+    </view>
 <!-- 走访打卡 -->
 <!-- <view class="card ">
     <view class="flex-sb">
diff --git a/subpages/searchResult/pages/resiInfo/resiInfo.wxss b/subpages/searchResult/pages/resiInfo/resiInfo.wxss
index 7c78709..f072bde 100644
--- a/subpages/searchResult/pages/resiInfo/resiInfo.wxss
+++ b/subpages/searchResult/pages/resiInfo/resiInfo.wxss
@@ -294,4 +294,82 @@ page {
 .dialog{
   padding: 0 20rpx;
   box-sizing: border-box;
+}
+.logsBox {
+  border-left: 3rpx solid #DADEE5;
+  margin-left: -18rpx;
+  padding-left: 12rpx;
+}
+
+.logs-top {
+  display: flex;
+  justify-content: space-between;
+  position: relative;
+  top: -32rpx;
+  padding-left: 12rpx;
+}
+
+.logs-top-title {
+  height: 31rpx;
+  font-family: PingFang SC;
+  font-weight: 500;
+  font-size: 32rpx;
+  color: #333333;
+  line-height: 41rpx;
+}
+
+.logs-top-time {
+  height: 20rpx;
+  font-family: PingFang SC;
+  font-weight: 500;
+  font-size: 26rpx;
+  color: #BDBDBD;
+  line-height: 40rpx;
+}
+
+.logs-content {
+  position: relative;
+  top: -24rpx;
+  padding-top: 12rpx;
+  padding-bottom: 24rpx;
+  display: flex;
+  justify-content: space-between;
+  font-family: PingFang SC;
+  font-weight: 500;
+  font-size: 30rpx;
+  color: #999999;
+  line-height: 52rpx;
+}
+
+.logs-content-left {
+  width: 48%;
+}
+
+.logs-content-right {
+  width: 48%;
+}
+
+.logs-content-txt {
+  color: #333333;
+}
+
+.item-dian {
+  position: relative;
+  left: -28rpx;
+  width: 32rpx;
+  height: 32rpx;
+  box-sizing: border-box;
+  background: #FFFFFF;
+  border-radius: 50%;
+  border: 1px solid #3A80E7;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.neidian {
+  width: 18rpx;
+  height: 18rpx;
+  background: #3A80E7;
+  border-radius: 50%;
 }
\ No newline at end of file
diff --git a/utils/api.js b/utils/api.js
index 24edf5f..bee2c4e 100644
--- a/utils/api.js
+++ b/utils/api.js
@@ -77,7 +77,8 @@ module.exports = {
   waitCollectHouseList,
   nonIntResiList,
   overView,
-  getFamilyRelationshipListByHouseId
+  getFamilyRelationshipListByHouseId,
+  getChangeRecordsById
 }
 
 // 获取公钥
@@ -404,6 +405,11 @@ function nonIntResiList(parm){
 function overView(parm){
   return fly.get(`actual/base/communityHouse/resiAndHouseCollect/overview`,parm)
 }
+// 获取更新记录
+function getChangeRecordsById(id) {
+  return fly.post(`actual/base/residentChangeRecord/getChangeRecordsById/${id}`,)
+}
+
 
 
 

From d8ffb033245ad7af8a6ce5f4f67d7797cee9e39f Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Fri, 10 May 2024 13:53:55 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E5=85=B3=E7=B3=BB=E5=9B=BE=E8=B0=B1?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../housePortrait/component/graph/graph.js    |  6 +--
 .../pages/resiInfo/component/graph/graph.js   | 41 ++++++++++++++++---
 2 files changed, 39 insertions(+), 8 deletions(-)

diff --git a/subpages/house/pages/housePortrait/component/graph/graph.js b/subpages/house/pages/housePortrait/component/graph/graph.js
index d24d72f..fd46ea8 100644
--- a/subpages/house/pages/housePortrait/component/graph/graph.js
+++ b/subpages/house/pages/housePortrait/component/graph/graph.js
@@ -110,7 +110,7 @@ Component({
                     
                     let links = data.map((item, index) => ({
                         "source": 0,
-                        "target": index+1,
+                        "target": index,
                         "name":item.resiHouseRel ===null?'未知':item.resiHouseRel ==='0'?'自住':item.resiHouseRel === '1'?'出租':'未知',
                         "label": {
                             "align": "center",
@@ -121,9 +121,9 @@ Component({
                             "color": "#9cbbf9"
                         }
                     }))
-                    links.splice(links.length-1,1)
+                    // links.splice(links.length-1,1)
                     let categories = data.map((item, index) => ({
-                        "name":item.houseHolderRel||'暂不清楚',
+                        "name":item.houseHolderRel||'未知',
                         "id":index+1,
                         "itemStyle": {
                             "color": '#9cbbf9'
diff --git a/subpages/searchResult/pages/resiInfo/component/graph/graph.js b/subpages/searchResult/pages/resiInfo/component/graph/graph.js
index ef1f760..08a5efb 100644
--- a/subpages/searchResult/pages/resiInfo/component/graph/graph.js
+++ b/subpages/searchResult/pages/resiInfo/component/graph/graph.js
@@ -55,6 +55,38 @@ Component({
                         const [item] = data.splice(index, 1);
                         data.unshift(item);
                     }
+                    data =   data = [
+                        {
+                            "id": "1752930435592757250",
+                            "name": "*玉",
+                            "age": 47,
+                            "gender": "1",
+                            "houseHolderRel": "本人",
+                            "homeId": "1752883647406022658",
+                            "type": 0,
+                            "resiHouseRel": null
+                        },
+                        {
+                            "id": "1752930434766479361",
+                            "name": "*一禾",
+                            "age": 13,
+                            "gender": "1",
+                            "houseHolderRel": "儿子",
+                            "homeId": "1752883647406022658",
+                            "type": 0,
+                            "resiHouseRel": null
+                        },
+                        {
+                            "id": "1752883647406022658",
+                            "name": "102户",
+                            "age": null,
+                            "gender": null,
+                            "houseHolderRel": null,
+                            "homeId": null,
+                            "type": 1,
+                            "resiHouseRel": null
+                        }
+                    ]
                     let nodeList = data.map((item, index) => {
                         let symbolUrl = '';
                         if (item.type === 1) {
@@ -101,8 +133,8 @@ Component({
                     
                     let links = data.map((item, index) => ({
                         "source": 0,
-                        "target": index+1,
-                        "name": item.houseHolderRel||'暂不清楚',
+                        "target": index,
+                        "name": item.houseHolderRel||'未知',
                         "label": {
                             "align": "center",
                             "fontSize": 12,
@@ -112,15 +144,14 @@ Component({
                             "color": "#9cbbf9"
                         }
                     }))
-                    links.splice(links.length-1,1)
                     let categories = data.map((item, index) => ({
-                        "name":item.houseHolderRel||'暂不清楚',
+                        "name":item.houseHolderRel||'未知',
                         "id":index+1,
                         "itemStyle": {
                             "color": '#9cbbf9'
                         },
                     }))
-                    
+                    categories.splice(0,1)
                     var option = {
 
                         legend: [{

From f5367ea0229d5d92a1bdb147bb0bac2f0b8c1061 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Fri, 10 May 2024 13:56:23 +0800
Subject: [PATCH 4/5] 1

---
 .../pages/resiInfo/component/graph/graph.js   | 32 -------------------
 1 file changed, 32 deletions(-)

diff --git a/subpages/searchResult/pages/resiInfo/component/graph/graph.js b/subpages/searchResult/pages/resiInfo/component/graph/graph.js
index 08a5efb..1ad2f52 100644
--- a/subpages/searchResult/pages/resiInfo/component/graph/graph.js
+++ b/subpages/searchResult/pages/resiInfo/component/graph/graph.js
@@ -55,38 +55,6 @@ Component({
                         const [item] = data.splice(index, 1);
                         data.unshift(item);
                     }
-                    data =   data = [
-                        {
-                            "id": "1752930435592757250",
-                            "name": "*玉",
-                            "age": 47,
-                            "gender": "1",
-                            "houseHolderRel": "本人",
-                            "homeId": "1752883647406022658",
-                            "type": 0,
-                            "resiHouseRel": null
-                        },
-                        {
-                            "id": "1752930434766479361",
-                            "name": "*一禾",
-                            "age": 13,
-                            "gender": "1",
-                            "houseHolderRel": "儿子",
-                            "homeId": "1752883647406022658",
-                            "type": 0,
-                            "resiHouseRel": null
-                        },
-                        {
-                            "id": "1752883647406022658",
-                            "name": "102户",
-                            "age": null,
-                            "gender": null,
-                            "houseHolderRel": null,
-                            "homeId": null,
-                            "type": 1,
-                            "resiHouseRel": null
-                        }
-                    ]
                     let nodeList = data.map((item, index) => {
                         let symbolUrl = '';
                         if (item.type === 1) {

From 1056d05fb3a7a19b87a7f573f54eef64a17cf424 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Wed, 15 May 2024 16:57:09 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E7=A4=BE=E5=8C=BA?=
 =?UTF-8?q?=E8=87=AA=E6=9F=A5=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4,?=
 =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E8=87=AA=E6=9F=A5=E8=B7=B3=E8=BD=AC=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=8F=82=E6=95=B0=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.js                               |  2 +-
 pages/index/index.wxml                             | 11 ++++++-----
 pages/index/index.wxss                             | 14 ++++++++++++++
 project.config.json                                |  3 ++-
 .../communitySelfInsp/pages/synthesis/synthesis.js |  1 +
 5 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/pages/index/index.js b/pages/index/index.js
index d0e5d4c..c565564 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -83,7 +83,7 @@ toDetaill(e){
 },
 toSynthesis(){
   wx.navigateTo({
-      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}`,
+      url: `/subpages/communitySelfInsp/pages/synthesis/synthesis?inspRecordId=${encodeURIComponent(this.data.communitySelfInspTop.id)}&qrCodeImgUrl=${encodeURIComponent(this.data.communitySelfInspTop.qrCodeImgUrl)}&agencyName=${encodeURIComponent(this.data.communitySelfInspTop.agencyName)}&monthName=${encodeURIComponent(this.data.communitySelfInspTop.monthName)}&questionnaireUrl=${encodeURIComponent(this.data.communitySelfInspTop.questionnaireUrl)}&status=${encodeURIComponent(this.data.communitySelfInspTop.status)}`,
   })
 },
 toHistoryQuery(){
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 9bfbf20..3992c5d 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -80,9 +80,11 @@
             <view class="bg_new_box">
                   <block wx:if="{{communitySelfInspTop.monthName}}">
                     <!-- <block wx:if='true'> -->
-                    <view class="new_h2" bind:tap="toSynthesis" >
-                        {{communitySelfInspTop.agencyName}}{{communitySelfInspTop.monthName}}月份满意度自查
-                    </view>
+                   <view>
+                      <view class="new_h2" bind:tap="toSynthesis" >
+                          {{communitySelfInspTop.agencyName}}{{communitySelfInspTop.monthName}}月份满意度自查
+                      </view>
+                   </view>
                     <view class="new_submitt">已提交 <b>{{communitySelfInspTop.personQty?communitySelfInspTop.personQty:'--'}}</b> 人</view>
                     <view class="button_a">
                       <button class="btn_fx" bind:tap="handelClickShare" data-item="{{communitySelfInspTop}}" open-type="share" >一键分享</button>
@@ -95,10 +97,9 @@
                         未创建{{curMonth}}月份满意度自查
                     </view>
                 <view class="bg_new_right">
-                        <text class="tag" wx:if="{{communitySelfInspTop.monthName}}">进行中</text>
                         <image src="../../images/work/map.png" mode=""  style="max-height: 200rpx;width: 200rpx;"/>
                 </view>
-
+                <text class="tag" wx:if="{{communitySelfInspTop.monthName}}">进行中</text>
             </view>
             <!--  -->
         </view>
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index d535010..6ca1af0 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -1033,6 +1033,20 @@ line-height: 40rpx;
   transform: translateY(-50%); 
   right: 0;
 }
+.bg_new_box .tag{
+  display: inline-block;
+  position: absolute;
+  top: 0;
+  right: 0;
+  background: #FFEFDB;
+  border-radius: 0rpx 10rpx 0rpx 10rpx;
+  padding: 10rpx 26rpx;
+  box-sizing: border-box;
+  font-size: 24rpx;
+  font-family: PingFang SC;
+  font-weight: 500;
+  color: #FF783C;
+}
 .new_h2{
   margin-top: 30rpx;
   margin-left: 30rpx;
diff --git a/project.config.json b/project.config.json
index 243fa51..49963e6 100644
--- a/project.config.json
+++ b/project.config.json
@@ -46,7 +46,8 @@
         "minifyWXML": true,
         "showES6CompileOption": false,
         "useCompilerPlugins": false,
-        "condition": false
+        "condition": false,
+        "ignoreUploadUnusedFiles": true
     },
     "compileType": "miniprogram",
     "libVersion": "2.19.4",
diff --git a/subpages/communitySelfInsp/pages/synthesis/synthesis.js b/subpages/communitySelfInsp/pages/synthesis/synthesis.js
index 0d4bbde..ea9fb16 100644
--- a/subpages/communitySelfInsp/pages/synthesis/synthesis.js
+++ b/subpages/communitySelfInsp/pages/synthesis/synthesis.js
@@ -34,6 +34,7 @@ Page({
             questionnaireUrl:decodeURIComponent(options.questionnaireUrl),
             status:decodeURIComponent(options.status)
           })
+          console.log(this.data.status);
           // 获取当前日期
         const currentDate = new Date();
         const currentMonth = currentDate.getMonth() + 1;