update

pages/follow/follow.js

@@ -6,7 +6,9 @@ Page({
    * 页面的初始数据
    */
   data: {
-    list:[]
+    list:[],
+    page: 1,
+    total: 0,
   },
 
   /**
@@ -16,14 +18,32 @@ Page({
     wx.showLoading({
       title: '正在加载',
     })
-    $api.getMyFollow().then(res=>{
+    this.getFollow()
+  },
+  next: function () {
+    if (this.data.list.length < this.data.total) {
+      const page = this.data.page + 1
+      this.setData({
+        page: page
+      })
+      this.getFollow()
+    }
+  },
+  getFollow() {
+    var list = this.data.list
+    $api.getMyFollow({
+      page: this.data.page, page_size: 20
+    }).then(res => {
       wx.hideLoading()
+      res.data.data.list.forEach(item => {
+        list.push(item)
+      })
       this.setData({
-        list:res.data.data.list
+        list: list,
+        total: res.data.data.total
       })
     })
   },
-
   /**
    * 生命周期函数--监听页面初次渲染完成
    */

pages/follow/follow.wxml

@@ -1,16 +1,19 @@
-<view class="follow" wx:for='{{list}}'>
-  <view class="name">{{item.username}}  <text>选手</text> 
-  <view>TOP <text>{{item.group_rank}}</text></view></view> 
-  <view class="info">
-    资产：  <view><label>187w</label> 
-    （今日收益 
-    <text  class="{{item.today_income[0]=='-' ?'down':'up'}}">{{item.today_income}}</text>
-    <text style="color:#F5F5F5;">  |  </text>
-    总收益 
-    <text  class="{{item.total_income[0]=='-' ?'down':'up'}}">{{item.total_income}}</text>
-    ）</view>
-  </view>
-</view>
+<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}}">
+    <view class="name">{{item.username}}  <text>选手</text> 
+    <view>TOP <text>{{item.group_rank}}</text></view></view> 
+    <view class="info">
+      资产：  <view><label>187w</label>(今日收益 
+      <text  class="{{item.today_income[0]=='-' ?'down':'up'}}">{{item.today_income}}</text>
+      <text style="color:#F5F5F5;">  |  </text>
+      总收益 
+      <text  class="{{item.total_income[0]=='-' ?'down':'up'}}">{{item.total_income}}</text>
+      )</view>
+    </view>
+  </navigator>
+  <block wx:if='{{total >= 20}}'>
+    <view class='loading' wx:if='{{list.length < total}}'>上拉加载更多...</view>
+  </block>
+  <view wx:if="{{list.length<=0}}" class="not_data">-暂无数据-</view>
+</scroll-view>
 
-
-<view wx:if="{{list.length<=0}}" class="not_data">-暂无数据-</view>

pages/follow/follow.wxss

@@ -45,4 +45,7 @@ page{
   color: #666;
   width: 85%;
   vertical-align: top;
+}
+scroll-view{
+  height: 100vh;
 }

pages/index/index.wxml

@@ -4,7 +4,6 @@
     <view class="zd"></view>
     <image src="../../images/tttz.png" mode="widthFix"></image>
       <view class="marquee_text">
-      <!-- <navigator>每股三大指数集体收涨 特斯拉估计创近…</navigator> -->
         <navigator url="../detail/detail?id={{item.id}}" wx:for="{{notices}}">{{item.name}}</navigator>
       </view>
   </view>

pages/search/search.wxml

@@ -27,9 +27,11 @@
   </picker>
 </view>
 <scroll-view scroll-y='{{true}}' bindscrolltolower='next'>
-  <view class="player" wx:for='{{list}}'>
-    <view class="name">{{item.username}}  <text>选手</text></view>
-    <view class="info">风格：<label class="tag" >短线</label></view>
+  <navigator 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>
+    </view>
     <view class="info">资产：
         <view><label>{{item.fund}}w</label> 
         （今日收益 <text class='up'> +8% </text> 
@@ -37,7 +39,7 @@
           总收益<text class='down'> -8% </text>）
         </view>
     </view>
-  </view>
+  </navigator>
   <block wx:if='{{total >= 20}}'>
     <view class='loading' wx:if='{{list.length < total}}'>上拉加载更多...</view>
   </block>

pages/upload/upload.js

