feat(我的收入)： 数据获取

@@ -5,11 +5,11 @@
        <span class="total-wait-apply">收款清单</span>
        <span class="total-wait-apply">收款清单</span>
        <span><span class="wait-label">待收金额:</span><span class="wait-price-num">￥{{props.data.waitApplyCashAmount}}</span></span>
        <span><span class="wait-label">待收金额:</span><span class="wait-price-num">￥{{props.data.waitApplyCashAmount}}</span></span>
      </p>
      </p>
-     <slot><div class="no-data">暂无收款清单</div></slot>
+     <slot name="waitApply"><div class="no-data">暂无收款清单</div></slot>
   </div>
   </div>
   <div class="income-detail-header">
   <div class="income-detail-header">
      <p class="total-income">收入明细</p>
      <p class="total-income">收入明细</p>
-     <slot><div class="no-data">暂无收入明细</div></slot>
+     <slot name="income"><div class="no-data">暂无收入明细</div></slot>
   </div>
   </div>
 </div>
 </div>
 </template>
 </template>

@@ -8,9 +8,16 @@
 
 
         <incomeHeader :data="getAssetSummary" class="header-inner-padding"></incomeHeader>
         <incomeHeader :data="getAssetSummary" class="header-inner-padding"></incomeHeader>
         <payAccount  class="inner-padding"></payAccount>
         <payAccount  class="inner-padding"></payAccount>
-        <incomeDetail :data="incomeData">
-          <template v-for="(item,index) in incomeData.list">
+        <incomeDetail :data="assetData">
+          <template #waitApply>
+            <div v-for="(item,index) in assetData.waitApplyInfo.list" :key="index">
               <incomeItem :item="item" :key="index"></incomeItem>
               <incomeItem :item="item" :key="index"></incomeItem>
+            </div>
+          </template>
+          <template #income>
+            <div v-for="(item,index) in assetData.incomeInfo.list" :key="index">
+              <incomeItem :item="item" :key="index"></incomeItem>
+            </div>
           </template>
           </template>
         </incomeDetail>
         </incomeDetail>
       <!-- 自定义下拉刷新内容 -->
       <!-- 自定义下拉刷新内容 -->
@@ -29,21 +36,27 @@ import incomeItem from './components/incomeItem';
 import pullDown from './components/pullDown';
 import pullDown from './components/pullDown';
 import payAccount from './components/payAccount';
 import payAccount from './components/payAccount';
 import { createNamespacedHelpers } from 'vuex';
 import { createNamespacedHelpers } from 'vuex';
-import {Style, Scroll} from 'cube-ui';
+import {Style} from 'cube-ui';
 import scrollMixin from '../../../mixins/scroll';
 import scrollMixin from '../../../mixins/scroll';
 const {mapState, mapGetters, mapActions} = createNamespacedHelpers('home/mine');
 const {mapState, mapGetters, mapActions} = createNamespacedHelpers('home/mine');
