From 127c5da300ebe4c6e8f9f7f39d414dbbf6e77540 Mon Sep 17 00:00:00 2001
From: ZhaoTongYao <531131322@qq.com>
Date: Tue, 3 Aug 2021 09:43:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BF=97=E6=84=BF=E8=80=85=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=9B=E6=9C=AA=E8=AE=A4=E8=AF=81=E6=B5=8F?=
 =?UTF-8?q?=E8=A7=88=E6=96=B0=E9=97=BB=E4=B8=8D=E5=8A=A0=E5=88=86=EF=BC=9B?=
 =?UTF-8?q?=E7=A7=AF=E5=88=86=E4=B8=AD=E5=BF=83=E5=A2=9E=E5=8A=A0=E6=80=BB?=
 =?UTF-8?q?=E7=A7=AF=E5=88=86=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/personalInfo/personalInfo.js   | 15 ++++++++++
 pages/indexNew/indexNew.js                    |  5 +++-
 pages/toRegister/toRegister.js                |  4 +--
 .../pages/leaderboardNew/leaderboardNew.wxml  | 21 ++++++++------
 .../pages/leaderboardNew/leaderboardNew.wxss  |  9 ++++--
 subpages/heart/pages/volunteer/volunteer.wxml |  2 +-
 subpages/home/pages/newsDetail/newsDetail.js  |  3 ++
 subpages/integralCentre/pages/index/index.js  |  2 ++
 .../integralCentre/pages/index/index.wxml     | 12 ++++++--
 .../integralCentre/pages/index/index.wxss     | 28 ++++++++++++-------
 10 files changed, 74 insertions(+), 27 deletions(-)

diff --git a/pages/complete/components/personalInfo/personalInfo.js b/pages/complete/components/personalInfo/personalInfo.js
index 8b4d8d0..cf94e9f 100644
--- a/pages/complete/components/personalInfo/personalInfo.js
+++ b/pages/complete/components/personalInfo/personalInfo.js
@@ -535,6 +535,11 @@ Component({
                     }
                   })
                 }
+              }).catch(err => {
+                this.setData({
+                  lock: false
+                })
+                return false
               })
             } else if (e.cancel) {
               this.setData({
@@ -579,6 +584,11 @@ Component({
                 }
               })
             }
+          }).catch(err => {
+            this.setData({
+              lock: false
+            })
+            return false
           })
         } else if (this.data.type === "resident") {
           api.completeResidentInfo(para).then(res => {
@@ -611,6 +621,11 @@ Component({
                 }
               })
             }
+          }).catch(err => {
+            this.setData({
+              lock: false
+            })
+            return false
           })
         }
       }
