From e4cd757cc2aa3383d18f7b5a80812111992d4288 Mon Sep 17 00:00:00 2001 From: lihenian <2629534615@qq.com> Date: Mon, 8 Nov 2021 17:35:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=80=89=E6=B0=91=E7=99=BB?= =?UTF-8?q?=E8=AE=B0=E5=8A=9F=E8=83=BD=20=E7=89=88=E6=9C=AC1.7.23?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.json | 7 + images/voter-icon.png | Bin 0 -> 11277 bytes pages/indexNew/indexNew.js | 19 + pages/indexNew/indexNew.wxml | 5 +- pages/toRegister/toRegister.js | 2 +- project.config.json | 5 +- project.private.config.json | 222 +++++----- subpages/voter/pages/register/register.js | 468 ++++++++++++++++++++ subpages/voter/pages/register/register.json | 6 + subpages/voter/pages/register/register.wxml | 86 ++++ subpages/voter/pages/register/register.wxss | 173 ++++++++ utils/api.js | 28 +- 12 files changed, 911 insertions(+), 110 deletions(-) create mode 100644 images/voter-icon.png create mode 100644 subpages/voter/pages/register/register.js create mode 100644 subpages/voter/pages/register/register.json create mode 100644 subpages/voter/pages/register/register.wxml create mode 100644 subpages/voter/pages/register/register.wxss diff --git a/app.json b/app.json index 55a0d9b..341c7ae 100644 --- a/app.json +++ b/app.json @@ -152,6 +152,13 @@ "pages/companyInformationList/companyInformationList", "pages/companyInformationDetail/companyInformationDetail" ] + }, + { + "root": "subpages/voter", + "name": "voter", + "pages": [ + "pages/register/register" + ] } ], "preloadRule": { diff --git a/images/voter-icon.png b/images/voter-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..b04baa74d6c16282011c0fdbb06146e3684a0acd GIT binary patch literal 11277 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 Nm61>suNE~7{69$x8*=~v literal 0 HcmV?d00001 diff --git a/pages/indexNew/indexNew.js b/pages/indexNew/indexNew.js index 4f3c35c..5ad6266 100644 --- a/pages/indexNew/indexNew.js +++ b/pages/indexNew/indexNew.js @@ -86,6 +86,7 @@ Page({ sxjs: {}, shouye: {}, tabRightList: [], //拼团购和顺道捎 + voterConfigImgUrl: "" // 选民登记 }, onShow: function () { if (wx.getStorageSync("token") != "" && wx.getStorageSync("token") != undefined && wx.getStorageSync("token") != null) { @@ -472,6 +473,7 @@ Page({ that.getIssueList() that.getProjectList() // that.getModuleList() + that.getVoterConfig() } } }) @@ -821,4 +823,21 @@ Page({ }) } }, + // 跳转到选民登记 2021-11-5 + navigateToVoter() { + wx.navigateTo({ + url: '/subpages/voter/pages/register/register' + }) + }, + // 首页选民登记入口配置 + getVoterConfig() { + api.getVoterConfig().then(res => { + const { imgUrl } = res.data[0] || {} + this.setData({ + voterConfigImgUrl: imgUrl + }) + }).catch(err => { + console.error(err) + }) + } }) \ No newline at end of file diff --git a/pages/indexNew/indexNew.wxml b/pages/indexNew/indexNew.wxml index 0f13e48..86f3631 100644 --- a/pages/indexNew/indexNew.wxml +++ b/pages/indexNew/indexNew.wxml @@ -177,8 +177,9 @@ - - + + + diff --git a/pages/toRegister/toRegister.js b/pages/toRegister/toRegister.js index 0a0b5fb..9df5003 100644 --- a/pages/toRegister/toRegister.js +++ b/pages/toRegister/toRegister.js @@ -21,7 +21,7 @@ Page({ // } // }) let that = this - const versionNum = "1.7.22" + const versionNum = "1.7.23" api.getScanSwitch(versionNum).then(function (res) { console.log(res.data) let state = res.data ? res.data.scanFlag : '1' diff --git a/project.config.json b/project.config.json index 7388078..f368cdf 100644 --- a/project.config.json +++ b/project.config.json @@ -31,7 +31,10 @@ "packNpmManually": false, "packNpmRelationList": [], "minifyWXSS": true, - "showES6CompileOption": false + "disableUseStrict": false, + "showES6CompileOption": false, + "useCompilerPlugins": false, + "minifyWXML": true }, "compileType": "miniprogram", "libVersion": "2.9.2", diff --git a/project.private.config.json b/project.private.config.json index 2c4b056..24e6c86 100644 --- a/project.private.config.json +++ b/project.private.config.json @@ -1,112 +1,124 @@ { - "setting": {}, - "condition": { - "plugin": { - "list": [] + "setting": {}, + "condition": { + "plugin": { + "list": [] + }, + "game": { + "list": [] + }, + "gamePlugin": { + "list": [] + }, + "miniprogram": { + "list": [ + { + "name": "pages/formid/formid", + "pathName": "pages/formid/formid", + "query": "gid=1233274128467787777", + "scene": 1011 }, - "game": { - "list": [] + { + "id": 2, + "name": "网格长注册", + "pathName": "pages/index/index", + "query": "scene=gridLeader", + "scene": 1011 }, - "gamePlugin": { - "list": [] + { + "id": 3, + "name": "subpages/home/pages/newsDetail/newsDetail", + "pathName": "subpages/home/pages/newsDetail/newsDetail", + "query": "id=7c8bc749ff4b6380bf1d902c0bde0ba&defaultGridId=1233592630168813569", + "scene": null }, - "miniprogram": { - "list": [ - { - "name": "pages/formid/formid", - "pathName": "pages/formid/formid", - "query": "gid=1233274128467787777", - "scene": 1011 - }, - { - "id": 2, - "name": "网格长注册", - "pathName": "pages/index/index", - "query": "scene=gridLeader", - "scene": 1011 - }, - { - "id": 3, - "name": "subpages/home/pages/newsDetail/newsDetail", - "pathName": "subpages/home/pages/newsDetail/newsDetail", - "query": "id=7c8bc749ff4b6380bf1d902c0bde0ba&defaultGridId=1233592630168813569", - "scene": null - }, - { - "id": -1, - "name": "社群列表", - "pathName": "subpages/associationNew/pages/associationlist/associationlist", - "query": "", - "scene": null - }, - { - "id": 5, - "name": "数据端跳转", - "pathName": "pages/indexNew/indexNew", - "query": "scene=1277169327606366209&from=analysis", - "scene": null - }, - { - "id": 7, - "name": "我有事说", - "pathName": "subpages/discussion/pages/addIssue/addIssue", - "query": "", - "scene": null - }, - { - "id": 8, - "name": "搜索页面", - "pathName": "subpages/oneKeyService/pages/search/search", - "query": "", - "scene": null - }, - { - "id": -1, - "name": "注册页面", - "pathName": "pages/toRegister/toRegister", - "query": "", - "scene": null - }, - { - "id": -1, - "name": "subpages/heart/pages/leaderboardNew/leaderboardNew", - "pathName": "subpages/heart/pages/leaderboardNew/leaderboardNew", - "query": "", - "scene": null - }, - { - "id": 9, - "name": "subpages/oneKeyService/pages/index/index", - "pathName": "subpages/oneKeyService/pages/index/index", - "query": "", - "scene": null - }, - { - "id": -1, - "name": "subpages/oneKeyService/pages/moduleList/moduleList", - "pathName": "subpages/oneKeyService/pages/moduleList/moduleList", - "query": "pid=4d667ea4ff8fb045b03a68a9d24207e9&bannerflag=1&categorycode=notice_jsqf&modulestyle=2&categoryname=锦水清风", - "scene": null - }, - { - "name": "积分中心", - "pathName": "subpages/integralCentre/pages/index/index", - "query": "", - "scene": null - }, - { - "name": "积分中心", - "pathName": "subpages/integralCentre/pages/exchangeIndex/exchangeIndex", - "query": "", - "scene": null - }, - { - "name": "带参网格码生成", - "pathName": "pages/index/index", - "query": "scene=1233592630168813569", - "scene": null - } - ] + { + "id": -1, + "name": "社群列表", + "pathName": "subpages/associationNew/pages/associationlist/associationlist", + "query": "", + "scene": null + }, + { + "id": 5, + "name": "数据端跳转", + "pathName": "pages/indexNew/indexNew", + "query": "scene=1277169327606366209&from=analysis", + "scene": null + }, + { + "id": 7, + "name": "我有事说", + "pathName": "subpages/discussion/pages/addIssue/addIssue", + "query": "", + "scene": null + }, + { + "id": 8, + "name": "搜索页面", + "pathName": "subpages/oneKeyService/pages/search/search", + "query": "", + "scene": null + }, + { + "id": -1, + "name": "注册页面", + "pathName": "pages/toRegister/toRegister", + "query": "", + "scene": null + }, + { + "id": -1, + "name": "subpages/heart/pages/leaderboardNew/leaderboardNew", + "pathName": "subpages/heart/pages/leaderboardNew/leaderboardNew", + "query": "", + "scene": null + }, + { + "id": 9, + "name": "subpages/oneKeyService/pages/index/index", + "pathName": "subpages/oneKeyService/pages/index/index", + "query": "", + "scene": null + }, + { + "id": -1, + "name": "subpages/oneKeyService/pages/moduleList/moduleList", + "pathName": "subpages/oneKeyService/pages/moduleList/moduleList", + "query": "pid=4d667ea4ff8fb045b03a68a9d24207e9&bannerflag=1&categorycode=notice_jsqf&modulestyle=2&categoryname=锦水清风", + "scene": null + }, + { + "name": "积分中心", + "pathName": "subpages/integralCentre/pages/index/index", + "query": "", + "scene": null + }, + { + "name": "积分中心", + "pathName": "subpages/integralCentre/pages/exchangeIndex/exchangeIndex", + "query": "", + "scene": null + }, + { + "name": "带参网格码生成", + "pathName": "pages/index/index", + "query": "scene=1233592630168813569", + "scene": null + }, + { + "name": "选民登记", + "pathName": "subpages/voter/pages/register/register", + "query": "", + "scene": null + }, + { + "name": "首页", + "pathName": "pages/indexNew/indexNew", + "query": "", + "scene": null } + ] } + } } \ No newline at end of file diff --git a/subpages/voter/pages/register/register.js b/subpages/voter/pages/register/register.js new file mode 100644 index 0000000..b182612 --- /dev/null +++ b/subpages/voter/pages/register/register.js @@ -0,0 +1,468 @@ +const api = require('../../../../utils/api') + +Page({ + data: { + districtPickerOptions: [], + districtPickerVisible: false, + districtPickerValue: [], + districtPickerLabel: '', + + groupPickerOptions: [], + groupPickerVisible: false, + groupPickerValue: [], + groupPickerLabel: '', + + nationPickerOptions: [], + nationPickerVisible: false, + nationPickerValue: [], + nationPickerLabel: '', + + rulePickerOptions: [], + rulePickerVisible: false, + rulePickerValue: [], + rulePickerLabel: '', + + name: '', + idCard: '', + address: '', + telephone: '', + smsCode: '', + note: '', + smsCodeText: '获取验证码', + id: '', + + submitBtnDisabled: false, + protocolChecked: false + }, + onLoad() { + Promise.all([this.getNationList(), this.getRuleList(), this.getDistrictList()]).then(res => { + this.getVoterDetail() + }) + }, + // 所选地区 + showDistrictPicker() { + this.setData({ + districtPickerVisible: true + }) + }, + onDistrictPickerConfirm(e) { + this.setData({ + districtPickerValue: e.detail.value, + districtPickerLabel: e.detail.label, + groupPickerValue: [], + groupPickerLabel: '' + }) + this.getGroupList() + }, + onDistrictPickerCancel() { + this.setData({ + districtPickerVisible: false + }) + }, + onDistrictPickerVisibleChange(e) { + this.setData({ + districtPickerVisible: e.detail.visible + }) + }, + + // 所选小组 + showGroupPicker() { + if ( this.data.districtPickerValue.length === 0) { + this.showToast("请先选择所在选区") + return false + } + this.setData({ + groupPickerVisible: true + }) + }, + onGroupPickerConfirm(e) { + this.setData({ + groupPickerValue: e.detail.value, + groupPickerLabel: e.detail.label + }) + }, + onGroupPickerCancel() { + this.setData({ + groupPickerVisible: false + }) + }, + onGroupPickerVisibleChange(e) { + this.setData({ + groupPickerVisible: e.detail.visible + }) + }, + + // 民族 + showNationPicker() { + this.setData({ + nationPickerVisible: true + }) + }, + onNationPickerConfirm(e) { + this.setData({ + nationPickerValue: e.detail.value, + nationPickerLabel: e.detail.label + }) + }, + onNationPickerCancel() { + this.setData({ + nationPickerVisible: false + }) + }, + onNationPickerVisibleChange(e) { + this.setData({ + nationPickerVisible: e.detail.visible + }) + }, + + // 参选原则 + showRulePicker() { + this.setData({ + rulePickerVisible: true + }) + }, + onRulePickerConfirm(e) { + this.setData({ + rulePickerValue: e.detail.value, + rulePickerLabel: e.detail.label + }) + }, + onRulePickerCancel() { + this.setData({ + rulePickerVisible: false + }) + }, + onRulePickerVisibleChange(e) { + this.setData({ + rulePickerVisible: e.detail.visible + }) + }, + + inputName(e) { + this.setData({ + name: e.detail.value + }) + }, + inputIdCard(e) { + this.setData({ + idCard: e.detail.value + }) + }, + inputAddress(e) { + this.setData({ + address: e.detail.value + }) + }, + inputTelephone(e) { + this.setData({ + telephone: e.detail.value + }) + }, + inputSmsCode(e) { + this.setData({ + smsCode: e.detail.value + }) + }, + inputNote(e) { + this.setData({ + note: e.detail.value + }) + }, + // 获取民族列表 + getNationList() { + return new Promise((resolve, reject) => { + api.getNationList().then(res => { + const arr = [] + res.data.forEach(item => { + arr.push({ + label: item.nationName, + value: item.nationNumericalCode + }) + }) + this.setData({ + nationPickerOptions: arr + }) + resolve(true) + }).catch(err => { + console.error(err) + reject(false) + }) + }) + }, + // 获取参选规则 + getRuleList() { + return new Promise((resolve, reject) => { + const params = { + configType: "2", + pid: "" + } + api.getVoterConfigList(params).then(res => { + console.log('参选规则列表', res) + const rulePickerOptions = [] + res.data.forEach(item => { + rulePickerOptions.push({ + label: item.configName, + value: item.configCode + }) + }) + this.setData({ + rulePickerOptions + }) + resolve(true) + }).catch(err => { + console.error(err) + reject(false) + }) + }) + }, + // 获取所选小区 + getDistrictList() { + return new Promise((resolve, reject) => { + const params = { + configType: "0", + pid: "" + } + api.getVoterConfigList(params).then(res => { + console.log('参选规则列表', res) + const districtPickerOptions = [] + res.data.forEach(item => { + districtPickerOptions.push({ + label: item.configName, + value: item.configCode, + id: item.id + }) + }) + this.setData({ + districtPickerOptions + }) + resolve(true) + }).catch(err => { + console.error(err) + reject(false) + }) + }) + }, + // 获取所在小组 + getGroupList() { + let pid = '' + this.data.districtPickerOptions.forEach(item => { + if (item.value === this.data.districtPickerValue[0]) { + pid = item.id + } + }) + const params = { + configType: "1", + pid + } + api.getVoterConfigList(params).then(res => { + console.log('参选规则列表', res) + const groupPickerOptions = [] + res.data.forEach(item => { + groupPickerOptions.push({ + label: item.configName, + value: item.configCode + }) + }) + this.setData({ + groupPickerOptions + }) + }).catch(err => { + console.error(err) + }) + }, + // 获取验证码 + getSmsCode () { + if (!this.data.telephone.trim('')) { + this.showToast("请先输入手机号") + return false + } + this.setData({ + smsCodeText: "获取中..." + }) + const mobile = this.data.telephone.trim('') + api.sendSms(mobile).then(() => { + this.showToast("验证码发送成功") + let num = 60 + this.setData({ + smsCodeText: "60s后重新获取" + }) + const timer = setInterval(() => { + if (num >= 1) { + this.setData({ + smsCodeText: `${num}s后重新获取` + }) + --num + } else { + clearInterval(timer) + this.setData({ + smsCodeText: "获取验证码" + }) + } + }, 1000) + }).catch(err => { + console.log(err) + this.setData({ + smsCodeText: "获取验证码" + }) + }) + }, + // 提交选民登记 + submitVoter() { + if (!this.data.protocolChecked) { + this.showToast('请勾选底部按钮') + return false + } + const { id, districtPickerValue, groupPickerValue, name, nationPickerValue, nationPickerLabel, idCard, address, rulePickerValue, note, telephone, smsCode } = this.data + if (districtPickerValue.length === 0) { + this.showToast('请选择所属选区') + return false + } else if (groupPickerValue.length === 0) { + this.showToast('请选择所在小组') + return false + } else if (!name) { + this.showToast('请输入真实姓名') + return false + } else if (nationPickerValue.length === 0) { + this.showToast('请选择民族') + return false + } else if (!idCard) { + this.showToast('请输入身份证号') + return false + } else if (!address) { + this.showToast('请输入户籍地址') + return false + } else if (rulePickerValue.length === 0) { + this.showToast('请选择参选原则') + return false + } else if (!telephone) { + this.showToast('请输入手机号码') + return false + } else if (!smsCode) { + this.showToast('请输入验证码') + return false + } + const params = { + id, + constituencyCode: districtPickerValue[0], + groupCode: groupPickerValue[0], + name, + nationName: nationPickerLabel, + nationNumericalCode: nationPickerValue[0], + idNumber: idCard, + domicile: address, + participationPrincipleCode: rulePickerValue[0], + remark: note, + mobile: telephone, + smsCode + } + wx.showLoading({ + title: '提交中...' + }) + this.setData({ + submitBtnDisabled: true + }) + api.submitVote(params).then(res => { + this.showToast('提交成功') + setTimeout(() => { + wx.navigateBack({ + delta: 1 + }); + }, 1000) + }).catch(err => { + console.error(err) + }).finally(() => { + this.setData({ + submitBtnDisabled: false + }) + }) + }, + // 获取详情 + getVoterDetail() { + api.getVoterDetail().then(res => { + if (res.data) { + const { id, constituencyCode, groupCode, name, nationNumericalCode, idNumber, domicile, participationPrincipleCode, remark, mobile } = res.data + let pid = '' + let districtPickerLabel = '' + this.data.districtPickerOptions.forEach(item => { + if (item.value === constituencyCode) { + districtPickerLabel = item.label + pid = item.id + } + }) + let nationPickerLabel = '' + this.data.nationPickerOptions.forEach(item => { + if (item.value === nationNumericalCode) { + nationPickerLabel = item.label + } + }) + let rulePickerLabel = '' + this.data.rulePickerOptions.forEach(item => { + if (item.value === participationPrincipleCode) { + rulePickerLabel = item.label + } + }) + this.getGroupDetail({ pid, groupCode }) + this.setData({ + id, + districtPickerLabel, + districtPickerValue: [constituencyCode], + name, + nationPickerLabel, + nationPickerValue: [nationNumericalCode], + idCard: idNumber, + address: domicile, + rulePickerLabel, + rulePickerValue: participationPrincipleCode, + note: remark, + telephone: mobile + }) + } + }).catch(err => { + console.error(err) + }) + }, + // 所选小组回显 + getGroupDetail({ pid, groupCode }) { + const params = { + configType: "1", + pid + } + api.getVoterConfigList(params).then(res => { + console.log('参选规则列表', res) + const groupPickerOptions = [] + res.data.forEach(item => { + groupPickerOptions.push({ + label: item.configName, + value: item.configCode + }) + }) + let groupPickerLabel = '' + groupPickerOptions.forEach(item => { + if (item.value === groupCode) { + groupPickerLabel = item.label + } + }) + this.setData({ + groupPickerLabel, + groupPickerOptions, + groupPickerValue: [groupCode] + }) + }).catch(err => { + console.error(err) + }) + }, + // 代码简化，弹窗统一封装 + showToast (title) { + wx.showToast({ + title: title, + icon: "none", + duration: 2000 + }) + }, + // 用户协议点选按钮 + changeCheckedState() { + this.setData({ + protocolChecked: !this.data.protocolChecked + }) + } +}) \ No newline at end of file diff --git a/subpages/voter/pages/register/register.json b/subpages/voter/pages/register/register.json new file mode 100644 index 0000000..467750a --- /dev/null +++ b/subpages/voter/pages/register/register.json @@ -0,0 +1,6 @@ +{ + "navigationBarTitleText": "选民登记", + "usingComponents": { + "wux-picker": "/dist/picker/index" + } +} \ No newline at end of file diff --git a/subpages/voter/pages/register/register.wxml b/subpages/voter/pages/register/register.wxml new file mode 100644 index 0000000..b118f66 --- /dev/null +++ b/subpages/voter/pages/register/register.wxml @@ -0,0 +1,86 @@ + + + 所在选区 + + 请选择所属的选区 + {{districtPickerLabel}} + + + + + + 所在小组 + + 请选择所属的选民小组 + {{groupPickerLabel}} + + + + + + 姓名 + + + + + + 民族 + + 请选择你的民族 + {{nationPickerLabel}} + + + + + + 身份证号 + + + + + + 户籍地址 + + + + + + 参选原则 + + 请选择参选原则 + {{rulePickerLabel}} + + + + + + 手机号码 + + + + + + + 验证码 + + + + + + 备注 + + + + + + + 本人承诺对所填写的内容真实性负责 + + + + 确定 + + + \ No newline at end of file diff --git a/subpages/voter/pages/register/register.wxss b/subpages/voter/pages/register/register.wxss new file mode 100644 index 0000000..8c60a79 --- /dev/null +++ b/subpages/voter/pages/register/register.wxss @@ -0,0 +1,173 @@ +.register { + width: 100%; +} + +.register .register-item { + width: 100%; + height: 80rpx; + box-sizing: border-box; + padding: 0px 30rpx; + display: flex; + align-items: center; + position: relative; +} +.register .register-item::before { + content: "*"; + position: absolute; + color: red; + left: 12rpx; + top: 25rpx; +} + +.register .register-item + .register-item { + margin-top: 35rpx; +} + +.register .register-item .label { + width: 140rpx; + height: 80rpx; + line-height: 80rpx; + color: #333; + font-size: 34rpx; + text-align: justify; +} + +.register .register-item .label:after { + content: ''; + width: 100%; + height: 0; + display: inline-block; +} + +.register .register-item .content { + width: calc(100% - 140rpx - 20rpx); + height: 100%; + background: #F0F0F0; + border-radius: 6px; + box-sizing: border-box; + padding: 0 30rpx; + margin-left: 20rpx; + display: flex; + align-items: center; + justify-content: space-between; +} + +.register .register-item .content .tip { + font-size: 30rpx; + color: #7A7A7A; +} + +.register .register-item .content .select-content { + font-size: 30rpx; + color: #333; +} + +.register .register-item .content .trigger { + width: 0px; + height: 0px; + border: 16rpx solid transparent; + border-top: 16rpx solid #c2c2c2; + position: relative; + top: 4px; +} + +.register .register-item .content input { + width: 100%; + height: 100%; +} + +.register .register-item .content .get-code { + flex-shrink: 0; + padding: 0 15rpx; + height: 50rpx; + line-height: 50rpx; + background: linear-gradient(to right, #db1a1f, #e95027); + color: #fff; + font-size: 24rpx; + border-radius: 10rpx; + margin: 0; + margin-left: 25rpx; +} + +.register .register-item .content .button-hover { + background: rgb(175, 1, 1); +} + +.register .multi-register-item { + display: flex; + min-height: 80rpx; + box-sizing: border-box; + padding: 0 30rpx; + margin-top: 35rpx; +} + +.register .multi-register-item .label { + width: 140rpx; + height: 80rpx; + line-height: 80rpx; + color: #333; + font-size: 34rpx; + text-align: justify; +} + +.register .multi-register-item .label:after { + content: ''; + width: 100%; + height: 0; + display: inline-block; +} + +.register .multi-register-item .content { + width: calc(100% - 140rpx - 20rpx); + height: 100%; + background: #F0F0F0; + border-radius: 6px; + box-sizing: border-box; + padding: 15rpx 30rpx 0rpx; + margin-left: 20rpx; +} + +.register .multi-register-item .content textarea { + width: 100%; + min-height: 60rpx; + padding-bottom: 30rpx; +} + +.protocol-container { + width: 100%; + height: 100rpx; + box-sizing: border-box; + padding: 0px 30rpx; + display: flex; + align-items: center; +} + +.protocol-container .protocol-content { + color: #7A7A7A; + font-size: 30rpx; + margin-left: 10rpx; +} + +.confirm-container { + width: 100%; + display: flex; + align-items: center; + justify-content: center; + margin: 100rpx 0; +} + +.confirm-container .confirm-btn { + width: 560rpx; + height: 85rpx; + border-radius: 40rpx; + background: #df0006; + color: #fff; + font-size: 34rpx; + display: flex; + align-items: center; + justify-content: center; +} + +.confirm-container .hover-confirm-btn { + background: #b30006; +} \ No newline at end of file diff --git a/utils/api.js b/utils/api.js index 3f14101..48adc26 100755 --- a/utils/api.js +++ b/utils/api.js @@ -83,7 +83,12 @@ module.exports = { // getActPeriods, getSignInActPeriods, - wenjuanPoints: wenjuanPoints + wenjuanPoints: wenjuanPoints, + getNationList, + getVoterConfigList, + submitVote, + getVoterDetail, + getVoterConfig } function getToken (wxCode) { @@ -681,4 +686,25 @@ function getSignInActPeriods (actId) { // 问卷加积分 function wenjuanPoints (bannerId) { return fly.post('news/banner/wenjuanPoints', { bannerId: bannerId }) +} + +// 选民登记-民族列表 +function getNationList() { + return fly.get('admin/nation/list') +} +// 选民登记-配置列表 +function getVoterConfigList({ configType, pid }) { + return fly.get('voter/config/list', { configType, pid }) +} +// 选民登记-提交接口 +function submitVote(data) { + return fly.post('voter/registration/submit', data) +} +// 选民登记-详情接口 +function getVoterDetail() { + return fly.get('voter/registration/detail') +} +// 选民登记-首页入口 +function getVoterConfig() { + return fly.get('imgConfig/getImgUrl/10') } \ No newline at end of file