1、修改用户中心排版

2、修改发票管理

components/mobile/MobileFooter.vue

@@ -83,6 +83,9 @@
         } else if (this.baseUtils.startWith(path, '/mobile/order') && _tp !== 'buyer') {
           return 'vendorCenter'
         } else if (this.baseUtils.startWith(path, '/mobile/center/vendor')) {
+          if (_tp === 'frompage') {
+            return 'user'
+          }
           return 'vendorCenter'
         } else {
           return ''

pages/mobile/center/user/payCenter.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="mobile-pay-center mobile-fix-content mobile-centerfix-content" :style="switchType === 'account' ? 'padding-bottom: 1rem;' : ''" id="mobileFixContent" @click="setShowSelect('all', false)">
-    <div class="mp-head">
+    <div class="mp-head" v-if="!fromUserPage">
       <span class="inline-block" :class="{'active': switchType === 'record'}" @click="setSwitchType('record')">交易记录</span>
       <span class="inline-block" :class="{'active': switchType === 'account'}" @click="setSwitchType('account')">付款账户</span>
     </div>
@@ -177,6 +177,7 @@
     middleware: 'authenticated',
     data () {
       return {
+        fromUserPage: false,
         remindText: '',
         timeoutCount: '',
         page: 1,
@@ -289,12 +290,20 @@
       EmptyStatus,
       BaseFilter
     },
-    fetch ({store}) {
-      return Promise.all([
+    fetch ({store, route}) {
+      return route.query.type ? Promise.all([
+        store.dispatch('payCenter/loadBuyerAccount', {count: 10, page: 1, sorting: {num: 'ASC'}, type: 'buyer'})
+      ]) : Promise.all([
 //        store.dispatch('payCenter/loadBuyerAccount', {count: 10, page: 1, sorting: {num: 'ASC'}, type: 'buyer'})
         store.dispatch('payCenter/loadBuyerRecord', {count: 10, page: 1, sorting: {'paytime': 'DESC'}})
       ])
     },
+    asyncData({route}) {
+      return {
+        fromUserPage: route.query.type ? true : false,
+        switchType: route.query.switchType || 'record'
+      }
+    },
     watch: {
       'buyerAccount': {
         handler: function (val) {
@@ -305,7 +314,8 @@
             }
             this.accountList = [...this.accountList, ...val.content]
           }
-        }
+        },
+        immediate: true
       },
       'buyerRecord': {
         handler: function (val) {

pages/mobile/center/vendor/payCenter.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="mobile-pay-center vendor-pay mobile-fix-content mobile-centerfix-content" :class="{'vendor-pay-record': switchType === 'record' && recordList.length}" id="mobileFixContent">
-    <div class="mp-head">
+    <div class="mp-head" v-if="!fromUserPage">
       <span class="inline-block" :class="{'active': switchType === 'record'}" @click="setSwitchType('record')">交易记录</span>
       <span class="inline-block" :class="{'active': switchType === 'account'}" @click="setSwitchType('account')">收款账户</span>
     </div>
@@ -178,6 +178,7 @@
     middleware: 'authenticated',
     data () {
       return {
+        fromUserPage: false,
         remindText: '',
         timeoutCount: '',
         page: 1,
@@ -276,10 +277,15 @@
       EmptyStatus,
       BaseFilter
     },
-    fetch ({store}) {
-      return Promise.all([
-        store.dispatch('payCenter/loadVendorRecord', {count: 10, page: 1, sorting: {'transferTime': 'DESC'}, type: 'sup'})
-      ])
+    fetch ({store, route}) {
+      return route.query.type ? Promise.all([store.dispatch('payCenter/loadVendorAccount', {count: 10, page: 1, sorting: {num: 'ASC'}, type: 'sup'})
+        ]) : Promise.all([store.dispatch('payCenter/loadVendorRecord', {count: 10, page: 1, sorting: {'transferTime': 'DESC'}, type: 'sup'})])
+    },
+    asyncData({route}) {
+      return {
+        fromUserPage: route.query.type ? true : false,
+        switchType: route.query.switchType || 'record'
+      }
     },
     watch: {
       'vendorAccount': {
@@ -291,7 +297,8 @@
             }
             this.accountList = [...this.accountList, ...val.content]
           }
-        }
+        },
+        immediate: true
       },
       'vendorRecord': {
         handler: function (val) {
@@ -342,7 +349,7 @@
         return this.accountData.data
       },
       vendorRecord () {
-        return this.recordData.data.data.data
+        return this.recordData.data.data ? this.recordData.data.data.data : []
       },
       fetching () {
         return this.switchType === 'account' ? this.accountData.fetching : this.recordData.fetching

pages/mobile/user/index.vue

@@ -42,11 +42,11 @@
             <img src="/images/mobile/user/fapiao.png" alt="">
             <p>发票信息</p>
           </li>
-          <li @click="go('/')">
+          <li @click="go('/mobile/center/vendor/payCenter?switchType=account&type=frompage')">
             <img src="/images/mobile/user/shoukuan.png" alt="">
             <p>收款账户</p>
           </li>
-          <li @click="go('/')">
+          <li @click="go('/mobile/center/user/payCenter?switchType=account&type=frompage')">
             <img src="/images/mobile/user/fukuang.png" alt="">
             <p>付款账户</p>
           </li>
@@ -139,8 +139,6 @@
         <!--<i class="iconfont icon-xiangyou"></i>-->
         <!--<div class="border-line"></div>-->
       <!--</div>-->
-
-
       <div class="deleteKuang" v-if="showLogout">
         <div class="kuangContent">
           <div class="title">系统提示</div>