From 16fc4c9da091552a2e6bf1895dbd7b305d1911fc Mon Sep 17 00:00:00 2001 From: ZhaoTongYao <531131322@qq.com> Date: Thu, 20 Aug 2020 09:32:23 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=88=A0=E9=99=A4=E8=87=AA=E6=88=91?= =?UTF-8?q?=E4=BB=8B=E7=BB=8D=E9=AA=8C=E8=AF=81=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- subpages/heart/pages/volunteer/volunteer.js | 32 ++++++++++----------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/subpages/heart/pages/volunteer/volunteer.js b/subpages/heart/pages/volunteer/volunteer.js index 91aa803..6e8fb87 100644 --- a/subpages/heart/pages/volunteer/volunteer.js +++ b/subpages/heart/pages/volunteer/volunteer.js @@ -19,7 +19,7 @@ Page({ wxCode: "", //用户unionId为空时 传入 encryptedData: "", //用户unionId为空时 传入 iv: "", //用户unionId为空时 传入 - introduce: "", //自我介绍 + // introduce: "", //自我介绍 volunteerNickname:"",//昵称 volunteerSignature:"",//签名 volunteerFaceImg:"",//头像 @@ -87,11 +87,11 @@ Page({ }) }, - adInputIntroduce (e) { - this.setData({ - introduce: e.detail.value - }) - }, + // adInputIntroduce (e) { + // this.setData({ + // introduce: e.detail.value + // }) + // }, volunteerSignature (e) { this.setData({ volunteerSignature: e.detail.value @@ -156,7 +156,7 @@ Page({ volunteerNickname:res.data.volunteerNickname, volunteerSignature:res.data.volunteerSignature, volunteerFaceImg:res.data.volunteerFaceImg, - introduce:res.data.introduce + // introduce:res.data.introduce }) resolve(true) }).catch(() => { @@ -244,15 +244,15 @@ Page({ this.showToast("小区或所在道路不能超过100个字") return false } - if (!this.data.introduce) { - this.showToast("请输入自我介绍") - return false - } + // if (!this.data.introduce) { + // this.showToast("请输入自我介绍") + // return false + // } - if (!this.data.introduce.length > 200) { - this.showToast("自我介绍输入内容不超过200字") - return false - } + // if (!this.data.introduce.length > 200) { + // this.showToast("自我介绍输入内容不超过200字") + // return false + // } const params = { smsCode: this.data.smsCode, realName: this.data.realName, @@ -262,7 +262,7 @@ Page({ villageName: this.data.villageName, dwellingPlace: this.data.dwellingPlace, gridId: this.data.gridId, - introduce: this.data.introduce, + // introduce: this.data.introduce, volunteerFaceImg:this.data.volunteerFaceImg, volunteerNickname:this.data.volunteerNickname, volunteerSignature:this.data.volunteerSignature, From 1d6ff89ac738fb4372cb0188453d6bd2dd701737 Mon Sep 17 00:00:00 2001 From: ZhaoTongYao <531131322@qq.com> Date: Thu, 20 Aug 2020 09:54:30 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=8F=90=E7=A4=BA=E6=96=87=E6=A1=88?= =?UTF-8?q?=E7=AD=BE=E5=90=8D=E6=94=B9=E4=B8=BA=E6=A0=BC=E8=A8=80=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- subpages/heart/pages/volunteer/volunteer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/subpages/heart/pages/volunteer/volunteer.js b/subpages/heart/pages/volunteer/volunteer.js index 6e8fb87..0726aeb 100644 --- a/subpages/heart/pages/volunteer/volunteer.js +++ b/subpages/heart/pages/volunteer/volunteer.js @@ -233,7 +233,7 @@ Page({ return false } if(!this.data.volunteerSignature){ - this.showToast("请输入签名") + this.showToast("请输入格言") return false } if (!this.data.road) { From 68527579907393ecdbf6b63f5e2664e9b33cf0a4 Mon Sep 17 00:00:00 2001 From: lihenian <2629534615@qq.com> Date: Thu, 20 Aug 2020 13:20:14 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=89=88=E6=9C=AC1.4.28=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E5=BF=97=E6=84=BF=E8=80=85=E8=AE=A4=E8=AF=81-?= =?UTF-8?q?=E8=87=AA=E6=88=91=E4=BB=8B=E7=BB=8D=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/toRegister/toRegister.js | 2 +- project.config.json | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pages/toRegister/toRegister.js b/pages/toRegister/toRegister.js index f83c7a9..44d9fe2 100644 --- a/pages/toRegister/toRegister.js +++ b/pages/toRegister/toRegister.js @@ -21,7 +21,7 @@ Page({ // } // }) let that = this - const versionNum = "1.4.27" + const versionNum = "1.4.28" api.getScanSwitch(versionNum).then(function (res) { console.log(res.data) let state = res.data.scanFlag diff --git a/project.config.json b/project.config.json index 97977e3..beae865 100644 --- a/project.config.json +++ b/project.config.json @@ -17,15 +17,15 @@ "checkInvalidKey": true, "checkSiteMap": true, "uploadWithSourceMap": true, + "compileHotReLoad": false, "babelSetting": { "ignore": [], "disablePlugins": [], "outputPath": "" }, + "useIsolateContext": true, "useCompilerModule": false, - "userConfirmedUseCompilerModuleSwitch": false, - "compileHotReLoad": false, - "useIsolateContext": true + "userConfirmedUseCompilerModuleSwitch": false }, "compileType": "miniprogram", "libVersion": "2.8.2",