Merge branch 'release'

components/activity/activity.wxml

@@ -25,7 +25,7 @@
           <text>活动地点：{{item.actAddress}}</text>
         </view>
       </view>
-      <view class="infos_nums" wx:if="{{!(state==2&&item.actCurrentState=='4')}}">
+      <view class="infos_nums" wx:if="{{!(state==2)}}">
     
         <span wx:if="{{item.actQuotaCategory == 0}}" class="total">不限名额</span>
         <span wx:else class="total">活动名额 {{item.actQuota}}人</span>

pages/toRegister/toRegister.js

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

project.config.json

@@ -23,9 +23,16 @@
 			"disablePlugins": [],
 			"outputPath": ""
 		},
-		"useIsolateContext": true,
+<<<<<<< HEAD
 		"useCompilerModule": true,
+		"userConfirmedUseCompilerModuleSwitch": false,
+		"compileHotReLoad": false,
+		"useIsolateContext": true
+=======
+		"useIsolateContext": true,
+		"useCompilerModule": false,
 		"userConfirmedUseCompilerModuleSwitch": false
+>>>>>>> 5f77a3de8685061a23d87e7003a24ef1037572cf
 	},
 	"compileType": "miniprogram",
 	"libVersion": "2.8.2",

subpages/discussion/pages/addIssue/addIssue.wxml

@@ -29,10 +29,10 @@
       </view>
     </view>
     <view class="info-tips">
-      <view class="tips" bindtap="toOperationDesc" data-phrase="政协委员有事好商量">
+      <view class="tips" bindtap="toOperationDesc" data-phrase="政协好商量">
         <!-- <view class="spot"></view> -->
         <checkbox></checkbox>
-        <view class="content display-inline">政协委员有事好商量</view>
+        <view class="content display-inline">政协好商量</view>
       </view>
     </view>
     <!-- <view class="new-info">希望人大代表倾听</view> -->

subpages/heart/pages/heartDetail/heartDetail.wxml

@@ -118,7 +118,7 @@
         </view>
       </view>
     </block>
-    <block wx:else>
+    <block wx:elif="{{actNewsContent!=''}}">
       <!-- 新闻稿 -->
       <view class="require">  
         <view class="info-box-last-require">

subpages/heart/pages/leaderboardNew/leaderboardNew.js

@@ -87,8 +87,8 @@ Page({
   },
   preViewImage (e) {
     let list = [];
-    list.push(this.data.banner[0].bannerImg)
+    list.push(this.data.banner[e.currentTarget.dataset.listIndex].bannerImg)
-    list.push(this.data.banner[1].bannerImg)
+    list.push(this.data.banner[e.currentTarget.dataset.listIndex+1].bannerImg)
     wx.previewImage({
       urls: list,
       current: e.currentTarget.dataset.src

subpages/heart/pages/leaderboardNew/leaderboardNew.wxml

@@ -1,8 +1,8 @@
 <view class="banner" wx:if="{{banner.length > 0}}">
   <swiper class="swiper">
     <swiper-item class="swiper-item" wx:for="{{banner}}" wx:for-item="item" wx:for-index="index" wx:key="index" wx:if="{{index%2==0&&(index+1)%2==1}}">
-      <image data-src="{{banner[index].bannerImg}}" data-list="{{banner[index]}}" bindtap="preViewImage" src="{{banner[index].bannerImg}}"></image>
+      <image data-src="{{banner[index].bannerImg}}" data-list-index="{{index}}" bindtap="preViewImage" src="{{banner[index].bannerImg}}"></image>
-      <image data-src="{{banner[index+1].bannerImg}}" data-list="{{banner[index+1]}}" bindtap="preViewImage" src="{{banner[index+1].bannerImg}}" wx:if="{{banner[index+1].bannerImg!=undefined}}"></image>
+      <image data-src="{{banner[index+1].bannerImg}}" data-list-index="{{index}}" bindtap="preViewImage" src="{{banner[index+1].bannerImg}}" wx:if="{{banner[index+1].bannerImg!=undefined}}"></image>
     </swiper-item>
   </swiper>
 </view>