修复bug

pages/day/day.wxml

@@ -15,6 +15,9 @@
         <view class="list">
             <view wx:for='{{item.today_stock}}' wx:for-item='stock'>
             {{stock.name}}  <text>{{stock.fund}}w</text></view>
+            <view wx:if='{{item.is_markt}}'>已开超市</view>
         </view>
     </view>
-</navigator>
+</navigator>
+
+<view style="text-align:center;padding:100px 0;" wx:if='{{datas.list.length==0}}'>暂无数据</view>

pages/index/index.js

@@ -59,10 +59,18 @@ Page({
       },
       success: res=> {
         console.log(res)
+        wx.hideNavigationBarLoading()
+        if(res.data.code != 0){
+          wx.showToast({
+            icon: 'none',
+            title: '服务器开小差啦',
+          })
+           return
+        }
         this.setData({
           datas: res.data.data
         })
-       wx.hideNavigationBarLoading()
+       
         if (res.data.data.records.length<=0){
             return;
        }

pages/index/index.wxml

@@ -1,5 +1,5 @@
 <!--index.wxml-->
-<view class="part" wx:if='{{userInfo.token}}' style="margin-bottom:0;">
+<view class="part" wx:if='{{datas.match_name}}' style="margin-bottom:0;">
   <view class="title">
     {{datas.match_name}}    
     <image mode="widthFix" src="../images/bank.png"></image>
@@ -27,9 +27,11 @@
         <view class="list">
             <view wx:for='{{item.today_stock}}' wx:for-item='stock'>
             {{stock.name}}  <text>{{stock.fund}}w</text></view>
+            <view wx:if='{{item.is_markt}}'>已开超市</view>
         </view>
     </view>
 </navigator>
 
 
-<view style="text-align:center;padding:100px 0;" wx:if='{{datas.records.length==0}}'>暂无数据</view>
+<view style="text-align:center;padding:100px 0;" wx:if='{{datas.records.length==0}}'>暂无数据</view>
+

pages/upload/upload.js

@@ -189,12 +189,16 @@ Page({
       })
       return
     }
-    if (!parm.today_stock[0].name || !parm.today_stock[0].fund) {
-      wx.showToast({
-        icon: 'none',
-        title: '请选择股票并输入资金额'
-      })
-      return
+    if (!parm.is_markt){
+      if (!parm.today_stock[0].name || !parm.today_stock[0].fund) {
+        wx.showToast({
+          icon: 'none',
+          title: '请选择股票并输入资金额'
+        })
+        return
+      }
+    }else{
+      parm.today_stock = []
     }
     if (parm.today_stock_img.length<=0) {
       wx.showToast({

pages/upload/upload.wxml

@@ -2,6 +2,11 @@
     <view class="label" style="margin-bottom:32rpx">持仓日期   {{stock_date}}</view>
     <view class="label">今日净资产</view>
     <input type='digit' bindinput="fundChange1" placeholder="请输入今日净资产"></input>
+    <view class="openmarket">  
+        开超市  
+        <switch checked="{{is_markt}}" bindchange="switch1Change"/>
+    </view> 
+    <block wx:if='{{!is_markt}}'>
     <view class="label">今日持股</view>
     <view class="info" wx:for='{{stock}}'>
       <input bindchange="nameChange" data-id='{{index}}'  value="{{item.name}}" placeholder="请输入股票名称"></input>
@@ -18,10 +23,7 @@
         <icon bindtap="del" data-id='{{index}}' style="margin-top:20rpx;" class="icon-small" type="cancel" size="25"></icon>
       </view>
     </view>
-    <view class="openmarket">  
-        开超市  
-        <switch checked="{{is_markt}}" bindchange="switch1Change"/>
-    </view> 
+    </block>
     <view class="label">账户截图</view>
     <view wx:for='{{today_stock_img}}'>
         <image style="width:220rpx;height:220rpx;" mode="scaleToFill" src="{{item}}"></image>

pages/user/user.js

@@ -55,6 +55,7 @@ Page({
   },
   /**登陆 */
   login:function(){
+
     var _this=this;
     if(!this.data.usercode){
         wx.showToast({
@@ -63,10 +64,9 @@ Page({
         })
         return;
     }
-    wx.showLoading({
-      title: '正在登陆',
-    })
-    wx.getUserInfo({
+   
+    wx.getUserProfile({
+      desc: '用于完善会员资料',
       success(res){
         //获取基本信息
         var data={
@@ -74,6 +74,9 @@ Page({
           avatarUrl: res.userInfo.avatarUrl,
           usercode: _this.data.usercode
         }
+        wx.showLoading({
+          title: '正在登陆',
+        })
         wx.login({
           success(res) {
             //获取code