联调

pages/inviteRanking/index.js

@@ -1,5 +1,6 @@
 import {
     getRankingData,
+    getInviteRanking
 } from '~/api/global'
 import {
     getInviteList
@@ -11,6 +12,8 @@ Page({
     data: {
         userInfo: {},
         ranking: '',
+        gap: '',
+        myCount: '',
         userList: [],
         inviteList: []
     },
@@ -32,8 +35,18 @@ Page({
         } = await getInviteList({
             pageSize: 9999
         })
+        let {
+            userList,
+            ranking,
+            gap,
+            myCount
+        } = await getInviteRanking()
         this.setData({
-            inviteList: list
+            inviteList: list,
+            userList,
+            ranking,
+            gap,
+            myCount
         })
     },
     async getRankingData(id) {
@@ -61,9 +74,9 @@ Page({
         if (!currentTarget.dataset.uid) {
             return
         }
-        /*  wx.navigateTo({
-             url: `/pages/personal/index?uid=${currentTarget.dataset.uid}&type=${this.data.rankingType==4?'pk':'user'}`,
-         }) */
+        wx.navigateTo({
+            url: `/pages/personal/index?uid=${currentTarget.dataset.uid}`,
+        })
     },
     showTranscript() {
         this.selectComponent("#popUp").showModal()

pages/inviteRanking/index.wxml

@@ -66,11 +66,11 @@
             </view>
             <view class="right">
                 <view class="info">
-                    <view class="i1">第33名</view>
-                    <view class="i2">距离上一名还差5</view>
+                    <view class="i1">第{{ranking}}名</view>
+                    <view class="i2">距离上一名还差{{gap}}</view>
                 </view>
                 <view class="num">
-                    10
+                    {{myCount}}
                 </view>
             </view>
         </view>
@@ -93,7 +93,7 @@
             </view>
             <scroll-view scroll-y="true" class="list" enhanced show-scrollbar='{{false}}'>
                 <view class="item" wx:for="{{inviteList}}" wx:key="eid">
-                    <view class="left">
+                    <view class="left" bindtap="jumpUserInfo" data-uid='{{item.uid}}'>
                         <view class="num">{{index+1}}</view>
                         <image src="{{item.avatar}}" class="avatar" data-uid="{{item.uid}}" bindtap="jumpUserInfo" />
                         <view class="nickName textOver">{{item.nickName||item.eid}}</view>

pages/my/index.wxml

@@ -14,7 +14,7 @@
                         <view class="nickName textOver">{{userInfo.user.nickName||'请输入昵称' }}</view>
                         <view class="gradeText textOver" catchtap="clipboar">学号：{{userInfo.user.eid}}</view>
                         <view class="validity" wx:if="{{isPreferential}}">
-                            {{vipTiem=='1'?'会员使用至：终身使用':!vipTiem?'会员已过期':'会员使用至：'+filters.formatDate(vipTime,5)}}
+                            {{vipTime=='1'?'会员使用至：终身使用':!vipTime?'会员已过期':'会员使用至：'+filters.formatDate(vipTime,5)}}
                         </view>
                     </view>
                     <view class="uRtopRight">