Merge branch 'release'

pages/toRegister/toRegister.js

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

project.config.json

@@ -24,7 +24,7 @@
 			"outputPath": ""
 		},
 		"useIsolateContext": true,
-		"useCompilerModule": false,
+		"useCompilerModule": true,
 		"userConfirmedUseCompilerModuleSwitch": false
 	},
 	"compileType": "miniprogram",
@@ -130,6 +130,13 @@
 					"pathName": "pages/toRegister/toRegister",
 					"query": "",
 					"scene": null
+				},
+				{
+					"id": -1,
+					"name": "subpages/heart/pages/leaderboardNew/leaderboardNew",
+					"pathName": "subpages/heart/pages/leaderboardNew/leaderboardNew",
+					"query": "",
+					"scene": null
 				}
 			]
 		}

subpages/discussion/pages/addIssue/addIssue.wxml

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

subpages/discussion/pages/addIssue/addIssue.wxss

@@ -13,7 +13,7 @@ page {
 
 .add-issue .issue-content {
   width: 100%;
-  height: 650rpx;
+  height: 730rpx;
   border-radius: 16rpx;
   background: #fff;
   box-sizing: border-box;
@@ -137,7 +137,7 @@ page {
   display: flex;
   justify-content: center;
   align-items: center;
-  margin-top: 180rpx;
+  margin-top: 100rpx;
 }
 
 .add-issue .publish-issue button {
@@ -164,7 +164,7 @@ page {
 }
 
 .info-tips {
-  width: 300rpx;
+  width: 400rpx;
   height: auto;
   /* display: flex;
   flex-direction: column;

subpages/heart/pages/clockIn/clockIn.js

@@ -25,7 +25,8 @@ Page({
     phraseId: "", //常用语id
     ldata: false,
     violationsCount: 0, //违规次数
-    isConReview: false
+    isConReview: false,
+    submissionDisabled: false
   },
   /**
    * 生命周期函数--监听页面加载
@@ -236,6 +237,9 @@ Page({
       return false
     }
 
+    this.setData({
+      submissionDisabled: true
+    })
     if (this.data.phraseId) {
       api.sagenumAddOne(this.data.phraseId).then(function () {
         // console.log('常用语言：' + res)
@@ -298,6 +302,9 @@ Page({
     // console.log('~~~~~~~":::::' + JSON.stringify(params))
     let that = this
     api.clock(params).then(function (res) {
+      that.setData({
+        submissionDisabled: false
+      })
       if (res.code == 0) {
         wx.showToast({
           title: "打卡成功",
@@ -337,6 +344,11 @@ Page({
           })
         }
       }
+    }).catch(err => {
+      console.log(err)
+      that.setData({
+        submissionDisabled: false
+      })
     })
   },
   Rad (d) { //经纬度转换成三角函数中度分表形式。

subpages/heart/pages/clockIn/clockIn.wxml

@@ -41,5 +41,5 @@
     <view class="clear"></view>
   </view>
 
-  <view class="button" bindtap="submission">提交打卡</view>
+  <view class="button" bindtap="submission" disabled="{{submissionDisabled}}">提交打卡</view>
 </view>

subpages/heart/pages/leaderboardNew/leaderboardNew.wxml

@@ -1,6 +1,10 @@
 <view class="banner" wx:if="{{banner.length > 0}}">
-  <image data-src="{{banner[0].bannerImg}}" data-list="{{banner}}" bindtap="preViewImage" src="{{banner[0].bannerImg}}"></image>
-  <image data-src="{{banner[1].bannerImg}}" data-list="{{banner}}" bindtap="preViewImage" src="{{banner[1].bannerImg}}"></image>
+  <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+1].bannerImg}}" data-list="{{banner[index+1]}}" bindtap="preViewImage" src="{{banner[index+1].bannerImg}}" wx:if="{{banner[index+1].bannerImg!=undefined}}"></image>
+    </swiper-item>
+  </swiper>
 </view>
 <!-- tabbar -->
   <view class="tab-bar">

subpages/heart/pages/leaderboardNew/leaderboardNew.wxss

@@ -248,4 +248,15 @@ button::after {
   .banner image{
       width: 310rpx;
       height: 440rpx;
+  }
+
+  .banner .swiper {
+      width: 100%;
+      height: 100%;
+  }
+  .banner .swiper .swiper-item {
+      display: flex;
+      flex-direction: row;
+      justify-content: center;
+      align-items: center;
   }