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 @@ 相关操作 修改居民信息 - 满意度调查 + 满意度调查 上报居民诉求 \ No newline at end of file