Merge branch 'master' of http://118.190.145.217:3000/xiaojincai/wanzb_xcxv2

pages/comment/comment.wxml

@@ -1,6 +1,6 @@
 <!--pages/comment/comment.wxml-->
 <scroll-view scroll-y='{{true}}' bindscrolltolower='next'>
-  <navigator class="list" wx:for='{{list}}' url="../today/today?id={{item.match_id}}&record_id={{item.id}}&player_id={{item.player_id}}">
+  <navigator hover-class="none" class="list" wx:for='{{list}}' url="../today/today?id={{item.match_id}}&record_id={{item.id}}&player_id={{item.player_id}}">
         <view class="name">{{item.username}}  <text>选手</text> <view>TOP <text>{{item.group_rank}}</text></view></view> 
         <view class="info">
                   日期： <view>{{item.stock_date}}（收益 <text  class="{{item.today_income[0]=='-' ?'down':'up'}}">{{item.today_income}}</text>）</view>

pages/day/day.wxml

@@ -1,6 +1,6 @@
 <scroll-view scroll-y='{{true}}' bindscrolltolower='next'>
   <view class="stock" wx:for='{{list}}'>
-  <navigator url="../record/record?id={{item.id}}" >
+  <navigator hover-class="none" url="../record/record?id={{item.id}}" >
     <view class="info">
       <view>{{item.stock_date}}（收益 <text  class="{{item.today_income[0]=='-' ?'down':'up'}}">{{item.today_income}}</text>）</view>
     </view>

pages/follow/follow.wxml

@@ -1,5 +1,5 @@
 <scroll-view  scroll-y='{{true}}' bindscrolltolower='next'>
-  <navigator class="follow" wx:for='{{list}}' url="../today/today?id={{item.match_id}}&record_id={{item.id}}&player_id={{item.player_id}}">
+  <navigator hover-class="none" class="follow" wx:for='{{list}}' url="../today/today?id={{item.match_id}}&record_id={{item.id}}&player_id={{item.player_id}}">
     <view class="name">{{item.username}}  <text>选手</text> 
     <view>TOP <text>{{item.group_rank}}</text></view></view> 
     <view class="info">

pages/games/games.wxml

@@ -1,11 +1,11 @@
-<navigator class="list">
+<navigator hover-class="none" class="list">
     <image mode="widthFix" src="../../images/jiangbei.png"></image>
     <view>
         第48届顽主杯实盘大赛
         <text>2021-10-11至2021-12-11</text>
     </view>
 </navigator>
-<navigator class="list">
+<navigator hover-class="none" class="list">
     <image mode="widthFix" src="../../images/jiangbei.png"></image>
     <view>
         第48届顽主杯实盘大赛

pages/index/index.wxml

@@ -4,7 +4,7 @@
     <view class="zd"></view>
     <image src="../../images/tttz.png" mode="widthFix"></image>
       <view class="marquee_text">
-        <navigator url="../detail/detail?id={{item.id}}" wx:for="{{notices}}">{{item.name}}</navigator>
+        <navigator hover-class="none" url="../detail/detail?id={{item.id}}" wx:for="{{notices}}">{{item.name}}</navigator>
       </view>
   </view>
 
@@ -17,7 +17,7 @@
       <scroll-view   upper-threshold="0" bindscrolltoupper='fresh' scroll-y='{{true}}' bindscrolltolower='next'>
           <view wx:if='{{loading}}' class="loading">下拉刷新</view>
           <view  class="item1" wx:for='{{followList}}'>
-            <navigator  url="../today/today?id={{item.match_id}}&record_id={{item.id}}&player_id={{item.player_id}}">
+            <navigator hover-class="none"  url="../today/today?id={{item.match_id}}&record_id={{item.id}}&player_id={{item.player_id}}">
               <view class="name">{{item.username}}  <text wx:if='{{item.badge}}'>{{item.badge}}</text> 
               <view>TOP <text>{{item.group_rank}}</text></view></view> 
               <view class="info">
