优化

pages/index/index.js

@@ -6,7 +6,7 @@ Page({
   data: {
     loading:0,
     notices:[],
-    tabs:['关注','热门股票','热门选手','胜率榜','冠军心得'],
+    tabs:['关注','热门股票','热门选手','胜率榜','冠军心得','今日反思'],
     cur:0,
     hot:0,
     date:'2022-04-27',
@@ -16,6 +16,7 @@ Page({
     hotFollowList:[],
     hotbuyList:[],
     championList:[],
+    explist:[],
     page:1,
     total:-1,
     page1: 1,
@@ -39,14 +40,15 @@ Page({
       this.setData({
         date:res.data.data
       })
+      $api.getNotoice().then(res=>{
+        this.setData({
+          notices:res.data.data
+        })
+      })
     })
     // this.getFollow()
    
-    $api.getNotoice().then(res=>{
-      this.setData({
-        notices:res.data.data
-      })
-    })
+    
     
   },
   fresh: function () {
@@ -236,6 +238,12 @@ Page({
           }
           this.getData()
           break;
+        case 5:
+          if (this.data.explist.length>0) {
+            return
+          }
+          this.getExp()
+          break;
       }
   },
   tabChange1(e){
@@ -287,6 +295,12 @@ Page({
           }
           this.getData()
           break;
+          case 5:
+          if (this.data.explist.length>0) {
+            return
+          }
+          this.getExp()
+          break;
       }
     }
   
@@ -300,15 +314,21 @@ Page({
     wx.showNavigationBarLoading()
     this.getHot()
   },
+  getExp(){
+    $api.getExperience({page:1,page_size:10}).then(res=>{
+      var data=res.data.data.list;
+      data.forEach(item=>{
+        item.today_income=parseInt(item.today_income)+"%"
+        item.total_income=parseInt(item.total_income)+"%"
+      })
+      this.setData({
+        explist: data
+      })
+    })
+  },
   onShow: function (e) {
     //判断是否报名
     $api.getAuthinfo().then(res=>{
-      // if(res.data.data.phone == null || res.data.data.phone==''){
-      //   wx.navigateTo({
-      //     url: '../login/user',
-      //   })
-      // }
-    
       if(res.data.data.role==0){
         wx.navigateTo({
           url: '../login/user?type=3',
@@ -322,6 +342,7 @@ Page({
       hotFollowList:[],
       hotbuyList:[],
       championList:[],
+      explist:[],
       page:1,
       total:-1,
       page1: 1,
@@ -347,6 +368,9 @@ Page({
       case 4:
         this.getData()
         break;
+        case 5:
+          this.getExp()
+          break;
     }
     // if (app.globalData.follow){
     //   this.setData({

pages/index/index.wxml

@@ -32,7 +32,7 @@
               </view> 
               <view class="recomment">
                   <image mode="widthFix" src="../../images/msg.png"></image>
-                  <text>{{item.comment_count}}</text>
+                  <text>{{item.comments_count}}</text>
                   <image mode="widthFix" src="../../images/zan.png"></image>
                   <text>{{item.zan_count}}</text>
               </view>
@@ -233,4 +233,49 @@
           </navigator>
       </scroll-view>
   </swiper-item>
+  <swiper-item>
+      <scroll-view   upper-threshold="0"  scroll-y='{{true}}'>
+          <view  class="item1" wx:for='{{explist}}'>
+            <navigator hover-class="none"  url="../today/today?id={{item.match_id}}&record_id={{item.id}}&player_id={{item.player_id}}">
+              <view class="relist">
+                  <image src="{{item.user_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>
+              <view class="content">{{item.experience}}</view>
+              <view class="recomment">
+                  <image mode="widthFix" src="../../images/msg.png"></image>
+                  <text>{{item.comments_count}}</text>
+                  <image mode="widthFix" src="../../images/zan.png"></image>
+                  <text>{{item.zans_count}}</text>
+              </view>
+
+
+              <!-- <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">
+                日期： <view>{{item.stock_date}}（今日收益 
+                <text  class="{{item.today_income[0]=='-' ?'down':'up'}}">{{item.today_income}}</text>）</view>
+              </view>
+              <view class="info">
+                资产：  <view><label>{{item.today_fund}}w</label> （总收益 
+                <text  class="{{item.total_income[0]=='-' ?'down':'up'}}">{{item.total_income}}</text>
+                胜率<text  class="{{item.win_rate[0]=='-' ?'down':'up'}}"> {{item.win_rate}}</text>
+                ）</view>
+              </view>
+               <view class="info">
+                  持仓： 
+                    <view wx:if='{{item.is_markt}}'>开超市</view>
+                    <view wx:elif='{{item.today_stock.length>0}}'>
+                        <block wx:for="{{item.today_stock}}" wx:for-item='i'> {{i.name}}({{i.fund}}w) </block>
+                    </view>
+                    <view wx:else>空仓</view>
+                </view>-->
+                </navigator>
+              
+          </view>
+      </scroll-view>
+  </swiper-item>
 </swiper>

pages/message/message.wxml

@@ -4,10 +4,10 @@
         <view class="content">{{item.content}}</view>
     </view>
     <view class="wz" wx:else>
-        <image src="{{item.user_avatar}}" ></image>
+        <image src="../../images/wz.jpg" ></image>
         <view>
-            <text class="name">{{item.user_name}}</text>
-            <view class="content">{{item.content}}</view>
+            <text class="name">顽主</text>
+            <view class="content">{{item.reply_content}}</view>
         </view>
     </view>
 </view>

pages/today/today.wxml

@@ -17,7 +17,7 @@
       <view class="num">{{datas.today_record.group_rank}}</view>
       排名
     </view>
-    <view class="today_income">{{datas.today_record.today_fund}} 
+    <view class="today_income">{{datas.today_record.today_income_fund}} 
       <text  class="{{datas.today_record.today_income[0]=='-' ?'down':'up'}}">{{datas.today_record.today_income}}</text>
     </view>
     <view class="label">今日收益</view>

pages/user/user.wxml

@@ -13,7 +13,7 @@
       <navigator hover-class="none"  url="../today/today?id={{todayinfo.match_id}}&record_id={{todayinfo.id}}&player_id={{todayinfo.player_id}}">
       
       <view class="money">
-        <text class="{{todayMoney[0]=='-' ?'down':'up'}}">{{todayMoney}}  </text>
+        <text class="{{today_income_fund[0]=='-' ?'down':'up'}}">{{today_income_fund}}  </text>
         <text class="{{todayinfo.today_income[0]=='-' ?'todaydown':'todayup'}}">{{todayinfo.today_income}}</text>
         <text class="today_text">今日收益</text>
       </view>

utils/api.js

@@ -36,11 +36,11 @@ function request(method, url, data) {
             } else if (res.data.code == 403) {
               //未登录
               reject(403)
-              setTimeout(()=>{
+              if(url.indexOf('authinfo')>=0){
                 wx.navigateTo({
                   url: '../login/user',
                 })
-              },100)
+              }
             }else{
               wx.hideNavigationBarLoading()
               wx.hideLoading()
@@ -153,6 +153,7 @@ const API = {
   deletechoice: (data) => request(DELETE, `/api/wx/v3/user/choice`, data),
   initfund: (data) => request(PUT, `/api/wx/player/fund`, data),
   getFans: (data) => request(GET, `/api/wx/v3/user/follower/list`, data),
+  getExperience: (data) => request(GET, `/api/wx/v3/experience/list`, data),
   
 }; 
 module.exports = {