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 @@ - - {{communitySelfInspTop.agencyName}}{{communitySelfInspTop.monthName}}月份满意度自查 - + + + {{communitySelfInspTop.agencyName}}{{communitySelfInspTop.monthName}}月份满意度自查 + + 已提交 {{communitySelfInspTop.personQty?communitySelfInspTop.personQty:'--'}} @@ -95,10 +97,9 @@ 未创建{{curMonth}}月份满意度自查 - 进行中 - + 进行中 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;