@@ -63,25 +63,25 @@
               </picker>
               <view class="hot">
                     <view class="tab1">热门持仓</view>
-                    <navigator url="../stock/stock?id={{item.id}}&date={{date}}" class="gp" wx:for='{{hotbuyList}}' wx:if='{{index<3}}'>
+                    <navigator hover-class="none" url="../stock/stock?id={{item.id}}&date={{date}}" class="gp" wx:for='{{hotbuyList}}' wx:if='{{index<3}}'>
                         <image wx:if='{{index==0}}' mode="widthFix" src="../../images/1.png"></image>
                         <image wx:if='{{index==1}}' mode="widthFix" src="../../images/2.png"></image>
                         <image wx:if='{{index==2}}' mode="widthFix" src="../../images/3.png"></image>
                         <view class="gp-name">{{item.stock_name}}</view>
                         <view class="num">持仓 <text>{{item.count}}</text> 人</view>
                     </navigator>
-                    <navigator url="../stock/stock?date={{date}}&type=1"  class="more">查看更多 <image mode="widthFix" src="../../images/right_icon.png"></image></navigator>
+                    <navigator hover-class="none" url="../stock/stock?date={{date}}&type=1"  class="more">查看更多 <image mode="widthFix" src="../../images/right_icon.png"></image></navigator>
               </view>
               <view class="hot">
                     <view class="tab2">热门清仓</view>
-                    <navigator url="../stock/stock?id={{item.id}}&date={{date}}&type=2" class="gp" wx:for='{{hotsellList}}' wx:if='{{index<3}}'>
+                    <navigator hover-class="none" url="../stock/stock?id={{item.id}}&date={{date}}&type=2" class="gp" wx:for='{{hotsellList}}' wx:if='{{index<3}}'>
                         <image wx:if='{{index==0}}' mode="widthFix" src="../../images/1.png"></image>
                         <image wx:if='{{index==1}}' mode="widthFix" src="../../images/2.png"></image>
                         <image wx:if='{{index==2}}' mode="widthFix" src="../../images/3.png"></image>
                         <view class="gp-name">{{item.stock_name}}</view>
                         <view class="num">清仓 <text>{{item.count}}</text> 人</view>
                     </navigator>
-                    <navigator  url="../stock/stock?date={{date}}&type=2" class="more">查看更多 <image mode="widthFix" src="../../images/right_icon.png"></image></navigator>
+                    <navigator hover-class="none"  url="../stock/stock?date={{date}}&type=2" class="more">查看更多 <image mode="widthFix" src="../../images/right_icon.png"></image></navigator>
               </view>
           </view>
       </scroll-view>
@@ -89,7 +89,7 @@
   <swiper-item>
       <scroll-view  scroll-y='{{true}}' bindscrolltolower='next3'>
           <view class="item3">
-             <navigator class="win" wx:for='{{hotFollowList}}' url="../today/today?id={{item.match_id}}&player_id={{item.id}}">
+             <navigator hover-class="none" class="win" wx:for='{{hotFollowList}}' url="../today/today?id={{item.match_id}}&player_id={{item.id}}">
                 <image wx:if='{{index==0}}' mode="widthFix" src="../../images/1.png"></image>
                 <image wx:if='{{index==1}}' mode="widthFix" src="../../images/2.png"></image>
                 <image wx:if='{{index==2}}' mode="widthFix" src="../../images/3.png"></image>
@@ -121,7 +121,7 @@
       <scroll-view  scroll-y='{{true}}' bindscrolltolower='next1'>
           <view class="item3">
           <view class="exp">释义:开赛以来选手单日收益为正天数占总天数比重,检验进攻稳定性</view>
