From a9df9623fa6ca351d3bff90d6afcd48b9be0d182 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Wed, 11 Oct 2023 18:22:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=A1=E6=88=90=E5=8A=9F=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA,=E5=B1=85=E6=B0=91=E6=BB=A1=E6=84=8F=E5=BA=A6?=
 =?UTF-8?q?=E8=B0=83=E6=9F=A5=E8=B7=B3=E8=BD=AC=E5=A1=AB=E8=A1=A8=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/work/work.js                                |  2 ++
 pages/work/work.wxss                              | 15 +++++++++------
 .../searchResult/pages/punchCard/punchCard.js     | 13 +++++++++++--
 .../searchResult/pages/punchCard/punchCard.wxml   |  2 +-
 4 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/pages/work/work.js b/pages/work/work.js
index 7458a10..aa5b180 100644
--- a/pages/work/work.js
+++ b/pages/work/work.js
@@ -61,6 +61,7 @@ Page({
                 communitySelfInspTop:res.data.list.splice(0,1)[0],
                 communitySelfInspList:res.data.list.splice(0,2),
             })
+            app.globalData.questionnaireUrl = this.data.communitySelfInspTop.questionnaireUrl
         }).catch(err=>{
             wx.hideLoading()
             console.log(err);
@@ -82,6 +83,7 @@ Page({
         this.setData({
             SearchRecordsList:wx.getStorageSync('searchRecords') || []
         })
+        this.getInspRecord()
     },
 
     /**
diff --git a/pages/work/work.wxss b/pages/work/work.wxss
index 4bfb0ab..b0338fe 100644
--- a/pages/work/work.wxss
+++ b/pages/work/work.wxss
@@ -347,7 +347,6 @@ page {
 }
 .body .bto .content{
     border-radius: 20rpx;
-    /*  */
     border-image: linear-gradient(0deg, #E7F1FF, #E5EDFB) 10 10;
     background: rgba(246,249,254,0.72);
     border: 1px solid #E7F1FF;
@@ -420,18 +419,22 @@ page {
  .body .bto .content .bg_box .bg_left .submit b{
      color:#3A80E7 ;
  }
-.body .bto .content .bg_box .bg_right{
+
+ .body .bto .content .bg_box .bg_right {
     position: relative;
     width: 160rpx;
-    height: 100%;
     display: flex;
     align-items: center;
+    /* 移除下面的固定高度 */
+    /* height: 186rpx; */
 }
+
+
 .body .bto .content .bg_box .bg_right image{
-    width: 160rpx;
-    height: 160rpx;
+    width: 180rpx;
+    height: 180rpx;
     position: relative;
-    top: 80rpx;
+    top: 10rpx;
 }
 .body .bto .content .bg_box .bg_right .tag{
     display: inline-block;
diff --git a/subpages/searchResult/pages/punchCard/punchCard.js b/subpages/searchResult/pages/punchCard/punchCard.js
index a3f525c..0208fe2 100644
--- a/subpages/searchResult/pages/punchCard/punchCard.js
+++ b/subpages/searchResult/pages/punchCard/punchCard.js
@@ -1,7 +1,7 @@
 // subpages/searchResult/pages/punchCard/punchCard.js
 import api from "../../../../utils/api"
 const QQMapWX = require('../../../../utils/qqmap-wx-jssdk')
-
+const app = getApp()
 var timerId= null;
 Page({
 
@@ -73,9 +73,12 @@ Page({
             punchFlag:!this.data.punchFlag,
             animationClass:'animate'
         })
-        console.log(this.data.animationClass);
         setTimeout(() => {
             this.setData({ animationClass: '' });
+            wx.showToast({
+              title: '打卡成功',
+              icon:'none'
+            })
         }, 1500);  
     },
     toAddResi(){
@@ -83,6 +86,12 @@ Page({
                 url: `/subpages/addResi/pages/addResi/addResi?type=edit&resiId=${this.data.resiId}`,
             })
     },
+    toWebView(){
+        console.log(app.globalData);
+        wx.navigateTo({
+            url: '/pages/webView/webView?url=' + app.globalData.questionnaireUrl,
+        })
+    },
     toEvent(){
         let obj ={
             resiId : this.data.resiId,
diff --git a/subpages/searchResult/pages/punchCard/punchCard.wxml b/subpages/searchResult/pages/punchCard/punchCard.wxml
index 49744c0..0472187 100644
--- a/subpages/searchResult/pages/punchCard/punchCard.wxml
+++ b/subpages/searchResult/pages/punchCard/punchCard.wxml
@@ -41,6 +41,6 @@
 <view class="card">
     <view class="title">相关操作</view>
     <view class="blue btn" bind:tap="toAddResi" style="margin-top: 40rpx ; ">修改居民信息</view>
-    <view class="yellow btn">满意度调查</view>
+    <view class="yellow btn" bind:tap="toWebView">满意度调查</view>
     <view class="green btn" bind:tap="toEvent">上报居民诉求</view>
 </view>
\ No newline at end of file