From 7eca3b3b35119a932a525c7c0a3beb12e8bcd5cd Mon Sep 17 00:00:00 2001
From: zhaoyongnian <541231643@qq.com>
Date: Wed, 9 Sep 2020 16:49:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=91=E7=9A=84=E6=B7=BB=E5=8A=A0=E7=A7=AF?=
 =?UTF-8?q?=E5=88=86=E5=85=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 epdc-resident-mp-yushan/pages/mine/mine.js   | 14 ++++++++++++--
 epdc-resident-mp-yushan/pages/mine/mine.wxml |  8 ++++++++
 epdc-resident-mp-yushan/pages/mine/mine.wxss | 12 +++++++++++-
 3 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/epdc-resident-mp-yushan/pages/mine/mine.js b/epdc-resident-mp-yushan/pages/mine/mine.js
index 3234076..459a521 100644
--- a/epdc-resident-mp-yushan/pages/mine/mine.js
+++ b/epdc-resident-mp-yushan/pages/mine/mine.js
@@ -17,7 +17,9 @@ Page({
     userInfo: {
       faceImg: '',
       nickname: '',
-      partyFlag: ''
+      partyFlag: '',
+      points: 0,
+      grade: 0
     },
     completeInfoDialogVisible: false,
     infoCompleted: 0
@@ -231,7 +233,8 @@ Page({
         userInfo: {
           faceImg: '',
           nickname: '',
-          partyFlag: '0'
+          points: 0,
+          grade: 0
         }
       })
       console.log(err)
@@ -293,5 +296,12 @@ Page({
     wx.navigateTo({
       url: '/subpages/mine/pages/gridManage/gridManage'
     })
+  },
+  //跳转到积分中心
+  navigateToIntegralCentre () {
+    this.getUserInfo();//防止积分变化
+    wx.navigateTo({
+      url: "/subpages/integralCentre/pages/index/index?points=" + this.data.userInfo.points
+    })
   }
 })
\ No newline at end of file
diff --git a/epdc-resident-mp-yushan/pages/mine/mine.wxml b/epdc-resident-mp-yushan/pages/mine/mine.wxml
index f3581fc..1356c98 100644
--- a/epdc-resident-mp-yushan/pages/mine/mine.wxml
+++ b/epdc-resident-mp-yushan/pages/mine/mine.wxml
@@ -25,6 +25,14 @@
             </view>
           </view>
         </view>
+        <view class="bottom">
+          <text class="text1">等级：{{userInfo.grade}}</text>
+    
+          <text class="text2" bindtap="navigateToIntegralCentre" data-points="{{userInfo.points}}">积分：{{userInfo.points}}</text>
+  
+          <text class="text3"></text>
+          <!-- <text class="text3" bindtap="jqqd">积分兑换</text> -->
+        </view>
         <!-- <view class="bottom">
           <view class="operation" bindtap="navigateToInviteRecord">
             <image src="../../images/mine/yaoqingjilu.png" />
diff --git a/epdc-resident-mp-yushan/pages/mine/mine.wxss b/epdc-resident-mp-yushan/pages/mine/mine.wxss
index 57fd66f..c2de6d8 100644
--- a/epdc-resident-mp-yushan/pages/mine/mine.wxss
+++ b/epdc-resident-mp-yushan/pages/mine/mine.wxss
@@ -127,11 +127,21 @@ page {
   margin-left: 9rpx;
 }
 .personal-info .box .content .bottom {
-  margin-top: 30rpx;
+  margin-top: 60rpx;
+  box-sizing: border-box;
+  width: 100%;
+  height: 30rpx;
   display: flex;
   align-items: center;
   justify-content: space-around;
 }
+.personal-info .box .content .bottom text{
+  color: #fff;
+  font-size: 28rpx;
+  line-height: 30rpx;
+  flex: 1;
+  text-align: center;
+}
 .personal-info .box .content .bottom .operation {
   flex: 1;
   display: flex;