index

pages/index/index.js

@@ -28,6 +28,7 @@ Page({
     articleList4:[],
     groups:{},
     role:0,
+    match_day:0,
   },
   onLoad() {
     wx.showNavigationBarLoading()
@@ -66,9 +67,12 @@ Page({
       })
     })
     $api.getWinList({new:1}).then(res=>{
+      let day = res.data.data[0].valid_dates.indexOf(res.data.data[0].date)
       this.setData({
-        winLost:res.data.data[0]
+        winLost:res.data.data[0],
+        match_day:day,
       })
+      
       $api.getWinLose({match_id:res.data.data[0].match_id}).then(res1=>{
           this.setData({
             groups:res1.data.data

pages/index/index.wxml

@@ -84,7 +84,7 @@
 
 <view class="up-down-view">
   <view class="up-title">
-        {{winLost.match_name}}
+        {{winLost.match_name}}<label wx:if="{{match_day >= 0}}">开赛第{{match_day}}天</label>
         <navigator url="../winlost/winlost">历届<image class="more-image" mode="widthFix" src="../../images/right_icon.png"></image></navigator>
   </view>
   <scroll-view style="height: 200rpx;" scroll-x='{{true}}' wx:if='{{groups}}'>
@@ -99,8 +99,8 @@
     </view>
   </scroll-view>
   <view class="today">
-    今日盈亏人数比 <text class="up">{{groups.win_cnt}}</text> : <text class="down">{{groups.lose_cnt}} </text>
-    今日人均收益(算数平均)  <text class="{{groups.today_win_lose_avg[0]=='-' ?'down':'up'}}">{{groups.today_win_lose_avg}}</text>
+    今日盈亏人数比 <text class="up" style="font-weight: 500;">{{groups.win_cnt}}</text> : <text class="down" style="font-weight: 500;">{{groups.lose_cnt}} </text>
+    今日人均收益(算数平均)  <text class="{{groups.today_win_lose_avg[0]=='-' ?'down':'up'}}" style="font-weight: 500;">{{groups.today_win_lose_avg}}</text>
   </view>
 
   <view class="tab">
@@ -110,7 +110,7 @@
 <swiper class="swiper-content" style="padding:0rpx 20rpx;height: 95vh;" current='{{cur1}}'  bindchange='curChange1'>
   <swiper-item class="up-down">
     <view class="title_1">
-      <text>涨幅</text><text>资产(w)</text><text>收益(w)</text>
+      <text>收益率</text><text>资产(w)</text><text>盈利(w)</text>
     </view>
     <navigator wx:for="{{winLost.total_income_up}}" hover-class="none"  url="../today/today?id={{item.match_id}}&record_id={{item.id}}&user_id={{item.user_id}}">
             <image wx:if="{{index<3}}" class="number" mode="widthFix" src="../../xiao/{{index+1}}.png"></image>
@@ -124,30 +124,29 @@
   </swiper-item>
   <swiper-item class="up-down">
     <view class="title_1">
-      <text>涨幅</text><text>资产(w)</text><text>收益(w)</text>
+      <text>盈利(w)</text><text>资产(w)</text><text>收益率</text>
     </view>
     <navigator wx:for="{{winLost.total_win_up}}" hover-class="none"  url="../today/today?id={{item.match_id}}&record_id={{item.id}}&user_id={{item.user_id}}">
             <image wx:if="{{index<3}}" class="number" mode="widthFix" src="../../xiao/{{index+1}}.png"></image>
             <text wx:else class="number">{{index+1}}</text>
             <text class="usm">{{item.username}}</text>
             
-            <text class="text up">{{ filters.toFix2(item.total_income*100)}}%</text>
-            <text class="text">{{item.today_fund}}</text>
             <text class="text up">{{filters.toFix2(item.today_fund - item.init_fund)}}</text>
+            <text class="text">{{item.today_fund}}</text>
+            <text class="text up">{{ filters.toFix2(item.total_income*100)}}%</text>
     </navigator>
   </swiper-item>
   <swiper-item class="up-down">
     <view class="title_1">
-      <text>涨幅</text><text>资产(w)</text><text>收益(w)</text>
+      <text>亏损(w)</text><text>资产(w)</text><text>收益率</text>
     </view>
     <navigator wx:for="{{winLost.total_win_down}}" hover-class="none"  url="../today/today?id={{item.match_id}}&record_id={{item.id}}&user_id={{item.user_id}}">
             <image wx:if="{{index<3}}" class="number" mode="widthFix" src="../../xiao/{{index+1}}.png"></image>
             <text wx:else class="number">{{index+1}}</text>
             <text class="usm">{{item.username}}</text>
-            
-            <text class="text down">{{ filters.toFix2(item.total_income*100)}}%</text>
-            <text class="text">{{item.today_fund}}</text>
             <text class="text down">{{filters.toFix2(item.today_fund - item.init_fund)}}</text>
+            <text class="text">{{item.today_fund}}</text>
+            <text class="text down">{{ filters.toFix2(item.total_income*100)}}%</text>
     </navigator>
   </swiper-item>
 </swiper>

pages/index/index.wxss

@@ -623,13 +623,13 @@ scroll-view{
   position: relative;
   z-index: 9;
   font-size: 28rpx;
-  font-weight: 400;
+  font-weight: 500;
 }
 .g_list view{
   position: relative;
   z-index: 9;
   font-size: 32rpx;
-  font-weight: 400;
+  font-weight: 500;
   margin-top: 10rpx;
 }
 .group_list image{

pages/winlost/winlost.js

@@ -8,7 +8,8 @@ Page({
    * 页面的初始数据
    */
   data: {
-    winLost:[]
+    winLost:[],
+    tabs1:['收益榜','盈利榜','亏损榜'],
   },
 
   /**
@@ -25,6 +26,13 @@ Page({
   pushToday(e){
     $push.pushToday(e.currentTarget.dataset)
   },
+  
+  tabChange1(e){
+    this.setData({
+      cur1:e.target.dataset.id
+    })
+},
+  
   /**
    * 生命周期函数--监听页面初次渲染完成
    */

pages/winlost/winlost.wxml

@@ -1,52 +1,56 @@
 <wxs module="filters" src="../../utils/toFixed.wxs" />
+
 <view class="up-down-view" wx:for="{{winLost}}" wx:for-item="list">
   <view class="up-title">
         {{list.match_name}}
   </view>
-  <scroll-view 	scroll-x='{{true}}' >
-    <view class="content-list">
-      <view class="up-down">
-        <text>盈利榜</text>
-        <navigator wx:for="{{list.total_income_up}}"   hover-class="none"  bind:tap="pushToday" data-match_id="{{item.match_id}}" data-record_id="{{item.id}}" data-user_id = "{{item.user_id}}">
-            <image wx:if="{{index<3}}" class="number" mode="widthFix" src="../../xiao/{{index+1}}.png"></image>
-            <text wx:else class="number">{{index+1}}</text>
-            <image class="avatar"   src="{{filters.defaultImg(item.avatar)}}"></image>
-            <text class="usm">{{item.username}}</text>
-            <text class="up">{{ filters.toFix2(item.total_income*100)}}%</text>
-        </navigator>
-      </view>
-      <view class="up-down">
-        <text>赚钱榜</text>
-        <navigator wx:for="{{list.total_win_up}}" hover-class="none"  bind:tap="pushToday" data-match_id="{{item.match_id}}" data-record_id="{{item.id}}" data-user_id = "{{item.user_id}}">
+  <view class="tab">
+    <view wx:for='{{tabs1}}' bindtap="tabChange1" data-id='{{index}}' class="{{index==cur1?'act':''}}">{{item}}</view>
+  </view>
+  <swiper class="swiper-content" style="padding:0rpx 20rpx;height: 85vh;" current='{{cur1}}'  bindchange='curChange1'>
+  <swiper-item class="up-down">
+    <view class="title_1">
+      <text>收益率</text><text>资产(w)</text><text>盈利(w)</text>
+    </view>
+    <navigator wx:for="{{list.total_income_up}}" hover-class="none"  url="../today/today?id={{item.match_id}}&record_id={{item.id}}&user_id={{item.user_id}}">
             <image wx:if="{{index<3}}" class="number" mode="widthFix" src="../../xiao/{{index+1}}.png"></image>
             <text wx:else class="number">{{index+1}}</text>
-            <image class="avatar"  src="{{filters.defaultImg(item.avatar)}}"></image>
             <text class="usm">{{item.username}}</text>
-            <text class="up">{{ filters.toFix2(item.total_win)}}w</text>
-        </navigator>
-      </view>
-      <view class="up-down">
-        <text>亏损榜</text>
-        <navigator wx:for="{{list.total_income_down}}" hover-class="none"  bind:tap="pushToday" data-match_id="{{item.match_id}}" data-record_id="{{item.id}}" data-user_id = "{{item.user_id}}">
+            
+            <text class="text up">{{ filters.toFix2(item.total_income*100)}}%</text>
+            <text class="text">{{item.today_fund}}</text>
+            <text class="text up">{{filters.toFix2(item.today_fund - item.init_fund)}}</text>
+    </navigator>
+  </swiper-item>
+  <swiper-item class="up-down">
+    <view class="title_1">
+      <text>盈利(w)</text><text>资产(w)</text><text>收益率</text>
+    </view>
+    <navigator wx:for="{{list.total_win_up}}" hover-class="none"  url="../today/today?id={{item.match_id}}&record_id={{item.id}}&user_id={{item.user_id}}">
             <image wx:if="{{index<3}}" class="number" mode="widthFix" src="../../xiao/{{index+1}}.png"></image>
             <text wx:else class="number">{{index+1}}</text>
-            <image class="avatar"   src="{{filters.defaultImg(item.avatar)}}"></image>
             <text class="usm">{{item.username}}</text>
-            <text class="down">{{ filters.toFix2(item.total_income*100)}}%</text>
-        </navigator>
-      </view>
-      <view class="up-down">
-        <text>亏钱榜</text>
-        <navigator wx:for="{{list.total_win_down}}" hover-class="none"  bind:tap="pushToday" data-match_id="{{item.match_id}}" data-record_id="{{item.id}}" data-user_id = "{{item.user_id}}">
+            
+            <text class="text up">{{filters.toFix2(item.today_fund - item.init_fund)}}</text>
+            <text class="text">{{item.today_fund}}</text>
+            <text class="text up">{{ filters.toFix2(item.total_income*100)}}%</text>
+    </navigator>
+  </swiper-item>
+  <swiper-item class="up-down">
+    <view class="title_1">
+      <text>亏损(w)</text><text>资产(w)</text><text>收益率</text>
+    </view>
+    <navigator wx:for="{{list.total_win_down}}" hover-class="none"  url="../today/today?id={{item.match_id}}&record_id={{item.id}}&user_id={{item.user_id}}">
             <image wx:if="{{index<3}}" class="number" mode="widthFix" src="../../xiao/{{index+1}}.png"></image>
             <text wx:else class="number">{{index+1}}</text>
-            <image class="avatar"   src="{{filters.defaultImg(item.avatar)}}"></image>
             <text class="usm">{{item.username}}</text>
-            <text class="down">{{ filters.toFix2(item.total_win)}}w</text>
-        </navigator>
-      </view>
-    </view>
-  </scroll-view>
+            <text class="text down">{{filters.toFix2(item.today_fund - item.init_fund)}}</text>
+            <text class="text">{{item.today_fund}}</text>
+            <text class="text down">{{ filters.toFix2(item.total_income*100)}}%</text>
+    </navigator>
+  </swiper-item>
+</swiper>
+
 </view>
 <view wx:if="{{winLost.length>0}}" class="end">~END~</view>
 <view style="margin-top: 100rpx;" wx:else class="end">~正在加载~</view>

pages/winlost/winlost.wxss

@@ -27,44 +27,77 @@ image.number{
   margin-right: 15rpx;
   margin-left: 10rpx;
 }
+
+.end{
+  text-align: center;
+  color: #999;
+  line-height: 50rpx;
+  font-size: 28rpx;
+}
+
+.tab{
+  background: #fff;
+  margin-top: 16rpx;
+  padding:0 20rpx;
+  display: flex;
+  border-bottom: 1px solid #f2f2f2;
+  
+}
+.tab view{
+  font-size: 32rpx;
+  color: #333;
+  line-height: 80rpx;
+  transition: all .1s linear;
+  margin-right: 30rpx;
+}
+.tab .act{
+  color: #FF583D;
+  border-bottom: 2px solid #FF583D;
+  font-size: 32rpx;
+}
 .up-down{
-  width: 100vw;
+  width: 100%;
   margin-right: 20rpx;
 }
 .up-down>navigator{
-  padding: 20rpx 0;
+  padding: 6rpx 0;
   border-bottom: 1px solid #f2f2f2;
   display: flex;
   font-size: 30rpx;
 }
+.up-down .text{
+  width: 18%;
+  /* font-weight: 500; */
+  margin-left: 10rpx;
+}
+.up-down .down,.up-down .up{
+  width: 20%;
+}
 .up-down .usm{
-  width: 38%;
+  width: 40%;
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
   margin-left: 10rpx;
 }
-.up-title{
-  font-size: 33rpx;
-  padding-bottom: 20rpx;
-  
+.title_1{
+  text-align: right;
 }
-.up-title navigator{
-  float: right;
-  font-size: 30rpx;
+.title_1 text{
+  display: inline-block;
+  width: 18%;
+  font-size: 24rpx;
+  color: #999;
+  text-align: left;
+  /* margin-left: -5rpx; */
 }
+
 .up-down navigator text{
-  line-height: 50rpx;
+  line-height: 80rpx;
 }
 .up-down>text{
   color: rgb(128, 128, 128);
-  font-size: 28rpx;
+  font-size: 30rpx;
   margin-bottom: 10rpx;
   display: block;
-}
-.end{
-  text-align: center;
-  color: #999;
-  line-height: 50rpx;
-  font-size: 28rpx;
 }