空仓

pages/day/day.wxml

@@ -20,8 +20,8 @@
                   <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 && item.today_stock.length<=0 && item.auto_complete<=0}}'>空仓</view>
+              <view wx:if='{{!item.is_markt && item.today_stock.length<=0 && item.auto_complete>0}}'>请假</view>
         </view>
     </view>
 </navigator>

pages/detail/detail.wxml

@@ -30,7 +30,9 @@
             src='{{img}}' data-src="{{img}}" bindtap="prview"></image>
              </view>
         </block>  
-        <view wx:if='{{!datas.yesterday_is_markt && datas.yesterday_stock.length<=0}}'>空仓</view>
+        <view wx:if='{{!datas.yesterday_is_markt && datas.yesterday_stock.length<=0 && datas.auto_complete<=0}}'>空仓</view>
+        <view wx:if='{{!datas.yesterday_is_markt && datas.yesterday_stock.length<=0 && datas.auto_complete>0}}'>请假</view>
+
   </view>
   <text class="tag blue">今日持股</text>
   <view class="list">
@@ -44,6 +46,8 @@
             src='{{img}}' data-src="{{img}}"  bindtap="prview"></image>
              </view>
         </block>
-        <view wx:if='{{!datas.is_markt && datas.today_stock.length<=0}}'>空仓</view>
+        <view wx:if='{{!datas.is_markt && datas.today_stock.length<=0 && datas.auto_complete<=0}}'>空仓</view>
+        <view wx:if='{{!datas.is_markt && datas.today_stock.length<=0 && datas.auto_complete>0}}'>请假</view>
+
   </view>
 </view>

pages/gameDetail/gameDetail.js

@@ -113,14 +113,15 @@ function initChart(canvas, width, height, dpr) {
               show: false
             },
             grid: {
-              x: 35,
+              x: 50,
               y: 40,
               x2: 10,
               y2: 35
             },
             tooltip: {
               show: true,
-              trigger: 'axis'
+              trigger: 'axis',
+              formatter: '{b0}: {c0}%'
             },
             xAxis: {
               type: 'category',
@@ -137,6 +138,14 @@ function initChart(canvas, width, height, dpr) {
               },
               type: 'value',
               name: '收益曲线',
+              axisLabel: {
+                formatter: function (value, index) {//隐藏 0
+                  let texts = [];
+                  texts.push(value + '%')
+                  return texts;
+                },
+                show: true
+              },
             },
             series: [{
               name: 'A',

pages/index/index.js

@@ -238,9 +238,7 @@ function setOption(chart, xdata, ydata) {
           texts.push(value+'%')
           return texts;
         },
-        show: true,
-        interval: 0,
-        // rotate: 40,
+        show: true
       },
     },
     series: [{

pages/index/index.wxml

@@ -30,7 +30,8 @@
             <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 && item.today_stock.length<=0 && item.auto_complete<=0}}'>空仓</view>
+        <view wx:if='{{!item.is_markt && item.today_stock.length<=0 && item.auto_complete>0}}'>请假</view>
         </view>
     </view>
 </navigator>