@@ -17,6 +17,7 @@ Page({
     today_fund:'',
     change:0,
     experience:'',
+    cur:0,
     freshen:true,
     disable:false
   },
@@ -29,6 +30,7 @@ Page({
       return;
     }
     $api.getCurrecord().then(res=>{
+      if (!res.data.today_stock){return}
       let stock = res.data.data.today_stock
       this.setData({
         stock: stock.length > 0 ? stock : [{ name: '', fund: '' }],
@@ -74,23 +76,49 @@ Page({
     })
   },
   bindPickerChange(e){
-    var i=e.target.dataset.id;
-    var v = e.detail.value
+    var i=this.data.cur;
+    var v = e.target.dataset.name
     var stock=this.data.stock;
-    var list=this.data.stockList; 
-    var value=this.data.value;  
-    value[i] =v;
-    stock[i]={
-      name: list[v].name,
-      code:list[v].code,
-      label: list[v].label
+    stock[i].name = v
+    this.setData({
+      stock: stock
+    })
+    setTimeout(()=>{
+      this.setData({
+        stockList: []
+      },50)
+    })
+    return;
+  },
+  stockSearch(e){
+    if (e.detail.value == ''){
+      this.setData({
+        stockList: []
+      })
+      return
     }
+    var i = e.target.dataset.id;
+    var v = e.detail.value
+    var stock = this.data.stock;
+    stock[i].name = v;
     this.setData({
-      stock: stock,
-      value: value
+      stock: stock
+    })
+    $api.searchStock({ name: e.detail.value}).then(res=>{
+        this.setData({
+          stockList:res.data.data,
+          cur:e.target.dataset.id
+        })
+    })
+  },
+  blur(){
+    // console.log(233)
+    this.setData({
+      stockList: []
     })
   },
   nameChange(e){
+    console.log(e)
     var i = e.target.dataset.id;
     var v = e.detail.value
     var stock = this.data.stock;

pages/upload/upload.wxml

@@ -1,4 +1,4 @@
-<form>
+<form bindtap="blur">
     <view class="label" >持仓日期   {{stock_date}}</view>
     <view class="note">交作业时间:15:00-15:30</view>
     <view class="label">今日净资产<text class="note">(单位：万)</text></view>
@@ -8,18 +8,16 @@
     <block wx:if='{{!is_markt}}'>
     <view class="label">今日持股<text class="note">(空仓请留空不填)</text></view>
     <view class="info" wx:for='{{stock}}'>
-      <input bindchange="nameChange" data-id='{{index}}'  value="{{item.name}}" placeholder="股票名称"></input>
-      <!-- <picker  bindchange="bindPickerChange" data-id='{{index}}' value="{{value[index]}}" range-key='label' range="{{stockList}}">
-        <view class="picker">
-          <text wx:if='{{value[index]<0}}' style="color:#999;">请选择股票</text>
-          {{stockList[value[index]].name}}
-        </view>
-      </picker> -->
+      <input bindinput='stockSearch'   data-id='{{index}}'  value="{{item.name}}" placeholder="股票名称"></input>
       <input type='digit' bindinput="fundChange" data-id='{{index}}' value="{{item.fund}}" placeholder="资金额"></input>
       <text style="color:red;font-weight:500">万</text>    
       <view  style="width:17%;">
         <icon bindtap="del" data-id='{{index}}' style="margin-top:20rpx;" class="icon-small" type="cancel" size="25"></icon>
       </view>
+      
+      <view class="stock_list" wx:if='{{stockList.length>0 && cur==index}}'>
+        <view wx:for='{{stockList}}' catchtap="bindPickerChange" wx:for-item='s' wx:for-index='i'  data-name='{{s.name}}' wx:key='{{index+""+i}}'>{{s.name}}</view>
+      </view>
     </view>
     <view bindtap="add" class="add"> + 添加持股</view>
     </block>
@@ -31,7 +29,8 @@
     <view wx:for='{{today_stock_img}}' class="stock_imgs">
         <image  src="{{item}}" bindtap="prview" data-src="{{item}}"></image>
         <view class="edit">
-            <text>识别</text><text bindtap="del1" data-id='{{index}}'>删除</text>
+            <!-- <text>识别</text> -->
+            <text bindtap="del1" data-id='{{index}}'>删除</text>
         </view>
         <!-- <icon bindtap="del1" data-id='{{index}}' class="icon-small" type="cancel" size="25"></icon> -->
     </view>

pages/upload/upload.wxss

@@ -34,6 +34,7 @@ picker{
   display: flex;
   margin-bottom: 15rpx;
   justify-content: space-between;
+  position: relative;
 }
 .info input{
   /* width: 30%; */
@@ -150,4 +151,20 @@ form button:not([size='mini']){
   text-align: center;
   font-size: 28rpx;
   margin: 0 2px;
+}
+.stock_list{
+  position: absolute;
+  width: 43%;
+  top: 100rpx;
+  left: 0;
+  overflow: auto;
+  background: #fff;
+  max-height: 300rpx;
+  border:1px solid #E0E0E0;
+  border-radius: 8rpx;
+  padding: 10rpx;       
+}
+.stock_list view{
+  padding:10rpx;
+  color: #666;
 }

pages/user/user.js

@@ -30,6 +30,11 @@ Page({
         usercode: res.data.data.usercode,
         userinfo: res.data.data
       })
+      if (res.data.data.need_fill){
+        wx.navigateTo({
+          url: '../style/style',
+        })
+      }
     })
     .catch(err=>{
       this.setData({

utils/api.js

@@ -128,7 +128,6 @@ 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),
-  
 }; 
 module.exports = {
   API: API