+
 export default {
 export default {
   mixins: [scrollMixin],
   mixins: [scrollMixin],
   data() {
   data() {
     return {
     return {
       page: 0,
       page: 0,
       totalPage: 0
       totalPage: 0
-      }
+    };
   },
   },
-    computed:{
+  computed: {
     ...mapGetters(['getAssetSummary']),
     ...mapGetters(['getAssetSummary']),
     ...mapState({
     ...mapState({
-        incomeData: (state) => state.assetData
+      assetData: (state) => state.assetData,
+      isEnd: state => {
+        const {incomeInfo} = state.assetData;
+
+        return incomeInfo.isEnd;
+      }
     }),
     }),
     loadingOptions() {
     loadingOptions() {
       return {
       return {
@@ -55,35 +68,33 @@ export default {
   created() {
   created() {
   },
   },
   activated() {
   activated() {
-      this.fetchAssetsAsync(true)
+    this.fetchAssetsAsync(true);
   },
   },
   watch: {
   watch: {
-      "incomeData.list": function(val) {
-        if(val.length === 0) {
-          this.options.pullUpLoad.txt.noMore = ''
-          // this.$refs.scroll.disable()
+    'assetData.incomeInfo.list': function(val) {
+      if (val.length === 0) {
+        this.options.pullUpLoad.txt.noMore = '';
       } else {
       } else {
-          this.options.pullUpLoad.txt.noMore = '到底啦~'
-          // this.$refs.scroll.enable()
+        this.options.pullUpLoad.txt.noMore = '到底啦~';
       }
       }
     }
     }
   },
   },
   methods: {
   methods: {
     ...mapActions(['fetchAssets']),
     ...mapActions(['fetchAssets']),
     onPullingUp() {
     onPullingUp() {
-        if(!this.incomeData.endReached) {
-          this.fetchAssetsAsync(false)
+      if (!this.isEnd) {
+        this.fetchAssetsAsync(false);
       } else {
       } else {
-          this.$refs.scroll.forceUpdate()
+        this.$refs.scroll.forceUpdate();
       }
       }
     },
     },
     fetchAssetsAsync(reFetch) {
     fetchAssetsAsync(reFetch) {
       return this.fetchAssets(reFetch).then(res => {
       return this.fetchAssets(reFetch).then(res => {
-          if (res.code === 200) {
-            let { page, pagetotal } = res.data || {};
+        if (res) {
+          let { currentPage, totalPage } = res || {};
 
 
-            this.page = page || 0;
-            this.totalPage = pagetotal || 0;
+          this.page = currentPage || 0;
+          this.totalPage = totalPage || 0;
         }
         }
       });
       });
     }
     }

@@ -24,14 +24,24 @@ export default function() {
       askBuyNum: 0,
       askBuyNum: 0,
       couponNum: 0,
       couponNum: 0,
       assetData: {
       assetData: {
-        isFetching: false,
-        list: [],
-        currentPage: 1,
-        pageSize: 20,
-        endReached: false,
         compensateIncome: '¥0.00',
         compensateIncome: '¥0.00',
         goodsIncome: '¥0.00',
         goodsIncome: '¥0.00',
         totalIncome: '¥0.00',
         totalIncome: '¥0.00',
+        waitApplyCashAmount: '0.00',
+        waitApplyInfo: {
+          isEnd: false,
+          currentPage: 1,
+          pageSize: 20,
+          totalPage: 0,
+          list: []
+        },
+        incomeInfo: {
+          isEnd: false,
+          currentPage: 1,
+          pageSize: 20,
+          totalPage: 0,
+          list: []
+        }
       },
       },
       walletData: {
       walletData: {
         isFetching: false,
         isFetching: false,
@@ -293,6 +303,18 @@ export default function() {
         state.resource1 = Object.assign({}, state.resource1, resource1);
         state.resource1 = Object.assign({}, state.resource1, resource1);
         state.resource2 = Object.assign({}, state.resource1, resource2);
         state.resource2 = Object.assign({}, state.resource1, resource2);
       },
       },
+
+      setAssetStatisticalInfo(state, summary = {}) {
+        const {compensateIncome, goodsIncome, totalIncome, waitApplyCashAmount} = summary;
+
+        state.assetData.compensateIncome = formatNumber(compensateIncome || 0);
+        state.assetData.goodsIncome = formatNumber(goodsIncome || 0);
+        state.assetData.totalIncome = formatNumber(totalIncome || 0);
+        state.assetData.waitApplyCashAmount = waitApplyCashAmount;
+      },
+      setAssets(state, assetsInfo = {}) {
+        state.assetData = {...state.assetData, ...assetsInfo};
+      }
     },
     },
     actions: {
     actions: {
       async fetchRollBoardList({ commit }) {
       async fetchRollBoardList({ commit }) {
@@ -379,38 +401,82 @@ export default function() {
           commit('addCouponSummary', { count: result.data });
           commit('addCouponSummary', { count: result.data });
         }
         }
       },
       },
-      async fetchAssets({ commit, state }, isRefresh) {
-        let {
-          isFetching,
-          endReached,
-          currentPage,
-          list,
-          pageSize,
-        } = state.assetData;
+      async fetchAssets({state, dispatch}, isRefresh) {
+        const {incomeInfo, waitApplyInfo} = state.assetData;
 
 
-        if (isFetching || (!isRefresh && endReached)) {
+        if (!isRefresh && waitApplyInfo.isEnd && incomeInfo.isEnd) {
           return;
           return;
         }
         }
-        let oldList = isRefresh ? [] : list;
 
 
-        // commit('assetFetching', {isFetching: true});
-        let page = isRefresh ? 1 : currentPage + 1;
+        if (waitApplyInfo.isEnd) {
+          const res = await dispatch('fetchInComeAssets');
+
+          return res;
+        } else {
+          const res = await dispatch('fetchWaitApplyAssets', isRefresh);
+
+          return res;
+        }
+      },
+
+      async fetchInComeAssets({commit, state}, isRefresh) {
+        let {currentPage, list, pageSize} = state.assetData.incomeInfo;
+
+        const page = isRefresh ? 1 : currentPage + 1;
+
+        if (isRefresh) {
+          list = [];
+        }
+
+        const result = await this.$api.get('/api/ufo/mine/assets', {
+          type: 2,
+          page,
+          limit: pageSize,
+        });
+
+        if (result.code === 200) {
+          let assetData = parseAssetList(result.data);
+
+          assetData.list = [...list, ...assetData.list];
+
+          commit('setAssetStatisticalInfo', result.data.summary);
+          commit('setAssets', {incomeInfo: assetData});
+
+          return assetData;
+        }
+      },
+
+      async fetchWaitApplyAssets({commit, state, dispatch}, isRefresh) {
+        let {currentPage, list, pageSize} = state.assetData.waitApplyInfo;
+
+        const page = isRefresh ? 1 : currentPage + 1;
+
+        if (isRefresh) {
+          list = [];
+        }
+
         const result = await this.$api.get('/api/ufo/mine/assets', {
         const result = await this.$api.get('/api/ufo/mine/assets', {
           type: 1,
           type: 1,
           page,
           page,
           limit: pageSize,
           limit: pageSize,
         });
         });
 
 
-        // commit('assetFetching', {isFetching: false});
         if (result.code === 200) {
         if (result.code === 200) {
           let assetData = parseAssetList(result.data);
           let assetData = parseAssetList(result.data);
-          let newList = [...oldList, ...assetData.list];
 
 
-          assetData.list = newList;
-          commit('addAssets', assetData);
+          assetData.list = [...list, ...assetData.list];
+
+          commit('setAssetStatisticalInfo', result.data.summary);
+          commit('setAssets', {waitApplyInfo: assetData});
+
+          if (assetData.isEnd) {
+            const res = await dispatch('fetchInComeAssets', isRefresh);
+
+            return res;
           }
           }
 
 
-        return result;
+          return assetData;
+        }
       },
       },
 
 
       async applyCash(_, id) {
       async applyCash(_, id) {

@@ -5,7 +5,6 @@ export function parseAssetList(json) {
     data,
     data,
     page,
     page,
     pagetotal,
     pagetotal,
-    summary
   } = json;
   } = json;
   let parsedList = data ? data.map((item) => {
   let parsedList = data ? data.map((item) => {
     let price = '';
     let price = '';
@@ -40,19 +39,14 @@ export function parseAssetList(json) {
       isWaitApply: item.links.includes('applyCash')
       isWaitApply: item.links.includes('applyCash')
     };
     };
   }) : [];
   }) : [];
-  let endReached = parsedList.length === 0 || page === pagetotal;
+  let isEnd = parsedList.length === 0 || page === pagetotal;
   let dealedList = {
   let dealedList = {
     currentPage: page,
     currentPage: page,
+    totalPage: pagetotal,
     list: parsedList,
     list: parsedList,
-    endReached,
+    isEnd,
   };
   };
 
 
-  if (summary) {
-    dealedList.compensateIncome = summary.compensateIncome;
-    dealedList.goodsIncome = summary.goodsIncome;
-    dealedList.totalIncome = summary.totalIncome;
-    dealedList.waitApplyCashAmount = summary.waitApplyCashAmount;
-  }
   return dealedList;
   return dealedList;
 }
 }
 export function formatNumber(number) {
 export function formatNumber(number) {