index

pages/apply/apply.wxml

@@ -21,8 +21,8 @@
           <text>百万组：50W到300W</text>
           <text>十万组：10W到50W</text>
           <text>菜鸟组：10W以下</text>
-          <text>各组第一奖牛气冲天奖杯!各组前三奖比赛纪念衫两件。五组选手总收益率第一，奖华为mate60一部。五组选手总盈利金额第一，奖华为mate60一部。</text>
-          <text>产业链选手禁止参赛，一经多个观众投诉反应，经核实有一定嫌疑，将立刻取消参赛资格。</text>
+          <text>各组第一奖牛气冲天奖杯+茅台飞天53度一瓶</text>
+          
         </view>
         <view class="title title1">3、交作业</view>
         <view class="date">
@@ -41,7 +41,7 @@
           <text>免费参赛：在比赛券商开户参赛，可永久免报名费，佣金低-网速快-网上开户几分钟完成，可同时兼容同花顺-通达信，已开通创业板权限的可转签，具体操作请站内</text>
           <navigator url="../message/message"><text class="change" >咨询我们</text></navigator>
           <text>
-          未取得免费参赛资格的老选手：含（开户选手，历届小组第一，倒数第一，种子选手，腰斩选手），请直接站内联系客服授权登记。</text>
+          永久免费参赛选手：开户选手，种子选手，历届小组前三，倒数前三，腰斩选手（如还未授权免费请联系客服）</text>
         </view>
         <view class="title title1">6、退赛</view>
         <view class="date">

pages/index/index.wxml

@@ -99,102 +99,58 @@
     </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>
+    今日盈亏人数比 <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>
   </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;height: 100vh;" current='{{cur1}}'  bindchange='curChange1'>
+<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>
     </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}}">
+    <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>
+            <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>涨幅</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}}">
+    <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>
+            <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>涨幅</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}}">
+    <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">{{item.today_fund}}</text>
+            <text class="text down">{{filters.toFix2(item.today_fund - item.init_fund)}}</text>
     </navigator>
   </swiper-item>
 </swiper>
-  <scroll-view style="display: none;" 	scroll-x='{{true}}' >
-    <view class="content-list">
-      <view class="up-down">
-        <text>盈利榜</text>
-        <navigator wx:for="{{winLost.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="{{winLost.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}}">
-            <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="{{winLost.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}}">
-            <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="{{winLost.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}}">
-            <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>
 </view>
 
 <view class="up-down-view">

pages/index/index.wxss

