From 24374f44e215e6fd4078d7f5d7052f32ca302063 Mon Sep 17 00:00:00 2001
From: ZhaoTongYao <531131322@qq.com>
Date: Wed, 19 Aug 2020 13:33:32 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=BF=97=E6=84=BF=E8=80=85=E6=B3=A8?=
 =?UTF-8?q?=E5=86=8C=E7=AD=BE=E5=90=8D=E6=94=B9=E4=B8=BA=E6=A0=BC=E8=A8=80?=
 =?UTF-8?q?=EF=BC=9B=E7=A7=AF=E5=88=86=E7=81=AB=E7=81=ABbanner=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 project.config.json                                   | 9 +--------
 subpages/heart/pages/leaderboardNew/leaderboardNew.js | 5 ++++-
 subpages/heart/pages/volunteer/volunteer.wxml         | 8 ++++----
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/project.config.json b/project.config.json
index fb18f29..97977e3 100644
--- a/project.config.json
+++ b/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",
diff --git a/subpages/heart/pages/leaderboardNew/leaderboardNew.js b/subpages/heart/pages/leaderboardNew/leaderboardNew.js
index 3053a54..63b17df 100644
--- a/subpages/heart/pages/leaderboardNew/leaderboardNew.js
+++ b/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)
-    list.push(this.data.banner[e.currentTarget.dataset.listIndex+1].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
diff --git a/subpages/heart/pages/volunteer/volunteer.wxml b/subpages/heart/pages/volunteer/volunteer.wxml
index e5fe5ca..96dc13d 100644
--- a/subpages/heart/pages/volunteer/volunteer.wxml
+++ b/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>

From 11467b40e55a21e1ebec34d570276511d23c7e81 Mon Sep 17 00:00:00 2001
From: lihenian <2629534615@qq.com>
Date: Wed, 19 Aug 2020 17:42:50 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=89=88=E6=9C=AC1.4.27=20=E5=BF=97?=
 =?UTF-8?q?=E6=84=BF=E8=80=85=E6=B3=A8=E5=86=8C=E7=AD=BE=E5=90=8D=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E6=A0=BC=E8=A8=80=EF=BC=8C=E5=88=A0=E9=99=A4=E8=87=AA?=
 =?UTF-8?q?=E6=88=91=E4=BB=8B=E7=BB=8D=EF=BC=9B=E7=A7=AF=E5=88=86=E7=81=AB?=
 =?UTF-8?q?=E7=81=ABbanner=E4=BF=AE=E5=A4=8D=EF=BC=9B?=
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 2d34e87..f83c7a9 100644
--- a/pages/toRegister/toRegister.js
+++ b/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