begmoon 1 year ago
parent
commit
a82f008b77

+ 1 - 1
app.json

@@ -53,7 +53,7 @@
         "pagePath": "pages/index/index",
         "iconPath": "images/home_0.png",
         "selectedIconPath": "images/home_1.png",
-        "text": "社区"
+        "text": "首页"
       },
       {
         "pagePath": "pages/rank/rank",

+ 1 - 1
pages/article/article.wxss

@@ -9,7 +9,7 @@ scroll-view{
   padding: 20rpx 0;
   border-bottom: 1px solid #f2f2f2;
   display: flex;
-  font-size: 26rpx;
+  font-size: 32rpx;
   position: relative;
 }
 .article-img{

+ 17 - 11
pages/baike/baike.wxss

@@ -18,7 +18,7 @@
 }
 .top_title text{
   display: block;
-  font-size: 25rpx;
+  font-size: 28rpx;
   color: #fff;
   font-weight: 400;
 }
@@ -33,7 +33,7 @@
   justify-content: space-between;
 }
 .tab view{
-  font-size: 28rpx;
+  font-size: 29rpx;
   color: #333;
   line-height: 80rpx;
   transition: all .1s linear;
@@ -65,7 +65,7 @@ scroll-view{
 }
 .list{
   color: #333;
-  font-size: 24rpx;
+  font-size: 32rpx;
   margin-bottom: 20rpx;
   padding: 0 20rpx 20rpx;
   font-weight: 500;
@@ -73,23 +73,29 @@ scroll-view{
 }
 .list text{
   margin-right: 10rpx;
+  font-size: 32rpx;
 }
 .info{
   display: flex;
   margin-top: 10rpx;
 }
 .info image{
-  width: 200rpx;
-  height: 200rpx;
+  width: 150rpx;
+  height: 150rpx;
   border-radius: 10rpx;
+  margin-top: 15rpx;
 }
 .info text{
   display: block;
-  width: 70%;
-  padding: 20rpx;
-  color: #666;
-  text-overflow: -o-ellipsis-lastline;
+  width: 85%;
+  padding-left: 20rpx;
+  padding-top: 10rpx;
+  /* padding: 20rpx; */
+  color: rgb(88, 88, 88);
+  /* text-overflow: -o-ellipsis-lastline; */
   overflow: hidden;text-overflow: ellipsis;display: -webkit-box;
   -webkit-line-clamp: 3;-webkit-box-orient: vertical;align-content: center;
-  height: 120rpx;
-}
+  height: 100%;
+  font-size: 30rpx;
+}
+

+ 26 - 19
pages/index/index.wxml

@@ -27,32 +27,32 @@
       短线百科
     </navigator>
     <navigator url="../todayExp/todayExp">
-      <image mode="widthFix" src="../../xiao/baike@2x.png"></image>
+      <image mode="widthFix" src="../../xiao/jrly@2x.png"></image>
       今日留言
     </navigator>
     <navigator url="../myfollow/myfollow">
-      <image mode="widthFix" src="../../xiao/baike@2x.png"></image>
+      <image mode="widthFix" src="../../xiao/wdgz@2x.png"></image>
       我的关注
     </navigator>
     <navigator url="../article/article?type=游资专场">
-      <image mode="widthFix" src="../../xiao/jcwz@2x.png"></image>
+      <image mode="widthFix" src="../../xiao/yzzc@2x.png"></image>
       游资专场
     </navigator>
     <navigator url="../article/article?type=冠军交割">
-      <image mode="widthFix" src="../../xiao/jcwz@2x.png"></image>
+      <image mode="widthFix" src="../../xiao/gjjg@2x.png"></image>
       冠军交割
     </navigator>
     <navigator url="../article/article?type=牛人专场">
-      <image mode="widthFix" src="../../xiao/jcwz@2x.png"></image>
+      <image mode="widthFix" src="../../xiao/nrzc@2x.png"></image>
       牛人专场
     </navigator>
     <navigator url="../article/article?type=妖股列传">
-      <image mode="widthFix" src="../../xiao/jcwz@2x.png"></image>
+      <image mode="widthFix" src="../../xiao/yglz@2x.png"></image>
       妖股列传
     </navigator>
 </view>
 
-<swiper class="banner-list" 	indicator-active-color='#FF583D'	indicator-color='rgba(255,255,255,.6)'  indicator-dots='{{true}}'>
+<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>
@@ -74,7 +74,7 @@
 <view class="up-down-view">
   <view class="up-title">
         {{winLost.match_name}}
-        <navigator url="../winlost/winlost">历届最高> </navigator>
+        <navigator url="../winlost/winlost">历届最高<image class="more-image" mode="widthFix" src="../../images/right_icon.png"></image></navigator>
   </view>
   <scroll-view 	scroll-x='{{true}}' >
     <view class="content-list">
@@ -126,28 +126,28 @@
   <scroll-view scroll-x='{{true}}'>
     <view class="content-list">
       <view class="up-down">
-        <view class="article-title"> <navigator url="../article/article?type=游资专场">more> </navigator>游资专场</view>
+        <view class="article-title"> <navigator url="../article/article?type=游资专场">more<image class="more-image" mode="widthFix" src="../../images/right_icon.png"></image></navigator>游资专场</view>
         <navigator wx:for="{{articleList1}}" wx:if="{{index<5}}" hover-class="none" url="../detail/detail?id={{item.id}}" >
           <text class="article-name">{{item.name}}</text>
           <image class="article-img" mode="aspectFill" src="{{item.img}}"></image>
         </navigator>
       </view>
       <view class="up-down">
-        <view class="article-title"> <navigator url="../article/article?type=冠军交割">more> </navigator>冠军交割</view>
+        <view class="article-title"> <navigator url="../article/article?type=冠军交割">more<image class="more-image" mode="widthFix" src="../../images/right_icon.png"></image></navigator>冠军交割</view>
         <navigator wx:for="{{articleList2}}" wx:if="{{index<5}}" hover-class="none" url="../detail/detail?id={{item.id}}" >
           <text class="article-name">{{item.name}}</text>
           <image class="article-img" mode="aspectFill" src="{{item.img}}"></image>
         </navigator>
       </view>
       <view class="up-down">
-        <view class="article-title"> <navigator url="../article/article?type=牛人专场">more> </navigator>牛人专场</view>
+        <view class="article-title"> <navigator url="../article/article?type=牛人专场">more<image class="more-image" mode="widthFix" src="../../images/right_icon.png"></image></navigator>牛人专场</view>
         <navigator wx:for="{{articleList3}}" wx:if="{{index<5}}" hover-class="none" url="../detail/detail?id={{item.id}}" >
           <text class="article-name">{{item.name}}</text>
           <image class="article-img" mode="aspectFill" src="{{item.img}}"></image>
         </navigator>
       </view>
       <view class="up-down">
-        <view class="article-title"> <navigator url="../article/article?type=妖股列传">more> </navigator>妖股列传</view>
+        <view class="article-title"> <navigator url="../article/article?type=妖股列传">more<image class="more-image" mode="widthFix" src="../../images/right_icon.png"></image></navigator>妖股列传</view>
         <navigator wx:for="{{articleList4}}" wx:if="{{index<5}}" hover-class="none" url="../detail/detail?id={{item.id}}" >
           <text class="article-name">{{item.name}}</text>
           <image class="article-img" mode="aspectFill" src="{{item.img}}"></image>
@@ -159,7 +159,7 @@
 
 
 <view class="baike">
-        <view class="article-title"> <navigator url="../baike/baike">more> </navigator>短线百科</view>
+        <view class="article-title"> <navigator url="../baike/baike">更多<image class="more-image" mode="widthFix" src="../../images/right_icon.png"></image></navigator>短线百科</view>
         <navigator wx:for="{{baikeList}}" class="baike-list" url="../detail/detail?id={{item.category_id}}&type=百科">
           <view>{{item.name}}</view>
           <view class="baike-info">
@@ -182,12 +182,17 @@
           <view  class="item1" wx:for='{{explist}}'>
             <navigator hover-class="none"  url="../today/today?id={{item.match_id}}&record_id={{item.id}}&user_id={{item.user_id}}">
               <view class="relist">
-                <image  src="{{filters.defaultImg(item.user_avatar)}}"></image>
+                <image  src="{{filters.defaultImg(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>
+                  <view class="msg">
+                      <text class="date">{{item.stock_date}}</text>
+                  </view>
+              </view>
+              <view class="item_money"><label class="item_money_title">资产 </label>{{item.today_fund}}w <label class="item_money_title"> 总收益 </label> <label class="{{item.total_income[0]=='-' ?'down':'up'}}">{{item.total_income}}</label>  <label class="item_money_title"> 今日收益 </label><label class="{{item.today_income[0]=='-' ?'down':'up'}}">{{item.today_income}}</label>
               </view>
+
               <view class="content" wx:if="{{item.experience}}">{{item.experience}}</view>
               <view class="recomment">
                   <image mode="widthFix" src="../../images/msg.png"></image>
@@ -208,13 +213,15 @@
           <view  class="item1" wx:for='{{followList}}'>
             <navigator hover-class="none"  url="../today/today?id={{item.match_id}}&record_id={{item.id}}&user_id={{item.user_id}}">
               <view class="relist">
-                  <image src="{{item.avatar}}" ></image>
+                <image  src="{{filters.defaultImg(item.avatar)}}"></image>
                   <view class="msg">
                       <text class="name">{{item.username}}</text>
-                      <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 class="msg">
+                      <text class="date">{{item.stock_date}}</text>
+                  </view>
+              </view>
+              <view class="item_money"><label class="item_money_title">资产 </label>{{item.today_fund}}w <label class="item_money_title"> 总收益 </label> <label class="{{item.total_income[0]=='-' ?'down':'up'}}">{{item.total_income}}</label>  <label class="item_money_title"> 今日收益 </label><label class="{{item.today_income[0]=='-' ?'down':'up'}}">{{item.today_income}}</label>
               </view>
               <view class="content" wx:if="{{item.experience}}">{{item.experience}}</view>
               <view class="imgs">

+ 94 - 61
pages/index/index.wxss

@@ -59,13 +59,13 @@ page{
   display: flex;
   flex-wrap: wrap;
   background-color: #fff;
-  padding: 10rpx 0;
+  padding: 20rpx 0;
 }
 .list-top navigator{
   width: 20%;
   text-align: center;
   padding: 10rpx 0;
-  font-size: 26rpx;
+  font-size: 29rpx;
 }
 .list-top image{
   width: 50rpx;
@@ -73,12 +73,12 @@ page{
   margin: 0 auto 5rpx;
 }
 .banner-list{
-  height: 370rpx;
+  height: 480rpx;
   background-color: #fff;
   margin-bottom: 20rpx;
 }
 .banner-list navigator{
-  height: 300rpx;
+  height: 400rpx;
   overflow: hidden;
 }
 .banner-list image{
@@ -86,16 +86,16 @@ page{
 }
 .banner-list .name{
   padding:0 20rpx;
-  line-height: 70rpx;
-  font-size: 27rpx;
-  font-weight: 600;
+  line-height: 80rpx;
+  font-size: 33rpx;
+
 }
 .banner-list .wx-swiper-dots.wx-swiper-dots-horizontal {
   position: absolute;
-  bottom: 90rpx;
+  bottom: 110rpx;
   right:auto;
-  left: 75%;
 }
+
 .notice{
   background-color: #fff;
   padding: 20rpx;
@@ -106,14 +106,14 @@ page{
 }
 .notice text{
   color: #FF583D;
-  font-size: 26rpx;
+  font-size: 32rpx;
   position: relative;
   left: 10rpx;
   top: -12rpx;
 }
 .notice-list{
   width: 80%;
-  font-size: 28rpx;
+  font-size: 30rpx;
   line-height: 55rpx;
   margin-top: -6rpx;
   padding-left: 20rpx;
@@ -124,64 +124,74 @@ page{
 }
 .content-list{
   display: flex;
-  width: 250vw;
+  width: 300vw;
 }
 .number{
-  width: 38rpx;
+  width: 50rpx;
   display: inline-block;
   text-align: center;
   color: #CE994F;
-  font-size: 26rpx;
-  font-weight: 600;
+  font-size: 30rpx;
+  font-weight: 500;
   margin-right: 10rpx;
-  margin-top: 6rpx;
+  margin-top: 3rpx;
 }
 image.number{
-  margin-top: 10rpx;
+  margin-top: 25rpx;
 }
 .avatar{
-  width: 50rpx;
-  height: 50rpx;
+  width: 90rpx;
+  height: 90rpx;
   border-radius: 50%;
-  margin-right: 10rpx;
+  margin-right: 15rpx;
+  margin-left: 10rpx;
 }
 .up-down{
-  width: 60vw;
-  margin-right: 40rpx;
+  width: 100vw;
+  margin-right: 20rpx;
 }
 .up-down>navigator{
   padding: 20rpx 0;
   border-bottom: 1px solid #f2f2f2;
   display: flex;
-  font-size: 28rpx;
+  font-size: 30rpx;
 }
 .up-down .usm{
-  width: 50%;
+  width: 38%;
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
+  margin-left: 10rpx;
 }
+
 .up-title{
-  font-size: 30rpx;
+  font-size: 33rpx;
   padding: 20rpx;
   
 }
 .up-title navigator{
   float: right;
-  font-size: 24rpx;
+  font-size: 28rpx;
+  top:5rpx;
+}
+
+.more-image{
+  width: 32rpx;
+  position: relative;
+  top:8rpx;
 }
 .up-down navigator text{
-  line-height: 50rpx;
+  line-height: 80rpx;
 }
 .up-down>text{
-  color: #999;
-  font-size: 24rpx;
+  color: rgb(128, 128, 128);
+  font-size: 30rpx;
   margin-bottom: 10rpx;
   display: block;
 }
 .article-img{
-  max-width: 60rpx;
-  height: 60rpx;
+  max-width: 100rpx;
+  height: 100rpx;
   border-radius: 8rpx;
 }
 .article-name{
@@ -189,15 +199,15 @@ image.number{
   width: 82%;
   line-height: 38rpx !important;
   height: 38rpx;
+  font-size: 30rpx;
 }
 .article-title{
-  font-size: 30rpx;
-  padding-right: 20rpx;
+  font-size: 33rpx;
   margin-bottom: 10rpx;
 }
 .article-title navigator{
-  font-size: 24rpx;
-  color: #999;
+  font-size: 30rpx;
+  color: rgb(128, 128, 128);
   float: right !important;
 }
 .baike{
@@ -207,14 +217,20 @@ image.number{
   margin: 20rpx 0;
 }
 .baike .article-title{
-  margin-bottom: 20rpx;
+  margin-bottom: 30rpx;
+  font-size: 33rpx;
+}
+
+.baike .article-title navigator{
+  font-size: 28rpx;
+  color: rgb(128, 128, 128);
+  float: right !important;
 }
 .baike-list{
   color: #333;
-  font-size: 26rpx;
+  font-size: 32rpx;
   margin-bottom: 20rpx;
-  padding: 0 0 20rpx;
-  font-weight: 500;
+  padding: 0 0 30rpx;
   border-bottom: 1px solid #f2f2f2;
 }
 .baike-list text{
@@ -222,23 +238,26 @@ image.number{
 }
 .baike-info{
   display: flex;
-  margin-top: 10rpx;
+  margin-top: 20rpx;
 }
 .baike-info image{
-  width: 150rpx;
-  height: 150rpx;
+  margin-top: 10rpx;
+  width: 130rpx;
+  height: 130rpx;
   border-radius: 10rpx;
 }
 .baike-info text{
   display: block;
-  width: 75%;
-  padding: 20rpx;
-  color: #666;
-  text-overflow: -o-ellipsis-lastline;
+  width: 85%;
+  padding-left: 20rpx;
+  padding-top: 10rpx;
+  /* padding: 20rpx; */
+  color: #000;
+  /* text-overflow: -o-ellipsis-lastline; */
   overflow: hidden;text-overflow: ellipsis;display: -webkit-box;
   -webkit-line-clamp: 3;-webkit-box-orient: vertical;align-content: center;
-  height: 123rpx;
-  font-size: 26rpx;
+  height: 100%;
+  font-size: 30rpx;
 }
 .tab{
   background: #fff;
@@ -249,7 +268,7 @@ image.number{
   
 }
 .tab view{
-  font-size: 28rpx;
+  font-size: 33rpx;
   color: #333;
   line-height: 80rpx;
   transition: all .1s linear;
@@ -258,6 +277,7 @@ image.number{
 .tab .act{
   color: #FF583D;
   border-bottom: 2px solid #FF583D;
+  font-size: 32rpx;
 }
 .swiper-content{
   background: #fff;
@@ -277,7 +297,7 @@ scroll-view{
 }
 .name{
   font-size: 32rpx;
-  font-weight: 500;
+  /* font-weight: 500; */
   margin-bottom: 20rpx;
 }
 .name>text{
@@ -524,26 +544,39 @@ scroll-view{
   padding-left: 80rpx;
   margin-bottom: 24rpx;
 }
-.relist>image{
-  width: 64rpx;
-  height: 64rpx;
+.relist image{
+  width: 90rpx;
+  height: 90rpx;
   position: absolute;
   left: 0;
-  top: 0;
   border-radius: 100%;
 }
-.content,.msg .name{
-  font-size: 30rpx;
-  line-height: 48rpx;
+.content{
+  font-size: 32rpx;
+  margin-top: 20rpx;
+}
+
+.msg .name{
+  font-size: 32rpx;
   color: #333;
+  margin-left: 30rpx;
 }
-.msg view{
-  color: #666;
+
+.msg .date{
   font-size: 28rpx;
+  color: #333;
+  margin-left: 30rpx;
 }
-.msg view label{
-  font-size: 28rpx;
+
+.item_money{
+  font-size: 33rpx;
 }
+
+.item_money_title{
+  font-size: 30rpx;
+}
+
+
 .recomment{
   padding:  24rpx 0;
   border-bottom: 1px solid rgba(245, 245, 245, 1);

+ 2 - 2
pages/login/user.wxml

@@ -45,8 +45,8 @@
     <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>  报名参赛(做选手)</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 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>
 

+ 6 - 4
pages/myfollow/myfollow.wxml

@@ -3,13 +3,15 @@
 <view class="up-down">
   <navigator wx:for="{{list}}" hover-class="none"  url="../homepage/homepage?id={{item.match_id}}&record_id={{item.id}}&user_id={{item.user_id}}">
               <view class="relist">
-                  <image src="{{item.avatar}}" ></image>
+                <image  src="{{filters.defaultImg(item.avatar)}}"></image>
                   <view class="msg">
                       <text class="name">{{item.username}}</text>
-                      <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 class="msg">
+                      <text class="date">{{item.stock_date}}</text>
+                  </view>
+              </view>
+              <view class="item_money"><label class="item_money_title">资产 </label>{{item.today_fund}}w <label class="item_money_title"> 总收益 </label> <label class="{{item.total_income[0]=='-' ?'down':'up'}}">{{item.total_income}}</label>  <label class="item_money_title"> 今日收益 </label><label class="{{item.today_income[0]=='-' ?'down':'up'}}">{{item.today_income}}</label>
               </view>
               <view class="content" wx:if="{{item.experience}}">{{item.experience}}</view>
               <view class="imgs">

+ 22 - 8
pages/myfollow/myfollow.wxss

@@ -14,24 +14,38 @@ navigator{
   margin-bottom: 24rpx;
 }
 .relist>image{
-  width: 64rpx;
-  height: 64rpx;
+  width: 90rpx;
+  height: 90rpx;
   position: absolute;
   left: 0;
   top: 0;
   border-radius: 100%;
 }
-.content,.msg .name{
-  font-size: 30rpx;
+.content{
+  font-size: 32rpx;
   line-height: 48rpx;
   color: #333;
+  margin-bottom: 15rpx;
 }
-.msg view{
-  color: #666;
-  font-size: 28rpx;
+.msg .name{
+  font-size: 32rpx;
+  color: #333;
+  margin-left: 30rpx;
 }
-.msg view label{
+
+.msg .date{
   font-size: 28rpx;
+  color: #333;
+  margin-left: 30rpx;
+}
+
+.item_money{
+  font-size: 33rpx;
+  margin-bottom: 15rpx;
+}
+
+.item_money_title{
+  font-size: 30rpx;
 }
 .recomment{
   padding:  24rpx 0;

+ 2 - 2
pages/tlb/tlb.wxml

@@ -14,8 +14,8 @@
     <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="usn">{{item.username}}</text>
-    <text wx:if="{{cur == 'win' || cur == 'loss'}}" class="bar" style="background-color: {{filters.getColor()}};width:{{item.win_loss/list[0].win_loss*300}}rpx"></text>
-    <text wx:else class="bar" style="background-color: {{filters.getColor()}};width:{{item.total_win_loss/list[0].total_win_loss*300}}rpx"></text>
+    <text wx:if="{{cur == 'win' || cur == 'loss'}}" class="bar" style="background-color: {{filters.getColor()}};width:{{item.win_loss/list[0].win_loss*320}}rpx"></text>
+    <text wx:else class="bar" style="background-color: {{filters.getColor()}};width:{{item.total_win_loss/list[0].total_win_loss*320}}rpx"></text>
     <text wx:if="{{cur == 'win' || cur == 'loss'}}">{{item.win_loss}}w</text>
     <text wx:else>{{item.total_win_loss}}w</text>
   </navigator>

+ 5 - 5
pages/tlb/tlb.wxss

@@ -27,7 +27,7 @@
   justify-content: space-between;
 }
 .tab view{
-  font-size: 28rpx;
+  font-size: 31rpx;
   color: #333;
   line-height: 80rpx;
   transition: all .1s linear;
@@ -39,11 +39,11 @@
   border-bottom: 2px solid #FF583D;
 }
 .number{
-  width: 38rpx;
+  width: 50rpx;
   display: inline-block;
   text-align: center;
   color: #999;
-  font-size: 24rpx;
+  font-size: 30rpx;
   font-weight: 600;
   position: relative;
   top: -3rpx;
@@ -59,7 +59,7 @@ scroll-view{
 }
 .list{
   color: #333;
-  font-size: 24rpx;
+  font-size: 28rpx;
   margin-bottom: 20rpx;
   padding: 0 20rpx;
   font-weight: 500;
@@ -75,7 +75,7 @@ scroll-view{
 }
 .list .usn{
   display: inline-block;
-  width: 25%;
+  width: 22%;
   text-align: right;
   overflow: hidden;
   text-overflow: ellipsis;

+ 7 - 3
pages/todayExp/todayExp.wxml

@@ -2,12 +2,16 @@
 <scroll-view  scroll-y='{{true}}'  bindscrolltolower='next'>
 <view class="up-down">
         <navigator wx:for="{{list}}" hover-class="none"  url="../today/today?id={{item.match_id}}&record_id={{item.id}}&user_id={{item.user_id}}">
-              <view class="relist">
-                  <image  src="{{filters.defaultImg(item.user_avatar)}}"></image>
+          <view class="relist">
+                <image  src="{{filters.defaultImg(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>
+                  <view class="msg">
+                      <text class="date">{{item.stock_date}}</text>
+                  </view>
+              </view>
+              <view class="item_money"><label class="item_money_title">资产 </label>{{item.today_fund}}w <label class="item_money_title"> 总收益 </label> <label class="{{item.total_income[0]=='-' ?'down':'up'}}">{{item.total_income}}</label>  <label class="item_money_title"> 今日收益 </label><label class="{{item.today_income[0]=='-' ?'down':'up'}}">{{item.today_income}}</label>
               </view>
               <view class="content" wx:if="{{item.experience}}">{{item.experience}}</view>
               <view class="recomment">

+ 22 - 8
pages/todayExp/todayExp.wxss

@@ -11,24 +11,38 @@ scroll-view{
   margin-bottom: 24rpx;
 }
 .relist>image{
-  width: 64rpx;
-  height: 64rpx;
+  width: 90rpx;
+  height: 90rpx;
   position: absolute;
   left: 0;
   top: 0;
   border-radius: 100%;
 }
-.content,.msg .name{
-  font-size: 30rpx;
+.content{
+  font-size: 32rpx;
   line-height: 48rpx;
   color: #333;
+  margin-bottom: 15rpx;
 }
-.msg view{
-  color: #666;
-  font-size: 28rpx;
+.msg .name{
+  font-size: 32rpx;
+  color: #333;
+  margin-left: 30rpx;
 }
-.msg view label{
+
+.msg .date{
   font-size: 28rpx;
+  color: #333;
+  margin-left: 30rpx;
+}
+
+.item_money{
+  font-size: 33rpx;
+  margin-bottom: 15rpx;
+}
+
+.item_money_title{
+  font-size: 30rpx;
 }
 .recomment{
   padding:  24rpx 0;

+ 19 - 17
pages/winlost/winlost.wxss

@@ -5,58 +5,60 @@
 }
 .content-list{
   display: flex;
-  width: 250vw;
+  width: 300vw;
 }
 .number{
-  width: 38rpx;
+  width: 50rpx;
   display: inline-block;
   text-align: center;
   color: #CE994F;
-  font-size: 26rpx;
-  font-weight: 600;
+  font-size: 30rpx;
+  font-weight: 500;
   margin-right: 10rpx;
-  margin-top: 6rpx;
+  margin-top: 3rpx;
 }
 image.number{
-  margin-top: 10rpx;
+  margin-top: 25rpx;
 }
 .avatar{
-  width: 50rpx;
-  height: 50rpx;
+  width: 90rpx;
+  height: 90rpx;
   border-radius: 50%;
-  margin-right: 10rpx;
+  margin-right: 15rpx;
+  margin-left: 10rpx;
 }
 .up-down{
-  width: 60vw;
-  margin-right: 40rpx;
+  width: 100vw;
+  margin-right: 20rpx;
 }
 .up-down>navigator{
   padding: 20rpx 0;
   border-bottom: 1px solid #f2f2f2;
   display: flex;
-  font-size: 26rpx;
+  font-size: 30rpx;
 }
 .up-down .usm{
-  width: 50%;
+  width: 38%;
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
+  margin-left: 10rpx;
 }
 .up-title{
-  font-size: 28rpx;
+  font-size: 33rpx;
   padding-bottom: 20rpx;
   
 }
 .up-title navigator{
   float: right;
-  font-size: 24rpx;
+  font-size: 30rpx;
 }
 .up-down navigator text{
   line-height: 50rpx;
 }
 .up-down>text{
-  color: #999;
-  font-size: 24rpx;
+  color: rgb(128, 128, 128);
+  font-size: 28rpx;
   margin-bottom: 10rpx;
   display: block;
 }

+ 2 - 1
project.config.json

@@ -44,7 +44,8 @@
     "showES6CompileOption": false,
     "useCompilerPlugins": false,
     "useStaticServer": true,
-    "ignoreUploadUnusedFiles": true
+    "ignoreUploadUnusedFiles": true,
+    "condition": false
   },
   "compileType": "miniprogram",
   "libVersion": "2.15.0",

BIN
xiao/gjjg@2x.png


BIN
xiao/gjjg@3x.png


BIN
xiao/jrly@2x.png


BIN
xiao/jrly@3x.png


BIN
xiao/nrzc@2x.png


BIN
xiao/nrzc@3x.png


BIN
xiao/wdgz@2x.png


BIN
xiao/wdgz@3x.png


BIN
xiao/yglz@2x.png


BIN
xiao/yglz@3x.png


BIN
xiao/yzzc@2x.png


BIN
xiao/yzzc@3x.png