diff --git a/pages/webView/webView.js b/pages/webView/webView.js index 698bb35..8d37869 100644 --- a/pages/webView/webView.js +++ b/pages/webView/webView.js @@ -11,8 +11,8 @@ Page({ console.log('url',this.data.url) } else { this.setData({ - // url: options.url - url:`${options.url}?deptName=${options.deptName}&gridId=${options.gridId}` + url: options.url + // url:`${options.url}?deptName=${options.deptName}&gridId=${options.gridId}` }) } } diff --git a/pages/work/work.js b/pages/work/work.js index 080a1b5..856e5ac 100644 --- a/pages/work/work.js +++ b/pages/work/work.js @@ -2,7 +2,6 @@ const app = getApp() import {getSituation,getInspRecord} from '../../utils/api' Page({ - /** * 页面的初始数据 */ @@ -179,5 +178,10 @@ Page({ wx.navigateTo({ url: '/subpages/communitySelfInsp/pages/synthesis/synthesis', }) + }, + toWebView(){ + wx.navigateTo({ + url: `/pages/webView/webView?url=${this.data.communitySelfInspTop.questionnaireUrl}`, + }) } }) \ No newline at end of file diff --git a/pages/work/work.wxml b/pages/work/work.wxml index 200c079..421bc23 100644 --- a/pages/work/work.wxml +++ b/pages/work/work.wxml @@ -60,12 +60,12 @@ 满意度自查 - 历史自查> + 历史自查 > - {{communitySelfInspTop.agencyName}}{{communitySelfInspTop.monthName}}月份满意度自查 + {{communitySelfInspTop.agencyName}}{{communitySelfInspTop.monthName}}月份满意度自查 已提交 {{communitySelfInspTop.personQty}} 一键分享 查看统计 diff --git a/pages/work/work.wxss b/pages/work/work.wxss index ba47016..bacc582 100644 --- a/pages/work/work.wxss +++ b/pages/work/work.wxss @@ -198,7 +198,7 @@ page { } .body{ height: auto; - padding: 0 20rpx; + padding: 0 20rpx 20rpx; position: relative; top: -20rpx; box-sizing: border-box; @@ -330,7 +330,7 @@ page { border-radius: 20rpx; box-sizing: border-box; margin-top:20rpx ; - padding: 0 30rpx; + padding: 0 30rpx 20rpx; } .body .bto .content{ border-radius: 20rpx;