bayi пре 2 година
родитељ
комит
2df9ba2c92

+ 2 - 0
api/global.js

@@ -16,4 +16,6 @@ module.exports = {
   getBannerList: data => request(`/v3/banner/${data}`, 'get', data),
   // 获取官方活动
   getActivities: data => request('/v3/activity', 'get', data),
+  // 获取排行榜详情
+  getRankingData: data => request(`/v3/activity/${data}`, 'get', data),
 }

+ 1 - 0
components/activityList/index.less

@@ -203,6 +203,7 @@
             height: 72rpx;
             margin: 0rpx 30rpx;
             border-radius: 50%;
+            background-color: #EBEBEB;
           }
 
           .nickName {

+ 1 - 0
components/activityList/index.wxss

@@ -173,6 +173,7 @@
   height: 72rpx;
   margin: 0rpx 30rpx;
   border-radius: 50%;
+  background-color: #EBEBEB;
 }
 .activityList .ranking-class-2 .body .row .left .nickName {
   width: 210rpx;

+ 16 - 2
pages/ranking/index.js

@@ -1,10 +1,14 @@
-// pages/ranking/index.js
+import {
+  getRankingData
+} from '~/api/global'
 Page({
 
   /**
    * 页面的初始数据
    */
   data: {
+    ranking: '',
+    userList: [],
     //2:邀新榜,3:热播榜,4:挑战pk榜
     rankingType: '',
     icon: '',
@@ -20,7 +24,6 @@ Page({
       icon: options.type == '2' ? '/static/yx.png' : options.type == '3' ? '/static/play.png' : '/static/win.png',
       podiumBoxBg: options.type == '2' ? 'invitation' : options.type == '3' ? 'hot' : 'pk',
     })
-
     wx.setNavigationBarTitle({
       title: options.title
     })
@@ -28,6 +31,17 @@ Page({
       frontColor: '#ffffff',
       backgroundColor: options.type == '2' ? '#ff7f6c' : options.type == '3' ? '#6D9FFE' : '#967DFF',
     })
+    this.getRankingData()
+  },
+  async getRankingData() {
+    let {
+      ranking,
+      userList
+    } = await getRankingData(this.data.rankingType)
+    this.setData({
+      ranking,
+      userList
+    })
   },
   jumpIntro() {
     wx.navigateTo({

+ 2 - 0
pages/ranking/index.less

@@ -23,6 +23,7 @@
         .avatar {
           width: 90rpx;
           height: 90rpx;
+          border-radius: 50%;
         }
 
         .iconBox {
@@ -129,6 +130,7 @@
             margin: 0rpx 28rpx 0rpx 44rpx;
             width: 78rpx;
             height: 78rpx;
+            background-color: #EBEBEB;
             border-radius: 50%;
           }
 

+ 17 - 14
pages/ranking/index.wxml

@@ -4,44 +4,47 @@
     <view class="tips2">周榜</view>
     <view class="podiumContent">
       <view class="user first">
-        <image src="/static/tj2.png" class="avatar" bindtap="jumpUserInfo" data-uid='e953c4e4607749b09ec14fd3d44b6cb6' />
+        <image src="{{userList[0].avatar}}" class="avatar" bindtap="jumpUserInfo" data-uid='{{userList[0].eid}}' />
         <view class="iconBox">
           <image src="{{icon}}" class="icon {{rankingType=='4'?'iconPk':''}}" />
-          <view class="num">333</view>
+          <view class="num">{{userList[0].count}}</view>
         </view>
         <view class="nickName textOver">
-          淡定的小鱼人
+          {{userList[0].nickName||userList[0].eid}}
         </view>
       </view>
       <view class="user second">
-        <image src="/static/tj2.png" class="avatar" bindtap="jumpUserInfo" data-uid='e953c4e4607749b09ec14fd3d44b6cb6' />
+        <image src="{{userList[1].avatar}}" class="avatar" bindtap="jumpUserInfo" data-uid='{{userList[1].eid}}' />
         <view class="iconBox">
           <image src="{{icon}}" class="icon {{rankingType=='4'?'iconPk':''}}" />
-          <view class="num">333</view>
+          <view class="num">{{userList[1].count}}</view>
         </view>
         <view class="nickName textOver">
-          淡定的小鱼人
+          {{userList[1].nickName||userList[1].eid}}
         </view>
       </view>
       <view class="user third">
-        <image src="/static/tj2.png" class="avatar" bindtap="jumpUserInfo" data-uid='e953c4e4607749b09ec14fd3d44b6cb6' />
+        <image src="{{userList[2].avatar}}" class="avatar" bindtap="jumpUserInfo" data-uid='{{userList[2].eid}}' />
         <view class="iconBox">
           <image src="{{icon}}" class="icon {{rankingType=='4'?'iconPk':''}}" />
-          <view class="num">333</view>
+          <view class="num">{{userList[2].count}}</view>
         </view>
         <view class="nickName textOver">
-          淡定的小鱼人
+          {{userList[2].nickName||userList[2].eid}}
         </view>
       </view>
     </view>
   </view>
   <view class="podiumList">
     <scroll-view scroll-y="true" enhanced="true" show-scrollbar="{{false}}" class="scrollBox">
-      <view class="row" wx:for="{{20}}" wx:key="index">
+      <view class="row" wx:for="{{userList.length-3}}" wx:key="index">
         <view class="left">
-          <view class="num">4</view>
-          <image src="/static/tj2.png" class="avatar" bindtap="jumpUserInfo" data-uid='{{item.user.uid}}' />
-          <view class="nickName textOver">奥克斯</view>
+          <view class="num">{{index+3}}</view>
+          <image src="{{userList[index+3].avatar}}" class="avatar" bindtap="jumpUserInfo"
+            data-uid='{{userList[index+3].eid}}' />
+          <view class="nickName textOver">
+            {{userList[index+3].nickName||userList[index+3].eid}}
+          </view>
         </view>
         <view class="right">
           <image src="{{icon}}" class="icon {{rankingType=='4'?'iconPk':''}}" />
@@ -51,7 +54,7 @@
     </scroll-view>
   </view>
   <view class="footer">
-    <view class="left">我的排名<text>100+</text></view>
+    <view class="left">我的排名<text>{{ranking?ranking:'100+'}}</text></view>
     <view class="rigth">呼朋唤友来加热</view>
   </view>
 </view>

+ 2 - 0
pages/ranking/index.wxss

@@ -23,6 +23,7 @@
 .rankingBox .podiumBox .podiumContent .user .avatar {
   width: 90rpx;
   height: 90rpx;
+  border-radius: 50%;
 }
 .rankingBox .podiumBox .podiumContent .user .iconBox {
   margin: 8rpx 0rpx 4rpx;
@@ -113,6 +114,7 @@
   margin: 0rpx 28rpx 0rpx 44rpx;
   width: 78rpx;
   height: 78rpx;
+  background-color: #EBEBEB;
   border-radius: 50%;
 }
 .rankingBox .podiumList .scrollBox .row .left .nickName {