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 ba88681..06f19e3 100644
Binary files a/subpages/oneKeyService/images/jubaojilu.png and b/subpages/oneKeyService/images/jubaojilu.png differ
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"