diff --git a/pages/indexNew/indexNew.js b/pages/indexNew/indexNew.js
index 64036e0..6fee08a 100644
--- a/pages/indexNew/indexNew.js
+++ b/pages/indexNew/indexNew.js
@@ -662,7 +662,7 @@ Page({
     api.getUserInfo().then(res => {
       // console.log('用户信息', res)
       wx.navigateTo({
-        url: "../../subpages/integralCentre/pages/index/index?points=" + res.data.points
+        url: "../../subpages/integralCentre/pages/index/index?points=" + res.data.points + '&pointsTotle=' + (res.data.pointsTotle || 0)
       })
     }).catch(err => {
       console.log(err)
@@ -746,6 +746,9 @@ Page({
   },
   //签到 2020.07.31
   toSignIn () {
+    if (this.verifyCompleteInfo()) {
+      return 
+    }
     if (this.data.isSignUp == 1) {
       return
     }
diff --git a/pages/toRegister/toRegister.js b/pages/toRegister/toRegister.js
index 2e198fc..b0cfbe6 100644
--- a/pages/toRegister/toRegister.js
+++ b/pages/toRegister/toRegister.js
@@ -21,10 +21,10 @@ Page({
     //   }
     // })
     let that = this
-    const versionNum = "1.7.9"
+    const versionNum = "1.7.10"
     api.getScanSwitch(versionNum).then(function (res) {
       console.log(res.data)
-      let state = res.data.scanFlag
+      let state = res.data ? res.data.scanFlag : '1'
       that.setData({
         experience: state
       })
diff --git a/subpages/heart/pages/leaderboardNew/leaderboardNew.wxml b/subpages/heart/pages/leaderboardNew/leaderboardNew.wxml
index 83115dc..fa4d3a1 100755
--- a/subpages/heart/pages/leaderboardNew/leaderboardNew.wxml
+++ b/subpages/heart/pages/leaderboardNew/leaderboardNew.wxml
@@ -16,18 +16,18 @@
   </view>
   <!-- 积分排行 -->
   <block wx:if="{{selectTab === 'tab1'}}">
-    <!-- <scroll-view scroll-x="{{true}}" class="scroll-tag">
+    <scroll-view scroll-x="{{true}}" class="scroll-tag">
       <view class="volunteer-tag">
         <view class="tag {{rankId == item.id ? 'sel' : ''}}" wx:for="{{rankTabList}}" wx:key="index" data-id="{{item.id}}" bindtap="changeTag">{{item.label}}</view>
       </view>
-    </scroll-view> -->
+    </scroll-view>
     <view class="bottom {{loveRankingList.length > 0 ? 'padding' : ''}}">
       <block wx:if="{{loveRankingList.length === 0 && preloadVisible}}">
         <preload-loveranking-item wx:for="{{[1,2,3,4]}}" wx:for-index="index" wx:key="index">
         </preload-loveranking-item>
       </block>
       
-      <block wx:elif="{{loveRankingList.length > 0 }}">
+      <!-- <block wx:elif="{{loveRankingList.length > 0 }}">
         <view class="list-item" wx:for-item="item" wx:key="index" wx:for-index="index" wx:for="{{loveRankingList}}">
           <view class="num {{index === 0 ? 'color1' : index === 1 ? 'color2' : index === 2 ? 'color3' : ''}}">
             {{index + 1}}</view>
@@ -50,8 +50,8 @@
             </view>
           </view>
         </view>
-      </block>
-      <!-- <block wx:elif="{{loveRankingList.length > 0 && rankId != '3'}}">
+      </block> -->
+      <block wx:elif="{{loveRankingList.length > 0 && rankId != '3'}}">
         <view class="list-item" wx:for-item="item" wx:key="index" wx:for-index="index" wx:for="{{loveRankingList}}">
           <view class="num {{index === 0 ? 'color1' : index === 1 ? 'color2' : index === 2 ? 'color3' : ''}}">
             {{index + 1}}</view>
@@ -86,12 +86,17 @@
             </view>
           </view>
         </view>
-      </block> -->
+      </block>
       <block wx:if="{{datalenght == 0}}">
         <view class="project-nodata">
           <image class="nodata-image" src="../../../../images/mine/project-nodata.png" />
-          <view class="nodata-tip">暂无排名</view>
-          <view class="nodata-tip">快来参加吧</view>
+          <block wx:if="{{rankId == '3'}}">
+            <view class="nodata-tip">暂无记录</view>
+          </block>
+          <block wx:else>
+            <view class="nodata-tip">暂无排名</view>
+            <view class="nodata-tip">快来参加吧</view>            
+          </block>
         </view>
       </block>
     </view>
diff --git a/subpages/heart/pages/leaderboardNew/leaderboardNew.wxss b/subpages/heart/pages/leaderboardNew/leaderboardNew.wxss
index b6aa34f..954849e 100755
--- a/subpages/heart/pages/leaderboardNew/leaderboardNew.wxss
+++ b/subpages/heart/pages/leaderboardNew/leaderboardNew.wxss
@@ -268,12 +268,15 @@ button::after {
       justify-content: center;
       align-items: center;
   }
-  
+
 .scroll-tag {
     height: 80rpx;
     display: flex;
     align-items: center;
     margin-bottom: 10rpx;
+    background-color: #fff;
+    padding: 0 30rpx;
+    box-sizing: border-box;
 }
 .volunteer-tag {
     background: rgba(255, 255, 255, 1);
@@ -281,7 +284,7 @@ button::after {
     white-space: nowrap;
     flex-direction: row;
     align-items: center;
-    justify-content: center;
+    justify-content: flex-start;
     height: 80rpx;
 }
 .volunteer-tag .tag {
@@ -293,7 +296,7 @@ button::after {
     font-family: PingFang SC;
     font-weight: 500;
     color: #333333;
-    min-width: 140rpx;
+    min-width: 180rpx;
     text-align: center;
     height: 48rpx;
     line-height: 48rpx;
diff --git a/subpages/heart/pages/volunteer/volunteer.wxml b/subpages/heart/pages/volunteer/volunteer.wxml
index 9439760..c216248 100755
--- a/subpages/heart/pages/volunteer/volunteer.wxml
+++ b/subpages/heart/pages/volunteer/volunteer.wxml
@@ -98,7 +98,7 @@
           </view>
         </picker>
       </view>
-      <view class="head-portrait" wx:if="{{false}}"> <!-- 2021.07.20 暂时不上线该功能 -->
+      <view class="head-portrait" >
         <view class="head-portrait-name">选择部门</view>
         <!-- <view class="time">{{volunteerTag.tag}}</view> -->
         <picker bindchange="choosePicker2" value="{{deptIndex}}" range="{{deptList}}" range-key="deptName">
diff --git a/subpages/home/pages/newsDetail/newsDetail.js b/subpages/home/pages/newsDetail/newsDetail.js
index bd4070c..c3c1f1c 100644
--- a/subpages/home/pages/newsDetail/newsDetail.js
+++ b/subpages/home/pages/newsDetail/newsDetail.js
@@ -187,6 +187,9 @@ Page({
   },
   // 倒计时
   countDown () {
+    if (this.data.infoCompleted == 0) {
+      return
+    }
     this.data.timer = setInterval(() => {
       console.log("加积分倒计时"+this.data.residentValue)
       if (this.data.residentValue > 1) {
diff --git a/subpages/integralCentre/pages/index/index.js b/subpages/integralCentre/pages/index/index.js
index 0bb0871..1cd3fc1 100644
--- a/subpages/integralCentre/pages/index/index.js
+++ b/subpages/integralCentre/pages/index/index.js
@@ -44,6 +44,7 @@ Page({
     loadMoreVisible: false,
     infoCompleted: 0, //是否完善了用户信息
     completeInfoDialogVisible: false,
+    pointsTotle: 0,
   },
   /**
    * 生命周期函数--监听页面加载
@@ -51,6 +52,7 @@ Page({
   onLoad: function (options) {
     this.setData({ //前面页面传过来的积分总数
       points: options.points,
+      pointsTotle: options.pointsTotle,
       infoCompleted: app.globalData.infoCompleted
     })
     this.pointsRankinglist(); //初始化加载积分记录列表
diff --git a/subpages/integralCentre/pages/index/index.wxml b/subpages/integralCentre/pages/index/index.wxml
index 7e45007..1f4df5d 100644
--- a/subpages/integralCentre/pages/index/index.wxml
+++ b/subpages/integralCentre/pages/index/index.wxml
@@ -1,7 +1,5 @@
 <view class="home">
   <view class='title'>
-    <text class="number">{{points}}</text>
-    <text class="name">可用积分</text>
     <view class="rule">
       <view class="exchange-box">
         <image src='../../images/exchange.png' class="exchange" bind:tap="goExchangeIndex" />
@@ -9,6 +7,16 @@
       <text bindtap="bindtapIntegralRule">积分规则</text>
       <image src="../../images/note.png" class="note" bindtap="bindtapIntegralRule" />
     </view>
+    <view class="points">
+      <view class="points-item">
+        <text class="number">{{pointsTotle}}</text>
+        <text class="name">总积分</text>
+      </view>
+      <view class="points-item">
+        <text class="number">{{points}}</text>
+        <text class="name">可用积分</text>
+      </view>
+    </view>
   </view>
   <!-- tabbar -->
   <view class="tab-bar">
diff --git a/subpages/integralCentre/pages/index/index.wxss b/subpages/integralCentre/pages/index/index.wxss
index 1107acf..37787bf 100644
--- a/subpages/integralCentre/pages/index/index.wxss
+++ b/subpages/integralCentre/pages/index/index.wxss
@@ -18,31 +18,26 @@ page {
 
 .title .number {
   height: 100rpx;
-  font-size: 100rpx;
+  font-size: 54rpx;
   line-height: 100rpx;
-  font-weight: bold;
+  font-weight: 500;
   color: rgba(255, 255, 255, 1);
-  margin-top: 100rpx;
 }
 
 .title .name {
-  height: 34rpx;
-  font-size: 34rpx;
-  line-height: 34rpx;
+  height: 50rpx;
+  font-size: 38rpx;
+  line-height: 50rpx;
   font-weight: 500;
   color: rgba(255, 255, 255, 1);
-  margin-top: 29rpx;
 }
 
 .title .rule {
   box-sizing: border-box;
   width: 100%;
   color: white;
-  position: absolute;
   display: flex;
   align-items: center;
-  /* left: 570rpx; */
-  top: 10rpx;
   font-size: 28rpx;
   padding-left: 20rpx;
 }
@@ -54,6 +49,19 @@ page {
   /* margin-right: 382rpx; */
 }
 
+.title .points {
+  width: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: space-around;
+}
+.title .points .points-item {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: space-around;
+}
+
 .exchange-box {
   margin-right: 360rpx;
 }