当日人均仓位

pages/index/index.js

@@ -64,9 +64,12 @@ Page({
     wx.getStorage({
       key: 'user',
       complete: res => {
-        this.setData({
-          role: res.data.role,
-        })
+        if(res.data){
+          this.setData({
+            role: res.data.role,
+          })
+        }
+        
       }
     })
 
@@ -305,54 +308,19 @@ Page({
   },
   getCangwei(mid){
     $api.getCangweiList({match_id:mid}).then(res=>{
-      var days=res.data.data.list,weeks=[]
-      days=days.reverse()
-      var ncangwei = []
-
-      for(let i=0;i<100;i++){
-        ncangwei.push({
-          name:'',
-          data:[],
-          total:0
+      var cangwei = [];
+      var records = res.data.data.list
+      for (let i = 0; i < records.length; i++) {
+        let date = records[i].stock_date.split('-');
+        let y = records[i].today_cangwei_avg.replace('%', '')
+        cangwei.push({
+          date:date[1] + '/' + date[2],
+          data:Number(y)
         })
       }
-      var pre=0;
-      days.forEach(item=>{
-        var w=this.getWeekNumber(item.stock_date)
-        if(w<pre){
-          if(w==1){
-            ncangwei[pre-1].data.push(item)
-          }else{
-            ncangwei[pre+w-2].data.push(item)
-          }
-        }else{
-          ncangwei[w-1].data.push(item)
-          pre=w
-        } 
-      })
-      
-      ncangwei=ncangwei.filter(item=>item.data.length>0)
-      
-      var w_text=['一','二','三','四','五','六','七','八','九','十','十一','十二','十三','十四','十五']
-      ncangwei.forEach((item,index)=>{
-        if(item.data.length>0){
-          item.name='第'+w_text[index]+'周'
-          var total=0
-          var money = 10000.0
-          item.data.forEach(i=>{
-            i.date=(new Date(i.stock_date).getMonth()+1)+'/'+(new Date(i.stock_date).getDate())
-          })
-        }
-      })
-
-      records = res.data.data.list
-      this.setData({
-        ec: {
-          onInit:initChart
-        },
-        cangwei:ncangwei.reverse()
-      })
-
+        this.setData({
+          cangwei:cangwei.reverse()
+        })
     })
   },
   //计算周数
@@ -581,17 +549,19 @@ function initChart(canvas, width, height, dpr) {
   for (let i = 0; i < records.length; i++) {
     let date = records[i].stock_date.split('-');
     xdata.push(date[1] + '/' + date[2])
-    let y = records[i].total_income.replace('%', '')
+    let y = records[i].today_cangwei_avg.replace('%', '')
     ydata.push(Number(y))
   }
-  xdata = xdata.reverse()
-  ydata = ydata.reverse()
+  xdata = xdata
+  ydata = ydata
+  console.log(xdata,ydata)
   const chart = echarts.init(canvas, null, {
     width: width,
     height: height,
     devicePixelRatio: dpr // new
   });
   canvas.setChart(chart);
+
   var option = {
     legend: {
       show: false
@@ -633,20 +603,7 @@ function initChart(canvas, width, height, dpr) {
       },
     },
     series: [{
-      name: 'A',
       type: 'line',
-      smooth: true,
-      symbolSize: 4,
-      lineStyle: {
-        color: '#FF2D68'
-        // color: new echarts.graphic.LinearGradient(1, 0, 0, 0, [{
-        //   offset: 0,
-        //   color: '#FF2D68'
-        // }, {
-        //   offset: 1,
-        //   color: '#4C4BFF'
-        // }]),
-      },
       itemStyle: {
         borderWidth: 5,
         borderColor: '#FFAD52',

pages/index/index.wxml

@@ -128,24 +128,19 @@
 </view>
 
 <view class="up-down-view" style="padding: 25rpx;">
-  <view class="article-title" > 选手人均仓位</view>
-  <view wx:if='{{cangwei.length>0}}' class=" ">
-      <view wx:for='{{cangwei}}' wx:if='{{item.data.length>0}}' class="yk">
-        <view class="week_name">{{item.name}}</view>
-        <view class="week_incom">
-          <view wx:for='{{item.data}}' wx:for-item='week' class="{{week.today_income=='0.0%' ?'none':''}} {{week.today_income[0]=='-' ?'down':'up'}}">
-            {{week.date}}
-            <text>{{week.today_cangwei_avg}}</text>
-        </view>
-        </view>
-      </view>
-  </view>
+  <view class="article-title" > 当日人均仓位</view>
+  <scroll-view scroll-x 	scroll-left='{{cangwei.length*45}}'  style="padding: 0;" wx:if="{{cangwei.length > 1}}">
+       <view class="bar-content" style="{{'width:'+cangwei.length*45+'px'}}">
+          <view wx:for="{{cangwei}}" class="bar-item" style="{{'height:'+item.data+'%'}}">
+            <text>{{item.data}}%</text>
+            <view ></view>
+            <text>{{item.date}}</text>
+          </view>
+       </view>
+    </scroll-view>
 </view>
 
-<view class="container">
-  <ec-canvas   ec="{{ ec }}">
-  </ec-canvas>
-</view>
+
 
 <view wx:if="{{isWeek || isScore}}" class="up-down-view" style="padding: 25rpx;">
   <view class="article-title" > 今日市场打分</view>

pages/index/index.wxss

@@ -737,4 +737,25 @@ ec-canvas {
   height: 100%;
   position: relative;
   z-index: 99;
+}
+.bar{
+  width: 100%;
+  overflow: auto;
+}
+.bar-content{
+  display: flex;
+  align-items: flex-end;
+  height:300rpx;
+}
+.bar-item{
+  margin-right: 20rpx;
+  text-align: center;
+  width: 35px;
+}
+.bar-item text{
+  font-size: 20rpx;
+}
+.bar-item view{
+    height:60%;
+    background-color: #85D6CB;
 }