From 84f0e8dd671b4d6c59bb5c33840c9202df752cff Mon Sep 17 00:00:00 2001 From: ZhaoTongYao <531131322@qq.com> Date: Thu, 4 Mar 2021 17:56:34 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=88=E6=9C=AC=201.6.27=20=E4=B8=80?= =?UTF-8?q?=E9=94=AE=E6=9C=8D=E5=8A=A1=E5=A2=9E=E5=8A=A0=E5=BB=BA=E8=AE=AE?= =?UTF-8?q?=E7=9B=B4=E9=80=9A=EF=BC=9B=E5=BF=97=E6=84=BF=E8=80=85=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=89=AB=E7=A0=81=E7=AD=BE=E5=88=B0=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.js | 6 + app.json | 8 +- images/home/happy.png | Bin 3314 -> 0 bytes images/home/scan.png | Bin 0 -> 11100 bytes pages/heartNew/heartNew.js | 33 ++- pages/heartNew/heartNew.wxml | 10 + pages/toRegister/toRegister.js | 2 +- .../pages/scanCodeSignin/scanCodeSignin.js | 69 +++++ .../pages/scanCodeSignin/scanCodeSignin.json | 9 + .../pages/scanCodeSignin/scanCodeSignin.wxml | 29 ++ .../pages/scanCodeSignin/scanCodeSignin.wxss | 102 +++++++ subpages/oneKeyService/images/suggest.png | Bin 0 -> 5026 bytes .../pages/moduleList/moduleList.js | 15 +- .../pages/moduleList/moduleList.wxml | 4 +- .../pages/reportIssue/reportIssue.js | 15 +- .../pages/suggestDetail/suggestDetail.js | 31 ++ .../pages/suggestDetail/suggestDetail.json | 4 + .../pages/suggestDetail/suggestDetail.wxml | 28 ++ .../pages/suggestDetail/suggestDetail.wxss | 40 +++ .../pages/suggestDict/suggestDict.js | 274 ++++++++++++++++++ .../pages/suggestDict/suggestDict.json | 7 + .../pages/suggestDict/suggestDict.wxml | 48 +++ .../pages/suggestDict/suggestDict.wxss | 141 +++++++++ .../pages/suggestDictList/suggestDictList.js | 75 +++++ .../suggestDictList/suggestDictList.json | 7 + .../suggestDictList/suggestDictList.wxml | 13 + .../suggestDictList/suggestDictList.wxss | 75 +++++ utils/api.js | 28 +- 28 files changed, 1062 insertions(+), 11 deletions(-) delete mode 100644 images/home/happy.png create mode 100644 images/home/scan.png create mode 100644 subpages/heart/pages/scanCodeSignin/scanCodeSignin.js create mode 100644 subpages/heart/pages/scanCodeSignin/scanCodeSignin.json create mode 100644 subpages/heart/pages/scanCodeSignin/scanCodeSignin.wxml create mode 100644 subpages/heart/pages/scanCodeSignin/scanCodeSignin.wxss create mode 100644 subpages/oneKeyService/images/suggest.png create mode 100644 subpages/oneKeyService/pages/suggestDetail/suggestDetail.js create mode 100644 subpages/oneKeyService/pages/suggestDetail/suggestDetail.json create mode 100644 subpages/oneKeyService/pages/suggestDetail/suggestDetail.wxml create mode 100644 subpages/oneKeyService/pages/suggestDetail/suggestDetail.wxss create mode 100644 subpages/oneKeyService/pages/suggestDict/suggestDict.js create mode 100644 subpages/oneKeyService/pages/suggestDict/suggestDict.json create mode 100644 subpages/oneKeyService/pages/suggestDict/suggestDict.wxml create mode 100644 subpages/oneKeyService/pages/suggestDict/suggestDict.wxss create mode 100644 subpages/oneKeyService/pages/suggestDictList/suggestDictList.js create mode 100644 subpages/oneKeyService/pages/suggestDictList/suggestDictList.json create mode 100644 subpages/oneKeyService/pages/suggestDictList/suggestDictList.wxml create mode 100644 subpages/oneKeyService/pages/suggestDictList/suggestDictList.wxss diff --git a/app.js b/app.js index 5b28c5c..f1ad011 100644 --- a/app.js +++ b/app.js @@ -16,6 +16,8 @@ App({ this.globalData.height = res.statusBarHeight this.globalData.deviceInfo.statusHeight = res.statusBarHeight this.globalData.deviceInfo.navigationHeight = menuButtonInfo.height + (menuButtonInfo.top - res.statusBarHeight) * 2 + this.globalData.screen.height = res.screenHeight + this.globalData.screen.width = res.screenWidth } }) }, @@ -44,6 +46,10 @@ App({ deviceInfo: { statusHeight: 20, navigationHeight: 40 + }, + screen: { + width: 375, + height: 667 } } }) \ No newline at end of file diff --git a/app.json b/app.json index 9a5ac81..47a2295 100644 --- a/app.json +++ b/app.json @@ -127,7 +127,8 @@ "pages/groupBuyPublish/groupBuyPublish", "pages/dropByPublish/dropByPublish", "pages/noticeNewDetail/noticeNewDetail", - "pages/noticeNewList/noticeNewList" + "pages/noticeNewList/noticeNewList", + "pages/scanCodeSignin/scanCodeSignin" ] }, { @@ -142,7 +143,10 @@ "pages/moduleList/moduleList", "pages/reportIssue/reportIssue", "pages/reportIssueList/reportIssueList", - "pages/reportIssueDetail/reportIssueDetail" + "pages/reportIssueDetail/reportIssueDetail", + "pages/suggestDict/suggestDict", + "pages/suggestDictList/suggestDictList", + "pages/suggestDetail/suggestDetail" ] } ], diff --git a/images/home/happy.png b/images/home/happy.png deleted file mode 100644 index b06468b936cadcd518492a789a2e2129cd060873..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3314 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 iz { + if (res.errMsg == 'scanCode:ok') { + wx.navigateTo({ + url: `/subpages/heart/pages/scanCodeSignin/scanCodeSignin?id=${res.result}` + }) + } + }, + fail: res => { + // 接口调用失败 + // wx.showToast({ + // icon: 'none', + // title: '接口调用失败！' + // }) + }, + complete: res => { + // 接口调用结束 + console.log(res) + } + }); + }, }) \ No newline at end of file diff --git a/pages/heartNew/heartNew.wxml b/pages/heartNew/heartNew.wxml index db03e2c..f5362b8 100644 --- a/pages/heartNew/heartNew.wxml +++ b/pages/heartNew/heartNew.wxml @@ -119,5 +119,15 @@ button-left="520" img-url="../../images/heart/apply-new.png" bindmovebtnCallBack="myApply"> + \ No newline at end of file diff --git a/pages/toRegister/toRegister.js b/pages/toRegister/toRegister.js index 1051f25..bb84ec5 100644 --- a/pages/toRegister/toRegister.js +++ b/pages/toRegister/toRegister.js @@ -21,7 +21,7 @@ Page({ // } // }) let that = this - const versionNum = "1.6.25" + const versionNum = "1.6.27" api.getScanSwitch(versionNum).then(function (res) { console.log(res.data) let state = res.data.scanFlag diff --git a/subpages/heart/pages/scanCodeSignin/scanCodeSignin.js b/subpages/heart/pages/scanCodeSignin/scanCodeSignin.js new file mode 100644 index 0000000..22b197e --- /dev/null +++ b/subpages/heart/pages/scanCodeSignin/scanCodeSignin.js @@ -0,0 +1,69 @@ +// subpages/heart/pages/scanCodeSignin/scanCodeSignin.js +import { getActInfo, signIn } from '../../../../utils/api' +Page({ + + /** + * 页面的初始数据 + */ + data: { + actId: '', + actInfo: {}, //活动信息 + dialogVisible: false, //提示框 + lock: false, //debounce + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + this.setData({ + actId: options.id + }) + this.getActInfo() + }, + + //获取活动信息 + getActInfo () { + let para = { + qrCodeId: this.data.actId + } + getActInfo(para).then(res => { + this.setData({ + actInfo: res.data + }) + }) + }, + //签到 + signin () { + if (this.data.lock) { + wx.showToast({ + title: '签到中...', + icon: 'loading', + duration: 2000 + }) + return + } + this.data.lock = true + console.log('签到状态：', this.data.actInfo.signInStatus) + if (this.data.actInfo.signInStatus == 0) { + let para = { + actId: this.data.actInfo.id + } + signIn(para).then(res => { + console.log(res.data) + if(res.code == 0) { + this.setData({ + dialogVisible: !this.data.dialogVisible + }) + } + }).catch(err => { + console.log(err) + this.data.lock = false + }) + } + }, + // + closeDialog () { + wx.navigateBack() + }, +}) \ No newline at end of file diff --git a/subpages/heart/pages/scanCodeSignin/scanCodeSignin.json b/subpages/heart/pages/scanCodeSignin/scanCodeSignin.json new file mode 100644 index 0000000..d8d2bac --- /dev/null +++ b/subpages/heart/pages/scanCodeSignin/scanCodeSignin.json @@ -0,0 +1,9 @@ +{ + "usingComponents": { + "wux-cell": "../../../../dist/cell/index", + "notice": "../../components/notice/notice" + }, + "navigationBarTitleText": "活动签到", + "navigationBarTextStyle": "white", + "navigationBarBackgroundColor": "#d53534" +} \ No newline at end of file diff --git a/subpages/heart/pages/scanCodeSignin/scanCodeSignin.wxml b/subpages/heart/pages/scanCodeSignin/scanCodeSignin.wxml new file mode 100644 index 0000000..10fbd79 --- /dev/null +++ b/subpages/heart/pages/scanCodeSignin/scanCodeSignin.wxml @@ -0,0 +1,29 @@ + + + + + + + + + + {{actInfo.title}} + 奖励积分: +{{actInfo.reward}} + + + + 签到时间：{{common.cutTime(actInfo.signinStartTime)}} 至 {{common.cutTime(actInfo.signinEndTime)}} + + + + + 已签到 + 签到 + + + + + + + module.exports.cutTime = function(time) { return time.substring(0,16) } + \ No newline at end of file diff --git a/subpages/heart/pages/scanCodeSignin/scanCodeSignin.wxss b/subpages/heart/pages/scanCodeSignin/scanCodeSignin.wxss new file mode 100644 index 0000000..1ddd2c8 --- /dev/null +++ b/subpages/heart/pages/scanCodeSignin/scanCodeSignin.wxss @@ -0,0 +1,102 @@ +/* subpages/heart/pages/scanCodeSignin/scanCodeSignin.wxss */ +page { + overflow: hidden; +} +.background { + box-sizing: border-box; + width: 100%; + height: 80rpx; + background: #d53534; + position: absolute; + z-index: -1; + top: 0; +} +.actinfo { + width: 690rpx; + height: 300rpx; + margin: 40rpx auto 80rpx; + display: flex; + flex-direction: column; + align-items: center; + justify-content: space-between; + background-color: #FFFFFF; + border-radius: 16rpx; + box-shadow: 10rpx 10rpx 10rpx #bfbfbf; + box-sizing: border-box; + padding: 20rpx; +} +.actinfo .top { + width: 100%; + display: flex; + justify-content: space-between; +} +.top .left { + width: 176rpx; + height: 200rpx; +} +.top .left .image { + width: 100%; + height: 100%; + border-radius: 10rpx; +} +.top .right { + width: 460rpx; + height: 200rpx; + display: flex; + flex-direction: column; + justify-content: space-between; +} +.top .right .act-title { + font-size: 36rpx; + font-family: PingFang SC; + font-weight: 500; + color: #333333; + overflow: hidden; + text-overflow: ellipsis; + word-wrap:break-word; + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: 2; + display: -webkit-box; +} +.top .right .act-score { + font-size: 28rpx; + font-family: PingFang SC; + font-weight: 500; + color: #E96E00; +} +.actinfo .bottom { + font-size: 24rpx; + font-family: PingFang SC; + font-weight: 500; + color: #A8A8A8; + width: 100%; +} + +.submit { + width: 592rpx; + height: 116rpx; + position: relative; + margin: 320rpx auto 0rpx; +} +.submit .submit-bk { + width: 100%; + height: 100%; + position: absolute; + z-index: -1; +} +.submit .submit-text { + font-size: 34rpx; + font-family: PingFang SC; + font-weight: 500; + color: #FFFFFF; + height: 100rpx; + line-height: 100rpx; + text-align: center; +} +.submit .disabled { + background-color: rgba(255,255,255,0.5); + border-radius: 100rpx; + height: 100%; + width: 100%; +} \ No newline at end of file diff --git a/subpages/oneKeyService/images/suggest.png b/subpages/oneKeyService/images/suggest.png new file mode 100644 index 0000000000000000000000000000000000000000..e133c6ba838587db4360b030ff07ece3967af41a GIT binary patch literal 5026 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 literal 0 HcmV?d00001 diff --git a/subpages/oneKeyService/pages/moduleList/moduleList.js b/subpages/oneKeyService/pages/moduleList/moduleList.js index f70c72d..77e6d01 100644 --- a/subpages/oneKeyService/pages/moduleList/moduleList.js +++ b/subpages/oneKeyService/pages/moduleList/moduleList.js @@ -112,6 +112,15 @@ Page({ pid: this.data.moduleInfo.pid } api.moduleCategory(params).then(res => { + //为 多个悬浮按钮设置初始位置 + if (this.data.pageIndex == 1) { + let index = 0 + res.data.forEach(item => { + if (item.categoryType == 'module_category_type_button') { + item.startY = 600 + 200 * index++ + '' + } + }) + } this.setData({ modulelist: this.data.modulelist.concat(res.data), loadMoreType: res.data.length === this.data.pageSize ? 'loading' : 'none', @@ -326,7 +335,7 @@ Page({ this.getNoticelist(e.detail.newsCategoryId) }, - //type-2 锦水清风-我要举报 + //type-2 我的诉求 / 建议直通 toReportIssue (e) { if (this.verifyCompleteInfo()) { return false @@ -335,6 +344,10 @@ Page({ wx.navigateTo({ url: "/subpages/oneKeyService/pages/reportIssue/reportIssue" }) + } else if (e.currentTarget.dataset.code == 'notice_jsqf_jyzt') { + wx.navigateTo({ + url: "/subpages/oneKeyService/pages/suggestDict/suggestDict" + }) } else { wx.showToast({ title: '暂未开放', diff --git a/subpages/oneKeyService/pages/moduleList/moduleList.wxml b/subpages/oneKeyService/pages/moduleList/moduleList.wxml index 43f2705..18afde4 100644 --- a/subpages/oneKeyService/pages/moduleList/moduleList.wxml +++ b/subpages/oneKeyService/pages/moduleList/moduleList.wxml @@ -48,7 +48,7 @@ - - 举报电话：{{item.mobile}} + 联系电话：{{item.mobile}} diff --git a/subpages/oneKeyService/pages/reportIssue/reportIssue.js b/subpages/oneKeyService/pages/reportIssue/reportIssue.js index 2016777..0d553d3 100644 --- a/subpages/oneKeyService/pages/reportIssue/reportIssue.js +++ b/subpages/oneKeyService/pages/reportIssue/reportIssue.js @@ -103,20 +103,28 @@ Page({ onInputContent (e) { this.setData({ - 'dataForm.content': e.detail.value + 'dataForm.content': e.detail.value.trim(' ') }) }, onInputUser (e) { this.setData({ - 'dataForm.reportUser': e.detail.value + 'dataForm.reportUser': e.detail.value.trim(' ') }) }, onInputMobile (e) { this.setData({ - 'dataForm.reportUserMobile': e.detail.value + 'dataForm.reportUserMobile': e.detail.value.trim(' ') }) }, + //去除 输入内容 首尾空格 + contentTrim () { + this.setData({ + 'dataForm.content': this.data.dataForm.content.trim(' '), + 'dataForm.reportUser': this.data.dataForm.reportUser.trim(' '), + 'dataForm.reportUserMobile': this.data.dataForm.reportUserMobile.trim(' ') + }) + }, //提交申请 submitIssue () { if (!this.data.isAgree) { @@ -127,6 +135,7 @@ Page({ this.showToast("正在提交，请耐心等待...") return false } + this.contentTrim() if (!this.data.dataForm.content) { this.showToast("请填写诉求内容") return false diff --git a/subpages/oneKeyService/pages/suggestDetail/suggestDetail.js b/subpages/oneKeyService/pages/suggestDetail/suggestDetail.js new file mode 100644 index 0000000..d2a8f4a --- /dev/null +++ b/subpages/oneKeyService/pages/suggestDetail/suggestDetail.js @@ -0,0 +1,31 @@ +const api = require("../../../../utils/api") + +Page({ + + /** + * 页面的初始数据 + */ + data: { + suggestId: '', + suggestDetail: {} + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + this.setData({ + suggestId: options.id + }) + this.getSuggestDetail() + }, + + getSuggestDetail () { + api.suggestDetail(this.data.suggestId).then(res => { + // console.log(res.data) + this.setData({ + suggestDetail: res.data + }) + }) + }, +}) \ No newline at end of file diff --git a/subpages/oneKeyService/pages/suggestDetail/suggestDetail.json b/subpages/oneKeyService/pages/suggestDetail/suggestDetail.json new file mode 100644 index 0000000..6cc6631 --- /dev/null +++ b/subpages/oneKeyService/pages/suggestDetail/suggestDetail.json @@ -0,0 +1,4 @@ +{ + "navigationBarTitleText": "建议详情", + "usingComponents": {} +} \ No newline at end of file diff --git a/subpages/oneKeyService/pages/suggestDetail/suggestDetail.wxml b/subpages/oneKeyService/pages/suggestDetail/suggestDetail.wxml new file mode 100644 index 0000000..8eb66e2 --- /dev/null +++ b/subpages/oneKeyService/pages/suggestDetail/suggestDetail.wxml @@ -0,0 +1,28 @@ + + + + 建议内容 + {{suggestDetail.content}} + + + 是否匿名 + + {{suggestDetail.anonymousFlag=='1'?'是':'否'}} + + + + + 建议人姓名 + {{suggestDetail.adviceUser}} + + + 建议人电话 + {{suggestDetail.adviceUserMobile}} + + + + 建议时间 + {{suggestDetail.createdTime}} + + + diff --git a/subpages/oneKeyService/pages/suggestDetail/suggestDetail.wxss b/subpages/oneKeyService/pages/suggestDetail/suggestDetail.wxss new file mode 100644 index 0000000..fb3a127 --- /dev/null +++ b/subpages/oneKeyService/pages/suggestDetail/suggestDetail.wxss @@ -0,0 +1,40 @@ +page { + width: 100%; + height: auto; + overflow-y: auto; + background: #f7f7f7; +} +.suggest-detail { + margin-bottom: 60rpx; +} +.suggest-detail .suggest-item { + width: 100%; + background-color: white; + display: flex; + flex-direction: column; + align-items: flex-start; + justify-content: center; + padding: 40rpx 30rpx; + margin-top: 16rpx; + box-sizing: border-box; +} +.suggest-detail .suggest-item .item-title { + font-size: 32rpx; + font-family: PingFang SC; + font-weight: bold; + color: #333333; +} +.suggest-detail .suggest-item .item-content { + font-size: 32rpx; + font-family: PingFang SC; + font-weight: 500; + color: #666666; + margin-top: 28rpx; +} +.suggest-detail .suggest-item .line { + width: 100%; + height: 1px; + background: #F2F2F2; + border-radius: 1px; + margin: 28rpx 0rpx; +} \ No newline at end of file diff --git a/subpages/oneKeyService/pages/suggestDict/suggestDict.js b/subpages/oneKeyService/pages/suggestDict/suggestDict.js new file mode 100644 index 0000000..abd84eb --- /dev/null +++ b/subpages/oneKeyService/pages/suggestDict/suggestDict.js @@ -0,0 +1,274 @@ +const api = require("../../../../utils/api") +//const understand_api = require("../../../../utils/understandJs") + +Page({ + + /** + * 页面的初始数据 + */ + data: { + //showPicker: false, //是否显示底部时间选择器插件 + dataForm: { + content: '', + anonymousFlag: '1', //0-不匿名 1-匿名 + adviceUser: '', + adviceUserMobile: '', + images: [] //当前未要求 + }, + dialogVisible: false, //提示框 + dialogTitle: '提交成功', //提交提示，成功还是失败 + errMsg: [], //提交失败msg + 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 => { }) + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady: function () { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow: function () { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide: function () { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload: function () { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh: function () { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function () { + + }, + + /** + * 用户点击右上角分享 + */ + // onShareAppMessage: function () { + + // } + + //是否匿名 + onChangeRadio (e) { + this.setData({ + 'dataForm.anonymousFlag': e.currentTarget.dataset.flag + }) + }, + + onInputContent (e) { + this.setData({ + 'dataForm.content': e.detail.value.trim(' ') + }) + }, + onInputUser (e) { + this.setData({ + 'dataForm.adviceUser': e.detail.value.trim(' ') + }) + }, + onInputMobile (e) { + this.setData({ + 'dataForm.adviceUserMobile': e.detail.value.trim(' ') + }) + }, + //去除 输入内容 首尾空格 + contentTrim () { + this.setData({ + 'dataForm.content': this.data.dataForm.content.trim(' '), + 'dataForm.adviceUser': this.data.dataForm.adviceUser.trim(' '), + 'dataForm.adviceUserMobile': this.data.dataForm.adviceUserMobile.trim(' ') + }) + }, + //提交申请 + submitIssue () { + // if (!this.data.isAgree) { + // this.showToast("请先勾选我已阅读并同意诉求须知") + // return false + // } + if (this.data.lock) { + this.showToast("正在提交，请耐心等待...") + return false + } + + this.contentTrim() + if (!this.data.dataForm.content) { + this.showToast("请填写建议内容") + return false + } + if ( this.data.dataForm.anonymousFlag == '0') { + if (!this.data.dataForm.adviceUser) { + this.showToast("请填写建议人姓名") + return false + } + if (this.data.dataForm.adviceUser.length > 50) { + this.showToast("姓名超过字符限制(50字以内)") + return false + } + if (!this.data.dataForm.adviceUserMobile) { + this.showToast("请填写建议人电话") + return false + } + if (this.data.dataForm.adviceUserMobile.length > 20) { + this.showToast("电话号码超过字符限制(20位)") + return false + } + } + wx.showLoading({ + title: "加载中", + }) + this.setData({ + lock: true + }) + const para = { ...this.data.dataForm } + para.isConReview = this.data.isConReview + console.log('submit suggest', para) + let that = this + api.suggestDict(para).then(res => { + wx.hideLoading() + this.setData({ + lock: false + }) + if (res.code == 0 && res.msg == 'success') { + this.data.errMsg = [] + this.setData({ + 'dataForm.content': '', + dialogTitle: '提交成功', + errMsg: this.data.errMsg, + dialogVisible: !this.data.dialogVisible, + violationsCount: 0, + isConReview: false + }) + // wx.navigateBack() + } else if (res.code == 533) { + this.data.violationsCount++ + console.log(this.data.violationsCount) + if (this.data.violationsCount == 1){ + wx.showToast({ + title: res.msg, + icon: "none", + duration: 2000 + }) + } else if (this.data.violationsCount == 2) { + wx.showModal({ + title: '提示', + content: '您提交的内容再次被判定为违规，您确定是否要提交？', + success (res) { + if (res.confirm) { + console.log('用户点击确定') + that.data.isConReview = true + that.submitIssue() + } else if (res.cancel) { + console.log('用户点击取消') + that.setData({ + violationsCount: 0, + isConReview: false + }) + } + } + }) + } + } else { + this.data.errMsg[0] = res.msg + this.setData({ + dialogTitle: '提交失败', + errMsg: this.data.errMsg, + dialogVisible: !this.data.dialogVisible + }) + } + }).catch(err => { + console.log(err) + wx.hideLoading() + this.setData({ + lock: false + }) + }) + }, + + //简化提示 + showToast (title) { + wx.showToast({ + title: title, + icon: "none", + duration: 2000 + }) + }, + //跳转到我的列表 + toSuggestList () { + wx.navigateTo({ + url: "/subpages/oneKeyService/pages/suggestDictList/suggestDictList" + }) + }, + + //弹框确定按钮 + confirmDialog () { + 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/suggestDict/suggestDict.json b/subpages/oneKeyService/pages/suggestDict/suggestDict.json new file mode 100644 index 0000000..63b3c8a --- /dev/null +++ b/subpages/oneKeyService/pages/suggestDict/suggestDict.json @@ -0,0 +1,7 @@ +{ + "navigationBarTitleText": "建议直通", + "usingComponents": { + "notice": "../../compontents/notice/notice", + "rich-text-dialog": "../../compontents/richTextDialog/richTextDialog" + } +} \ No newline at end of file diff --git a/subpages/oneKeyService/pages/suggestDict/suggestDict.wxml b/subpages/oneKeyService/pages/suggestDict/suggestDict.wxml new file mode 100644 index 0000000..877eb7d --- /dev/null +++ b/subpages/oneKeyService/pages/suggestDict/suggestDict.wxml @@ -0,0 +1,48 @@ + + + + + + + 建议描述 + + + + 是否匿名 + + + + + 是 + + + + + + 否 + + + + + + + + + 提交 + + + + + + \ No newline at end of file diff --git a/subpages/oneKeyService/pages/suggestDict/suggestDict.wxss b/subpages/oneKeyService/pages/suggestDict/suggestDict.wxss new file mode 100644 index 0000000..dceddf6 --- /dev/null +++ b/subpages/oneKeyService/pages/suggestDict/suggestDict.wxss @@ -0,0 +1,141 @@ +page { + width: 100%; + overflow-y: auto; + background: #f7f7f7; +} +.suggest-list { + position: relative; + overflow: hidden; +} +.suggest-list .suggest-dict-img { + position: absolute; + right: -10rpx; + top: 16rpx; +} +.suggest-list .suggest-dict-img image { + width: 164rpx; + height: 76rpx; +} +.suggest-list .issue-item { + width: 100%; + background-color: white; + display: flex; + flex-direction: column; + align-items: flex-start; + justify-content: center; + padding: 0rpx 30rpx; + margin-top: 16rpx; + box-sizing: border-box; +} +.suggest-list .agree-box { + height: 80rpx; + display: flex; + align-items: center; + margin-top: 20rpx; +} +.suggest-list .agree-box .checkbox-group { + display: flex; + align-items: center; + justify-content: center; +} +.suggest-list .agree-box .checkbox { + margin-left: 22rpx; + display: flex; + align-items: center; + justify-content: center; +} +.suggest-list .agree-box .checkbox checkbox { + transform: scale(0.7); +} +.suggest-list .agree-box .agreement { + color: cornflowerblue; +} +.suggest-list .text-item { + height: 450rpx; +} +.line { + width: 690rpx; + height: 1px; + background: #DCDCDC; + border-radius: 1px; +} +.line2 { + width: 625rpx; + height: 1px; + background: #DCDCDC; + border-radius: 1px; +} +.suggest-list .issue-item .item-title { + height: 50rpx; + line-height: 50rpx; + font-size: 32rpx; + font-family: PingFang SC; + font-weight: bold; + color: #333333; + margin: 28rpx 0rpx 12rpx 0rpx; +} +.suggest-list .issue-item .item-content { + width: 100%; + height: 44rpx; + line-height: 44rpx; + font-size: 32rpx; + font-family: PingFang SC; + font-weight: 500; + color: #666666; +} +.suggest-list .issue-item .text-content { + font-weight: 400; + height: 350rpx; +} +.submit { + width: 592rpx; + height: 116rpx; + position: relative; + margin: 68rpx auto 0rpx; +} +.submit .submit-bk { + width: 100%; + height: 100%; + position: absolute; + z-index: -1; +} +.submit .submit-text { + font-size: 34rpx; + font-family: PingFang SC; + font-weight: 500; + color: #FFFFFF; + height: 100rpx; + line-height: 100rpx; + text-align: center; +} + +.radio-group { + width: 100%; +} +.radio-group .radio-item:first-child { + margin-top: 0rpx; +} +.radio-group .radio-item { + display: flex; + justify-content: flex-start; + align-items: center; + margin: 30rpx 0rpx; +} +.radio-group .radio-item .radio-img { + width: 34rpx; + height: 34rpx; +} +.radio-group .radio-item .radio-text { + margin-left: 32rpx; + font-size: 32rpx; + font-family: PingFang SC; + font-weight: 500; + color: #666666; +} +.radio-group .radio-info { + margin-left: 66rpx; +} +.radio-group .radio-info .info { + margin: 30rpx 0rpx; +} + diff --git a/subpages/oneKeyService/pages/suggestDictList/suggestDictList.js b/subpages/oneKeyService/pages/suggestDictList/suggestDictList.js new file mode 100644 index 0000000..e680675 --- /dev/null +++ b/subpages/oneKeyService/pages/suggestDictList/suggestDictList.js @@ -0,0 +1,75 @@ +const api = require("../../../../utils/api") + +Page({ + + /** + * 页面的初始数据 + */ + data: { + pageIndex: 1, + pageSize: 10, + nodata: false, + loadMoreType: 'none', + loadMoreVisible: false, + suggestlist: [] + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + this.getSuggestList() + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function () { + this.setData({ + loadMoreVisible: true + }) + if (this.data.loadMoreType === "loading") { + this.setData({ + pageIndex: this.data.pageIndex + 1 + }) + this.getSuggestList() + } + }, + + getSuggestList () { + const para = { + pageIndex: this.data.pageIndex, + pageSize: this.data.pageSize + } + api.suggestDictList(para).then(res => { + console.log(res) + this.setData({ + suggestlist: [...this.data.suggestlist,...res.data], + loadMoreType: res.data.length === this.data.pageSize ? 'loading' : 'none', + loadMoreVisible: res.data.length === this.data.pageSize ? false : true + }) + if (this.data.suggestlist.length == 0) { + this.setData({ + nodata: true, + loadMoreType: 'none', + loadMoreVisible: false, + }) + } + }).catch(err => { + this.setData({ + suggestlist: [], + nodata: true, + loadMoreType: 'none', + loadMoreVisible: false, + }) + console.log(err) + }) + }, + //跳转到申请信息详情 + toSuggestDetail (e) { + console.log('跳转详情', e.currentTarget.dataset.id) + wx.navigateTo({ + url: `/subpages/oneKeyService/pages/suggestDetail/suggestDetail?id=${e.currentTarget.dataset.id}` + }) + } +}) \ No newline at end of file diff --git a/subpages/oneKeyService/pages/suggestDictList/suggestDictList.json b/subpages/oneKeyService/pages/suggestDictList/suggestDictList.json new file mode 100644 index 0000000..2675ea5 --- /dev/null +++ b/subpages/oneKeyService/pages/suggestDictList/suggestDictList.json @@ -0,0 +1,7 @@ +{ + "navigationBarTitleText": "建议记录", + "usingComponents": { + "load-more": "/components/loadMore/loadMore", + "no-data": "/components/nodata/nodata" + } +} \ No newline at end of file diff --git a/subpages/oneKeyService/pages/suggestDictList/suggestDictList.wxml b/subpages/oneKeyService/pages/suggestDictList/suggestDictList.wxml new file mode 100644 index 0000000..8808164 --- /dev/null +++ b/subpages/oneKeyService/pages/suggestDictList/suggestDictList.wxml @@ -0,0 +1,13 @@ + + + + {{item.content}} + + 提交时间：{{item.createdTime}} + + + + + + + diff --git a/subpages/oneKeyService/pages/suggestDictList/suggestDictList.wxss b/subpages/oneKeyService/pages/suggestDictList/suggestDictList.wxss new file mode 100644 index 0000000..ecbd959 --- /dev/null +++ b/subpages/oneKeyService/pages/suggestDictList/suggestDictList.wxss @@ -0,0 +1,75 @@ +page { + width: 100%; + height: auto; + overflow-y: auto; + background: #f7f7f7; +} +.suggest-list { + +} +.suggest-list .suggest-item { + width: 100%; + background-color: white; + display: flex; + flex-direction: column; + align-items: flex-start; + justify-content: center; + padding: 0rpx 30rpx 30rpx; + margin-top: 16rpx; + box-sizing: border-box; +} +.suggest-list .suggest-item .item-title { + font-size: 32rpx; + font-family: PingFang SC; + font-weight: bold; + color: #333333; + margin: 32rpx 0rpx; + overflow: hidden; + text-overflow: ellipsis; + display: box; + display: -webkit-box; + -webkit-line-clamp: 2; + -webkit-box-orient: vertical; +} +.suggest-list .suggest-item .item-content { + width: 100%; + height: 44rpx; + line-height: 44rpx; + font-size: 32rpx; + font-family: PingFang SC; + font-weight: 500; + color: #999999; +} +.suggest-list .suggest-item .text-content { + height: 88rpx; + color: #666666; +} +.suggest-list .suggest-item .line { + width: 100%; + height: 1px; + background: #F2F2F2; + border-radius: 1px; + margin: 28rpx 0rpx; +} +.suggest-list .suggest-item .item-time { + font-size: 30rpx; + font-family: PingFang SC; + font-weight: 400; + color: #666666; +} +.suggest-list .suggest-item .item-state { + margin: 26rpx 0rpx 28rpx; + font-size: 30rpx; + font-family: PingFang SC; + font-weight: 400; + color: #666666; +} +.suggest-list .suggest-item .item-state .state-0 { + color: #FB9F00; +} +.suggest-list .suggest-item .item-state .state-1 { + color: #28C896; +} +.suggest-list .suggest-item .item-state .state-2 { + color: #D80000; +} \ No newline at end of file diff --git a/utils/api.js b/utils/api.js index 975f322..73e1ae9 100644 --- a/utils/api.js +++ b/utils/api.js @@ -65,7 +65,12 @@ module.exports = { reportIssue: reportIssue, reportIssueList: reportIssueList, reportIssueDetail: reportIssueDetail, - getVolunteerTags: getVolunteerTags + getVolunteerTags: getVolunteerTags, + getActInfo: getActInfo, + signIn: signIn, + suggestDict: suggestDict, + suggestDictList: suggestDictList, + suggestDetail: suggestDetail } function getToken (wxCode) { @@ -585,4 +590,25 @@ function reportIssueDetail (id) { //志愿者标签列表 function getVolunteerTags () { return fly.get(`app-user/volunteer/tags`) +} +//居民扫签到码获取活动信息接口 +function getActInfo (para) { + return fly.get(`act/actsignin/actInfo`, para) +} +// 居民签到打卡 +function signIn (para) { + return fly.post("act/actsignin/signin", para) +} + +// 建议直通-我的建议 +function suggestDict (para) { + return fly.post("custom/advice/submit", para) +} +// 一键服务-建议直通-建议列表接口 +function suggestDictList(para) { + return fly.get('custom/advice/list', para) +} +//一键服务-建议直通-建议详情接口 +function suggestDetail (id) { + return fly.get(`custom/advice/detail/${id}`) } \ No newline at end of file