add follows date

pages/change/change.wxml

@@ -1,20 +1,21 @@
-<view class="item">
-    <label>今日净资产</label>
-    <input bindinput="todaychange" type='digit' placeholder-style="color:rgba(203, 203, 203, 1)"  placeholder="请填写"/>
-    <text class="note">(单位：万)</text>
-</view>
+
 
 <view class="item">
-    <label>今转出资金</label>
+    <label>今日转出资金</label>
     <input bindinput="outchange" type='digit' placeholder-style="color:rgba(203, 203, 203, 1)"  placeholder="请填写"/>
     <text class="note">(单位：万)</text>
 </view>
 <view class="item">
-    <label>今转入资金</label>
+    <label>今日转入资金</label>
     <input bindinput="inchange" type='digit' placeholder-style="color:rgba(203, 203, 203, 1)"   placeholder="请填写"/>
     <text class="note">(单位：万)</text>
 </view>
 <view class="item">
+    <label>今日进出后收盘净资产</label>
+    <input bindinput="todaychange" type='digit' placeholder-style="color:rgba(203, 203, 203, 1)"  placeholder="请填写"/>
+    <text class="note">(单位：万)</text>
+</view>
+<view class="item">
     <label>账户截图</label>
     <view class="stock_imgs" wx:if='{{today_stock_img}}'>
         <image  src="{{today_stock_img}}" bindtap="prview" data-src="{{today_stock_img}}"></image>
@@ -27,6 +28,10 @@
             上传图片
     </view>
 </view>
+<view class="item2">
+      <text style="margin: 0;">除权规则：入金比赛成绩稀释，出金保持成绩不变</text>
+</view>
+
 <button bindtap="trypost">确认除权后的成绩</button>
 
 <view wx:if="{{init_fund}}">
@@ -59,11 +64,9 @@
 
 </view>
 
-<view class="item2">
-      <text style="margin: 0;">除权规则：入金比赛成绩稀释，出金保持成绩不变</text>
-</view>
 
-<view class="item2">出金计算方法</view>
+
+<!-- <view class="item2">出金计算方法</view>
 <view class="item1">
       <text style="margin: 0;">今日收益：（今日净资产+出金-昨日净资产）/ 昨日净资产
 总收益：（今日净资产+出金-初始资金）/ 初始资金
@@ -77,4 +80,4 @@
 总收益：（今日净资产-入金-初始资金）/ 初始资金+入金
 复权后的初始资产：初始资金+入金
 复权后的昨日资产：昨日净资金+入金</text>
-</view>
+</view> -->

pages/change/change.wxss

@@ -8,13 +8,14 @@ page{
 }
 .item label{
     font-size: 30rpx;
-    line-height: 88rpx;
-    width: 150rpx;
+    /* line-height: 88rpx; */
+    width: 200rpx;
     color: #333;
     margin-right: 30rpx;
+    margin-top: 20rpx;
 }
 .item input{
-    width: 40%;
+    width: 30%;
     height: 88rpx;
     border: 1px solid rgba(224, 224, 224, 1);
     border-radius: 8rpx;

pages/index/index.wxml

@@ -22,7 +22,9 @@
                   <image src="{{item.avatar}}" ></image>
                   <view class="msg">
                       <text class="name">{{item.username}}</text>
-                      <view>资产：{{item.today_fund}}w（总收益 <label class="{{item.total_income[0]=='-' ?'down':'up'}}">{{item.total_income}}</label>  |  今日收益 <label class="{{item.today_income[0]=='-' ?'down':'up'}}">{{item.today_income}}</label>）</view>
+                      <view>日期：{{item.stock_date}}（今日收益 <label class="{{item.today_income[0]=='-' ?'down':'up'}}">{{item.today_income}}</label>）
+                      </view>
+                      <view>资产：{{item.today_fund}}w（总收益 <label class="{{item.total_income[0]=='-' ?'down':'up'}}">{{item.total_income}}</label>｜胜率 {{item.win_rate}}）</view>
                   </view>
               </view>
               <view class="content" wx:if="{{item.experience}}">{{item.experience}}</view>

pages/login/user.wxml

@@ -46,7 +46,7 @@
             <image src="../../images/logo.png"></image>
     </view>
   <navigator url="../apply/apply?type=2"><image style="width: 24px;" mode="widthFix" src="../../images/bs.png"></image>  报名参赛(做选手)</navigator>
-  <navigator wx:if="{{player_type==0}}"  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="../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

@@ -8,7 +8,7 @@
   </picker>
   
 </view> -->
-<view  class="marquee_container" wx:if="{{info.signup_status==0}}">
+<view  class="marquee_container" wx:if="{{info.signup_status==1}}">
   <view class="zd"></view>
   <navigator hover-class="none" url="../apply/apply?type=2">
   <image src="../../images/lb.png" mode="widthFix" class="notice"></image>

pages/signup/signup.wxml

@@ -1,3 +1,6 @@
+<view class="money">报名费用 ¥<label wx:if='{{type==2}}'>{{info.player_price}}</label>
+  <label wx: wx:else>{{info.viewer_price}}</label>
+</view>
 <view class="item" wx:if='{{type==2}}'> 
    <label>比赛分组</label>
    <view class="tags"> 
@@ -30,4 +33,4 @@
           <view class="disabled" wx:else>{{text}}</view>
     </view>
 </view>
-<button bindtap="post">提交</button>
+<button bindtap="post">提交报名</button>

pages/signup/signup.wxss

@@ -2,6 +2,13 @@
 page{
   padding: 30rpx;
 }
+
+.money{
+  font-weight: 500;
+  margin-top: 50rpx;
+  margin-bottom: 30rpx;
+}
+
 .item{
   padding: 30rpx 0 0rpx;
   padding-left: 140rpx;

pages/upload/upload.wxml

@@ -1,7 +1,7 @@
 <form bindtap="blur">
     <view class="label" >持仓日期   {{stock_date}}</view>
     <view class="note">交作业时间:15:00-15:30</view>
-    <navigator wx:if="{{role == 2}}" class="change" url="../change/change">今日资金有出入？点此处申报</navigator>
+    <navigator wx:if="{{role == 2}}" class="change" url="../change/change">今日有出入金？必须先点此处申报</navigator>
     <view class="label">今日净资产<text class="note">(单位：万)</text>  </view>
     <input type='digit' value="{{today_fund}}" bindinput="fundChange1" placeholder="请输入今日净资产"></input>
     <text style="color:red;font-weight:500">万</text>