Merge branch 'master' of http://118.190.145.217:3000/xiaojincai/wanzb_xcxv3 into master

pages/index/index.wxml

@@ -55,7 +55,7 @@
 <swiper class="banner-list" 	indicator-active-color='#FF5800'	indicator-color='rgba(255,255,255,.6)'  indicator-dots='{{true}}'>
         <block wx:for="{{banners}}" wx:key="*this">
           <swiper-item>
-            <navigator url="../detail/detail?id={{item.id}}"><image mode="widthFix" src="{{item.img}}"></image></navigator>
+            <navigator url="../detail/detail?id={{item.id}}"><image mode="aspectFill" src="{{item.img}}"></image></navigator>
             <view class="name">{{item.name}}</view>
           </swiper-item>
         </block>
@@ -124,13 +124,7 @@
   </view>
 </view>
 
-<view class="up-down-view" style="padding: 0 25rpx;">
-  <view class="today" wx:if='{{0}}'>
-    今日盈亏人数比 <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> -->
-    <text class="{{groups.today_win_lose_avg[0]=='-' ?'down':'up'}}" style="font-weight: 500;text-decoration: underline;" bind:tap="tapAvg">{{groups.today_win_lose_avg}}</text>
-  </view>
+<view class="up-down-view">
   <view class="up-title">
         {{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>

pages/index/index.wxss

@@ -180,7 +180,7 @@ image.number{
 }
 .article-title{
   font-size: 33rpx;
-  margin-bottom: 10rpx;
+  margin-bottom: 40rpx;
 }
 .article-title navigator{
   font-size: 30rpx;
@@ -667,12 +667,12 @@ scroll-view{
 .yk{
   display: flex;
   justify-content: space-between;
-  font-size: 20rpx;
+  font-size: 24rpx;
 }
 .week_name{
   width: 15%;
-  padding: 10px 0;
-  font-size: 24rpx;
+  padding: 12px 0;
+  font-size: 26rpx;
 }
 .week_total{
   width: 15%;
@@ -694,14 +694,14 @@ scroll-view{
   color: #fff;
 }
 .week_incom .down{
-  background-color: #E90001;
+  background-color: #07B20B;
   color: #fff !important;
 }
 .week_incom .up{
-  background-color: #07B20B;
+  background-color: #E90001;
   color: #fff !important;
 }
 .week_incom .none{
-  background-color: #d7d7d7;
+  background-color: #a3a3a3;
   /* color: #fff !important; */
 }

pages/today/today.wxml

@@ -52,7 +52,7 @@
           <text style="width: 70rpx;" class="{{item.money[0]=='-' ?'down':'up'}}">{{item.money}}</text>
         </view>
     </view>
-  <view wx:if='{{datas.today_record.today_stock.length>0&&datas.today_record.today_stock.length<9}}' class="container" style="height:400rpx;width: 70%;">
+  <view wx:if='{{datas.today_record.today_stock.length>0&&datas.today_record.today_stock.length<9}}' class="container" style="height:400rpx;width: 65%;">
     <ec-canvas id="mychart-dom-pie" canvas-id="mychart-pie" ec="{{ ec1 }}"></ec-canvas>
   </view>
   <view wx:if='{{datas.today_record.today_stock.length>8}}' class="container" style="height:550rpx;width: 65%;">
@@ -60,10 +60,8 @@
   </view>
 </view>
 
-<view class="title">持仓图<text class="des">（除持仓图外，欢迎选手上传买卖点神图）</text>
-  <navigator style="font-size: 24rpx;text-decoration: underline;color: #333;" url="../winloseRank/winloseRank?user_id={{user_id}}&match_id={{datas.match.id}}">
-  个股盈亏排名
-      <image class="more" mode="widthFix" src="../../images/right_icon.png">
+<view class="title">持仓图<text class="des"> 除持仓图外，欢迎选手上传买卖点神图</text>
+  <navigator style="font-size: 26rpx;text-decoration: underline;color: rgb(128, 128, 128);" url="../winloseRank/winloseRank?user_id={{user_id}}&match_id={{datas.match.id}}">个股盈亏排名<image class="more" mode="widthFix" src="../../images/right_icon.png">
       </image>
     </navigator>
 </view>
@@ -75,8 +73,7 @@
 <view wx:if='{{datas.records.length>1}}'>
   <view class="quxian">
     <label class="quxian_title">收益曲线</label>
-    <navigator class="match_info" url="../matchdetail/matchdetail?user_id={{user_id}}&match_id={{datas.match.id}}">本届完整赛况
-      <image class="more" mode="widthFix" src="../../images/right_icon.png">
+    <navigator class="match_info" url="../matchdetail/matchdetail?user_id={{user_id}}&match_id={{datas.match.id}}">本届完整赛况<image class="more" mode="widthFix" src="../../images/right_icon.png">
       </image>
     </navigator>
   </view>

pages/today/today.wxss

@@ -450,16 +450,18 @@ picker{
 }
 
 .match_info{
-  font-size: 28rpx;
+  font-size: 26rpx;
   position: absolute;
-  right: 24rpx;
+  right: 10rpx;
   top: 10rpx;
+  text-decoration: underline;
+  color: rgb(128, 128, 128);
 }
 
 .more{
   width: 32rpx;
   position: relative;
-  top: 5rpx;
+  top: 10rpx;
 }
 
 .calendar{