Merge branch 'jiaoneiqunuan' of gitlab2.dui88.com:wanghongyuan/new_taobao into jiaoneiqunuan

# Conflicts:
#	taobao_jn/client/resconfig/resList.js

taobao_jn/client/api.js

@@ -23,6 +23,7 @@ const request = tbccRequest({
 // api handle 列表
 const apiList = {
     ...capi,
+    /**助力 */
     doHelp: {
         handle: 'doHelp',
         method: 'get',
@@ -73,45 +74,57 @@ const apiList = {
         method: 'get',
         isShowLoading: false
     },
-    /**获取用户信息 */
-    getUserInfo: {
-        handle: 'getUserInfo',
+    /**获取游戏信息 */
+    getGameInfo: {
+        handle: 'getGameInfo',
         method: 'get',
         isShowLoading: false
     },
-    /**登录 */
-    login: {
-        handle: 'login',
+    /**参与游戏 */
+    doJoin: {
+        handle: 'doJoin',
         method: 'get',
         isShowLoading: false
     },
-    /**领养猫，提交猫咪信息 */
-    adoptCat: {
-        handle: 'adoptCat',
+    /**游戏结束 */
+    gameOver: {
+        handle: 'gameOver',
         method: 'get',
         isShowLoading: false
     },
-    /**召回信息 */
-    recallInfo: {
-        handle: 'recallInfo',
+    /**游戏中获取本局奖励的温暖值 */
+    getWarmDetailListByCurGame: {
+        handle: 'getWarmDetailListByCurGame',
         method: 'get',
         isShowLoading: false
     },
-    /**召回猫 */
-    recallCat: {
-        handle: 'recallCat',
+    /**获取当前游戏邀请人列表 */
+    getInviteListByCurGame: {
+        handle: 'getInviteListByCurGame',
         method: 'get',
         isShowLoading: false
     },
-    /**兑换奖品 */
-    exchangeGood: {
-        handle: 'exchangeGood',
+    /**游戏中发放温暖值 */
+    sendWarmsByCurGame: {
+        handle: 'sendWarmsByCurGame',
         method: 'get',
         isShowLoading: false
     },
-    /**获取兑换奖品列表 */
-    exchangeGoodList: {
-        handle: 'exchangeGoodList',
+    /**获取排行明细列表 */
+    getUserRankList: {
+        handle: 'getUserRankList',
+        method: 'get',
+        isShowLoading: false
+    },
+    /**获取排行榜奖品列表 */
+    getRankPrizeList: {
+        handle: 'getRankPrizeList',
+        method: 'get',
+        isShowLoading: false
+    },
+    /**获取邀请好友列表 */
+    getInviteList: {
+        handle: 'getInviteList',
         method: 'get',
         isShowLoading: false
     }

taobao_jn/client/app.acss

@@ -29,7 +29,13 @@ page {
     margin-top:-812rpx;
     background: rgba(0, 0, 0, 0.5);
   }
-
+  .popcontainer_down {
+    position: fixed;
+    width: 750rpx;
+    height: 1624rpx;
+    bottom:0rpx;
+    background: rgba(0, 0, 0, 0.5);
+  }
   .btn:active {
     transform: scale(0.9);
     -ms-transform: scale(0.9);

taobao_jn/client/app.js

@@ -9,8 +9,8 @@ cloud.init({
 App({
   env,
   requestType: 'cloud', // yapi，cloud: 云函数
-  // requestType: 'local', // yapi，cloud: 云函数
-  cloudName: 'tmallCat', // 主云函数项目名 tmallCat
+  requestType: 'local', // yapi，cloud: 云函数
+  cloudName: 'jn', // 主云函数项目名 tmallCat
   // cloudName: 'bubbleSurviva', // 主云函数项目名 tmallCat
   cloud,
   tbcc,

taobao_jn/client/components/cominvitelistmodal/cominvitelistmodal.acss

@@ -2,7 +2,7 @@
   width: 750rpx;
   height: 957rpx;
   opacity: 1;
-  top: 667rpx;
+  bottom:0rpx;
   position: absolute;
   transform-origin: 0rpx 0rpx 0rpx;
 }
@@ -23,27 +23,6 @@
   position: absolute;
   transform-origin: 0rpx 0rpx 0rpx;
 }
-.invitelistmodal .invitelisttext .tb23512544 {
-  width: 155rpx;
-  height: 20rpx;
-  opacity: 0.61960784;
-  top: 65rpx;
-  position: absolute;
-  transform-origin: 0rpx 0rpx 0rpx;
-  font-size: 24rpx;
-  color: #000000;
-}
-.invitelistmodal .invitelisttext .tu_ceng20200433 {
-  width: 206rpx;
-  height: 19rpx;
-  opacity: 0.61960784;
-  left: 353rpx;
-  top: 66rpx;
-  position: absolute;
-  transform-origin: 0rpx 0rpx 0rpx;
-  font-size: 24rpx;
-  color: #000000;
-}
 .invitelistmodal .invitelisttext .tb23512322 {
   width: 155rpx;
   height: 20rpx;
@@ -74,6 +53,8 @@
   transform-origin: 0rpx 0rpx 0rpx;
   font-size: 30rpx;
   color: #000000;
+  font-weight: bolder;
+
 }
 .invitelistmodal .invitelisttext .invitelisttime {
   width: 190rpx;
@@ -84,6 +65,7 @@
   transform-origin: 0rpx 0rpx 0rpx;
   font-size: 30rpx;
   color: #000000;
+  font-weight: bolder;
 }
 .invitelistmodal .invitelistclose {
   width: 59rpx;
@@ -93,3 +75,46 @@
   position: absolute;
   transform-origin: 50% 50% 0rpx;
 }
+.invitelistmodal .inviteList {
+    width: 750rpx;
+    height: 682rpx;
+    opacity: 1;
+    display: block;
+    top: 198rpx;
+    position: absolute;
+    transform-origin: 0px 0px 0px;
+    overflow: scroll;
+}
+.invitelistmodal .inviteList .inviteItem {
+      width: 750rpx;
+      height: 30rpx;
+      opacity: 1;
+      margin: 0 auto 12rpx;
+      position: relative;
+      transform-origin: 0px 0px 0px;
+}
+.invitelistmodal .inviteList .inviteItem .inviteId{
+        width: 300rpx;
+        height: 40rpx;
+        opacity: 1;
+        display: block;
+        left: 90rpx;
+        top: 10rpx;
+        position: absolute;
+        font-size: 26rpx;
+        color: rgba(0, 0, 0, 1);
+        transform-origin: 0px 0px 0px;
+        text-align: left;
+}
+.invitelistmodal .inviteList .inviteItem .inviteTime{
+        width: 300rpx;
+        height: 40rpx;
+        opacity: 1;
+        display: block;
+        left: 444rpx;
+        top: 10rpx;
+        position: absolute;
+        font-size: 26rpx;
+        color: rgba(0, 0, 0, 1);
+        transform-origin: 0px 0px 0px;
+}

taobao_jn/client/components/cominvitelistmodal/cominvitelistmodal.axml

 <view class="invitelistmodal ">
         <image class="invitelistbg " src={{resList['fe67e0c4-26fa-4f08-bf4a-5128b65a7fdd'].url}} />
         <view class="invitelisttext " >
-        <view class="inviteItem">
-          <label class="tb23512544 ">tb235***1214</label>
-          <label class="tu_ceng20200433 ">2020.09.15 23：56</label>
-          </view>
           <label class="invitelistid ">淘宝id</label>
           <label class="invitelisttime ">成功入会时间</label>
         </view>
+
+        <view class="inviteList" >
+          <view class="inviteItem" a:for="{{inviteList}}">
+            <label class="inviteId ">{{item.userNick}}</label>
+            <label class="inviteTime ">{{item.createTime}}</label>
+          </view>
+          </view>
+
         <image class="invitelistclose btn" onTap="onCloseModal" src={{resList['db42e12e-c495-4526-9dbf-1e435614119c'].url}} />
       </view>
\ No newline at end of file

taobao_jn/client/components/cominvitelistmodal/cominvitelistmodal.js

@@ -2,17 +2,92 @@
 
 import resList from '../../resconfig/resList';
 import API from '../../api';
+const app = getApp();
+const {
+    tbcc
+} = app;
+const {
+    commonToast,
+    navigateToOutside,
+    getUserAddress,
+    setClipboard
+} = tbcc.tb;
 Component({
-  props: {},
-  data: {
-    resList: resList
-  },
-  methods: {
-    onCloseModal(){
-        const {onCloseModal} = this.props;
-        onCloseModal&&onCloseModal();
-    }
-  },
+    props: {},
+    data: {
+        resList: resList,
+        inviteList: []
+    },
+    methods: {
+        onCloseModal() {
+            const {
+                onCloseModal
+            } = this.props;
+            onCloseModal && onCloseModal();
+        },
+        /**获取列表 */
+        async getInviteList() {
+            my.showLoading();
+            let {
+                success,
+                data
+            } = await API.getInviteList({
+                pageSize: 100
+            }).catch(r => {
+                my.hideLoading();
+                commonToast(r && r.message);
+            }) || {};
+            if (success) {
+                my.hideLoading();
+                // console.log("aaaa",data.list)
+                // console.log("bbb",this.getTime(1602482660574))
+                for (let i = 0; i < data.list.length; i++) {
+                    data.list[i].createTime = this.getTime1(parseInt(data.list[i].createTime));
+                    console.log(data.list[i].createTime)
+                }
+                console.log(data.list);
+                this.setData({
+                    inviteList: data.list
+                })
+            }
+        },
+        /**根据时间戳获取日期-月-日 */
+        getTime(time) {
+            let date = new Date(time);
+            let year = date.getFullYear();
+            let month = date.getMonth() + 1;
+            let day = date.getDate();
+            month = month < 10 ? "0" + month : month;
+            day = day < 10 ? "0" + day : day;
+
+            date = month + '-' + day;
+
+            console.log(date);
 
+            return date;
+        },
+        // 转换时间
+        getTime1(time) {
+            const yy = new Date(time).getFullYear();
+            const mm = new Date(time).getMonth() + 1 + '';
+            const dd = new Date(time).getDate() + '';
+            let m = mm.padStart(2, '0');
+            let d = dd.padStart(2, '0');
+            const t1 = `${yy}.${m}.${d} `;
+            // console.log(new Date(endTime).toLocaleDateString())
+            // const t1 = new Date(endTime).toLocaleDateString() + '';//获取年月日
+            const t2 = new Date(time).getHours() + ''; //获取时
+            const t3 = new Date(time).getMinutes() + ''; //获取分
+            const t4 = new Date(time).getMilliseconds() + ''; //获取秒
+            console.log(time, new Date(time + 48 * 60 * 60 * 1000).toLocaleString(), 'time');
+            let date = t1 + "" + t2.padStart(2, '0') + ":" + t3.padStart(2, '0');
+            return date;
+        },
+
+    },
+
+    didMount() {
+        this.getInviteList();
+    }
 
 });
\ No newline at end of file

taobao_jn/client/components/comrulemodal/comrulemodal.js

@@ -2,6 +2,9 @@
 
 import resList from '../../resconfig/resList';
 import API from '../../api';
+const app = getApp();
+const { tbcc } = app;
+const { commonToast, navigateToOutside, getUserAddress, setClipboard } = tbcc.tb;
 Component({
     props: {},
     data: {

taobao_jn/client/components/prizeModal/prizeModal.acss

@@ -17,10 +17,10 @@
 }
 
 .my-prize-page .my-prize-label {
-  width: 286rpx;
-  height: 49rpx;
+  width: 167rpx;
+  height: 40rpx;
   margin: 140rpx auto 40rpx;
-  background: url('//yun.duiba.com.cn/aurora/assets/a15fe07a819f3f6deb271725b37468030523dc05.png') no-repeat;
+  background: url('//yun.duiba.com.cn/spark/assets/myPrizeTitle.ed095f3772339f3920623585c92fc271ac4dc3ea.png') no-repeat;
   background-size: 100% 100%;
 }
 
@@ -31,7 +31,7 @@
 
 .my-prize-page .my-prize-empty {
   text-align: center;
-  color: #fff;
+  color: #000;
   margin-top: 30rpx;
 }
 

taobao_jn/client/pages/myprize/myprize.js

@@ -16,7 +16,7 @@ Page({
     endTime: null,//到期时间
     task: {
       image: {
-        bg: '//yun.duiba.com.cn/aurora/assets/7283d715cc5c7d13a5f498d15f5f5b9f4d9c29e5.jpg', //背景图
+        bg: '//yun.duiba.com.cn/spark/assets/myprizeBg.1f636c459b0a7e272f3cc65c80c7bc2a88bc2833.jpg', //背景图
         copyIcon: '//yun.dui88.com/duiba-components-c-myprizemyprize_copy_code.png', //复制
         addressBth: '//yun.duiba.com.cn/aurora/assets/82cc3c6d8861334ebaf128c98e3341b687bdc007.png', //填写地址(实物奖品)
         getBth: '//yun.dui88.com/duiba-components-c-myprizeget_now.png', //立即领取(除实物奖品外)
@@ -81,9 +81,9 @@ Page({
     }) || {};
     if (success && data) {
       this.setData({
-        myPrizeList: data
+        myPrizeList: data.list
       })
-      this.getEndTime(data)
+      this.getEndTime(data.list)
     }
     if (type != 'noLoading') {
       my.hideLoading();

taobao_jn/client/pages/pagepageindex/pagepageindex.acss

@@ -16,7 +16,6 @@
   flex: 1;
   display: flex;
   flex-direction: column;
-  z-index: 999;
   pointer-events: none;
 }
 
@@ -73,6 +72,34 @@
   position: absolute;
   transform-origin: 0rpx 0rpx 0rpx;
 }
+
+.pageindex .sai_duan .unbattle7 {
+  width: 197rpx;
+  height: 162rpx;
+  opacity: 1;
+  left: 366rpx;
+  top: 26rpx;
+  position: absolute;
+  transform-origin: 0rpx 0rpx 0rpx;
+}
+.pageindex .sai_duan .unbattle5 {
+  width: 197rpx;
+  height: 162rpx;
+  opacity: 1;
+  left: 185rpx;
+  top: 26rpx;
+  position: absolute;
+  transform-origin: 0rpx 0rpx 0rpx;
+}
+.pageindex .sai_duan .unbattle3 {
+  width: 197rpx;
+  height: 162rpx;
+  opacity: 1;
+  top: 26rpx;
+  position: absolute;
+  transform-origin: 0rpx 0rpx 0rpx;
+}
+
 .pageindex .pkbtn {
   width: 562rpx;
   height: 112rpx;

taobao_jn/client/pages/pagepageindex/pagepageindex.axml

@@ -2,24 +2,28 @@
         <image class="bg " src={{resList['3ee62d6c-3e44-470b-b2a5-fb805ec6a6c3'].url}} />
 
         <view class="sai_duan ">
-          <image class="battle7 " src={{resList['bc577ab5-4214-43b4-93ff-e9e24c9cec62'].url}} />
-          <image class="battle5 " src={{resList['64d76df1-a48b-4d97-9c94-07164242403f'].url}} />
-          <image class="battle3 " src={{resList['1b34bd2c-8a88-4a4a-9e9f-9cccc1ef0a97'].url}} />
+          <image class="battle7 " a:if="{{curGameStep<3}}" src={{resList['bc577ab5-4214-43b4-93ff-e9e24c9cec62'].url}} />
+          <image class="battle5 " a:if="{{curGameStep<2}}" src={{resList['64d76df1-a48b-4d97-9c94-07164242403f'].url}} />
+          <image class="battle3 " a:if="{{curGameStep==1}}" src={{resList['1b34bd2c-8a88-4a4a-9e9f-9cccc1ef0a97'].url}} />
+          
+          <image class="unbattle7 " a:if="{{curGameStep>=3}}" src={{resList['efcd4cc7-b279-466c-b0d1-c6d67fc39dda'].url}} />
+          <image class="unbattle5 " a:if="{{curGameStep>=2}}" src={{resList['837ea833-da23-46fd-ae6b-3d40489f5e19'].url}} />
+          <image class="unbattle3 " a:if="{{curGameStep>=1}}" src={{resList['1b34bd2c-8a88-4a4a-9e9f-9cccc1ef0a97'].url}} />
         </view>
         <image class="pkbtn " src={{resList['bf922d14-54e9-41d2-8c47-281963554715'].url}} />
         <image class="assisdebtn btn" onTap="openModal" data-item="inviteList" src={{resList['3ed92e80-21fa-4557-aaf1-92519d445f97'].url}} />
 
-        <image class="unlockbtn2 " src={{resList['b167ddb3-23b8-4290-ba90-196bbe63daba'].url}} />
-        <image class="lockbtn2 " src={{resList['62f291e9-e8c8-40f8-9d4d-a0445f085fdc'].url}} />
+        <image class="unlockbtn2 " a:if="{{curGameStep<2}}" src={{resList['b167ddb3-23b8-4290-ba90-196bbe63daba'].url}} />
+        <image class="lockbtn2 " a:if="{{curGameStep<2}}" src={{resList['62f291e9-e8c8-40f8-9d4d-a0445f085fdc'].url}} />
 
-        <image class="unlockbtn3 " src={{resList['b167ddb3-23b8-4290-ba90-196bbe63daba'].url}} />
-        <image class="lockbtn3 " src={{resList['62f291e9-e8c8-40f8-9d4d-a0445f085fdc'].url}} />
+        <image class="unlockbtn3 " a:if="{{curGameStep<3}}" src={{resList['b167ddb3-23b8-4290-ba90-196bbe63daba'].url}} />
+        <image class="lockbtn3 " a:if="{{curGameStep<3}}" src={{resList['62f291e9-e8c8-40f8-9d4d-a0445f085fdc'].url}} />
 
         <view class="wen_zi2 ">
-          <label class="superise ">赢XXX元惊喜礼包</label>
+          <label class="superise ">赢4999元惊喜礼包</label>
           <view class="lei_ji_sheng_chang ">
-            <label class="curtemp ">当前温暖值：0</label>
-            <label class="currank ">排名位于第 500+位</label>
+            <label class="curtemp ">当前温暖值：{{curWarms}}</label>
+            <label class="currank ">排名位于第 {{curRank}}位</label>
           </view>
         </view>
         <image class="rankbtn btn" onTap="navigateTo" data-item="pagepagerank" src={{resList['c57b33fc-8a26-4f7c-9a62-d0d16cae3406'].url}} />
@@ -32,5 +36,8 @@
 </view>
       <view class="popcontainer" a:if="{{modalStatus}}">
       <rule-modal a:if="{{modalStatus==1}}" onCloseModal="closeModal"></rule-modal>
+      
+      </view>
+      <view class="popcontainer_down" a:if="{{modalStatus}}">
       <invitelist-modal a:if="{{modalStatus==2}}" onCloseModal="closeModal"></invitelist-modal>
       </view>

taobao_jn/client/pages/pagepageindex/pagepageindex.js

@@ -23,7 +23,16 @@ const fireSrc = "cloud://7C78D5F72134804930A61B03665091AF//fire.svga"
 
 Page({
     data: {
-        modalStatus: 0
+        /**弹窗状态 */
+        modalStatus: 0,
+        /**当前温暖值 */
+        curWarms:'',
+        /**当前排名 */
+        curRank:'',
+        /**当前游戏阶段 */
+        curGameStep:1,
+        /**活动结束后排行榜奖励信息 */
+        rankPrize:{}
     },
 
     onLoad(props) {
@@ -126,7 +135,8 @@ Page({
             } = userInfo;
             app.nickName = nickName;
             app.avatar = avatar;
-            this.login();
+            this.judgeDoHelp();
+            // this.login();
         }
     },
     /**
@@ -147,10 +157,30 @@ Page({
         }) || {};
 
         if (success) {
-            // this.init();
+            this.judgeDoHelp();
         }
     },
-
+    /**判断是否是助力 */
+    judgeDoHelp(){
+        this.updateGameInfo();
+    },
+    /**更新游戏信息 */
+    async updateGameInfo(){
+        my.showLoading();
+        const {success,data} = await API.getGameInfo().catch(r=>{
+            my.hideLoading();
+            commonToast(r&&r.message);
+        })||{};
+        if(success){
+            this.setData({
+                curWarms:data.warms+'',
+                curRank:data.rank,
+                curGameStep:data.step
+            })
+            my.hideLoading();
+        }
+        
+    },
     /**打开弹窗 */
     openModal(e) {
         console.log(e);

taobao_jn/client/pages/pagepagerank/pagepagerank.acss

@@ -47,31 +47,33 @@
   width: 155rpx;
   height: 20rpx;
   opacity: 0.61960784;
-  left: 145rpx;
+  left: 150rpx;
+  top: -13rpx;
   position: absolute;
   transform-origin: 0rpx 0rpx 0rpx;
-  font-size: 24rpx;
+  font-size: 28rpx;
   color: #000000;
 }
 .pagerank .ranktex .myrank .ranktemp {
   width: 13rpx;
   height: 19rpx;
   opacity: 0.61960784;
-  left: 421rpx;
-  top: 1rpx;
+  left: 426rpx;
+  top: -10rpx;
   position: absolute;
   transform-origin: 0rpx 0rpx 0rpx;
-  font-size: 24rpx;
+  font-size: 28rpx;
   color: #000000;
 }
 .pagerank .ranktex .myrank .rank {
   width: 38rpx;
   height: 19rpx;
   opacity: 0.61960784;
-  top: 1rpx;
+  left: 5rpx;
+  top: -11rpx;
   position: absolute;
   transform-origin: 0rpx 0rpx 0rpx;
-  font-size: 24rpx;
+  font-size: 28rpx;
   color: #000000;
 }
 .pagerank .ranktex .bang_dan_xin_xi {
@@ -112,6 +114,65 @@
   font-size: 30rpx;
   color: #000000;
 }
+.pagerank .ranktex .rankList {
+    width: 596rpx;
+    height: 574rpx;
+    opacity: 1;
+    left: 4rpx;
+    top: 268rpx;
+    position: absolute;
+    transform-origin: 0px 0px 0px;
+    overflow: scroll
+}
+.pagerank .ranktex .rankList .rankItem {
+    width: 596rpx;
+    height: 40rpx;
+    opacity: 1;
+    top: 20rpx;
+    margin: 0 auto 24rpx;
+    position: relative;
+    transform-origin: 0px 0px 0px;
+}
+.pagerank .ranktex .rankList .rankItem .itemrank{
+        width: 98rpx;
+        height: 40rpx;
+        opacity: 1;
+        display: block;
+        left: 16rpx;
+        top: 8rpx;
+        position: absolute;
+        font-size: 26rpx;
+        color: rgba(0, 0, 0, 1);
+        transform-origin: 0px 0px 0px;
+        text-align: center;
+}
+.pagerank .ranktex .rankList .rankItem .itemrankid{
+        width: 300rpx;
+        height: 40rpx;
+        opacity: 1;
+        display: block;
+        left: 108rpx;
+        top: 8rpx;
+        position: absolute;
+        font-size: 26rpx;
+        color: rgba(0, 0, 0, 1);
+        transform-origin: 0px 0px 0px;
+        text-align: center;
+}
+.pagerank .ranktex .rankList .rankItem .itemranktemp{
+        width: 150rpx;
+        height: 40rpx;
+        opacity: 1;
+        display: block;
+        left: 376rpx;
+        top: 8rpx;
+        position: absolute;
+        font-size: 26rpx;
+        color: rgba(0, 0, 0, 1);
+        transform-origin: 0px 0px 0px;
+        text-align: center;
+}
+
 .pagerank .ranktex .ranktit2 {
   width: 596rpx;
   height: 165rpx;

taobao_jn/client/pages/pagepagerank/pagepagerank.axml

@@ -3,15 +3,22 @@
         <image class="rankreturnbtn " src={{resList['071da23d-ca97-4979-91d1-533fe386eef7'].url}} />
         <view class="ranktex ">
           <view class="myrank ">
-            <label class="rankid ">tb235***1214</label>
-            <label class="ranktemp ">3</label>
-            <label class="rank ">150</label>
+            <label class="rankid ">{{myRankInfo.userNick}}</label>
+            <label class="ranktemp ">{{myRankInfo.warms}}</label>
+            <label class="rank ">{{myRank}}</label>
           </view>
           <view class="bang_dan_xin_xi ">
             <label class="tao_baoid ">淘宝id</label>
-            <label class="lei_ji_ji_bai_ren_shu ">累计击败人数</label>
+            <label class="lei_ji_ji_bai_ren_shu ">累计温暖值</label>
             <label class="pai_ming ">排名</label>
           </view>
+          <view class="rankList">
+            <view class="rankItem" a:for="{{rankList}}">
+                <label class="itemrankid ">{{item.userNick}}</label>
+                <label class="itemranktemp ">{{item.warms}}</label>
+                <label class="itemrank ">{{item.rank}}</label>
+            </view>
+        </view>
           <view class="ranktit2 ">
             <label class="ranktit4 ">抱团取暖冲榜赢大奖</label>
             <label class="ranktit3 ">赢取清空购物车终极大奖</label>

taobao_jn/client/pages/pagepagerank/pagepagerank.js

 'use strict';
 
+import API from '../../api';
 import resList from '../../resconfig/resList'; //import API from '../../api';
-
+const app = getApp();
+const {
+    tbcc
+} = app;
+const {
+    commonToast,
+    getAuthUserInfo,
+    navigateToOutside,
+    getSystemInfo
+} = tbcc.tb;
 Page({
-  data: {},
+  data: {
+      rankList:[],
+      myRankInfo:{},
+      myRank:''
+  },
 
   onLoad(props) {
     this.setData({
       resList: resList
     });
+    my.showLoading();
+    this.getRankList();
+  },
+
+  async getRankList(){
+    const {success,data} = await API.getUserRankList().catch(r=>{
+        my.hideLoading();
+        commonToast(r&&r.message);
+    })||{};
+    if(success){
+        my.hideLoading();
+        let myrank = data.myRankInfo.rank>=500?'500+':data.myRankInfo.rank;
+        this.setData({
+            rankList:data.list,
+            myRankInfo:data.myRankInfo,
+            myRank:myrank
+        })
+    }
   }
 
 });
\ No newline at end of file

taobao_jn/mocks/jn.getGameInfo.json

+{
+    "code": -63977959.54748182,
+    "success": true,
+    "data": {
+        "warms": 59,
+        "rank": "60",
+        "winTimes": 22180029.681882724,
+        "step": 2,
+        "openId": -56636935.38550403,
+        "rankPrize": {
+            "name": "reprehenderit voluptate dolore Lorem pariatur",
+            "type": "ipsum velit",
+            "image": "Lorem irure sed"
+        }
+    }
+}
\ No newline at end of file

taobao_jn/mocks/jn.getInviteList.json

+{
+    "code": 49007093.447030544,
+    "success": true,
+    "data": {
+        "total": -83737725.21260352,
+        "currentPage": 82193661.53663245,
+        "totalPage": -12361727.86125888,
+        "list": [
+            {
+                "userNick": "1111",
+                "createTime": "1602482660574"
+            },
+            {
+                "userNick": "2222",
+                "createTime": "1602485660574"
+            },
+            {
+                "userNick": "3333",
+                "createTime": "1602482660574"
+            },
+            {
+                "userNick": "44444444",
+                "createTime": "1602482660574"
+            },
+            {
+                "userNick": "5555555555",
+                "createTime": "1602482660574"
+            },
+            {
+                "userNick": "2222",
+                "createTime": "1602485660574"
+            },
+            {
+                "userNick": "3333",
+                "createTime": "1602482660574"
+            },
+            {
+                "userNick": "44444444",
+                "createTime": "1602482660574"
+            },
+            {
+                "userNick": "5555555555",
+                "createTime": "1602482660574"
+            },
+            {
+                "userNick": "2222",
+                "createTime": "1602485660574"
+            },
+            {
+                "userNick": "3333",
+                "createTime": "1602482660574"
+            },
+            {
+                "userNick": "44444444",
+                "createTime": "1602482660574"
+            },
+            {
+                "userNick": "5555555555",
+                "createTime": "1602482660574"
+            },
+            {
+                "userNick": "3333",
+                "createTime": "1602482660574"
+            },
+            {
+                "userNick": "44444444",
+                "createTime": "1602482660574"
+            },
+            {
+                "userNick": "5555555555",
+                "createTime": "1602482660574"
+            }
+        ]
+    }
+}
\ No newline at end of file

taobao_jn/mocks/jn.getUserRankList.json

+{
+    "code": 51865280.00561252,
+    "success": true,
+    "data": {
+        "myRankInfo": {
+            "rank": "560",
+            "warms": "1",
+            "userNick": "caoxingru12"
+        },
+        "list": [
+            {
+                "openId": "111111",
+                "userNick": "111111",
+                "avatar": "1111",
+                "warms": 100,
+                "rank": 1
+            },
+            {
+                "openId": "111111",
+                "userNick": "2222",
+                "avatar": "1111",
+                "warms": 99,
+                "rank": 2
+            },
+            {
+                "openId": "111111",
+                "userNick": "2222",
+                "avatar": "1111",
+                "warms": 99,
+                "rank": 2
+            },
+            {
+                "openId": "111111",
+                "userNick": "2222",
+                "avatar": "1111",
+                "warms": 99,
+                "rank": 2
+            },
+            {
+                "openId": "111111",
+                "userNick": "2222",
+                "avatar": "1111",
+                "warms": 99,
+                "rank": 2
+            },
+            {
+                "openId": "111111",
+                "userNick": "2222",
+                "avatar": "1111",
+                "warms": 99,
+                "rank": 2
+            },
+            {
+                "openId": "111111",
+                "userNick": "2222",
+                "avatar": "1111",
+                "warms": 99,
+                "rank": 2
+            },
+            {
+                "openId": "111111",
+                "userNick": "2222",
+                "avatar": "1111",
+                "warms": 99,
+                "rank": 2
+            },
+            {
+                "openId": "111111",
+                "userNick": "2222",
+                "avatar": "1111",
+                "warms": 99,
+                "rank": 2
+            },
+            {
+                "openId": "111111",
+                "userNick": "2222",
+                "avatar": "1111",
+                "warms": 99,
+                "rank": 2
+            },
+            {
+                "openId": "111111",
+                "userNick": "2222",
+                "avatar": "1111",
+                "warms": 99,
+                "rank": 2
+            }
+        ]
+    }
+}
\ No newline at end of file

taobao_jn/mocks/tmallCat.doFollowTask.json

-{
-    "success": 1,
-    "data": {
-        "value": "500",
-        "backTime": "1989897768",
-        "serverTime": "188888776"
-    },
-    "message":"fuck"
-}
\ No newline at end of file

taobao_jn/mocks/tmallCat.doSignTask.json

-{
-    "success": false,
-    "data": {
-        "value": "500",
-        "backTime": "1989897768",
-        "serverTime": "188888776"
-    },
-    "message":"fuck"
-}
\ No newline at end of file

taobao_jn/mocks/tmallCat.exchangeGood.json

-{
-  "success": 1,
-  "data": {
-    "channel": "aliqua sint fugiat non do",
-    "strategyCode": "anim",
-    "code": "amet",
-    "image": "ea nulla aute eu",
-    "name": "in",
-    "type": -27273675.128173023
-    
-  },
-  "code": "quis nostrud fugiat pariatur",
-  "message":"欢乐币不足"
-}
\ No newline at end of file

taobao_jn/mocks/tmallCat.getMyPrizeList.json

-{
-    "code": "000000",
-    "data": {
-        "list": [
-            {
-                "_id": "5f71d38a67f1375241ab6b2b",
-                "activityId": "5f7183e852bbded304b27d71",
-                "amount": 20000,
-                "amount_unit": "分",
-                "asac": "1A202010JWPLV3428VWIEP",
-                "can_win": true,
-                "code": "a66621ec7c434842bfe4d01082128f1d",
-                "createDay": "2020/09/28",
-                "createTime": 1601295242020,
-                "display_amount": "200",
-                "display_amount_unit": "元",
-                "display_start_fee": "2000",
-                "drawStatus": 1,
-                "effective_end": "2020-10-11 00:00:00",
-                "effective_start": "2020-08-24 00:00:00",
-                "effective_time_mode": "ABSOLUTE",
-                "ename": "",
-                "end_date": "2020-09-25 23:59:59",
-                "expiredTime": 1601628302000,
-                "feature": {
-                    "bcType": "B",
-                    "couponTag": "1002",
-                    "itemIds": "611952670190",
-                    "sellerId": "2838892713",
-                    "shopId": "150920153",
-                    "shopLogo": "/5a/f4/TB16vpHhER1BeNjy0FmSuv0wVXa.jpg",
-                    "shopName": "华为官方旗舰店",
-                    "shopSiteCategory": "3",
-                    "shopUrl": "//store.taobao.com/shop/view_shop.htm?shop_id=150920153",
-                    "spreadId": "4327893208",
-                    "templateCode": "15398721100",
-                    "title": "MatePro",
-                    "uuid": "1094cefe51a348698e6647f5e6ba4181"
-                },
-                "has_inventory": true,
-                "id": "5f71d38a67f1375241ab6b2b",
-                "image": "",
-                "material": {
-                    "SHORT_NAME": "华为MatePad Pro",
-                    "brandLogo": "T1bOKxFoFcXXb1upjX.jpg",
-                    "itemIDTianHe": "611952670190",
-                    "itemMainPicture": "O1CN01HHEnRU1KZ6mud3VjW_!!6000000001177-2-yinhe.png",
-                    "mamaCouponValue": "学生专享200元",
-                    "mamaShopItemurl": "https://detail.tmall.com/item.htm?spm=a1z10.1-b-s.w20163031-21766675787.18.10577597DWdOA0&id=611952670190&scene=taobao_shop&sku_properties=5919063:6536025"
-                },
-                "name": "fuckyou",
-                "openId": "AAHaNvjuAMaJc3uyPjfEGuv9",
-                "prizeDataType": 2,
-                "prizeId": "5f6c3e7d114fbbc8c98bffae",
-                "remark": "",
-                "send_life_cycle_state": "running",
-                "show_rules": {
-                    "show_rule_dto": [
-                        {
-                            "passed": true,
-                            "type": "WIN_LIMIT"
-                        }
-                    ]
-                },
-                "start_date": "2020-08-27 16:21:56",
-                "start_fee": 200000,
-                "strategyCode": "08c6f4e89c7b412792a2395fa3d0fd4a",
-                "test": false,
-                "title": "MatePro",
-                "type": 1,
-                "type_desc": "商品优惠券",
-                "updateTime": 1601295242020,
-                "userNick": "tb80525668"
-            },
-            {
-                "_id": "5f71d38852bbded304b3f8a3",
-                "activityId": "5f7183e852bbded304b27d71",
-                "createDay": "2020/09/28",
-                "createTime": 1601295240072,
-                "drawStatus": 1,
-                "ename": "",
-                "expiredTime": 1601628302000,
-                "id": "5f71d38852bbded304b3f8a3",
-                "image": "https://img.alicdn.com/imgextra/i2/2208492139886/O1CN01XlNdWj2Mtq8E9OEw1_!!2208492139886-2-miniprogram.png",
-                "name": "兑换奖励235",
-                "openId": "AAHaNvjuAMaJc3uyPjfEGuv9",
-                "prizeDataType": 2,
-                "prizeId": "5f6b09b39897b412b595a32b",
-                "remark": "",
-                "type": 3,
-                "updateTime": 1601295240072,
-                "userNick": "tb80525668"
-            },
-            {
-                "_id": "5f71d38567f1375241ab6b20",
-                "activityId": "5f7183e852bbded304b27d71",
-                "amount": 10000,
-                "amount_unit": "分",
-                "asac": "1A202010JWPLV3428VWIEP",
-                "can_win": true,
-                "code": "f8564ef50a86418b9226ce1d9bb6ace6",
-                "createDay": "2020/09/28",
-                "createTime": 1601295237953,
-                "display_amount": "100",
-                "display_amount_unit": "元",
-                "display_start_fee": "200",
-                "drawStatus": 1,
-                "effective_end": "2020-09-30 00:00:00",
-                "effective_start": "2020-08-28 00:00:00",
-                "effective_time_mode": "ABSOLUTE",
-                "ename": "",
-                "end_date": "2020-09-26 23:59:59",
-                "expiredTime": 1601628302000,
-                "feature": {
-                    "bcType": "B",
-                    "couponTag": "1002",
-                    "itemIds": "611439436633",
-                    "sellerId": "2838892713",
-                    "shopId": "150920153",
-                    "shopLogo": "/5a/f4/TB16vpHhER1BeNjy0FmSuv0wVXa.jpg",
-                    "shopName": "华为官方旗舰店",
-                    "shopSiteCategory": "3",
-                    "shopUrl": "//store.taobao.com/shop/view_shop.htm?shop_id=150920153",
-                    "spreadId": "4328244590",
-                    "templateCode": "15417747656",
-                    "title": "freebuds 3",
-                    "uuid": "ea9a79c0459640f8aeb94c24530e4141"
-                },
-                "has_inventory": true,
-                "id": "5f71d38567f1375241ab6b20",
-                "image": "",
-                "material": {
-                    "brandLogo": "T1bOKxFoFcXXb1upjX.jpg"
-                },
-                "name": "fuckyou3",
-                "openId": "AAHaNvjuAMaJc3uyPjfEGuv9",
-                "prizeDataType": 2,
-                "prizeId": "5f6c3e7d114fbbc8c98bffae",
-                "remark": "",
-                "send_life_cycle_state": "running",
-                "show_rules": {
-                    "show_rule_dto": [
-                        {
-                            "passed": true,
-                            "type": "WIN_LIMIT"
-                        }
-                    ]
-                },
-                "start_date": "2020-08-28 11:04:24",
-                "start_fee": 20000,
-                "strategyCode": "08c6f4e89c7b412792a2395fa3d0fd4a",
-                "test": false,
-                "title": "freebuds 3",
-                "type": 1,
-                "type_desc": "商品优惠券",
-                "updateTime": 1601295237953,
-                "userNick": "tb80525668"
-            },
-            {
-                "_id": "5f71d3849897b412b5a4fa47",
-                "activityId": "5f7183e852bbded304b27d71",
-                "asac": "1A202010JWPLV3428VWIEP",
-                "can_win": true,
-                "code": "7254115b0fcc4c77bdbb35ed658c1db2",
-                "createDay": "2020/09/28",
-                "createTime": 1601295236035,
-                "drawStatus": 1,
-                "effective_interval": 31,
-                "effective_time_mode": "RELATIVE",
-                "ename": "",
-                "end_date": "2020-12-23 23:59:59",
-                "expiredTime": 1601628302000,
-                "feature": {
-                    "couponTag": "49534003",
-                    "description": "酒店信用住立减券",
-                    "sellerId": "4064563648",
-                    "spreadId": "3465672059",
-                    "subActId": "34922",
-                    "templateCode": "3545184060",
-                    "title": "酒店信用住优惠券",
-                    "uuid": "6ff76ab7cf3c4002be6f64902e659322"
-                },
-                "has_inventory": true,
-                "id": "5f71d3849897b412b5a4fa47",
-                "image": "",
-                "interval_time_unit": "DAYS",
-                "material": {
-                    "benefitBigPic": "https://gw.alicdn.com/tfs/TB1aF67RFP7gK0jSZFjXXc5aXXa-895-703.png",
-                    "benefitSmallPic": "https://gw.alicdn.com/tfs/TB1aF67RFP7gK0jSZFjXXc5aXXa-895-703.png",
-                    "benefitUrl": "https://h5.m.taobao.com/trip/hotel/search/index.html?ttid=12zfb000000416"
-                },
-                "name": "fuckyou2",
-                "openId": "AAHaNvjuAMaJc3uyPjfEGuv9",
-                "prizeDataType": 2,
-                "prizeId": "5f6c3e7d114fbbc8c98bffae",
-                "remark": "",
-                "send_life_cycle_state": "running",
-                "show_rules": {
-                    "show_rule_dto": [
-                        {
-                            "passed": true,
-                            "type": "WIN_LIMIT"
-                        }
-                    ]
-                },
-                "start_date": "2020-07-15 15:45:12",
-                "strategyCode": "08c6f4e89c7b412792a2395fa3d0fd4a",
-                "test": false,
-                "title": "酒店最高减50元券",
-                "type": 1,
-                "type_desc": "飞猪资格券",
-                "updateTime": 1601295236035,
-                "userNick": "tb80525668"
-            }
-        ]
-    },
-    "message": "成功",
-    "success": true
-}
\ No newline at end of file

taobao_jn/mocks/tmallCat.getSence.json

-{
-    "success": true,
-    "message":"",
-    "data": {
-        "sence": 1,
-        "senceTips":["测试","测试"],
-        "senceGuide":{
-            "1":false,
-            "2":false,
-            "3":false,
-            "4":true
-        }
-    
-    }
-}
\ No newline at end of file

taobao_jn/mocks/tmallCat.getTaskList.json

-{
-    "code": "000000",
-    "data": [
-        {
-            "completeTimes": 0,
-            "rewards": 1,
-            "status": 2,
-            "taskRateType": 2,
-            "taskType": "sign",
-            "times": 1,
-            "title": "每日签到",
-            "todayCompleteTimes": 0,
-            "waitReceive": 0
-        },
-        {
-            "completeTimes": 0,
-            "rewards": 10,
-            "sellerId": "oooo",
-            "status": 1,
-            "taskRateType": 1,
-            "taskType": "follow",
-            "title": "关注店铺1"
-        },
-        {
-            "completeTimes": 0,
-            "rewards": 10,
-            "sellerId": "wwwww",
-            "status": 1,
-            "taskRateType": 1,
-            "taskType": "follow",
-            "title": "关注店铺2"
-        },
-        {
-            "completeTimes": 0,
-            "itemIds": "",
-            "rewards": "2",
-            "status": 1,
-            "taskRateType": 2,
-            "taskType": "browseGoods",
-            "times": 1,
-            "title": "浏览商品",
-            "todayCompleteTimes": 0,
-            "url": "http://www.taobao.com",
-            "waitReceive": 0
-        },
-        {
-            "completeTimes": 0,
-            "rewards": "1",
-            "status": 1,
-            "taskRateType": 1,
-            "taskType": "invites",
-            "times": 3,
-            "title": "邀请",
-            "todayCompleteTimes": 0,
-            "waitReceive": 0
-        }
-    ],
-    "message": "成功",
-    "success": true
-}
\ No newline at end of file

taobao_jn/mocks/tmallCat.getUserEnergy.json

-{
-    "success": true,
-    "data": 2000,
-    "code": "culpa eu Ut"
-}
\ No newline at end of file

taobao_jn/mocks/tmallCat.getUserInfo.json

-{
-    "success": true,
-    "message":"",
-    "data": {
-        "catType": 4,
-        "userNick": "Edwise",
-        "energy": 1000,
-        "happyCoin":1000,
-        "experience": 80,
-        "level": "1",
-        "avatar": "http://wwc.alicdn.com/avatar/getAvatar.do?userIdStr=vFHbMm8SPFPHPFRHPG7HPmPhvmgyPGPIP07-OF*eMmQT&width=80&height=80&type=sns",
-        "sence": 1,
-        "catName": "哈哈哈",
-        "senceTips":["1说话说话说话说话说话说话说话说话说话说话说话","2说话说话说话说话说话说话说话说话说话说话说话说话","3说话说话说话说话说话说话说话说话说话说话说话说话"],
-        "energyMax":2000,
-        "experienceMax":100,
-        "senceGuide":true
-    
-    }
-}
\ No newline at end of file

taobao_jn/mocks/tmallCat.interaction.json

-{
-    "success": true,
-    "data": {
-        "tips": "梳毛梳毛梳毛梳毛梳毛梳毛梳毛梳毛梳毛梳毛梳毛梳毛梳毛梳毛梳毛",
-        "isUpgrade": true,
-        "channel": "aliqua",
-        "strategyCode": "dolore",
-        "code": "et nostrud adipisicing",
-        "image": "occaecat aliquip",
-        "name": "officia et deserunt ut",
-        "type": 65894870.29773912
-    },
-    "code": "culpa eu Ut"
-}
\ No newline at end of file

taobao_jn/mocks/tmallCat.login.json

-{"success":true,"data":{"openId":"incididunt non"},"code":"dolor ex"}
\ No newline at end of file

taobao_jn/mocks/tmallCat.recallCat.json

-{
-    "success": true,
-    "data": {
-        "value": 100,
-        "type": 4,
-        "backType": 1,
-        "desc": "恭喜恭喜恭喜恭喜恭喜恭喜恭喜恭喜恭喜恭喜",
-        "tips": []
-    }
-}
\ No newline at end of file

taobao_jn/mocks/tmallCat.recallInfo.json

-{
-    "success": true,
-    "data": {
-        "value": "500",
-        "backTime": "1989897768",
-        "serverTime": "188888776"
-    }
-}
\ No newline at end of file

taobao_jn/mocks/tmallCat.receiveTaskRewards.json

-{
-    "success": 1,
-    "data": {
-        "energy": "500",
-        "times": "1989897768",
-        "serverTime": "188888776"
-    },
-    "message":"fuck"
-}
\ No newline at end of file

taobao_jn/mocks/tmallCat.recoverEnergy.json

-{
-    "success": true,
-    "data": null,
-    "code": "culpa eu Ut"
-}
\ No newline at end of file

taobao_jn/mocks/tmallCat.updateSenceGuide.json

-{
-    "success": true,
-    "data": null,
-    "code": "culpa eu Ut"
-}
\ No newline at end of file