tanyanfei 3 years ago
parent
commit
37d32fa5e4

+ 1 - 1
pages/day/day.wxml

@@ -6,7 +6,7 @@
     <view class="item">
     <view class="item">
         <text class="tag red">资产</text>{{item.today_fund}} 
         <text class="tag red">资产</text>{{item.today_fund}} 
          <text class="tag border">当日收益</text><text>{{item.today_income}}</text>  
          <text class="tag border">当日收益</text><text>{{item.today_income}}</text>  
-         <text class="tag border">总收益</text><text>{{item.today_income}}</text>
+         <text class="tag border">总收益</text><text>{{item.total_income}}</text>
     </view>
     </view>
     <view class="item">
     <view class="item">
         <text class="tag blue">持仓</text>
         <text class="tag blue">持仓</text>

+ 2 - 0
pages/gameDetail/gameDetail.js

@@ -86,6 +86,8 @@ function initChart(canvas, width, height, dpr) {
             xdata.push(date[1] + '/' + date[2])
             xdata.push(date[1] + '/' + date[2])
             ydata.push(records[i].today_fund)
             ydata.push(records[i].today_fund)
           }
           }
+          xdata = xdata.reverse()
+          ydata = ydata.reverse()
           const chart = echarts.init(canvas, null, {
           const chart = echarts.init(canvas, null, {
             width: width,
             width: width,
             height: height,
             height: height,

+ 2 - 2
pages/gameDetail/gameDetail.wxml

@@ -1,7 +1,7 @@
 <view class="part detail">
 <view class="part detail">
     <view><text>参赛名称</text>{{datas.match.name}}</view>
     <view><text>参赛名称</text>{{datas.match.name}}</view>
-    <view><text>参赛日期</text>{{datas.match.start_time}}-{{datas.match.end_time}}</view>
-    <!-- <view><text>参赛名</text>{{datas.match.start_time}}</view> -->
+    <view><text>参赛日期</text>{{datas.match.start_time}}{{datas.match.end_time}}</view>
+    <view><text>参赛名</text><open-data  type="userNickName"></open-data></view>
     <view><text>参赛组</text>{{datas.match.groups}}</view>
     <view><text>参赛组</text>{{datas.match.groups}}</view>
 </view>
 </view>
 <view class="part info" wx:if='{{datas.today_record}}'>
 <view class="part info" wx:if='{{datas.today_record}}'>

+ 2 - 0
pages/index/index.js

@@ -90,6 +90,8 @@ function initChart(canvas, width, height, dpr) {
             xdata.push(date[1] + '/' + date[2])
             xdata.push(date[1] + '/' + date[2])
             ydata.push(records[i].today_fund)
             ydata.push(records[i].today_fund)
           }
           }
+          xdata = xdata.reverse()
+          ydata=ydata.reverse()
           const chart = echarts.init(canvas, null, {
           const chart = echarts.init(canvas, null, {
             width: width,
             width: width,
             height: height,
             height: height,

+ 5 - 2
pages/index/index.wxml

@@ -11,7 +11,7 @@
   </view>
   </view>
   
   
 </view>
 </view>
-<view style="text-align:center;padding:100px 0;" wx:if='{{datas.records.length==0}}'>暂无数据</view>
+
 <navigator  class="part part1" wx:for='{{datas.records}}' url="../detail/detail?id={{item.id}}"> 
 <navigator  class="part part1" wx:for='{{datas.records}}' url="../detail/detail?id={{item.id}}"> 
     <view class="item">
     <view class="item">
         <text class="tag">日期</text>{{item.stock_date}}
         <text class="tag">日期</text>{{item.stock_date}}
@@ -19,7 +19,7 @@
     <view class="item">
     <view class="item">
         <text class="tag red">资产</text>{{item.today_fund}} 
         <text class="tag red">资产</text>{{item.today_fund}} 
          <text class="tag border">当日收益</text><text>{{item.today_income?item.today_income:''}}</text>  
          <text class="tag border">当日收益</text><text>{{item.today_income?item.today_income:''}}</text>  
-         <text class="tag border">总收益</text><text>{{item.today_income?item.today_income:''}}</text>
+         <text class="tag border">总收益</text><text>{{item.total_income?item.total_income:''}}</text>
     </view>
     </view>
     <view class="item">
     <view class="item">
         <text class="tag blue">持仓</text>
         <text class="tag blue">持仓</text>
@@ -29,3 +29,6 @@
         </view>
         </view>
     </view>
     </view>
 </navigator>
 </navigator>
+
+
+<view style="text-align:center;padding:100px 0;" wx:if='{{datas.records.length==0}}'>暂无数据</view>

+ 1 - 0
pages/list/list.wxml

@@ -7,6 +7,7 @@
         <image wx:if='{{index==0}}' mode="widthFix" src="../images/1.png"></image>
         <image wx:if='{{index==0}}' mode="widthFix" src="../images/1.png"></image>
         <image wx:if='{{index==1}}' mode="widthFix" src="../images/2.png"></image>
         <image wx:if='{{index==1}}' mode="widthFix" src="../images/2.png"></image>
         <image wx:if='{{index==2}}' mode="widthFix" src="../images/3.png"></image>
         <image wx:if='{{index==2}}' mode="widthFix" src="../images/3.png"></image>
+        <text style="width:36rpx;text-align:center;" wx:if='{{index>2}}'>{{index+1}}</text>
         <text class="name">{{item.username}}</text>
         <text class="name">{{item.username}}</text>
         <text>{{item.fund}}</text>
         <text>{{item.fund}}</text>
         <text>{{item.today_fund}}</text>
         <text>{{item.today_fund}}</text>

+ 1 - 1
pages/rank/rank.wxml

@@ -3,7 +3,7 @@
     <text>排名</text><text>选手</text><text>初始资产</text>
     <text>排名</text><text>选手</text><text>初始资产</text>
     <text>今日资产</text><text>总盈亏</text>
     <text>今日资产</text><text>总盈亏</text>
 </view>
 </view>
-<view class="list" wx:for="{{datas.groups}}">
+<view class="list" wx:for="{{datas.groups}}"  wx:if='{{index<3}}'>
     <view class="title">
     <view class="title">
         {{item.name}}
         {{item.name}}
         <navigator url="../list/list?id={{item.id}}">
         <navigator url="../list/list?id={{item.id}}">

+ 30 - 2
pages/upload/upload.js

@@ -112,7 +112,7 @@ Page({
     var i = e.target.dataset.id;
     var i = e.target.dataset.id;
     var v = e.detail.value
     var v = e.detail.value
     var stock = this.data.stock;
     var stock = this.data.stock;
-    stock[i].fund=v;
+    stock[i].fund = Number(v);
     this.setData({
     this.setData({
       stock: stock
       stock: stock
     })
     })
@@ -163,7 +163,28 @@ Page({
       today_stock:this.data.stock,
       today_stock:this.data.stock,
       is_markt: this.data.is_markt,
       is_markt: this.data.is_markt,
       today_stock_img: this.data.today_stock_img,
       today_stock_img: this.data.today_stock_img,
-      today_fund: this.data.today_fund
+      today_fund: Number(this.data.today_fund)
+    }
+    if (!parm.today_fund){
+      wx.showToast({
+        icon: 'none',
+        title: '请输入今日净资产'
+      })
+      return
+    }
+    if (today_fund.length<=0) {
+      wx.showToast({
+        icon: 'none',
+        title: '请选择股票'
+      })
+      return
+    }
+    if (parm.today_stock_img.length<=0) {
+      wx.showToast({
+        icon: 'none',
+        title: '请上传截图'
+      })
+      return
     }
     }
     wx.showLoading({
     wx.showLoading({
       title: '正在提交',
       title: '正在提交',
@@ -177,6 +198,13 @@ Page({
       method:'POST',
       method:'POST',
       success: res => {
       success: res => {
         wx.hideLoading()
         wx.hideLoading()
+        if (res.data.code != 0) {
+          wx.showToast({
+            icon: 'none',
+            title: res.data.message,
+          })
+          return;
+        }
         wx.showToast({
         wx.showToast({
           title: '提交成功',
           title: '提交成功',
         })
         })

+ 1 - 1
pages/upload/upload.wxml

@@ -1,7 +1,7 @@
 <form>
 <form>
     <view class="label" style="margin-bottom:32rpx">持仓日期   {{stock_date}}</view>
     <view class="label" style="margin-bottom:32rpx">持仓日期   {{stock_date}}</view>
     <view class="label">今日净资产</view>
     <view class="label">今日净资产</view>
-    <input bindinput="fundChange1" placeholder="请输入今日净资产"></input>
+    <input type='tel' bindinput="fundChange1" placeholder="请输入今日净资产"></input>
     <view class="label">今日持股</view>
     <view class="label">今日持股</view>
     <view class="info" wx:for='{{stock}}'>
     <view class="info" wx:for='{{stock}}'>
       <!-- <input placeholder="请输入名称"></input> -->
       <!-- <input placeholder="请输入名称"></input> -->