@@ -108,14 +108,14 @@ image.number{
   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;
+  /* font-weight: 500; */
   margin-left: 10rpx;
 }
 .up-down .down,.up-down .up{
@@ -244,7 +244,7 @@ image.number{
   
 }
 .tab view{
-  font-size: 33rpx;
+  font-size: 32rpx;
   color: #333;
   line-height: 80rpx;
   transition: all .1s linear;
@@ -610,23 +610,27 @@ scroll-view{
 }
 .group_list{
   display: flex;
-  width: 1000rpx;
+  width: 1100rpx;
 }
 .g_list{
   position: relative;
   text-align: center;
-  padding: 20rpx 40rpx;
-  margin-right: 20rpx;
+  padding: 10rpx 40rpx;
+  margin-right: 15rpx;
 }
 .g_list text{
   display: block;
   position: relative;
   z-index: 9;
   font-size: 28rpx;
+  font-weight: 400;
 }
 .g_list view{
   position: relative;
   z-index: 9;
+  font-size: 32rpx;
+  font-weight: 400;
+  margin-top: 10rpx;
 }
 .group_list image{
   width: 100%;
@@ -636,10 +640,10 @@ scroll-view{
 }
 .g_list .fund{
   font-weight: bolder;
-  font-size: 30rpx;
+  font-size: 32rpx;
   margin: 5rpx 0;
 }
 .today{
   padding: 25rpx;
-  font-size: 24rpx;
+  font-size: 26rpx;
 }

pages/login/user.js

@@ -252,20 +252,20 @@ Page({
       })
       
       //老用户直接进入系统
-      // if(res.data.data.role != 0){
+      if(res.data.data.role != 0){
         app.globalData.follow = 1
         wx.switchTab({
           url: '../index/index',
         })
         
-        // return;
-      // }
+        return;
+      }
 
       //新用户选择报名
-      // _this.setData({
-      //   status:3,
-      //   player_type:0
-      // })
+      _this.setData({
+        status:3,
+        player_type:0
+      })
       
       wx.setNavigationBarTitle({
         title: '',

pages/login/user.wxml

@@ -41,12 +41,12 @@
 
 
 <view class="no_login" wx:if='{{status == 3}}'>
-  <view class="title">顽主杯实盘大赛VIP报名</view>
+  <view class="title">顽主杯实盘大赛报名</view>
     <view class='avatar'>
             <image src="../../images/logo.png"></image>
     </view>
-  <navigator url="../apply/apply?type=2"><image style="width: 24px;" mode="widthFix" src="../../images/bs.png"></image>报名参赛(选手VIP)</navigator>
-  <navigator  style="background: none;color:#D94B24;" url="../apply/apply?type=1"><image style="width: 24px;" mode="widthFix" src="../../images/yk.png"></image>报名观赛(游客VIP)</navigator>
+  <navigator url="../apply/apply?type=2"><image style="width: 24px;" mode="widthFix" src="../../images/bs.png"></image>报名选手(参赛)</navigator>
+  <navigator  style="background: none;color:#D94B24;" url="../apply/apply?type=1"><image style="width: 24px;" mode="widthFix" src="../../images/yk.png"></image>报名游客(观赛)</navigator>
   <navigator style="background: none;color:#D94B24;" url="../message/message"><image style="width: 18px;" mode="widthFix" src="../../images/zx.png"></image>  咨询顽主</navigator>
 </view>
 

pages/rank/rank.wxml

@@ -63,7 +63,8 @@
         <text  class="{{player.total_income[0]=='-'?'down':'up'}}">{{player.total_income}}</text>
     </navigator>
     <view style="padding:10rpx 30rpx;position: relative;">
-      <text class="note">日盈利<text class="up">5%</text>以上{{item.win_count}}人，日亏损<text class="down">5%</text>以上{{item.loss_count}}人</text>
+      <!-- <text class="note">日盈利<text class="up">5%</text>以上{{item.win_count}}人，日亏损<text class="down">5%</text>以上{{item.loss_count}}人</text> -->
+      <text class="note">总盈亏人数比 <text class="up">{{item.total_income_win}}</text> : <text class="down">{{item.total_income_lose}}</text>    今日盈亏人数比 <text class="up">{{item.today_income_win}}</text> : <text class="down">{{item.today_income_lose}}</text> 缺席率 {{item.out_rate}}</text>
       <!-- <navigator hover-class="none" url="../comment/comment?id={{item.id}}" class="assess">顽主点评</navigator> -->
         <!-- <text class="note">点击选手，查看每日持股与交割单...</text> -->
     </view>

pages/rank/rank.wxss

@@ -168,7 +168,7 @@ page{
   margin-bottom: 20rpx;
 }
 .list .note{
-  font-size:28rpx;
+  font-size:26rpx;
   padding-top: 30rpx;
   color:#666;
   display: block;

pages/stock/stock.wxml

@@ -89,8 +89,8 @@
             {{item.stock_name}}
             <text>持仓金额：{{filters.toFix2(item.total_fund)}}w</text>
           </view>
-        <view class="num" wx:if='{{type==1}}'> <text>{{item.count}}</text> 人持仓</view>
-        <view class="num" wx:else>清仓 <text>{{item.count}}</text> 人</view>
+        <view class="num"> <text>{{item.count}}</text> 人持仓</view>
+      
         </navigator>
         <block wx:if='{{total >= 20}}'>
                 <view class='loading' wx:if='{{list.length < total}}'>上拉加载更多...</view>
@@ -113,8 +113,7 @@
             {{item.stock_name}}
             <text>持仓金额：{{filters.toFix2(item.total_fund)}}w</text>
           </view>
-        <view class="num" wx:if='{{type==1}}'> <text>{{item.count}}</text> 人持仓</view>
-        <view class="num" wx:else>清仓 <text>{{item.count}}</text> 人</view>
+        <view class="num"> <text>{{item.count}}</text> 人持仓</view>
         </navigator>
     </scroll-view>
 </view>

utils/api.js

@@ -129,6 +129,12 @@ function initUser(){
         data: res.data.data,
       })
     }
+
+    if(res.data.data.role==0){
+      wx.navigateTo({
+        url: '../login/user?type=3&player_type='+res.data.data.player_type,
+      })
+    }
   })
 }