tanyanfei 4 years ago
parent
commit
7aac98377b
3 changed files with 18 additions and 8 deletions
  1. 2 1
      pages/gameDetail/gameDetail.wxml
  2. 6 1
      pages/gameDetail/gameDetail.wxss
  3. 10 6
      pages/upload/upload.js

+ 2 - 1
pages/gameDetail/gameDetail.wxml

@@ -5,7 +5,8 @@
     <view><text>参赛组</text>{{datas.match.groups}}</view>
 </view>
 <view class="part info" wx:if='{{datas.today_record}}'>
-    <view> <text>{{datas.today_record.rank}}</text>排名  </view>
+    <view style="width:20%;"> <text>{{datas.today_record.rank}}</text>排名  </view>
+    <view style="width:30%;"> <text>{{datas.today_record.group_rank}}</text>小组排名  </view>
     <view> <text  class="{{datas.today_record.today_income[0]=='-'?'down':'up'}}">{{datas.today_record.today_income}}</text>盈亏  </view>
     <view> <text>{{datas.today_record.init_fund}}</text>初始资产(万)  </view>
     <view> <text >{{datas.today_record.today_fund}}</text>今日资产(万)  </view>

+ 6 - 1
pages/gameDetail/gameDetail.wxss

@@ -27,8 +27,13 @@ page{
   padding: 16rpx 32rpx;
 }
 .info view:first-child{
+  /* border-right: 1px solid #F6F6F6; */
+}
+.info view:nth-child(2){
   border-right: 1px solid #F6F6F6;
-  border-bottom: 1px solid #F6F6F6
+}
+.info view:nth-child(4){
+  border-top: 1px solid #F6F6F6
 }
 .info view:last-child{
   border-left: 1px solid #F6F6F6;

+ 10 - 6
pages/upload/upload.js

@@ -190,13 +190,17 @@ Page({
       return
     }
     if (!parm.is_markt){
-      if (!parm.today_stock[0].name || !parm.today_stock[0].fund) {
-        wx.showToast({
-          icon: 'none',
-          title: '请选择股票并输入资金额'
-        })
-        return
+      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 = []
     }