-             <navigator class="win" wx:for='{{winList}}' url="../today/today?id={{item.match_id}}&player_id={{item.player_id}}">
+             <navigator hover-class="none" class="win" wx:for='{{winList}}' url="../today/today?id={{item.match_id}}&player_id={{item.player_id}}">
                 <image wx:if='{{index==0}}' mode="widthFix" src="../../images/1.png"></image>
                 <image wx:if='{{index==1}}' mode="widthFix" src="../../images/2.png"></image>
                 <image wx:if='{{index==2}}' mode="widthFix" src="../../images/3.png"></image>
@@ -153,7 +153,7 @@
       <scroll-view  scroll-y='{{true}}' bindscrolltolower='next2'>
           <view class="item4">
           <view class="exp">释义:开赛以来选手最大单日回撤,检验防守稳固性</view>
-            <navigator class="win" wx:for='{{defendList}}' url="../today/today?id={{item.match_id}}&player_id={{item.player_id}}">
+            <navigator hover-class="none" class="win" wx:for='{{defendList}}' url="../today/today?id={{item.match_id}}&player_id={{item.player_id}}">
                 <image wx:if='{{index==0}}' mode="widthFix" src="../../images/1.png"></image>
                 <image wx:if='{{index==1}}' mode="widthFix" src="../../images/2.png"></image>
                 <image wx:if='{{index==2}}' mode="widthFix" src="../../images/3.png"></image>
@@ -182,7 +182,7 @@
   </swiper-item>
   <swiper-item>
       <scroll-view  scroll-y='{{true}}'>
-          <navigator url="../detail/detail?id={{item.id}}" class="list" wx:for='{{championList}}'>
+          <navigator hover-class="none" url="../detail/detail?id={{item.id}}" class="list" wx:for='{{championList}}'>
              <view>
                 <view class="title">
                    {{item.name}}

pages/index/index.wxss

