报名

pages/homepage/homepage.wxml

@@ -26,14 +26,16 @@
   </view> -->
   <view>
     <text>跟踪股票</text>
-    <block wx:for="{{datas.stock_follow}}">{{item}}</block>
+    <block wx:for="{{datas.stock_follow}}">{{item}}   </block>
   </view>
 </view>
 <view class="style" style="margin: 0;">
     <view class="game">参赛  <picker>第49届顽主杯实盘大赛</picker></view>
+    <block wx:if="{{datas.today_record.group_rank}}">
     <view>
       <text>时间</text>{{datas.today_record.stock_date}}
     </view>
+    
     <view>
       <text>排名</text>{{datas.today_record.group_rank}}（{{datas.today_record.match_group_name}}）
     </view>
@@ -46,6 +48,7 @@
     <view>
       <text>胜率</text>{{datas.today_record.win_rate}}（最大回撤 <label class="{{datas.today_record.badest_income[0]=='-' ?'down':'up'}}"> {{datas.today_record.badest_income}} </label>）
     </view>
+  </block>
 </view>
 <view class="content">
     <!-- <view class="title">收益曲线</view> -->
@@ -122,7 +125,7 @@
         <text>{{item.zans_count}}</text>
     </view>
   </view>
-  <view class="look_all">
+  <view class="look_all" wx:if="{{stockList.length>0}}">
     <navigator hover-class="none" url="../day/day?id={{id}}&player_id={{player_id}}">
           查看全部
     </navigator>

pages/index/index.js

@@ -27,15 +27,20 @@ Page({
     error:0
   },
   onLoad() {
+    
     wx.showNavigationBarLoading()
     var y = new Date().getFullYear(), m = (new Date().getMonth() + 1), d = new Date().getDate();
     m = m > 9 ? m : '0' + m;
     d = d > 9 ? d : '0' + d;
-    this.setData({
-      date: y + '-' + m + '-' + d
+    // this.setData({
+    //   date: y + '-' + m + '-' + d
+    // })
+    $api.getDate().then(res=>{
+      this.setData({
+        date:res.data.data
+      })
     })
-
-    this.getFollow()
+    // this.getFollow()
    
     $api.getNotoice().then(res=>{
       this.setData({
@@ -145,13 +150,7 @@ Page({
       })
     })
     
-    // $api.getDate().then(res=>{
-    //   this.setData({
-    //     date:res.data.data
-    //   })
-    //   this.getHot()
-    //   this.getHotFollowList()
-    // })
+    
   }, 
   //热门选手分页
   next3: function () {
@@ -182,11 +181,7 @@ Page({
   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 => {
       
       this.setData({
@@ -215,26 +210,31 @@ Page({
             return
           }
           this.getFollow()
+          break;
         case 1:
           if (this.data.hotbuyList.length>0) {
             return
           }
           this.getHot()
+          break;
         case 2:
           if (this.data.hotFollowList.length > 0) {
             return
           }
           this.getHotFollowList()
+          break;
         case 3:
           if (this.data.winList.length > 0) {
             return
           }
           this.getWin()
+          break;
         case 4:
           if (this.data.championList.length>0) {
             return
           }
           this.getData()
+          break;
       }
   },
   tabChange1(e){
@@ -262,11 +262,13 @@ Page({
             return
           }
           this.getFollow()
+          break;
         case 1:
           if (this.data.hotbuyList) {
             return
           }
           this.getHot()
+          break;
         case 2:
           if (this.data.hotFollowList.length > 0) {
             return
@@ -277,11 +279,13 @@ Page({
             return
           }
           this.getWin()
+          break;
         case 4:
           if (this.data.championList) {
             return
           }
           this.getData()
+          break;
       }
     }
   
@@ -296,6 +300,14 @@ Page({
     this.getHot()
   },
   onShow: function (e) {
+    //判断是否报名
+    $api.getAuthinfo().then(res=>{
+      if(res.data.data.role==0){
+        wx.navigateTo({
+          url: '../apply/apply',
+        })
+      }
+    })
     this.setData({
       followList:[],
       defendList:[],
@@ -315,14 +327,19 @@ Page({
     switch(this.data.cur){
       case 0:
         this.getFollow()
+        break;
       case 1:
         this.getHot()
+        break;
       case 2:
         this.getHotFollowList()
+        break;
       case 3:
         this.getWin()
+        break;
       case 4:
         this.getData()
+        break;
     }
     // if (app.globalData.follow){
     //   this.setData({

pages/rank/rank.js

@@ -86,7 +86,7 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-    console.log('show')
+ 
     wx.hideNavigationBarLoading()
     if (!this.data.datas.groups){
       $api.getDate().then(res => {

pages/user/user.js

@@ -71,11 +71,18 @@ Page({
       wx.setNavigationBarTitle({
         title: '',
       })
-      this.setData({
-        usercode: res.data.data.usercode,
-        userinfo: res.data.data,
-        status:3
-      })
+      
+      if(res.data.data.role==0){
+        wx.navigateTo({
+          url: '../apply/apply',
+        })
+      }else{
+        this.setData({
+          usercode: res.data.data.usercode,
+          userinfo: res.data.data,
+          status:3
+        })
+      }
     })
     .catch(err=>{
       this.setData({
@@ -211,9 +218,7 @@ Page({
     logindata.phcode=this.data.phcode
     $api.login(logindata).then(res=>{
       if(res.data.code == 0){
-          this.setData({
-            status:3
-          })
+  
           this.getUserData()
           this.getTodayData()
       } 
@@ -222,9 +227,7 @@ Page({
   login2(){
     $api.bindphone({phone:this.data.phone,phcode:this.data.phcode}).then(res=>{
       if(res.data.code == 0){
-          this.setData({
-            status:3
-          })
+      
           this.getUserData()
           this.getTodayData()
       }
@@ -250,6 +253,14 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
+    //判断是否报名
+    $api.getAuthinfo().then(res=>{
+      if(res.data.data.role==0){
+        wx.navigateTo({
+          url: '../apply/apply',
+        })
+      }
+    })
     this.getTodayData()
 
   },

pages/user/user.wxml

@@ -9,7 +9,7 @@
         </view>
         <navigator  url="../homepage/homepage?id={{todayinfo.match_id}}&record_id={{todayinfo.id}}&player_id={{todayinfo.player_id}}&type=1" class="mine">我的主页</navigator>
       </view>
-      <view  wx:if='{{todayinfo.match_id}}' class="today">
+      <view  wx:if='{{todayinfo.today_fund}}' class="today">
       <navigator hover-class="none"  url="../change/change">
       
       <view class="money">

pages/user/user.wxss

@@ -104,7 +104,7 @@ page{
 }
 
 .today{
-  margin: 30rpx 30rpx;
+  margin: 30rpx 30rpx 0;
   background: #fff;
   border-radius: 8rpx;
   box-shadow: 0 0 10px 0px rgba(51, 51, 51, 0.1);
@@ -191,7 +191,7 @@ page{
   left: -10rpx;
 }
 .list{
-  margin: 0 30rpx;
+  margin:30rpx;
   border-radius: 8rpx;
   box-shadow: 0 0 10px 0px rgba(51, 51, 51, 0.1);
   overflow: hidden;