修改首页

pages/index/index.js

@@ -7,7 +7,9 @@ Page({
     loading:0,
     notices:[],
     tabs:['今日留言','我的关注'],
+    tabs1:['收益榜','盈利榜','亏损榜'],
     cur:0,
+    cur1:0,
     date:'2022-04-27',
     explist:[],   //留言
     total1:0,
@@ -21,7 +23,8 @@ Page({
     articleList1:[],
     articleList2:[],
     articleList3:[],
-    articleList4:[]
+    articleList4:[],
+    groups:{}
   },
   onLoad() {
     
@@ -56,6 +59,11 @@ Page({
       this.setData({
         winLost:res.data.data[0]
       })
+      $api.getWinLose({match_id:res.data.data[0].match_id}).then(res1=>{
+          this.setData({
+            groups:res1.data.data
+          })
+      })
     })
     $api.getBaikeRandom().then(res=>{
       this.setData({
@@ -149,6 +157,11 @@ Page({
       })
       this.renew()
   },
+  tabChange1(e){
+    this.setData({
+      cur1:e.target.dataset.id
+    })
+},
   //预览
   preview(e){
     wx.previewImage({
@@ -164,7 +177,13 @@ Page({
         this.renew()
     }
   },
-
+  curChange1(e){
+    if (e.detail.source == "touch"){
+        this.setData({
+          cur1: e.detail.current
+        })
+    }
+  },
 
 
   renew(){

pages/index/index.wxml

@@ -85,9 +85,73 @@
 <view class="up-down-view">
   <view class="up-title">
         {{winLost.match_name}}
-        <navigator url="../winlost/winlost">历届最高<image class="more-image" mode="widthFix" src="../../images/right_icon.png"></image></navigator>
+        <navigator url="../winlost/winlost">历届<image class="more-image" mode="widthFix" src="../../images/right_icon.png"></image></navigator>
   </view>
-  <scroll-view 	scroll-x='{{true}}' >
+  <scroll-view style="height: 200rpx;" scroll-x='{{true}}' wx:if='{{groups}}'>
+    <view class="group_list">
+      <view wx:for='{{groups.group_win_lose_list}}' class="g_list">
+        <image mode="widthFix" wx:if="{{item.today_income_avg[0]=='-'}}" src="../../images/indexlose@2x.png"></image>
+        <image mode="widthFix" wx:else src="../../images/indexwin@2x.png"></image>
+        <view>{{item.match_group_name}}</view>
+        <text class="fund {{item.today_income_avg[0]=='-' ?'down':'up'}}">{{item.today_fund}}</text>
+        <text class="{{item.today_income_avg[0]=='-' ?'down':'up'}}">{{item.today_income_avg}}</text>
+      </view>
+    </view>
+  </scroll-view>
+  <view class="today">
+    今日盈亏人数比 <text class="up">{{groups.win_cnt}}</text>:{{groups.lose_cnt}}
+    今日人均收益(算数平均) <text class="{{groups.today_win_lose_avg[0]=='-' ?'down':'up'}}">{{groups.today_win_lose_avg}}</text>
+  </view>
+
+  <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:10rpx 25rpx;" 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="{{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">{{item.today_fund}}</text>
+    </navigator>
+  </swiper-item>
+  <swiper-item class="up-down">
+    <view class="title_1">
+      <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>
+            <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">{{item.today_fund}}</text>
+    </navigator>
+  </swiper-item>
+  <swiper-item class="up-down">
+    <view class="title_1">
+      <text>涨幅</text><text>资产(w)</text><text>收益(w)</text>
+    </view>
+    <navigator wx:for="{{winLost.total_income_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">{{item.today_fund}}</text>
+    </navigator>
+  </swiper-item>
+</swiper>
+  <scroll-view style="display: none;" 	scroll-x='{{true}}' >
     <view class="content-list">
       <view class="up-down">
         <text>盈利榜</text>

pages/index/index.wxss

@@ -104,7 +104,7 @@ image.number{
   margin-left: 10rpx;
 }
 .up-down{
-  width: 100vw;
+  width: 100%;
   margin-right: 20rpx;
 }
 .up-down>navigator{
@@ -113,13 +113,32 @@ image.number{
   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;
 }
+.title_1{
+  text-align: right;
+}
+.title_1 text{
+  display: inline-block;
+  width: 18%;
+  font-size: 24rpx;
+  color: #999;
+  text-align: left;
+  /* margin-left: -5rpx; */
+}
 
 .up-title{
   font-size: 33rpx;
@@ -588,4 +607,39 @@ scroll-view{
   font-size: 26rpx;
   margin-top: 5rpx;
   font-weight: 400;
+}
+.group_list{
+  display: flex;
+  width: 1000rpx;
+}
+.g_list{
+  position: relative;
+  text-align: center;
+  padding: 20rpx 40rpx;
+  margin-right: 20rpx;
+}
+.g_list text{
+  display: block;
+  position: relative;
+  z-index: 9;
+  font-size: 28rpx;
+}
+.g_list view{
+  position: relative;
+  z-index: 9;
+}
+.group_list image{
+  width: 100%;
+  position: absolute;
+  left: 0;
+  top: 0;
+}
+.g_list .fund{
+  font-weight: bolder;
+  font-size: 30rpx;
+  margin: 5rpx 0;
+}
+.today{
+  padding: 25rpx;
+  font-size: 24rpx;
 }

utils/api.js

@@ -6,8 +6,8 @@ const DELETE = 'DELETE';
 // wxb299e10e65157301
 // wx2938132b773c7b5a
 // const baseURL = 'https://wx.scxjc.club';
-// const baseURL = 'https://test.hunanwanzhu.com';
-const baseURL = 'https://api.hunanwanzhu.com';
+const baseURL = 'https://test.hunanwanzhu.com';
+// const baseURL = 'https://api.hunanwanzhu.com';
 
 function request(method, url, data) {
   var token='';
@@ -172,7 +172,8 @@ const API = {
   blackUser: (data) => request(POST, `/api/wx/v3/user/black`, data),
   getNbcomments: (data) => request(GET, `/api/wx/v3/stock/nbcomments/list`, data),
   getStockNbcomments: (data) => request(GET, `/api/wx/v3/stock/comments/list`, data),
-  
+  getWinLose: (data) => request(GET, `/api/wx/v3/match/group/winlose/statistic`, data),
+ 
 }; 
 module.exports = {
   API: API