From 4f66227d0f1f763b1a86eb964192168b7699950c Mon Sep 17 00:00:00 2001
From: ZhaoTongYao <531131322@qq.com>
Date: Wed, 24 Feb 2021 17:28:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E9=94=AE=E6=9C=8D=E5=8A=A1=E4=B8=AD?=
=?UTF-8?q?=E6=88=91=E8=A6=81=E4=B8=BE=E6=8A=A5=E6=94=B9=E4=B8=BA=E6=88=91?=
=?UTF-8?q?=E7=9A=84=E8=AF=89=E6=B1=82=E5=B9=B6=E5=A2=9E=E5=8A=A0=E8=AF=89?=
=?UTF-8?q?=E6=B1=82=E9=A1=BB=E7=9F=A5=E5=8D=8F=E8=AE=AE=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/toRegister/toRegister.js | 2 +-
.../richTextDialog/richTextDialog.js | 65 +++++++++++++
.../richTextDialog/richTextDialog.json | 6 ++
.../richTextDialog/richTextDialog.wxml | 16 ++++
.../richTextDialog/richTextDialog.wxss | 89 ++++++++++++++++++
subpages/oneKeyService/images/jubaojilu.png | Bin 3469 -> 21995 bytes
.../pages/reportIssue/reportIssue.js | 49 +++++++++-
.../pages/reportIssue/reportIssue.json | 5 +-
.../pages/reportIssue/reportIssue.wxml | 14 ++-
.../pages/reportIssue/reportIssue.wxss | 25 ++++-
.../reportIssueDetail/reportIssueDetail.json | 2 +-
.../reportIssueDetail/reportIssueDetail.wxml | 8 +-
.../reportIssueList/reportIssueList.json | 2 +-
13 files changed, 266 insertions(+), 17 deletions(-)
create mode 100644 subpages/oneKeyService/compontents/richTextDialog/richTextDialog.js
create mode 100644 subpages/oneKeyService/compontents/richTextDialog/richTextDialog.json
create mode 100644 subpages/oneKeyService/compontents/richTextDialog/richTextDialog.wxml
create mode 100644 subpages/oneKeyService/compontents/richTextDialog/richTextDialog.wxss
diff --git a/pages/toRegister/toRegister.js b/pages/toRegister/toRegister.js
index 28cbcca..53daf6a 100644
--- a/pages/toRegister/toRegister.js
+++ b/pages/toRegister/toRegister.js
@@ -21,7 +21,7 @@ Page({
// }
// })
let that = this
- const versionNum = "1.6.22"
+ const versionNum = "1.6.23"
api.getScanSwitch(versionNum).then(function (res) {
console.log(res.data)
let state = res.data.scanFlag
diff --git a/subpages/oneKeyService/compontents/richTextDialog/richTextDialog.js b/subpages/oneKeyService/compontents/richTextDialog/richTextDialog.js
new file mode 100644
index 0000000..91c5fbe
--- /dev/null
+++ b/subpages/oneKeyService/compontents/richTextDialog/richTextDialog.js
@@ -0,0 +1,65 @@
+Component({
+ data: {
+ visible: false
+ },
+ properties: {
+ dialogVisible: {
+ type: Boolean,
+ value: false,
+ observer: function () {
+ this.setData({
+ visible: !this.data.visible
+ })
+ }
+ },
+ title: {
+ type: String,
+ value: ""
+ },
+ content: {
+ type: String,
+ value: ""
+ },
+ confirmText: {
+ type: String,
+ value: ""
+ },
+ cancelText: {
+ type: String,
+ value: ""
+ }
+ },
+ pageLifetimes: {
+ show () {
+
+ },
+ hide () {
+
+ }
+ },
+ lifetimes: {
+ attached () {
+
+ },
+ detached () {
+
+ }
+ },
+ methods: {
+ close () {
+ this.triggerEvent("close")
+ this.setData({
+ visible: false
+ })
+ },
+ confirm () {
+ this.triggerEvent("confirm")
+ this.setData({
+ visible: false
+ })
+ },
+ catchmove () {
+
+ }
+ }
+})
\ No newline at end of file
diff --git a/subpages/oneKeyService/compontents/richTextDialog/richTextDialog.json b/subpages/oneKeyService/compontents/richTextDialog/richTextDialog.json
new file mode 100644
index 0000000..8a3819a
--- /dev/null
+++ b/subpages/oneKeyService/compontents/richTextDialog/richTextDialog.json
@@ -0,0 +1,6 @@
+{
+ "component": true,
+ "usingComponents": {
+ "parser": "../../../../components/parser/parser"
+ }
+}
\ No newline at end of file
diff --git a/subpages/oneKeyService/compontents/richTextDialog/richTextDialog.wxml b/subpages/oneKeyService/compontents/richTextDialog/richTextDialog.wxml
new file mode 100644
index 0000000..78f476f
--- /dev/null
+++ b/subpages/oneKeyService/compontents/richTextDialog/richTextDialog.wxml
@@ -0,0 +1,16 @@
+
+
+
+
+
+ {{title}}
+
+
+
+
+
+ {{cancelText}}
+ {{confirmText}}
+
+
+
\ No newline at end of file
diff --git a/subpages/oneKeyService/compontents/richTextDialog/richTextDialog.wxss b/subpages/oneKeyService/compontents/richTextDialog/richTextDialog.wxss
new file mode 100644
index 0000000..8d31553
--- /dev/null
+++ b/subpages/oneKeyService/compontents/richTextDialog/richTextDialog.wxss
@@ -0,0 +1,89 @@
+.notice {
+ width: 100%;
+ height: 100vh;
+ position: fixed;
+ z-index: 100;
+ left: 0;
+ top: 0;
+ background: rgba(0,0,0, 0.4);
+ display: flex;
+ justify-content: center;
+ align-items: center;
+}
+.notice .box {
+ width: 480rpx;
+ background: #fff;
+ border-radius: 16rpx;
+ overflow: hidden;
+ padding: 0 20rpx;
+ position: relative;
+}
+.notice .box .close {
+ width:100%;
+ height: 60rpx;
+ display: flex;
+ justify-content: flex-end;
+ align-items: center;
+}
+.notice .box .close cover-image {
+ width: 40rpx;
+ height: 40rpx;
+ object-fit: cover;
+}
+.notice .box .title {
+ height: 60rpx;
+ line-height: 60rpx;
+ width: 100%;
+ text-align:center;
+ font-size: 36rpx;
+ color: #333;
+ margin-bottom: 23rpx;
+}
+.notice .box .content {
+ height: 480rpx;
+ width: 100%;
+ padding-bottom: 35rpx;
+ white-space: normal;
+}
+.notice .box .content view {
+ font-size: 30rpx;
+ line-height: 50rpx;
+ height: 50rpx;
+ width: 100%;
+ text-align: center;
+ color: #666;
+}
+.notice .box .border {
+ width: 100%;
+ height: 0;
+ border: 0.5rpx solid #eaeaea;
+ border-bottom: 1rpx solid transparent;
+ position: absolute;
+ left:0;
+ bottom: 105rpx;
+}
+.notice .box .operation {
+ width: calc(100% - 40rpx);
+ height: 75rpx;
+ padding: 15rpx 0;
+ display: flex;
+ justify-content: space-around;
+ align-items: center;
+ margin-left: 20rpx
+}
+.notice .box .operation view {
+ flex: 1;
+ color: #999;
+ font-size: 36rpx;
+ width: 49%;
+ height: 100%;
+ line-height: 75rpx;
+ text-align:center;
+}
+.notice .box .operation .confirm{
+ color: #04BCA0;
+}
+
+rich-text {
+ height: 480rpx;
+}
\ No newline at end of file
diff --git a/subpages/oneKeyService/images/jubaojilu.png b/subpages/oneKeyService/images/jubaojilu.png
index ba88681a2998aa3e33ff1f24b23237ce442fb5d5..06f19e32a4de1ed6b2bed2185d63b7f409bd9b73 100644
GIT binary patch
literal 21995
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
diff --git a/subpages/oneKeyService/pages/reportIssue/reportIssue.js b/subpages/oneKeyService/pages/reportIssue/reportIssue.js
index 5f797d2..2016777 100644
--- a/subpages/oneKeyService/pages/reportIssue/reportIssue.js
+++ b/subpages/oneKeyService/pages/reportIssue/reportIssue.js
@@ -1,5 +1,6 @@
// subpages/heart/pages/myApply/myApply.js
const api = require("../../../../utils/api")
+const understand_api = require("../../../../utils/understandJs")
Page({
@@ -21,13 +22,27 @@ Page({
lock: false, //锁定提交状态,防止连击,
violationsCount: 0, //内容审核计数
isConReview: false, //内容审核标志
+ isAgree: false, //是否 勾选已阅读
+ agreement: {}, //须知内容
+ agreementVisible: false, //是否显示 诉求须知 内容
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
-
+ let params = {
+ pageIndex: 1,
+ pageSize: 10,
+ noticeCategory: 'notice_jsqf_wyjb'
+ }
+ understand_api.noticelist(params).then(res => {
+ console.log(res.data[0])
+ this.data.agreement = { ...res.data[0] }
+ this.setData({
+ agreement: this.data.agreement
+ })
+ }).catch(err => { })
},
/**
@@ -104,17 +119,21 @@ Page({
//提交申请
submitIssue () {
+ if (!this.data.isAgree) {
+ this.showToast("请先勾选我已阅读并同意诉求须知")
+ return false
+ }
if (this.data.lock) {
this.showToast("正在提交,请耐心等待...")
return false
}
if (!this.data.dataForm.content) {
- this.showToast("请填写举报的问题")
+ this.showToast("请填写诉求内容")
return false
}
if ( this.data.dataForm.anonymousFlag == '0') {
if (!this.data.dataForm.reportUser) {
- this.showToast("请填写举报人姓名")
+ this.showToast("请填写诉求人姓名")
return false
}
if (this.data.dataForm.reportUser.length > 50) {
@@ -122,7 +141,7 @@ Page({
return false
}
if (!this.data.dataForm.reportUserMobile) {
- this.showToast("请填写举报人电话")
+ this.showToast("请填写诉求人电话")
return false
}
if (this.data.dataForm.reportUserMobile.length > 20) {
@@ -209,7 +228,7 @@ Page({
duration: 2000
})
},
- //跳转到我的举报列表
+ //跳转到我的列表
toIssueList () {
wx.navigateTo({
url: "/subpages/oneKeyService/pages/reportIssueList/reportIssueList"
@@ -225,5 +244,25 @@ Page({
if (this.data.errMsg.length == 0) {
wx.navigateBack()
}
+ },
+
+ checkboxChange (e) {
+ let value = e.detail.value
+ this.setData({
+ isAgree: value.length > 0 ? true : false
+ })
+ },
+
+ //是否显示 诉求须知 对话框
+ showAgreement () {
+ this.setData({
+ agreementVisible: true
+ })
+ },
+ // 关闭 诉求须知 回调函数
+ confirmAgreement () {
+ this.setData({
+ agreementVisible: false
+ })
}
})
\ No newline at end of file
diff --git a/subpages/oneKeyService/pages/reportIssue/reportIssue.json b/subpages/oneKeyService/pages/reportIssue/reportIssue.json
index e1bcc17..8f444a8 100644
--- a/subpages/oneKeyService/pages/reportIssue/reportIssue.json
+++ b/subpages/oneKeyService/pages/reportIssue/reportIssue.json
@@ -1,6 +1,7 @@
{
- "navigationBarTitleText": "我要上访",
+ "navigationBarTitleText": "我的诉求",
"usingComponents": {
- "notice": "../../compontents/notice/notice"
+ "notice": "../../compontents/notice/notice",
+ "rich-text-dialog": "../../compontents/richTextDialog/richTextDialog"
}
}
\ No newline at end of file
diff --git a/subpages/oneKeyService/pages/reportIssue/reportIssue.wxml b/subpages/oneKeyService/pages/reportIssue/reportIssue.wxml
index 8210199..08e1311 100644
--- a/subpages/oneKeyService/pages/reportIssue/reportIssue.wxml
+++ b/subpages/oneKeyService/pages/reportIssue/reportIssue.wxml
@@ -4,8 +4,8 @@
- 上访内容描述
-
+ 诉求描述
+
是否匿名
@@ -28,6 +28,14 @@
+
+
+
+ 《{{agreement.noticeTitle||'诉求须知'}}》
+
+
@@ -36,3 +44,5 @@
+
+
\ No newline at end of file
diff --git a/subpages/oneKeyService/pages/reportIssue/reportIssue.wxss b/subpages/oneKeyService/pages/reportIssue/reportIssue.wxss
index b97c8ca..b2b5c9f 100644
--- a/subpages/oneKeyService/pages/reportIssue/reportIssue.wxss
+++ b/subpages/oneKeyService/pages/reportIssue/reportIssue.wxss
@@ -28,6 +28,29 @@ page {
margin-top: 16rpx;
box-sizing: border-box;
}
+.issue-list .agree-box {
+ height: 80rpx;
+ display: flex;
+ align-items: center;
+ margin-top: 20rpx;
+}
+.issue-list .agree-box .checkbox-group {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+}
+.issue-list .agree-box .checkbox {
+ margin-left: 22rpx;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+}
+.issue-list .agree-box .checkbox checkbox {
+ transform: scale(0.7);
+}
+.issue-list .agree-box .agreement {
+ color: cornflowerblue;
+}
.issue-list .text-item {
height: 450rpx;
}
@@ -69,7 +92,7 @@ page {
width: 592rpx;
height: 116rpx;
position: relative;
- margin: 78rpx auto 0rpx;
+ margin: 68rpx auto 0rpx;
}
.submit .submit-bk {
width: 100%;
diff --git a/subpages/oneKeyService/pages/reportIssueDetail/reportIssueDetail.json b/subpages/oneKeyService/pages/reportIssueDetail/reportIssueDetail.json
index fcd5152..9ff368a 100644
--- a/subpages/oneKeyService/pages/reportIssueDetail/reportIssueDetail.json
+++ b/subpages/oneKeyService/pages/reportIssueDetail/reportIssueDetail.json
@@ -1,4 +1,4 @@
{
- "navigationBarTitleText": "上访详情",
+ "navigationBarTitleText": "诉求详情",
"usingComponents": {}
}
\ No newline at end of file
diff --git a/subpages/oneKeyService/pages/reportIssueDetail/reportIssueDetail.wxml b/subpages/oneKeyService/pages/reportIssueDetail/reportIssueDetail.wxml
index 40b70b8..49bf551 100644
--- a/subpages/oneKeyService/pages/reportIssueDetail/reportIssueDetail.wxml
+++ b/subpages/oneKeyService/pages/reportIssueDetail/reportIssueDetail.wxml
@@ -1,7 +1,7 @@
- 上访内容
+ 诉求内容
{{issueDetails.content}}
@@ -12,16 +12,16 @@
- 上访人姓名
+ 诉求人姓名
{{issueDetails.reportUser}}
- 上访人电话
+ 诉求人电话
{{issueDetails.reportUserMobile}}
- 上访时间
+ 诉求时间
{{issueDetails.createdTime}}
diff --git a/subpages/oneKeyService/pages/reportIssueList/reportIssueList.json b/subpages/oneKeyService/pages/reportIssueList/reportIssueList.json
index 65ea2f3..9ae724c 100644
--- a/subpages/oneKeyService/pages/reportIssueList/reportIssueList.json
+++ b/subpages/oneKeyService/pages/reportIssueList/reportIssueList.json
@@ -1,5 +1,5 @@
{
- "navigationBarTitleText": "上访记录",
+ "navigationBarTitleText": "诉求记录",
"usingComponents": {
"load-more": "/components/loadMore/loadMore",
"no-data": "/components/nodata/nodata"