bug

pages/day/day.wxml

@@ -13,12 +13,15 @@
     <view class="item">
         <text class="tag blue">持仓</text>
         <view class="list">
+              <view wx:if='{{item.is_markt}}'>开超市</view>
+              <block wx:if='{{!item.is_markt && item.today_stock.length>0}}'>
+              <view wx:for='{{item.today_stock}}' wx:for-item='stock' >
+                  {{stock.name}}  
+                  <text wx:if='{{stock.fund>0}}'>{{stock.fund}}万</text>
+              </view>
+              </block>
+              <view wx:if='{{!item.is_markt && item.today_stock.length<=0}}'>空仓</view>
             
-            <view wx:if='{{item.is_markt}}'>已开超市</view>
-            <block wx:else>
-                <view wx:for='{{item.today_stock}}' wx:for-item='stock'>
-              {{stock.name}}  <text wx:if='{{stock.fund}}'>{{stock.fund}}万</text></view>
-            </block>
         </view>
     </view>
 </navigator>

pages/detail/detail.wxml

@@ -20,18 +20,20 @@
 <view class="part">
   <text class="tag blue">昨日持股</text>
   <view class="list">
-        <!-- <view wx:if='{{item.is_markt}}'>已开超市</view> -->
-        <!-- <block wx:else> -->
+        <view wx:if='{{datas.yesterday_is_markt}}'>开超市</view>
+        <block wx:if='{{!datas.yesterday_is_markt && datas.yesterday_stock.length>0}}'>
             <view wx:for='{{datas.yesterday_stock}}' wx:for-item='stock' >
-            {{stock.name}}  <text wx:if='{{stock.fund}}'>{{stock.fund}}万</text></view>
-        <!-- </block>   -->
+            {{stock.name}}  <text wx:if='{{stock.fund>0}}'>{{stock.fund}}万</text></view>
+        </block>  
+        <view wx:if='{{!datas.yesterday_is_markt && datas.yesterday_stock.length<=0}}'>空仓</view>
   </view>
   <text class="tag blue">今日持股</text>
   <view class="list">
-      <!-- <view wx:if='{{item.is_markt}}'>已开超市</view> -->
-        <!-- <block wx:else> -->
+      <view wx:if='{{datas.is_markt}}'>开超市</view>
+        <block  wx:if='{{!datas.is_markt && datas.today_stock.length>0}}'>
             <view wx:for='{{datas.today_stock}}' wx:for-item='stock' >
-            {{stock.name}}  <text wx:if='{{stock.fund}}'>{{stock.fund}}万</text></view>
-        <!-- </block> -->
+            {{stock.name}}  <text wx:if='{{stock.fund>0}}'>{{stock.fund}}万</text></view>
+        </block>
+        <view wx:if='{{!datas.is_markt && datas.today_stock.length<=0}}'>空仓</view>
   </view>
 </view>

pages/index/index.wxml

@@ -26,10 +26,11 @@
         <text class="tag blue">持仓</text>
         <view class="list">
         <view wx:if='{{item.is_markt}}'>开超市</view>
-        <block wx:else>
+        <block wx:if='{{!item.is_markt && item.today_stock.length>0}}'>
             <view wx:for='{{item.today_stock}}' wx:for-item='stock' >
-            {{stock.name}}  <text>{{stock.fund}}万</text></view>
+            {{stock.name}}  <text wx:if='{{stock.fund>0}}'>{{stock.fund}}万</text></view>
         </block>
+        <view wx:if='{{!item.is_markt && item.today_stock.length<=0}}'>空仓</view>
         </view>
     </view>
 </navigator>

pages/upload/upload.js

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