tanyanfei 3 years ago
parent
commit
9267e19cdc
2 changed files with 11 additions and 7 deletions
  1. 3 1
      pages/rank/rank.wxss
  2. 8 6
      pages/today/today.wxml

+ 3 - 1
pages/rank/rank.wxss

@@ -12,6 +12,8 @@ page{
 }
 .date-picker{
   margin-top: 20rpx;
+  text-align: left;
+  padding-left: 10rpx;
 }
 .date-picker image{
   height: 30rpx;
@@ -21,7 +23,7 @@ page{
 .search{
   height: 45rpx;
   position: absolute;
-  right: 30rpx;
+  left: 250rpx;
   bottom: 0rpx;
 }
 .search image{

+ 8 - 6
pages/today/today.wxml

@@ -100,18 +100,14 @@
     </navigator>
   </view>
   <view  class="stock" wx:for='{{stockList}}' wx:if="{{index<3}}">
-    <navigator url="../record/record?id={{item.id}}">
+    <navigator>
       <view class="info">
         <view>{{item.stock_date}}(收益 <text  class="{{item.today_income[0]=='-' ?'down':'up'}}">{{item.today_income}}</text>)</view>
       </view>
       <view class="info">
         资产:  <view><label>{{item.today_fund}}w</label> (收益 <text  class="{{item.total_income[0]=='-' ?'down':'up'}}">{{item.total_income}}</text>)</view>
       </view>
-      <!-- <view class="info">持仓: <view>
-          <block wx:for='{{item.today_stock}}' wx:for-item='i'>
-            {{i.name}}({{i.fund}}w)
-          </block>
-      </view></view> -->
+      
       <view class="info">
                   持仓: 
                     <view wx:if='{{item.is_markt}}'>开超市</view>
@@ -120,6 +116,12 @@
                     </view>
                     <view wx:else>空仓</view>
       </view>
+      <view class="info" wx:if='{{item.experience}}'>
+        今日反思:{{item.experience}}
+      </view>
+      <view class="info" wx:if='{{item.wanzhu_comment}}'>
+        顽主点评:{{item.wanzhu_comment}}
+      </view>
     </navigator>
     <view class="imgs">
           <image wx:for='{{item.today_stock_img}}' wx:for-item='i'  bindtap="preview" data-src='{{i}}' data-urls='{{item.today_stock_img}}'