排名查询和显示

compontents/curriculum/curriculum.js

@@ -38,7 +38,7 @@ Component({
   methods: {
     onTap (e) {
       let flage = e.target.dataset.flag;
-      const height = this.properties.studyLog.length * 54;
+      const height = this.properties.studyLog.length * 56;
       if(flage){
         this.util(flage, '680rpx');
         this.setData({

compontents/ranking/ranking.js

@@ -1,4 +1,7 @@
 // compontents/ranking/ranking.js
+const util = require('../../utils/util.js');
+const APIClient = require('../../utils/APIClient.js');
+const login = require('../../utils/loginSchedule.js');
 Component({
   /**
    * 组件的属性列表
@@ -41,15 +44,17 @@ Component({
    */
   data: {
     animationData: {},
+    rankData: {},
+    indexs: 0
   },
 
   /**
    * 组件的方法列表
    */
   methods: {
-    /*展开更多/
+    /*展开更多*/
     more (e) {
-     let height = this.properties.friendsData.length * 80;
+     let height = this.properties.friendsData.length * 80.3;
      this.util(height+'rpx')
     },
     /* 创建动画并执行 */
@@ -69,5 +74,27 @@ Component({
         animationData: animation.export()  
       })  
     },
+   
+  }, 
+
+  ready: function () {
+    let options = util.getUrl();
+    console.log(options)
+    this.setData({
+      indexs: options.ind
+    })
+    //获取排名
+    login.getOpenidSessionKey(res => {
+      //获取排名
+      APIClient.getFriendSchedule('wx/friendsRank/user', {
+        uid: res.data.data.uid
+      }).success(res => {
+        console.log(res)
+        this.setData({
+          rankData: res.data.data,
+        })
+      })
+    }, () => {
+    });  
   }
 })

compontents/ranking/ranking.wxml

@@ -31,12 +31,26 @@
     </view>
     <view class="my-rank-list">
         <view class="rank-head">
-            <text class="rank-text">{{myData.rank}}</text>
-            <image src="{{myData.users.headImgUrl}}" class="head-img"></image>
-            <text>{{myData.users.wechatName}}</text>
+            <text wx:if="{{indexs == 1}}" class="rank-text">{{rankData.expRank}}</text>
+            <text wx:elif="{{indexs == 2}}" class="rank-text">{{rankData.userQuestionRank}}</text>
+            <text wx:elif="{{indexs == 3}}" class="rank-text">{{rankData.userQuestionCorrectRank}}</text>
+            <text wx:else class="rank-text">{{rankData.userMetalRank}}</text>
+            <image src="{{rankData.users.headImgUrl}}" class="head-img"></image>
+            <text style="width: 215px; overflow: hidden;">{{rankData.users.wechatName}}</text>
+        </view>
+        <!--判断显示个人排名-->
+        <view wx:if="{{indexs == 1}}">
+            <text class="medal-num" style="color: #5b82fa">LV{{rankData.level}}</text>
+        </view>
+        <view wx:elif="{{indexs == 2}}">
+            <text class="medal-num" style="color: #5b82fa">{{rankData.userQuestionNum}}道</text>
+        </view>
+        <view wx:elif="{{indexs == 3}}">
+            <text class="medal-num" style="color: #5b82fa">{{rankData.userQuestionAccuracy}}%</text>
+        </view>
+        <view wx:else>
+            <text class="medal-num" style="color: #5b82fa">{{rankData.userMetalNum}}枚</text>
         </view>
-        <text wx:if="{{myData.exp >= 0}}" class="medal-num" style="color: #5b82fa">LV{{myData.number}}({{myData.exp}})</text>
-        <text wx:else class="medal-num" style="color: #5b82fa">{{myData.number}}{{str}}</text>
     </view> 
     <view class="particular" bindtap="more" data-flag="{{flag}}" wx:if="{{height}}">
         查看更多

compontents/ranking/ranking.wxss

@@ -33,10 +33,6 @@
     top: 0rpx;
     width: 136rpx;
     text-align: center;  
-    word-break:keep-all;/* 不换行 */   
-    white-space:nowrap;/* 不换行 */  
-    overflow:hidden;/* 内容超出宽度时隐藏超出部分的内容 */   
-    text-overflow:ellipsis;/* 当对象内文本溢出时显示省略标记(...) ；需与overflow:hidden;一起使用。*/    
 }
 
 .my-rank .head-rank-2 {
@@ -45,10 +41,6 @@
     top: 0rpx;
     width: 116rpx;
     text-align: center;  
-    word-break:keep-all;/* 不换行 */   
-    white-space:nowrap;/* 不换行 */  
-    overflow:hidden;/* 内容超出宽度时隐藏超出部分的内容 */   
-    text-overflow:ellipsis;/* 当对象内文本溢出时显示省略标记(...) ；需与overflow:hidden;一起使用。*/    
 }
 
 .my-rank .head-rank-1 .head{
@@ -126,7 +118,7 @@
     display: flex;
     justify-content: space-between;
     align-items: center;
-    height: 78rpx;
+    height: 79rpx;
     padding: 0 20rpx;
     border-top: 2rpx solid #ccc;
 }

compontents/tarbar/tarbar.js

@@ -79,7 +79,7 @@ Component({
   },
   ready() {
     let options = util.getUrl();
-    console.log(options)
+    //console.log(options)
     if(options.ind) {
       this.setData({ navBtnSelectIdx: options.ind});
     }

pages/index/index.js

@@ -188,7 +188,6 @@ Page({
         this.setData({
           rankData: res.data.data,
         })
-
       })
     }, () => {
       this.setData({

pages/index/index.wxml

@@ -55,20 +55,20 @@
               <view class="dashed"></view>
               <view class="ranking-con">
                 <view class="rank">
-                  <text>勋章数量：{{rankData.metalsRank.number}}枚</text>
-                  <text>第{{rankData.metalsRank.rank}}名</text>
+                  <text>勋章数量：{{rankData.userMetalNum}}枚</text>
+                  <text>第{{rankData.userMetalRank == 0 ? '1000+' : rankData.userMetalRank}}名</text>
                 </view>
                 <view class="rank">
-                  <text>等级：LV{{rankData.expRank.number}}</text>
-                  <text>第{{rankData.expRank.rank}}名</text>
+                  <text>等级：LV{{rankData.level}}</text>
+                  <text>第{{rankData.expRank === 0 ? '1000+' : rankData.expRank}}名</text>
                 </view>
                 <view class="rank">
-                  <text>答题量：{{rankData.userQuestionRank.number}}题</text>
-                  <text>第{{rankData.userQuestionRank.rank}}名</text>
+                  <text>答题量：{{rankData.userQuestionNum}}题</text>
+                  <text>第{{rankData.userQuestionRank == 0 ? '1000+' :  rankData.userQuestionRank}}名</text>
                 </view>
                 <view class="rank">
-                  <text>答题准确率：{{rankData.userQuestionCorrectRank.numberCorrect}}%</text>
-                  <text>第{{rankData.userQuestionCorrectRank.rank}}名</text>
+                  <text>答题准确率：{{rankData.userQuestionAccuracy}}%</text>
+                  <text>第{{rankData.userQuestionCorrectRank == 0 ? '1000+' : rankData.userQuestionCorrectRank}}名</text>
                 </view>
               </view>
               <view class="particular">

pages/index/index.wxss

@@ -169,7 +169,6 @@
 
 .img view {
   position: relative;
-  flex: 1;
   display: flex;
   flex-direction: column;
   justify-content: center;

pages/transmit/transmit.js

@@ -91,7 +91,7 @@ Page({
     // })
     const postsId = options.postId || '';
     const shareKey = options.shareKey || '';
-    console.log('shareKey' + options.shareKey)
+    console.log('shareKey' + JSON.stringify(options));
     //判断分享过来的参数是否有postId查询单挑显示 
     if(postsId || shareKey) {
       login.getOpenidSessionKey(res => {

project.config.json

@@ -29,7 +29,7 @@
 			"list": []
 		},
 		"miniprogram": {
-			"current": 6,
+			"current": 7,
 			"list": [
 				{
 					"id": 0,
@@ -83,7 +83,7 @@
 					"id": 7,
 					"name": "分享",
 					"pathName": "pages/transmit/transmit",
-					"query": "shareKey=1527586079692937&ind=7",
+					"query": "shareKey=1527671780483633&ind=7",
 					"scene": "1011"
 				}
 			]