Merge branch 'release'

pages/toRegister/toRegister.js

@@ -21,7 +21,7 @@ Page({
     //   }
     // })
     let that = this
-    const versionNum = "1.4.26"
+    const versionNum = "1.4.27"
     api.getScanSwitch(versionNum).then(function (res) {
       console.log(res.data)
       let state = res.data.scanFlag

project.config.json

@@ -17,22 +17,15 @@
 		"checkInvalidKey": true,
 		"checkSiteMap": true,
 		"uploadWithSourceMap": true,
-		"compileHotReLoad": false,
 		"babelSetting": {
 			"ignore": [],
 			"disablePlugins": [],
 			"outputPath": ""
 		},
-<<<<<<< HEAD
-		"useCompilerModule": true,
+		"useCompilerModule": false,
 		"userConfirmedUseCompilerModuleSwitch": false,
 		"compileHotReLoad": false,
 		"useIsolateContext": true
-=======
-		"useIsolateContext": true,
-		"useCompilerModule": false,
-		"userConfirmedUseCompilerModuleSwitch": false
->>>>>>> 5f77a3de8685061a23d87e7003a24ef1037572cf
 	},
 	"compileType": "miniprogram",
 	"libVersion": "2.8.2",

subpages/heart/pages/leaderboardNew/leaderboardNew.js

@@ -88,7 +88,10 @@ Page({
   preViewImage (e) {
     let list = [];
     list.push(this.data.banner[e.currentTarget.dataset.listIndex].bannerImg)
+    console.log(list)
+    if (e.currentTarget.dataset.listIndex+1 < this.data.banner.length) {
       list.push(this.data.banner[e.currentTarget.dataset.listIndex+1].bannerImg)
+    }    
     wx.previewImage({
       urls: list,
       current: e.currentTarget.dataset.src

subpages/heart/pages/volunteer/volunteer.wxml

@@ -79,11 +79,11 @@
       </view>
 
       <view class="head-portrait-last">
-        <view class="head-portrait-name-last">签名</view>
+        <view class="head-portrait-name-last">格言</view>
       </view>
       <view class="info-box-last-v2">
         <view class="introduce">
-          <textarea disabled= '{{disabled}}' placeholder-class="placeholder-style" value="{{volunteerSignature}}" placeholder="请输入您的签名" bindblur="volunteerSignature" bindinput="volunteerSignature" maxlength="20"></textarea>
+          <textarea disabled= '{{disabled}}' placeholder-class="placeholder-style" value="{{volunteerSignature}}" placeholder="请输入您的格言" bindblur="volunteerSignature" bindinput="volunteerSignature" maxlength="20"></textarea>
         </view>
       </view>
 
@@ -128,7 +128,7 @@
     </view>
 
     <!-- 居住地址 -->
-    <view class="info magin-top">
+    <!-- <view class="info magin-top">
       <view class="info-box">
         <view class="info-left header">
           自我介绍
@@ -141,7 +141,7 @@
           <textarea disabled= '{{disabled}}' placeholder-class="placeholder-style" value="{{introduce}}" placeholder="请输入自我介绍、是否参加过公益活动、参加了哪些公益活动" bindblur="adInputIntroduce" bindinput="adInputIntroduce" maxlength="500"></textarea>
         </view>
       </view>
-    </view>
+    </view> -->
 
     <view class="submit-btn" wx:if="{{unionIdStatus === '1'}}">
       <button hover-class="hover-button" bindtap="submission">提交认证</button>