From 0295228ad1b843f65033c3528d8eeb1dafb6526b Mon Sep 17 00:00:00 2001
From: zhaoyongnian <541231643@qq.com>
Date: Sat, 9 May 2020 09:39:19 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86=E4=B8=AD=E5=BF=83=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/mine/mine.js                            | 11 ++++--
 pages/mine/mine.wxml                          |  8 ++--
 subpages/integralCentre/pages/index/index.js  | 37 ++++++++++++++++---
 .../integralCentre/pages/index/index.wxml     |  8 +---
 4 files changed, 45 insertions(+), 19 deletions(-)

diff --git a/pages/mine/mine.js b/pages/mine/mine.js
index 9070c65..7e600de 100644
--- a/pages/mine/mine.js
+++ b/pages/mine/mine.js
@@ -19,7 +19,9 @@ Page({
     userInfo: {
       faceImg: '',
       nickname: '',
-      partyFlag: ''
+      partyFlag: '',
+      points:0,
+      grade:0
     },
     completeInfoDialogVisible: false,
     infoCompleted: 0
@@ -233,7 +235,9 @@ Page({
         userInfo: {
           faceImg: '',
           nickname: '',
-          partyFlag: '0'
+          partyFlag: '0',
+          points:0,
+          grade:0
         }
       })
       console.log(err)
@@ -305,8 +309,9 @@ Page({
   },
   //跳转到积分中心
   navigateToIntegralCentre(e) {
+    console.log(':::::'+e.currentTarget.dataset.points)
     wx.navigateTo({
-      url: `/subpages/integralCentre/pages/index/index?points = ` + e.currentTarget.dataset.points
+      url: `/subpages/integralCentre/pages/index/index?points=` + e.currentTarget.dataset.points
     })
   }
 })
\ No newline at end of file
diff --git a/pages/mine/mine.wxml b/pages/mine/mine.wxml
index d99cd67..fd2c4f9 100644
--- a/pages/mine/mine.wxml
+++ b/pages/mine/mine.wxml
@@ -26,10 +26,10 @@
           </view>
         </view>
         <view class="bottom" bindtap="navigateToIntegralCentre" data-points="{{userInfo.points}}">
-          <text wx:if="{{userInfo.grade > 0}}" class="text1">等级：{{userInfo.grade}}</text>
-          <text wx:else class="text1">等级：0</text>
-          <text wx:if="{{userInfo.points > 0}}" class="text2">积分：{{userInfo.points}}</text>
-          <text wx:else class="text2">积分：0</text>
+          <text class="text1">等级：{{userInfo.grade}}</text>
+    
+          <text class="text2">积分：{{userInfo.points}}</text>
+  
           <text class="text3">积分兑换</text>
         </view>
         <!-- <view class="bottom">
diff --git a/subpages/integralCentre/pages/index/index.js b/subpages/integralCentre/pages/index/index.js
index 3cd0af7..1753620 100644
--- a/subpages/integralCentre/pages/index/index.js
+++ b/subpages/integralCentre/pages/index/index.js
@@ -12,7 +12,9 @@ Page({
    * 页面的初始数据
    */
   data: {
-    points:0,//积分
+    nodatapointsRecord: false,
+    nodatapointsRanking: false,
+    points: 0, //积分
     pageIndex: 1,
     pageSize: 10,
     pointsRecordlist: [], //积分记录列表
@@ -38,7 +40,7 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function(options) {
-    this.setData({//前面页面传过来的积分总数
+    this.setData({ //前面页面传过来的积分总数
       points: options.points
     })
     this.pointsRecordlist(); //初始化加载积分记录列表
@@ -53,6 +55,8 @@ Page({
       pointsRecordlist: [],
       pointsRankinglist: [],
       selectTab: e.currentTarget.dataset.tab,
+      nodatapointsRecord: false,
+      nodatapointsRanking: false,
     })
     if (this.data.selectTab == 'tab1') {
       this.pointsRecordlist(); //初始化加载积分记录列表
@@ -80,6 +84,7 @@ Page({
       loadMoreType: 'none',
       loadMoreVisible: false,
       pointsRankinglist: [],
+      nodatapointsRanking: false,
     })
 
     that.pointsRankinglist()
@@ -99,10 +104,20 @@ Page({
         pointsRecordlist: that.data.pointsRecordlist.concat(res.data),
         loadMoreType: res.data.length === that.data.pageSize ? 'loading' : 'none',
       })
+      if (that.data.pointsRecordlist.length > 0) {
+        that.setData({
+          nodatapointsRecord: false,
+        })
+      } else {
+        that.setData({
+          nodatapointsRecord: true,
+        })
+      }
     }).catch(err => {
       that.setData({
         loadMoreType: 'none',
-        pointsRecordlist: []
+        pointsRecordlist: [],
+        nodatapointsRecord: false,
       })
       console.log(err)
     })
@@ -122,10 +137,20 @@ Page({
         pointsRankinglist: that.data.pointsRankinglist.concat(res.data),
         loadMoreType: res.data.length === that.data.pageSize ? 'loading' : 'none',
       })
+      if (that.data.pointsRankinglist.length > 0) {
+        that.setData({
+          nodatapointsRanking: false
+        })
+      } else {
+        that.setData({
+          nodatapointsRanking: true
+        })
+      }
     }).catch(err => {
       that.setData({
         loadMoreType: 'none',
-        pointsRankinglist: []
+        pointsRankinglist: [],
+        nodatapointsRanking: false
       })
       console.log(err)
     })
@@ -143,8 +168,7 @@ Page({
   /**
    * 生命周期函数--监听页面显示
    */
-  onShow: function (options) {
-  },
+  onShow: function(options) {},
 
   /**
    * 生命周期函数--监听页面隐藏
@@ -179,6 +203,7 @@ Page({
         pageIndex: this.data.pageIndex + 1,
         pageSize: this.data.pageSize,
         timestamp: this.data.timestamp,
+        nodatapointsRecord: false,
       })
 
       if (this.data.selectTab == 'tab1') {
diff --git a/subpages/integralCentre/pages/index/index.wxml b/subpages/integralCentre/pages/index/index.wxml
index 720b657..e9c6970 100644
--- a/subpages/integralCentre/pages/index/index.wxml
+++ b/subpages/integralCentre/pages/index/index.wxml
@@ -24,9 +24,7 @@
         <text wx:else>+</text>{{item.points}}</view>
       <view class="jf-list-li jf-list-li-last color1">{{item.operationTime}}</view>
     </view>
-    <view wx:if="{{pointsRecordlist.length < 1}}">
-      <no-data isShow="{{true}}"></no-data>
-    </view>
+    <no-data isShow="{{nodatapointsRecord}}"></no-data>
   </block>
   <!-- 积分排行 -->
   <block wx:else>
@@ -51,9 +49,7 @@
       <view class="right">{{item.points}}</view>
     </view>
 
-    <view wx:if="{{pointsRankinglist.length < 1}}">
-      <no-data isShow="{{true}}"></no-data>
-    </view>
+    <no-data isShow="{{nodatapointsRanking}}"></no-data>
   </block>
 
   <!--加载更多提示-->