From 1843b96a2a57674da10ea3b139f9969e5d4b4476 Mon Sep 17 00:00:00 2001
From: mengxiaolong <meng.xiaolong@ebiz-digits.com>
Date: Wed, 12 Aug 2020 16:31:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F,=E6=8E=A5=E5=8F=A3=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/ebiz/my/my.js            |  2 +-
 src/views/ebiz/my/UserIncome.vue | 29 ++++++++++++++++++-----------
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/src/api/ebiz/my/my.js b/src/api/ebiz/my/my.js
index d12f9a84f..0aacdfd21 100644
--- a/src/api/ebiz/my/my.js
+++ b/src/api/ebiz/my/my.js
@@ -41,7 +41,7 @@ export function getAgentInfo(data) {
 export function getAgentIncome(data) {
   return request({
     // url: getUrl('/agent/income/info', 0),
-    url: getUrl('/agent/agent/income/info', 1),
+    url: getUrl('/agent/agentTransform/income/info', 1),
     method: 'post',
     data
   })
diff --git a/src/views/ebiz/my/UserIncome.vue b/src/views/ebiz/my/UserIncome.vue
index 889b5b172..770065ea8 100644
--- a/src/views/ebiz/my/UserIncome.vue
+++ b/src/views/ebiz/my/UserIncome.vue
@@ -5,7 +5,7 @@
         <van-button round color="#e9332f" size="mini">当月</van-button>
         <span class="ml10" style="font-size: 14px;" @click="showDatePicker = true">选择日期</span>
       </div>
-      <van-row>
+      <van-row class="stickyContent">
         <van-col span="24">
           <div id="date-picker">
             <!-- 收入展示面板 -->
@@ -30,8 +30,8 @@
 
     <!-- 输入具体内容 -->
     <van-row class="moneyContent" v-for="(item, index) in moneyData" :key="index">
-      <van-col class="text-center" span="12">{{ item.payRollMoney }}</van-col>
       <van-col class="text-center" span="12">{{ item.payRollName }}</van-col>
+      <van-col class="text-center" span="12">{{ item.payRollMoney }}</van-col>
     </van-row>
 
     <!-- 日期选择 -->
@@ -49,9 +49,9 @@
 </template>
 
 <script>
-// import echarts from 'echarts'
 import { Sticky, List, Button, Collapse, CollapseItem, Cell, CellGroup, DatetimePicker, Popup, Row, Col, Tab, Tabs } from 'vant'
 import { getAgentIncome } from '@/api/ebiz/my/my.js'
+import formatter from '@/assets/js/utils/date-utils.js'
 export default {
   data() {
     return {
@@ -126,15 +126,21 @@ export default {
       currentDate: new Date(),
       active: 2,
       echartsShow: true, // 展示 echarts 对应的 tab 栏
-      monthActualPay: '', // 当月实付
-      monthShouldPay: 7340, // 当月应付
+      monthActualPay: 0, // 当月实付
+      monthShouldPay: 0, // 当月应付
       rewardInfoList: [], // 收益明细
       paymentInfo: {} // 加扣款明细
     }
   },
   created() {
-    const monthDate = this.$options.filters.timeFormat(this.currentDate, 'YYYYDD')
-    this.getIncomeInfo(monthDate)
+    // let currentMonth = formatter.formatDate(new Date(), 'YYYYMM')
+    // this.getIncomeInfo(currentMonth)
+    for (let i = 0; i < 20; i++) {
+      this.moneyData.push({
+        payRollMoney: 1000,
+        payRollName: 'xxxx'
+      })
+    }
   },
   mounted() {
     // 基于准备好的dom，初始化echarts实例
@@ -144,10 +150,6 @@ export default {
     // 设置背景颜色
     // document.body.style.backgroundColor = '#fff'
   },
-  beforeRouteLeave(to, from, next) {
-    document.body.style.backgroundColor = ''
-    next()
-  },
   components: {
     [Collapse.name]: Collapse,
     [CollapseItem.name]: CollapseItem,
@@ -317,6 +319,10 @@ export default {
 </script>
 
 <style lang="scss">
+.stickyContent {
+  background-color: #fff;
+}
+
 .titleBar {
   background-color: #fff;
   padding: 1em;
@@ -346,6 +352,7 @@ export default {
 }
 
 .user-income-container {
+  min-height: 100vh;
   background-color: #fff;
 }