update

app.json

@@ -14,10 +14,10 @@
     "pages/games/games",
     "pages/search/search",
     "pages/rank/rank",
-    
+    "pages/style/style",
     "pages/detail/detail",
     
-    "pages/style/style",
+    
     "pages/list/list",
     "pages/today/today",
     "pages/comment/comment"

pages/index/index.js

@@ -6,18 +6,21 @@ Page({
   data: {
     loading:0,
     notices:[],
-    tabs:['关注','热门股票','胜率榜','防守榜','冠军心得'],
+    tabs:['关注','热门股票','热门选手','胜率榜','防守榜','冠军心得'],
     cur:0,
     date:'2021-11-09',
     followList:[],
     defendList:[],
     winList:[],
+    hotFollowList:[],
     page:1,
     total:0,
     page1: 1,
     total1: 0,
     page2: 1,
     total2: 0,
+    page3: 1,
+    total3: 0,
     error:0
   },
   onLoad() {
@@ -138,16 +141,48 @@ Page({
         championList: res.data.data.list
       })
     })
+    
     $api.getDate().then(res=>{
       this.setData({
         date:res.data.data
       })
       this.getHot()
+      this.getHotFollowList()
     })
   }, 
+  //热门选手分页
+  next3: function () {
+    if (this.data.hotFollowList.length < this.data.total3) {
+      const page = this.data.page3 + 1
+      this.setData({
+        page3: page
+      })
+      this.getHotFollowList()
+    }
+  },
+  getHotFollowList() {
+    var hotFollowList = this.data.hotFollowList
+    let stock_date = this.data.date
+    $api.getHotFollow({
+      page: this.data.page3, page_size: 20, stock_date: stock_date
+    }).then(res => {
+      res.data.data.list.forEach(item => {
+        hotFollowList.push(item)
+      })
+      this.setData({
+        hotFollowList: hotFollowList,
+        total3: res.data.data.total
+      })
+    })
+  },
   getHot(){
     //热门
     let stock_date = this.data.date
+    $api.getHotFollow({ stock_date: stock_date }).then(res => {
+      this.setData({
+        hotFollowList: res.data.data.list
+      })
+    })
     $api.getHotbuyList({ stock_date: stock_date }).then(res => {
       wx.hideNavigationBarLoading()
       this.setData({

pages/index/index.wxml

@@ -84,6 +84,37 @@
       </scroll-view>
   </swiper-item>
   <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}}">
+                <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>
+                <text class="rank" wx:if='{{index>2}}'>{{index+1}}</text>
+                <view class="name">
+                  {{item.player_name}}  <text>{{item.badge}}</text>
+                  <view>关注 
+                    <text>{{item.count}}</text>
+                  </view>
+                </view>
+                <view class="info" wx:if='{{item.style.length>0}}'>风格：
+                <label class="tag" wx:for='{{item.style}}' wx:for-item='i'>{{i}}</label></view>
+                <view class="info">
+                    资产：  
+                    <view><label>{{item.today_fund}}w</label>(总收益 <text class='up'> {{item.total_income}} </text> 
+                      <text style="color:#F5F5F5;">  |  </text>
+                      <text style="color:#666;">最大回撤</text>
+                      <text class="{{item.badest_income[0]=='-' ?'down':'up'}}"> {{item.badest_income}} </text>)
+                  </view>
+                </view>
+             </navigator>
+          </view>
+          <block wx:if='{{total3 >= 20}}'>
+            <view class='loading' wx:if='{{hotFollowList.length < total3}}'>上拉加载更多...</view>
+          </block>
+      </scroll-view>
+  </swiper-item>
+  <swiper-item>
       <scroll-view  scroll-y='{{true}}' bindscrolltolower='next1'>
           <view class="item3">
              <navigator class="win" wx:for='{{winList}}' url="../today/today?id={{item.match_id}}&player_id={{item.player_id}}">

pages/index/index.wxss

@@ -68,7 +68,7 @@ page{
   transition: all .1s linear;
 }
 .tab .act{
-  font-size: 40rpx;
+  font-size: 38rpx;
   font-weight: 500;
 }
 swiper{
@@ -212,7 +212,7 @@ scroll-view{
 .win{
   position: relative;
   padding: 30rpx 0;
-  padding-left: 60rpx;
+  padding-left: 59rpx;
   border-bottom: 1px solid #F5F5F5;
 }
 .win image{

pages/style/style.js

@@ -6,15 +6,15 @@ Page({
    * 页面的初始数据
    */
   data: {
-    arr1: ['短线', '中线', '长线'],
-    arr2: ['分仓', '重仓', '全仓', '融资'],
-    arr3: ['首板', '接力', '半路', '低吸', '价值投机', '波段锁仓', '可转债'],
-    arr4: ['5厘米', '10厘米', '20厘米', '次新股','N字头','可转债'],
+    arr1: [],
+    arr2: [],
+    arr3: [],
+    arr4: [],
     form:{
       join_time: '',
-      zq: '',
-      cw: '',
-      df: '',
+      zq: [],
+      cw: [],
+      df: [],
       init_fund: '',
       account_img: ''
     }
@@ -33,15 +33,26 @@ Page({
       })
     })
     $api.getMyStyle().then(res=>{
+      var form = res.data.data;
+      form.zq = form.zq.split(',')
+      form.cw = form.cw.split(',')
+      form.df = form.df.split(',')
+      form.pz = form.pz.split(',')
         this.setData({
-          form:res.data.data
+          form: form
         })
     })
   },
   change(e){
     let value = e.target.dataset.id, item = e.target.dataset.item;
     let form=this.data.form;
-    form[item] = value;
+    // form[item] = value;
+    console.log(form[item].indexOf(value))
+    if (form[item].indexOf(value)<0){
+      form[item].push(value)
+    }else{
+      form[item].splice(form[item].indexOf(value),1)
+    }
     this.setData({
       form: form
     })
@@ -104,22 +115,57 @@ Page({
     })
   },
   post(){
-    var form=this.data.form;
+    var form = { ...this.data.form};
+    form.zq = form.zq.join(',')
+    form.cw = form.cw.join(',')
+    form.df = form.df.join(',')
+    form.pz = form.pz.join(',')
+    if (!form.zq) {
+      wx.showToast({
+        title: '请选择周期',
+        icon:'none'
+      })
+      return
+    }
+    if (!form.cw) {
+      wx.showToast({
+        title: '请选择仓位',
+        icon: 'none'
+      })
+      return
+    }
+    if (!form.df) {
+      wx.showToast({
+        title: '请选择打法',
+        icon: 'none'
+      })
+      return
+    }
+    if (!form.pz) {
+      wx.showToast({
+        title: '请选择品种',
+        icon: 'none'
+      })
+      return
+    }
     if (!form.join_time){
       wx.showToast({
         title: '请选择入市时间',
+        icon: 'none'
       })
       return
     }
     if (!form.init_fund) {
       wx.showToast({
         title: '请输入参赛金额',
+        icon: 'none'
       })
       return
     }
     if (!form.account_img) {
       wx.showToast({
         title: '请上传账号截图',
+        icon: 'none'
       })
       return
     }

pages/style/style.wxml

@@ -1,26 +1,28 @@
+<wxs src="../../utils/tool.wxs" module="tool"></wxs>
 <view class="title">请选择你的操作风格</view>
+<view wx:if='{{arr1.length>0}}'>
 <view class="item">
   <label>周期</label>
   <view class="tags">
-      <text wx:for='{{arr1}}' class="{{item == form.zq?'act':''}}" bindtap="change" data-id='{{item}}' data-item='zq'>{{item}}</text>
+      <text wx:for='{{arr1}}' class="{{tool.indexOf(form.zq, item)>=0?'act':''}}" bindtap="change" data-id='{{item}}' data-item='zq'>{{item}}</text>
   </view>
 </view>
 <view class="item">
   <label>仓位</label>
   <view class="tags">
-      <text wx:for='{{arr2}}' class="{{item == form.cw?'act':''}}" bindtap="change" data-id='{{item}}' data-item='cw'>{{item}}</text>
+      <text wx:for='{{arr2}}' class="{{tool.indexOf(form.cw, item)>=0?'act':''}}" bindtap="change" data-id='{{item}}' data-item='cw'>{{item}}</text>
   </view>
 </view>
 <view class="item">
   <label>打法</label>
   <view class="tags">
-      <text wx:for='{{arr3}}' class="{{item == form.df?'act':''}}" bindtap="change" data-id='{{item}}' data-item='df'>{{item}}</text>
+      <text wx:for='{{arr3}}' class="{{tool.indexOf(form.df, item)>=0?'act':''}}" bindtap="change" data-id='{{item}}' data-item='df'>{{item}}</text>
   </view>
 </view>
 <view class="item">
   <label>品种</label>
   <view class="tags">
-      <text wx:for='{{arr4}}' class="{{item == form.pz?'act':''}}" bindtap="change" data-id='{{item}}' data-item='pz'>{{item}}</text>
+      <text wx:for='{{arr4}}' class="{{tool.indexOf(form.pz, item)>=0?'act':''}}" bindtap="change" data-id='{{item}}' data-item='pz'>{{item}}</text>
   </view>
 </view>
 <view class="item">
@@ -52,4 +54,5 @@
       </view>
   </view>
 </view>
-<button bindtap="post" class="post_btn">确定</button>
+<button bindtap="post" class="post_btn">确定</button>
+</view>

pages/style/style.wxss

@@ -33,7 +33,7 @@ page{
   margin-right: 16rpx;
 }
 .tags .act{
-  border: none;
+  border: 1px solid #FFEFEB;
   background: #FFEFEB;
   color: #D94B24;
 }

utils/api.js

@@ -128,6 +128,7 @@ const API = {
   searchStock: (data) => request(GET, `/api/wx/stock/search`, data),
   getNotoice: (data) => request(GET, `/api/wx/v2/notices/list`, data),
   getDate: (data) => request(GET, `/api/wx/v2/default/date`, data),
+  getHotFollow: (data) => request(GET, `/api/wx/v2/hot/follow/list`, data),
 }; 
 module.exports = {
   API: API

utils/tool.wxs

@@ -0,0 +1,6 @@
+// 扩展支持 indexOf
+function indexOf(array, value) {
+  return array.indexOf(value)
+}
+// 导出
+module.exports.indexOf = indexOf