bayi il y a 1 an
Parent
commit
82c3ee51ad
3 fichiers modifiés avec 9 ajouts et 12 suppressions
  1. 0 2
      api/global.js
  2. 6 7
      pages/ranking/index.js
  3. 3 3
      utils/request.js

+ 0 - 2
api/global.js

@@ -14,8 +14,6 @@ module.exports = {
     getActivities: data => request('/v3/activity', 'get', data),
     // 获取排行榜详情
     getRankingData: data => request('/v3/activity/rank', 'get', data),
-    // 获取排行榜个人排名
-    getSelfRanking: data => request('/v3/activity/currentRank', 'get', data),
     // 获取排行榜可选日期 
     getRankedDay: data => request('/v3/rank/statistics/day', 'get', data),
     // 获取朗读赛详情

+ 6 - 7
pages/ranking/index.js

@@ -1,6 +1,5 @@
 import {
     getRankingData,
-    getSelfRanking,
     getRankedDay
 } from '~/api/global'
 import event from '~/mixins/event'
@@ -11,6 +10,7 @@ Page({
      */
     data: {
         userList: [],
+        ranking:'',
         //2:邀新榜,3:热播榜,4:挑战pk榜
         rankingType: '',
         icon: '',
@@ -42,17 +42,16 @@ Page({
             frontColor: '#ffffff',
             backgroundColor: options.type == '2' ? '#50AE75' : options.type == '3' ? '#FF7E6C' : '#8468FA',
         })
-        let userList = await getRankingData({
-            type: options.type,
-            day: this.data.day
-        })
-        let self = await getSelfRanking({
+        let {
+            userList,
+            ranking
+        } = await getRankingData({
             type: options.type,
             day: this.data.day
         })
-        console.log(self);
         this.setData({
             userList,
+            ranking
         })
     },
     switchType({

+ 3 - 3
utils/request.js

@@ -6,13 +6,13 @@ const {
         envVersion
     }
 } = wx.getAccountInfoSync();
-/* if (envVersion == 'develop') {
+if (envVersion == 'develop') {
     baseUrl = 'https://reader-api.efunbox.cn/wx'
     oldUrl = 'https://reader-api.efunbox.cn'
-} else { */
+} else {
     baseUrl = 'https://reader-api.ai160.com/wx'
     oldUrl = 'https://reader-api.ai160.com'
-// }
+}
 
 function request(url, method, data, oldBaseUrl = false, intercept = true) {
     let header = {