From ec8ce023eeea3e69097492d3dfd7d1cf986e391e Mon Sep 17 00:00:00 2001 From: ZhaoTongYao <531131322@qq.com> Date: Mon, 23 Nov 2020 17:26:01 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B9=A6=E9=A6=99?= =?UTF-8?q?=E9=94=A6=E6=B0=B4=E6=A8=A1=E5=9D=97=EF=BC=9B=E6=88=91=E8=A6=81?= =?UTF-8?q?=E4=B8=BE=E6=8A=A5=E6=8C=89=E9=92=AE=E6=94=B9=E4=B8=BA=E5=8F=AF?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/indexNew/indexNew.js | 57 ++++++++++++++----- pages/indexNew/indexNew.wxml | 12 +++- pages/indexNew/indexNew.wxss | 36 +++++++++++- .../pages/moduleList/moduleList.js | 16 ++++-- .../pages/moduleList/moduleList.wxml | 30 +++++----- utils/config.js | 4 +- 6 files changed, 119 insertions(+), 36 deletions(-) diff --git a/pages/indexNew/indexNew.js b/pages/indexNew/indexNew.js index 8f171b5..935f465 100644 --- a/pages/indexNew/indexNew.js +++ b/pages/indexNew/indexNew.js @@ -81,8 +81,9 @@ Page({ signMsg: '', signCode: 0, isSignUp: 0, - yjfwPID: '', //一键服务pid - jmjsPID: '', //解码锦水pid + yjfw: {}, + jmjs: {}, + sxjs: {}, }, onShow: function () { if (wx.getStorageSync("token") != "" && wx.getStorageSync("token") != undefined && wx.getStorageSync("token") != null) { @@ -99,6 +100,7 @@ Page({ newsList: [] }) this.getNewsList() + this.getModuleList() } } }, @@ -186,14 +188,6 @@ Page({ that.setData({ zyzqnGridId:item.residentValue }) - } else if (item.residentType === 'module_category' && item.residentCode === 'module_category_yjfw') { - that.setData({ - yjfwPID:item.residentValue - }) - } else if (item.residentType === 'module_category' && item.residentCode === 'module_category_jmjs') { - that.setData({ - jmjsPID:item.residentValue - }) } }) } @@ -278,6 +272,36 @@ Page({ }) }) }, + getModuleList: function () { + let params = { + pageIndex: 1, + pageSize: 10, + pid: '0' + } + api.moduleCategory(params).then(res => { + console.log('获取模块列表',res.data) + res.data.forEach( item => { + if (item.categoryCode == 'sxjs') { + this.data.sxjs = { ...item } + this.setData({ + sxjs: this.data.sxjs + }) + } else if (item.categoryCode == 'jmjs') { + this.data.jmjs = { ...item } + this.setData({ + jmjs: this.data.jmjs + }) + } else if (item.categoryCode == 'yjfw') { + this.data.yjfw = { ...item } + this.setData({ + yjfw: this.data.yjfw + }) + } + }) + }).catch(err => { + console.log(err) + }) + }, onReachBottom () { this.setData({ loadMoreVisible: true @@ -427,6 +451,7 @@ Page({ that.getNewsList() that.getIssueList() that.getProjectList() + that.getModuleList() } } }) @@ -454,10 +479,16 @@ Page({ currentIndex: e.detail.current }) }, + //跳转到 书香锦水 页面 + toSxjs () { + wx.navigateTo({ + url: `/subpages/oneKeyService/pages/moduleList/moduleList?pid=${this.data.sxjs.id}&bannerflag=${this.data.sxjs.bannerFlag}&categorycode=${this.data.sxjs.categoryCode}&modulestyle=${this.data.sxjs.moduleStyle}&categoryname=${this.data.sxjs.categoryName}` + }) + }, //跳转到 一键服务页面(新) 2020.07.15 toOneKeyService () { wx.navigateTo({ - url: `/subpages/oneKeyService/pages/index/index?pid=${this.data.yjfwPID}&title=一键服务` + url: `/subpages/oneKeyService/pages/index/index?pid=${this.data.yjfw.id}&title=一键服务` }) }, // 点击-更多，跳转通知列表 @@ -477,7 +508,7 @@ Page({ //了解锦水 toUnderstandJs (){ wx.navigateTo({ - url: `/subpages/oneKeyService/pages/index/index?pid=${this.data.jmjsPID}&title=解码锦水` + url: `/subpages/oneKeyService/pages/index/index?pid=${this.data.jmjs.id}&title=解码锦水` }) }, @@ -739,7 +770,7 @@ Page({ let params = { pageIndex: page, pageSize: 10, - pid: this.data.yjfwPID + pid: this.data.yjfw.id } let op = {} return new Promise((resolve, reject) => { diff --git a/pages/indexNew/indexNew.wxml b/pages/indexNew/indexNew.wxml index 8bd3ebf..a6eeec1 100644 --- a/pages/indexNew/indexNew.wxml +++ b/pages/indexNew/indexNew.wxml @@ -137,13 +137,13 @@ - 一键服务 + {{yjfw.categoryName}} - 解码锦水 + {{jmjs.categoryName}} + - + \ No newline at end of file diff --git a/pages/indexNew/indexNew.js b/pages/indexNew/indexNew.js index 935f465..23dc4f5 100644 --- a/pages/indexNew/indexNew.js +++ b/pages/indexNew/indexNew.js @@ -106,6 +106,7 @@ Page({ }, onLoad: function (options) { this.getResidentConfig() + this.getModuleList() if (options.shareType) { const para = { shareType: options.shareType, @@ -451,7 +452,7 @@ Page({ that.getNewsList() that.getIssueList() that.getProjectList() - that.getModuleList() + // that.getModuleList() } } }) diff --git a/pages/mine/components/topicItemNew/topicItemNew.wxss b/pages/mine/components/topicItemNew/topicItemNew.wxss index e05cae5..e298182 100644 --- a/pages/mine/components/topicItemNew/topicItemNew.wxss +++ b/pages/mine/components/topicItemNew/topicItemNew.wxss @@ -51,7 +51,7 @@ /* width: calc(100% - 58rpx); */ margin-top: 30rpx; display: grid; - grid-template-columns: repeat(auto-fit, minmax(216rpx, 1fr)); + grid-template-columns: repeat(auto-fit, minmax(208rpx, 1fr)); grid-gap: 7rpx; } diff --git a/subpages/associationNew/pages/addTopic/addTopic.js b/subpages/associationNew/pages/addTopic/addTopic.js index d27b2ec..8b94139 100644 --- a/subpages/associationNew/pages/addTopic/addTopic.js +++ b/subpages/associationNew/pages/addTopic/addTopic.js @@ -18,7 +18,8 @@ Page({ topicType:"",//0:事好儿鼓个掌 1:话对捧个场 addTopicPrevious: 0, violationsCount: 0, - isConReview: false + isConReview: false, + lock: false, //锁定发布按钮状态，防止连击 }, onShow () { @@ -245,6 +246,13 @@ Page({ duration: 2000 }) return false + } else if (this.data.topicValue.length > 1000) { + wx.showToast({ + title: "超出1000字数限制", + icon: "none", + duration: 2000 + }) + return false } else if (this.data.addressValue === "") { wx.showToast({ title: "请输入-地址", @@ -278,13 +286,19 @@ Page({ images: imagesList, isConReview: this.data.isConReview } + this.setData({ + lock: true + }) wx.showLoading({ title: "加载中", }) let that = this addTopic(para).then(res => { wx.hideLoading() - console.log(res) + this.setData({ + lock: false + }) + // console.log(res) if (res.code == 0) { wx.showToast({ title: "发布成功", @@ -331,6 +345,10 @@ Page({ } }).catch(err => { console.log('err',err) + wx.hideLoading() + this.setData({ + lock: false + }) }) }, // 删除图片 diff --git a/subpages/associationNew/pages/addTopic/addTopic.wxml b/subpages/associationNew/pages/addTopic/addTopic.wxml index fe98c38..4fb833d 100644 --- a/subpages/associationNew/pages/addTopic/addTopic.wxml +++ b/subpages/associationNew/pages/addTopic/addTopic.wxml @@ -1,8 +1,8 @@ - @@ -24,7 +24,7 @@ - + diff --git a/subpages/associationNew/pages/eventlist/eventlist.js b/subpages/associationNew/pages/eventlist/eventlist.js index ef50bf9..1cadaac 100644 --- a/subpages/associationNew/pages/eventlist/eventlist.js +++ b/subpages/associationNew/pages/eventlist/eventlist.js @@ -36,6 +36,7 @@ Page({ showModal: false, //是否显示屏蔽原因模态框 shieldId: '', //被屏蔽话题的ID shieldReason: '', //屏蔽的原因 + lock: false, //锁定发布状态，防止连击 }, /** * 生命周期函数--监听页面加载 @@ -267,6 +268,9 @@ Page({ }) return } + this.setData({ + lock: true + }) let that = this; const para = { topicId: that.data.topicId,//被评论的话题ID @@ -276,6 +280,9 @@ Page({ } commentSubmit(para).then(res => { // 评论成功以后，调用接口比对出当前评论列表的数据，对已有列表数据进行替换 + this.setData({ + lock: false + }) if (res.code == 0) { this.setData({ violationsCount: 0, @@ -318,6 +325,9 @@ Page({ } }).catch(err => { console.log(err) + this.setData({ + lock: false + }) }) }, diff --git a/subpages/associationNew/pages/eventlist/eventlist.wxml b/subpages/associationNew/pages/eventlist/eventlist.wxml index 79fd107..c9de29a 100644 --- a/subpages/associationNew/pages/eventlist/eventlist.wxml +++ b/subpages/associationNew/pages/eventlist/eventlist.wxml @@ -74,7 +74,7 @@ - + diff --git a/subpages/discussion/pages/addIssue/addIssue.js b/subpages/discussion/pages/addIssue/addIssue.js index 4862a43..4d158a6 100644 --- a/subpages/discussion/pages/addIssue/addIssue.js +++ b/subpages/discussion/pages/addIssue/addIssue.js @@ -19,7 +19,8 @@ Page({ violationsCount: 0, isConReview: false, tagIds: [], - checkboxs: [] + checkboxs: [], + lock: false, //锁定发布状态，防止连击 }, onLoad () { this.getEventTagList() @@ -253,12 +254,18 @@ Page({ isConReview: this.data.isConReview, tagIds: this.data.tagIds } + this.setData({ + lock: true + }) wx.showLoading({ title: "加载中..." }) let that = this addIssue(para).then(res => { wx.hideLoading() + this.setData({ + lock: false + }) console.log("发布议题", res) if (res.code == 0) { this.setData({ @@ -295,6 +302,9 @@ Page({ } } }).catch(err => { + this.setData({ + lock: false + }) wx.showToast({ title: err, icon: "none", diff --git a/subpages/discussion/pages/addIssue/addIssue.wxml b/subpages/discussion/pages/addIssue/addIssue.wxml index 9d7acae..480d4c0 100644 --- a/subpages/discussion/pages/addIssue/addIssue.wxml +++ b/subpages/discussion/pages/addIssue/addIssue.wxml @@ -47,7 +47,7 @@ - + diff --git a/subpages/discussion/pages/remarkOrReply/remarkOrReply.js b/subpages/discussion/pages/remarkOrReply/remarkOrReply.js index a2dbff0..41a1f5c 100644 --- a/subpages/discussion/pages/remarkOrReply/remarkOrReply.js +++ b/subpages/discussion/pages/remarkOrReply/remarkOrReply.js @@ -11,7 +11,8 @@ Page({ issueId: "", projectId: "", violationsCount: 0, //违规次数 - isConReview: false + isConReview: false, + lock: false, //锁定提交状态，防止双击 }, onLoad (options) { if (options.detailType === "issue") { @@ -52,6 +53,9 @@ Page({ itemId: this.data.detailType === "project" ? this.data.projectId : "", isConReview: this.data.isConReview } + this.setData({ + lock: true + }) wx.showLoading({ title: "加载中..." }) @@ -60,6 +64,9 @@ Page({ if (this.data.detailType === "issue") { //议题 issueComReply(para).then(res => { wx.hideLoading() + this.setData({ + lock: false + }) console.log("评论或回复", res) if (res.code == 0) { wx.showToast({ @@ -67,6 +74,9 @@ Page({ icon: "none", duration: 1000 }) + this.setData({ + textareaValue: '' + }) const pages = getCurrentPages() const page = pages[pages.length - 2] if (page.getRemarkList) { @@ -107,10 +117,16 @@ Page({ } }).catch(err => { console.log(err) + this.setData({ + lock: false + }) }) } else { //项目 itemComReply(para).then(res => { wx.hideLoading() + this.setData({ + lock: false + }) console.log("评论或回复", res) if (res.code == 0) { wx.showToast({ @@ -118,6 +134,9 @@ Page({ icon: "none", duration: 1000 }) + this.setData({ + textareaValue: '' + }) const pages = getCurrentPages() const page = pages[pages.length - 2] if (page.getRemarkList) { @@ -158,12 +177,18 @@ Page({ } }).catch(err => { console.log(err) + this.setData({ + lock: false + }) }) } } else { //对 议题/项目 进行评论 if (this.data.detailType === "issue") { //议题 issueCom(para).then(res => { wx.hideLoading() + this.setData({ + lock: false + }) console.log("评论或回复", res) if (res.code == 0) { wx.showToast({ @@ -171,6 +196,9 @@ Page({ icon: "none", duration: 1000 }) + this.setData({ + textareaValue: '' + }) const pages = getCurrentPages() const page = pages[pages.length - 2] if (page.getRemarkList) { @@ -211,10 +239,16 @@ Page({ } }).catch(err => { console.log(err) + this.setData({ + lock: false + }) }) } else { //项目 itemCom(para).then(res => { wx.hideLoading() + this.setData({ + lock: false + }) console.log("评论或回复", res) if (res.code == 0) { wx.showToast({ @@ -222,6 +256,9 @@ Page({ icon: "none", duration: 1000 }) + this.setData({ + textareaValue: '' + }) const pages = getCurrentPages() const page = pages[pages.length - 2] if (page.getRemarkList) { @@ -262,6 +299,9 @@ Page({ } }).catch(err => { console.log(err) + this.setData({ + lock: false + }) }) } } diff --git a/subpages/discussion/pages/remarkOrReply/remarkOrReply.wxml b/subpages/discussion/pages/remarkOrReply/remarkOrReply.wxml index d2a2952..7be7c69 100644 --- a/subpages/discussion/pages/remarkOrReply/remarkOrReply.wxml +++ b/subpages/discussion/pages/remarkOrReply/remarkOrReply.wxml @@ -12,6 +12,6 @@ - + \ No newline at end of file diff --git a/subpages/heart/pages/clockIn/clockIn.js b/subpages/heart/pages/clockIn/clockIn.js index 4c0728e..530301a 100644 --- a/subpages/heart/pages/clockIn/clockIn.js +++ b/subpages/heart/pages/clockIn/clockIn.js @@ -219,6 +219,14 @@ Page({ * 数据提交方法 */ submission () { + if (this.data.submissionDisabled) { + wx.showToast({ + title: "正在提交打卡，请耐心等待...", + icon: "none", + duration: 3000 + }) + return false + } if (this.data.operationDesc === "") { wx.showToast({ title: "请先输入打卡描述", @@ -306,6 +314,9 @@ Page({ submissionDisabled: false }) if (res.code == 0) { + that.setData({ + operationDesc: '' + }) wx.showToast({ title: "打卡成功", icon: "none", diff --git a/subpages/heart/pages/clockIn/clockIn.wxml b/subpages/heart/pages/clockIn/clockIn.wxml index 139f94c..19a89e0 100644 --- a/subpages/heart/pages/clockIn/clockIn.wxml +++ b/subpages/heart/pages/clockIn/clockIn.wxml @@ -41,5 +41,5 @@ - 提交打卡 + 提交打卡 \ No newline at end of file diff --git a/subpages/heart/pages/myApply/myApply.js b/subpages/heart/pages/myApply/myApply.js index 536e5e9..29c6f49 100644 --- a/subpages/heart/pages/myApply/myApply.js +++ b/subpages/heart/pages/myApply/myApply.js @@ -20,7 +20,10 @@ Page({ actTel: '', dialogVisible: false, //提示框 }, - curCode: '', //区分是start还是end + curCode: '', //区分是start还是end, + violationsCount: 0, //内容审核计数 + isConReview: false, //内容审核标志 + lock: false, //锁定发布按钮状态，防止连击 }, /** @@ -149,6 +152,9 @@ Page({ //提交申请 submitApply () { + if (this.data.lock) { + return false + } if (!this.data.dataForm.actTitle) { this.showToast("请填写活动标题") return false @@ -193,17 +199,64 @@ Page({ this.showToast("请填写联系人电话") return false } + wx.showLoading({ + title: "加载中", + }) this.setData({ + lock: true, 'dataForm.actPeopleNum': parseInt(this.data.dataForm.actPeopleNum) }) const para = { ...this.data.dataForm } + para.isConReview = this.data.isConReview console.log('submit apply', para) + let that = this api.applyAct(para).then(res => { - if(res.code == '' && res.msg == 'success') { + wx.hideLoading() + this.setData({ + lock: false + }) + if(res.code == 0) { this.setData({ - dialogVisible: !this.data.dialogVisible + dialogVisible: !this.data.dialogVisible, + 'dataForm.Title': '', + violationsCount: 0, + isConReview: false }) + } 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.addTopic() + } else if (res.cancel) { + console.log('用户点击取消') + that.setData({ + violationsCount: 0, + isConReview: false + }) + } + } + }) + } } + }).catch(err => { + console.log('err',err) + wx.hideLoading() + this.setData({ + lock: false + }) }) }, diff --git a/subpages/heart/pages/volunteer/volunteer.js b/subpages/heart/pages/volunteer/volunteer.js index b976176..dd5fe9c 100644 --- a/subpages/heart/pages/volunteer/volunteer.js +++ b/subpages/heart/pages/volunteer/volunteer.js @@ -37,7 +37,8 @@ Page({ getMobileType: "wx", smsCodeText: "获取验证码", uploadImageList: [], - disabled:false + disabled:false, + lock: false, //锁定提交状态，防止连击 }, onLoad: function () { this.setData({ @@ -293,6 +294,9 @@ Page({ encryptedData: this.data.unionIdStatus === "1" ? "" : this.data.encryptedData, iv: this.data.unionIdStatus === "1" ? "" : this.data.iv } + this.setData({ + lock: true + }) wx.showLoading({ title: "正在提交", }) @@ -305,12 +309,18 @@ Page({ wx.setStorageSync("token", res.data.token) this.setData({ + lock: false, dialogVisible: !this.data.dialogVisible, dialogTitle: "志愿者认证", dialogContent: ["您已认证成功，快去报名吧"], dialogConfirmText: "确定", // dialogCancelText: '否' }) + }).catch(err => { + console.log(err) + this.setData({ + lock: false + }) }) }, confirmDialog () { diff --git a/subpages/heart/pages/volunteer/volunteer.wxml b/subpages/heart/pages/volunteer/volunteer.wxml index 26fd3e6..d1fb424 100644 --- a/subpages/heart/pages/volunteer/volunteer.wxml +++ b/subpages/heart/pages/volunteer/volunteer.wxml @@ -156,11 +156,11 @@ --> - + - + diff --git a/subpages/oneKeyService/pages/reportIssue/reportIssue.js b/subpages/oneKeyService/pages/reportIssue/reportIssue.js index 289b4b1..aa3ea59 100644 --- a/subpages/oneKeyService/pages/reportIssue/reportIssue.js +++ b/subpages/oneKeyService/pages/reportIssue/reportIssue.js @@ -18,6 +18,9 @@ Page({ dialogVisible: false, //提示框 dialogTitle: '提交成功', //提交提示，成功还是失败 errMsg: [], //提交失败msg + lock: false, //锁定提交状态，防止连击, + violationsCount: 0, //内容审核计数 + isConReview: false, //内容审核标志 }, /** @@ -101,6 +104,10 @@ Page({ //提交申请 submitIssue () { + if (this.data.lock) { + this.showToast("正在提交，请耐心等待...") + return false + } if (!this.data.dataForm.content) { this.showToast("请填写举报的问题") return false @@ -123,18 +130,59 @@ Page({ return false } } - + wx.showLoading({ + title: "加载中", + }) + this.setData({ + lock: true + }) const para = { ...this.data.dataForm } + para.isConReview = this.data.isConReview console.log('submit issue', para) api.reportIssue(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 + 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.addTopic() + } else if (res.cancel) { + console.log('用户点击取消') + that.setData({ + violationsCount: 0, + isConReview: false + }) + } + } + }) + } } else { this.data.errMsg[0] = res.msg this.setData({ @@ -143,6 +191,12 @@ Page({ dialogVisible: !this.data.dialogVisible }) } + }).catch(err => { + console.log(err) + wx.hideLoading() + this.setData({ + lock: false + }) }) }, diff --git a/utils/config.js b/utils/config.js index e94fe91..2a84d51 100644 --- a/utils/config.js +++ b/utils/config.js @@ -6,9 +6,9 @@ module.exports = { }; function BASEURL() { - // return 'https://eug-test.elinkit.com.cn/js/epdc-api/api/' // 锦水测试环境 - return 'https://epdc-jinshui.elinkservice.cn/epdc-api/api/' // 锦水正式环境接口地址 - // return 'http://192.168.43.19:9094/epdc-api/api/' + return 'https://eug-test.elinkit.com.cn/js/epdc-api/api/' // 锦水测试环境 + // return 'https://epdc-jinshui.elinkservice.cn/epdc-api/api/' // 锦水正式环境接口地址 + // return 'http://10.211.55.2:9094/epdc-api/api/' } function WEBROOT() { From d13c706f6766fc4e67c524b7cb12da4c3047e697 Mon Sep 17 00:00:00 2001 From: lihenian <2629534615@qq.com> Date: Fri, 27 Nov 2020 17:16:06 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=AD=A3=E5=BC=8F=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- utils/config.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/config.js b/utils/config.js index 2a84d51..7f4183f 100644 --- a/utils/config.js +++ b/utils/config.js @@ -6,8 +6,8 @@ module.exports = { }; function BASEURL() { - return 'https://eug-test.elinkit.com.cn/js/epdc-api/api/' // 锦水测试环境 - // return 'https://epdc-jinshui.elinkservice.cn/epdc-api/api/' // 锦水正式环境接口地址 + // return 'https://eug-test.elinkit.com.cn/js/epdc-api/api/' // 锦水测试环境 + return 'https://epdc-jinshui.elinkservice.cn/epdc-api/api/' // 锦水正式环境接口地址 // return 'http://10.211.55.2:9094/epdc-api/api/' } From 1e8fb30442fabc5a72bda8c1a7dad83e7bdbc343 Mon Sep 17 00:00:00 2001 From: lihenian <2629534615@qq.com> Date: Fri, 27 Nov 2020 17:49:11 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E7=89=88=E6=9C=AC1.6.6=20=E6=89=80?= =?UTF-8?q?=E6=9C=89=E6=8F=90=E4=BA=A4=E5=A2=9E=E5=8A=A0=E9=98=B2=E6=AD=A2?= =?UTF-8?q?=E8=BF=9E=E5=87=BB=EF=BC=9B=E6=88=91=E8=A6=81=E4=B8=BE=E6=8A=A5?= =?UTF-8?q?=E5=92=8C=E7=94=B3=E8=AF=B7=E5=8F=91=E5=8D=95=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=86=85=E5=AE=B9=E5=AE=A1=E6=A0=B8=EF=BC=9B=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E6=89=AB=E7=A0=81=E8=80=81=E5=85=B5=E5=9C=A8=E7=BA=BF=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E8=B7=B3=E8=BD=ACBUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/toRegister/toRegister.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/toRegister/toRegister.js b/pages/toRegister/toRegister.js index a66210f..c303a4a 100644 --- a/pages/toRegister/toRegister.js +++ b/pages/toRegister/toRegister.js @@ -21,7 +21,7 @@ Page({ // } // }) let that = this - const versionNum = "1.6.5" + const versionNum = "1.6.6" api.getScanSwitch(versionNum).then(function (res) { console.log(res.data) let state = res.data.scanFlag