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] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E7=A4=BE=E5=8C=BA=E8=87=AA?=
 =?UTF-8?q?=E6=9F=A5=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4,=E7=A4=BE?=
 =?UTF-8?q?=E5=8C=BA=E8=87=AA=E6=9F=A5=E8=B7=B3=E8=BD=AC=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=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;