@@ -60,6 +60,7 @@ page{
   padding:0 25rpx;
   display: flex;
   justify-content: space-between;
+  
 }
 .tab view{
   font-size: 28rpx;
@@ -70,6 +71,7 @@ page{
 .tab .act{
   font-size: 38rpx;
   font-weight: 500;
+  line-height: 88rpx;
 }
 swiper{
   background: #fff;
@@ -90,7 +92,7 @@ scroll-view{
 }
 .name>text{
   color: #AAAAAA;
-  font-size: 22rpx;
+  font-size: 20rpx;
   border: 1px solid #AAAAAA;
   border-radius: 4rpx;
   font-weight: 400;
@@ -173,6 +175,8 @@ scroll-view{
 }
 .hot image{
   width: 54rpx;
+  position: relative;
+  top:3rpx;
 }
 .gp{
   display: flex;
@@ -183,13 +187,13 @@ scroll-view{
   font-weight: 500;
   font-size: 32rpx;
   width: 70%;
-  padding-left: 4rpx;
+  padding-left: 8rpx;
 }
 .num{
   font-size: 28rpx;
   color: #666;
   text-align: right;
-  width: 80%;
+  width: 200rpx;
 }
 .num text{
   font-size: 36rpx;
@@ -219,12 +223,12 @@ scroll-view{
 .win image{
   width: 50rpx;
   position: absolute;
-  top: 30rpx;
+  top: 33rpx;
   left: 0;
 }
 .win .rank{
   position: absolute;
-  top: 30rpx;
+  top: 32rpx;
   left: 0;
   width:50rpx;text-align:center;color:#CE994F;
 }

pages/list/list.wxml

@@ -18,7 +18,7 @@
     </view>
 </view>
 <scroll-view scroll-y="true" class="list" bindscrolltolower='next'>
-    <navigator class="item" wx:for='{{list}}'  url="../today/today?id={{item.match_id}}&record_id={{item.id}}&player_id={{item.player_id}}">
+    <navigator hover-class="none" class="item" wx:for='{{list}}'  url="../today/today?id={{item.match_id}}&record_id={{item.id}}&player_id={{item.player_id}}">
         <image wx:if='{{item.group_rank==1}}' mode="widthFix" src="../../images/1.png"></image>
         <image wx:if='{{item.group_rank==2}}' mode="widthFix" src="../../images/2.png"></image>
         <image wx:if='{{item.group_rank==3}}' mode="widthFix" src="../../images/3.png"></image>

pages/mymatch/mymatch.wxml

@@ -1,3 +1,3 @@
 <!--pages/mymatch/mymatch.wxml-->
-<navigator wx:for="{{list}}" url="../today/today?id={{item.id}}">{{item.name}}</navigator>
+<navigator hover-class="none" wx:for="{{list}}" url="../today/today?id={{item.id}}">{{item.name}}</navigator>
 <view wx:if="{{list.length<=0}}" class="not_data">-暂无数据-</view>

pages/rank/rank.wxml

@@ -1,5 +1,5 @@
 <!-- <view class="_top">
-  <navigator url="../search/search"><image class="search" mode="heightFix" src="../../images/ss.png"></image></navigator>
+  <navigator hover-class="none" url="../search/search"><image class="search" mode="heightFix" src="../../images/ss.png"></image></navigator>
   <picker mode="date" value="{{date}}"  bindchange="bindDateChange">
                 <view class="date-picker">
                    {{date}}
@@ -19,7 +19,7 @@
                    <!-- <image  mode="heightFix"  src="../../images/icon_rise@2x.png"></image> -->
                 </view>
     </picker>
-    <navigator class="search" url="../search/search"><image  mode="heightFix" src="../../images/ss2.png"></image></navigator>
+    <navigator hover-class="none" class="search" url="../search/search"><image  mode="heightFix" src="../../images/ss2.png"></image></navigator>
 </view>
 
 <view class="top">
@@ -29,11 +29,11 @@
 <view class="list" wx:for="{{datas.groups}}" >
     <view class="title">
         {{item.name}} <text>（{{item.players_num}}人）</text>
-        <navigator url="../list/list?id={{item.id}}&stock_date={{date}}">
+        <navigator hover-class="none" url="../list/list?id={{item.id}}&stock_date={{date}}">
           查看更多  <image mode="widthFix" src="../../images/right_icon.png"></image>
         </navigator>
     </view> 
-    <navigator class="item" wx:for='{{item.players}}' 
+    <navigator hover-class="none" class="item" wx:for='{{item.players}}' 
     wx:for-index='i' wx:for-item='player'  url="../today/today?id={{item.match_id}}&record_id={{player.id}}&player_id={{player.player_id}}">
         <image wx:if='{{i==0}}' mode="widthFix" src="../../images/1.png"></image>
         <image wx:if='{{i==1}}' mode="widthFix" src="../../images/2.png"></image>
@@ -45,7 +45,7 @@
     </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>
-      <navigator url="../comment/comment?id={{item.id}}" class="assess">顽主点评</navigator>
+      <navigator hover-class="none" url="../comment/comment?id={{item.id}}" class="assess">顽主点评</navigator>
         <!-- <text class="note">点击选手，查看每日持股与交割单...</text> -->
     </view>
 </view>

pages/search/search.wxml

@@ -27,7 +27,7 @@
   </picker>
 </view>
 <scroll-view scroll-y='{{true}}' bindscrolltolower='next'>
-  <navigator url="../today/today?id={{item.match_id}}&player_id={{item.id}}" class="player" wx:for='{{list}}'>
+  <navigator hover-class="none" url="../today/today?id={{item.match_id}}&player_id={{item.id}}" class="player" wx:for='{{list}}'>
     <view class="name">{{item.username}}  <text>{{item.badge}}</text></view>
     <view class="info" wx:if='{{item.style.length>0}}'>风格：
                 <label class="tag" wx:for='{{item.style}}' wx:for-item='i'>{{i}}</label>

pages/stock/stock.wxml

@@ -8,7 +8,7 @@
 <view wx:if='{{id}}'>
   <image wx:if='{{info.img}}' mode="withFix" src="{{info.img}}"></image>
   <view wx:if='{{info.desc}}' class="desc">{{info.desc}}</view>
-  <navigator class="player" wx:for='{{info.list}}' url="../today/today?id={{item.match_id}}&player_id={{item.player_id}}">
+  <navigator hover-class="none" class="player" wx:for='{{info.list}}' url="../today/today?id={{item.match_id}}&player_id={{item.player_id}}">
     <view class="name">{{item.username}}  <text>{{item.badge}}</text> 
     <view>TOP <text>{{item.group_rank}}</text></view></view> 
     <view class="info">
@@ -29,7 +29,7 @@
   </navigator>
 </view>
 <scroll-view wx:else scroll-y='{{true}}' bindscrolltolower='next'>
-    <navigator class="list" url="../stock/stock?id={{item.id}}&&date={{stock_date}}&type={{type}}" wx:for='{{list}}'>{{item.stock_name}}
+    <navigator hover-class="none" class="list" url="../stock/stock?id={{item.id}}&&date={{stock_date}}&type={{type}}" wx:for='{{list}}'>{{item.stock_name}}
     <view class="num" wx:if='{{type==1}}'>持仓 <text>{{item.count}}</text> 人</view>
     <view class="num" wx:else>清仓 <text>{{item.count}}</text> 人</view>
     </navigator>

pages/style/style.wxss

@@ -72,6 +72,8 @@ page{
 }
 .post_btn{
   margin: 100rpx 0 40rpx;
+  line-height: 88rpx;
+  padding: 0;
 }
 .item picker{
   display: inline-block;

pages/today/today.wxml

@@ -105,12 +105,12 @@
 
 <view class="days_stock">
   <view class="title">每日持股
-    <navigator url="../day/day?id={{id}}&player_id={{player_id}}">
+    <navigator hover-class="none" url="../day/day?id={{id}}&player_id={{player_id}}">
           查看更多  <image mode="widthFix" src="../../images/right_icon.png"></image>
     </navigator>
   </view>
   <view  class="stock" wx:for='{{stockList}}' wx:if="{{index<3}}">
-    <navigator>
+    <navigator hover-class="none">
       <view class="info">
         <view>{{item.stock_date}}（收益 <text  class="{{item.today_income[0]=='-' ?'down':'up'}}">{{item.today_income}}</text>）</view>
       </view>

pages/user/user.wxml

@@ -9,21 +9,21 @@
         </view>
       </view>
       <view style="padding:0 30rpx;background:#fff;">
-        <navigator  class="item" url="../style/style">
+        <navigator hover-class="none"  class="item" url="../style/style">
             我的风格  <image mode="widthFix" src="../../images/right_icon.png"></image>
         </navigator>
-        <navigator  class="item" url="../follow/follow">
+        <navigator hover-class="none"  class="item" url="../follow/follow">
             我的关注  <image mode="widthFix" src="../../images/right_icon.png"></image>
         </navigator>
-        <navigator  class="item" url="../mymatch/mymatch">
+        <navigator hover-class="none"  class="item" url="../mymatch/mymatch">
             我的比赛  <image mode="widthFix" src="../../images/right_icon.png"></image>
         </navigator>
-        <navigator style="border:none"  class="item" url="../aboutus/aboutus">
+        <navigator hover-class="none" style="border:none"  class="item" url="../aboutus/aboutus">
             关于我们  <image mode="widthFix" src="../../images/right_icon.png"></image>
         </navigator>
       </view>  
-      <navigator  class="item logout" bindtap="logout">
-            退出登陆  <image mode="widthFix" src="../../images/right_icon.png"></image>
+      <navigator hover-class="none"  class="item logout" bindtap="logout">
+            退出登录  <image mode="widthFix" src="../../images/right_icon.png"></image>
         </navigator> 
 </view>
 <!-- 未登录 -->