Merge branch 'release'

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

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",

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(() => {
@@ -233,7 +233,7 @@ Page({
       return false
     }
     if(!this.data.volunteerSignature){
-      this.showToast("请输入签名")
+      this.showToast("请输入格言")
       return false
     }
     if (!this.data.road) {
@@ -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,