细节修改

pages/index/index.js

@@ -36,12 +36,7 @@ Page({
   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
-    // })
+    
     $api.getDate().then(res=>{
       this.setData({
         date:res.data.data
@@ -52,10 +47,9 @@ Page({
         })
       })
     })
+
     this.getFollow()
    
-    
-    
   },
   fresh: function () {
     this.setData({
@@ -95,6 +89,8 @@ Page({
         error:0,
         loading: 0
       })
+
+      app.globalData.follow = 0
     })
     .catch(err=>{
       this.setData({
@@ -126,30 +122,6 @@ Page({
       })
     })
   },
-  //防守分页  防守榜去掉
-  // next2: function () {
-  //   if (this.data.defendList.length < this.data.total2) {
-  //     const page = this.data.page2 + 1
-  //     this.setData({
-  //       page2: page
-  //     })
-  //     this.getDefen()
-  //   }
-  // },
-  // getDefen() {
-  //   var defendList = this.data.defendList
-  //   $api.getDefend({
-  //     page: this.data.page2, page_size: 20
-  //   }).then(res => {
-  //     res.data.data.list.forEach(item => {
-  //       defendList.push(item)
-  //     })
-  //     this.setData({
-  //       defendList: defendList,
-  //       total2: res.data.data.total
-  //     })
-  //   })
-  // },
 
   getData(){
     //心得
@@ -210,11 +182,6 @@ Page({
       })
       wx.hideNavigationBarLoading()
     })
-    // $api.getHotsellList({ stock_date: stock_date }).then(res => {
-    //   this.setData({
-    //     hotsellList: res.data.data.list
-    //   })
-    // })
     
   },
   tabChange(e){
@@ -328,8 +295,10 @@ Page({
       }
     })
     
-    if(this.data.followList.length<=0){
+    if(this.data.cur == 0 && app.globalData.follow == 1){
       this.data.loading = 1
+      this.data.page    = 1
+      this.data.total   = -1,
       this.getFollow()
     }
   },

pages/list/list.js

@@ -30,7 +30,7 @@ Page({
     var data={
       id: this.data.id,
       page: this.data.page,
-      page_size:20,
+      page_size:50,
       order_by: this.data.order_by,
       stock_date:this.data.date
     }

pages/list/list.wxml

@@ -30,7 +30,7 @@
         
     </navigator>
     
-    <block wx:if='{{total >= 20}}'>
+    <block wx:if='{{total >= 50 }}'>
                   <view class='more' wx:if='{{list.length < total}}'>上拉加载更多...</view>
                   <!-- <view class='more' wx:else>已加载全部数据！</view> -->
     </block>

pages/login/user.js

@@ -3,7 +3,7 @@ const app = getApp()
 var host = app.globalData.host;
 const $api = require('../../utils/api.js').API;
 var logindata={}
-const defaultAvatarUrl = 'https://mmbiz.qpic.cn/mmbiz/icTdbqWNOwNRna42FI242Lcia07jQodd2FJGIYQfG0LAJGFxM4FbnQP6yfMxBgJ0F3YRqJCJ1aPAK2dQagdusBZg/0'
+const defaultAvatarUrl = '../../images/userdefault.png'
 
 Page({
 
@@ -156,6 +156,24 @@ Page({
       usercode: this.data.usercode
     }
 
+    if(data.avatarUrl == defaultAvatarUrl){
+      wx.showToast({
+        icon: 'none',
+        title: '请选择头像',
+      })
+      return
+    }
+
+    if(data.nickName == ''){
+      wx.showToast({
+        icon: 'none',
+        title: '请输入昵称',
+      })
+      return
+    }
+
+    
+
     this.wxlogin(data)
   },
 

pages/message/message.wxss

@@ -5,14 +5,14 @@ page{
 }
 .list{
     position: relative;
-    margin-bottom: 48rpx;
+    margin-bottom: 80rpx;
 }
 .list:last-child{
     padding-bottom: 160rpx;
 }
 .post{
     position: fixed;
-    padding: 24rpx 30rpx 80rpx;
+    padding: 24rpx 30rpx 50rpx;
     bottom: 0;
     left: 0;
     background: #fff;
@@ -30,6 +30,7 @@ page{
     font-size: 30rpx;
     color: #333;
     padding: 0 16rpx;
+    margin-bottom: 24rpx;
 }
 .post button:not([size='mini']){
     height: 64rpx;

pages/stock/stock.wxss

@@ -221,7 +221,7 @@ image{
 }
 .post{
   position: fixed;
-  padding: 24rpx 30rpx 80rpx;
+  padding: 24rpx 30rpx 50rpx;
   bottom: 0;
   left: 0;
   background: #fff;
@@ -239,6 +239,7 @@ image{
   font-size: 30rpx;
   color: #666;
   padding: 0 16rpx;
+  margin-bottom: 24rpx;
 }
 .post button:not([size='mini']){
   height: 64rpx;

pages/today/today.wxml

@@ -52,7 +52,8 @@
   </view>
 </view>
 
-<view class="title">交割单</view>
+<view class="title">持仓图<text class="des">（为方便阅读，股票线图为系统自动补充，非选手上传）</text></view>
+
 <view class="imgs" wx:if='{{datas.today_record.today_stock_img.length>0}}'>
     <image wx:for='{{datas.today_record.today_stock_img}}' wx:for-item='i'  bindtap="preview" data-src='{{i}}' data-urls='{{datas.today_record.today_stock_img}}'
                  class="img" src="{{i}}"></image>

pages/today/today.wxss

@@ -391,7 +391,7 @@ picker{
 }
 .post{
   position: fixed;
-  padding: 24rpx 30rpx 80rpx;
+  padding: 24rpx 30rpx 50rpx;
   bottom: 0;
   left: 0;
   background: #fff;
@@ -409,6 +409,7 @@ picker{
   font-size: 30rpx;
   color: #666;
   padding: 0 16rpx;
+  margin-bottom: 24rpx;
 }
 .post button:not([size='mini']){
   height: 64rpx;
@@ -430,6 +431,11 @@ picker{
 .zan{
   animation: good .5s;
 }
+
+.des{
+  color: #b1b1b1;
+  font-size: 24rpx;
+}
 @keyframes good
 {
     0% {