修复bug

app.wxss

@@ -6,4 +6,10 @@ view,text{
 }
 input,form,page{
   box-sizing: border-box;
+}
+.up{
+  color: #FF5151 !important; 
+}
+.down{
+   color: green !important;
 }

pages/index/index.js

@@ -5,12 +5,18 @@ var host = app.globalData.host;
 Page({
   data: {
     ec: {
-      onInit: initChart
+      // onInit: initChart
+      lazyLoad: true
     },
+    timer: '',
     datas:{},
     userInfo:{}
+  },
+  onReady: function () {               //这一步是一定要注意的
+    
   },
   onLoad(){
+    
     wx.showNavigationBarLoading()
     /**获取token */
     wx.getStorage({
@@ -47,6 +53,7 @@ Page({
     }
   },
   getData(){
+    this.oneComponent = this.selectComponent('#mychart');
     wx.request({
       url: host + '/api/wx/index',
       header: {
@@ -58,6 +65,16 @@ Page({
           datas: res.data.data
         })
        wx.hideNavigationBarLoading()
+        var records = res.data.data.records, xdata = [], ydata = [];
+        for (let i = 0; i < records.length; i++) {
+          let date = records[i].stock_date.split('-');
+          xdata.push(date[1] + '/' + date[2])
+          ydata.push(records[i].today_fund)
+        }
+        xdata = xdata.reverse()
+        ydata = ydata.reverse()
+        this.init_one(xdata, ydata)
+
       },
       fail: error => {
         //跳转到登陆页面
@@ -67,7 +84,16 @@ Page({
       }
     })
   },
-  onReady() {
+  init_one: function (xdata, ydata) {           //初始化第一个图表
+    this.oneComponent.init((canvas, width, height) => {
+      const chart = echarts.init(canvas, null, {
+        width: width,
+        height: height
+      });
+      setOption(chart, xdata, ydata)
+      this.chart = chart;
+      return chart;
+    });
   },
 });
 
@@ -160,3 +186,60 @@ function initChart(canvas, width, height, dpr) {
   
   
 }
+
+
+function setOption(chart, xdata, ydata) {
+  var option = {
+    legend: {
+      show: false
+    },
+    grid: {
+      x: 35,
+      y: 40,
+      x2: 10,
+      y2: 35
+    },
+    tooltip: {
+      show: true,
+      trigger: 'axis'
+    },
+    xAxis: {
+      type: 'category',
+      data: xdata,
+      axisLabel: {
+        interval: 0,
+        rotate: 40,
+        color: '#999999'
+      }
+    },
+    yAxis: {
+      axisLine: {
+        show: true
+      },
+      type: 'value',
+      name: '收益曲线',
+    },
+    series: [{
+      name: 'A',
+      type: 'line',
+      smooth: true,
+      symbolSize: 8,
+      lineStyle: {
+        color: new echarts.graphic.LinearGradient(1, 0, 0, 0, [{
+          offset: 0,
+          color: '#FF2D68'
+        }, {
+          offset: 1,
+          color: '#4C4BFF'
+        }]),
+      },
+      itemStyle: {
+        borderWidth: 5,
+        borderColor: '#FFAD52',
+        color: '#FFAD52'
+      },
+      data: ydata
+    }]
+  };
+  chart.setOption(option)
+}

pages/index/index.wxml

@@ -1,31 +1,32 @@
 <!--index.wxml-->
-<view class="part" wx:if='{{userInfo.token}}'>
+<view class="part" wx:if='{{userInfo.token}}' style="margin-bottom:0;">
   <view class="title">
     {{datas.match_name}}    
     <image mode="widthFix" src="../images/bank.png"></image>
     <view class="rank"> <text>{{datas.cur_rank?datas.cur_rank:''}}</text>当前排名 </view>  
   </view>
-  <view class="container"  wx:if='{{datas.records.length>0}}'>
+</view>
+
+<view class="container">
     <ec-canvas id="mychart" canvas-id="mychart-line" ec="{{ ec }}">
     </ec-canvas>
   </view>
-  
-</view>
 
 <navigator  class="part part1" wx:for='{{datas.records}}' url="../detail/detail?id={{item.id}}"> 
     <view class="item">
         <text class="tag">日期</text>{{item.stock_date}}
     </view>
     <view class="item">
-        <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.total_income?item.total_income:''}}</text>
+        <text class="tag red">资产</text>{{item.today_fund}}w
+         <text class="tag border">当日收益</text>
+         <text class="{{item.today_income[0]=='-'?'down':'up'}}">{{item.today_income?item.today_income:''}}</text>  
+         <text class="tag border">总收益</text><text class="{{item.total_income[0]=='-'?'down':'up'}}">{{item.total_income?item.total_income:''}}</text>
     </view>
     <view class="item">
         <text class="tag blue">持仓</text>
         <view class="list">
             <view wx:for='{{item.today_stock}}' wx:for-item='stock'>
-            {{stock.name}}  <text>{{stock.fund}}</text></view>
+            {{stock.name}}  <text>{{stock.fund}}w</text></view>
         </view>
     </view>
 </navigator>

pages/index/index.wxss

@@ -9,6 +9,8 @@ page{
   align-items: center;
   justify-content: space-between;
   box-sizing: border-box; 
+  background: #fff;
+  margin-bottom: 16rpx;
 } 
 
 ec-canvas {
@@ -72,6 +74,7 @@ ec-canvas {
   padding: 0 3px;
   
 }
+
 .item .red{
   background: #FF5151;
 }

pages/list/list.wxml

@@ -9,8 +9,8 @@
         <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>{{item.fund}}</text>
-        <text>{{item.today_fund}}</text>
-        <text class="red">{{item.total_income}}</text>
+        <text>{{item.fund}}w</text>
+        <text>{{item.today_fund}}w</text>
+        <text  class="{{item.total_income[0]=='-'?'down':'up'}}">{{item.total_income}}</text>
     </view>
 </view>

pages/rank/rank.wxml

@@ -16,9 +16,9 @@
         <image wx:if='{{i==1}}' mode="widthFix" src="../images/2.png"></image>
         <image wx:if='{{i==2}}' mode="widthFix" src="../images/3.png"></image>
         <text class="name">{{player.username}}</text>
-        <text>{{player.fund}}</text>
-        <text>{{player.today_fund}}</text>
-        <text class="red">{{player.total_income}}</text>
+        <text>{{player.fund}}w</text>
+        <text>{{player.today_fund}}w</text>
+        <text  class="{{player.total_income[0]=='-'?'down':'up'}}">{{player.total_income}}</text>
     </view>
 </view>
 

pages/upload/upload.js

@@ -9,7 +9,7 @@ Page({
   data: {
     open:true,
     stock_date: new Date().getFullYear() + '-' + Number(new Date().getMonth() + 1) + '-' + new Date().getDate(),
-    stock:[{label:'',name:'',code:'',fund:''}],
+    stock:[{name:'',fund:''}],
     stockList:[],
     today_stock_img:[],
     value:[-1],
@@ -108,6 +108,15 @@ Page({
       value: value
     })
   },
+  nameChange(e){
+    var i = e.target.dataset.id;
+    var v = e.detail.value
+    var stock = this.data.stock;
+    stock[i].name = v;
+    this.setData({
+      stock: stock
+    })
+  },
   fundChange(e){
     var i = e.target.dataset.id;
     var v = e.detail.value

pages/upload/upload.wxml

@@ -4,13 +4,13 @@
     <input type='digit' bindinput="fundChange1" placeholder="请输入今日净资产"></input>
     <view class="label">今日持股</view>
     <view class="info" wx:for='{{stock}}'>
-      <!-- <input placeholder="请输入名称"></input> -->
-      <picker  bindchange="bindPickerChange" data-id='{{index}}' value="{{value[index]}}" range-key='label' range="{{stockList}}">
+      <input bindchange="nameChange" data-id='{{index}}'  value="{{item.name}}" placeholder="请输入股票名称"></input>
+      <!-- <picker  bindchange="bindPickerChange" data-id='{{index}}' value="{{value[index]}}" range-key='label' range="{{stockList}}">
         <view class="picker">
           <text wx:if='{{value[index]<0}}' style="color:#999;">请选择股票</text>
           {{stockList[value[index]].name}}
         </view>
-      </picker>
+      </picker> -->
       <input type='digit' bindinput="fundChange" data-id='{{index}}' value="{{item.fund}}" placeholder="请输入资金额"></input>
       <text>w</text>
       <view bindtap="add" wx:if='{{index==stock.length-1}}' class="add">添加持股</view>