up

app.json

@@ -8,11 +8,12 @@
     "pages/gameDetail/gameDetail",
     "pages/game/game",
     "pages/day/day",
-    
+    "pages/list/list",
     "pages/rank/rank",
     
+    
     "pages/detail/detail",
-    "pages/list/list",
+    
     "pages/aboutus/aboutus"
   ],
   "window":{

pages/index/index.wxml

@@ -1,5 +1,5 @@
 <!--index.wxml-->
-  <view wx:if="{{datas.notices.length>0}}" class="marquee_container" style="--marqueeWidth--:-12em">
+  <view wx:if="{{datas.notices.length>0}}" class="marquee_container" style="--marqueeWidth--:-24em">
     <view class="zd"></view>
     <image src="../images/tttz.png" mode="widthFix"></image>
       <view class="marquee_text">

pages/index/index.wxss

@@ -141,7 +141,7 @@ ec-canvas {
 .marquee_text{
   color:#333;
   font-size: 28rpx;
-  display: inline-block;
+  display: flex;
   white-space: nowrap;
   animation-name: around;
   animation-duration: 10s;  /*过渡时间*/
@@ -149,7 +149,7 @@ ec-canvas {
   animation-timing-function:linear;
 }
 .marquee_text navigator{
-  margin-right: 200px;
+  margin-right: 20px;
 }
 .marquee_container image{
   width: 53px;

pages/list/list.js

@@ -7,13 +7,20 @@ Page({
    * 页面的初始数据
    */
   data: {
-
-  },
+    total:0,
+    page:1,
+    group:{},
+    list:[]
+  },  
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
+    // options.id=29
+    this.setData({
+      id: options.id 
+    })
     wx.showNavigationBarLoading()
     /**获取token */
     wx.getStorage({
@@ -22,7 +29,7 @@ Page({
         this.setData({
           userInfo: res.data
         })
-        this.getData(options.id);
+        this.getData();
       },
       fail: error => {
         //跳转到登陆页面
@@ -32,16 +39,36 @@ Page({
       }
     })
   },
-  getData(id) {
+  next: function () {
+    if (this.data.list.length < this.data.total) {
+      const page = this.data.page + 1
+      this.setData({
+        page: page
+      })
+      this.getData()
+    }
+  },
+  getData() {
+    const list = this.data.list;
     wx.request({
       url: host + '/api/wx/group/rank',
-      data: { id: id },
+      data: { 
+        id: this.data.id ,
+        page: this.data.page,
+        page_size:20
+      },
       header: {
         'Authorization': this.data.userInfo.token
       },
       success: res => {
+        const players = res.data.data.players;
+        for (let i = 0; i < players.length; i++) {
+          list.push(players[i])
+        }
         this.setData({
-          datas: res.data.data
+          group: res.data.data.group,
+          list:list,
+          total: res.data.data.total
         })
         wx.setNavigationBarTitle({
           title: res.data.data.group.name,

pages/list/list.wxml

@@ -2,18 +2,23 @@
     <text>排名</text><text>选手</text><text>初始资产</text>
     <text>今日资产</text><text>总盈亏</text>
 </view>
-<view class="list">
-    <navigator class="item" wx:for='{{datas.players}}'  url="../gameDetail/gameDetail?id={{item.match_id}}&record_id={{item.id}}">
-        <image wx:if='{{index==0}}' mode="widthFix" src="../images/1.png"></image>
-        <image wx:if='{{index==1}}' mode="widthFix" src="../images/2.png"></image>
-        <image wx:if='{{index==2}}' mode="widthFix" src="../images/3.png"></image>
-        <text style="width:36rpx;text-align:center;" wx:if='{{index>2}}'>{{index+1}}</text>
+<scroll-view scroll-y="true" class="list" bindscrolltolower='next'>
+    <navigator class="item" wx:for='{{list}}'  url="../gameDetail/gameDetail?id={{item.match_id}}&record_id={{item.id}}">
+        <image wx:if='{{item.group_rank==1}}' mode="widthFix" src="../images/1.png"></image>
+        <image wx:if='{{item.group_rank==2}}' mode="widthFix" src="../images/2.png"></image>
+        <image wx:if='{{item.group_rank==3}}' mode="widthFix" src="../images/3.png"></image>
+        <text style="width:36rpx;text-align:center;" wx:if='{{item.group_rank>3}}'>{{item.group_rank}}</text>
         <text class="name">{{item.username}}</text>
         <text>{{item.fund}}w</text>
         <text>{{item.today_fund}}w</text>
         <text  class="{{item.total_income[0]=='-'?'down':'up'}}">{{item.total_income}}</text>
     </navigator>
+    
+    <block wx:if='{{total >= 20}}'>
+                  <view class='more' wx:if='{{list.length < total}}'>上拉加载更多...</view>
+                  <!-- <view class='more' wx:else>已加载全部数据！</view> -->
+    </block>
     <view>
         <text class="note">点击选手，查看每日持股与交割单...</text>
     </view>
-</view>
+</scroll-view>

pages/list/list.wxss

@@ -11,6 +11,7 @@ page{
   margin-bottom: 20rpx;
   justify-content: space-between;
 }
+
 .item{
   display: flex;
   justify-content: space-between;
@@ -19,6 +20,8 @@ page{
 }
 .item text{
   color: #333;
+  width: 21%;
+  text-align: center;
 }
 .item .red{
   color: #FF5151;
@@ -36,8 +39,10 @@ page{
 }
 .list{
   background: #fff;
-  padding: 40rpx 0;
+  padding: 20rpx 0;
   margin-bottom: 20rpx;
+  height: calc(100vh - 120rpx);
+  box-sizing: border-box;
 }
 .list .note{
   font-size:22rpx;
@@ -61,9 +66,19 @@ page{
 .item text{
   display: block;
 }
-.name{
-  width: 112rpx;
+.item .name{
+  width: 25%;
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
+  text-align: left;
+  margin-left: 5%;
+}
+.item text:last-child{
+  text-align: right;
+}
+.more{
+  text-align:center;
+  color:#999;
+  padding:10rpx 0;
 }

pages/rank/rank.js

@@ -52,10 +52,7 @@ Page({
   getData() {
     wx.request({
       url: host + '/api/wx/group/rank/list',
-      data:{
-        page:1,
-        page_size:20
-      },
+      
       header: {
         'Authorization': this.data.userInfo.token
       },