1、修改发票管理页面样式

2、修改移动端我的排版样式

assets/scss/mobileInvoice.scss

@@ -5,10 +5,12 @@ $blue-base: #3f84f6;
     border-bottom: .28rem solid #f1f3f6;
   }
   .mi-remind-area {
-    padding: .24rem .3rem;
+    padding: .24rem 0.15rem;
     font-size: .28rem;
     color: #333;
     line-height: .42rem;
+    margin: 0 0.24rem;
+    background: #fff;
     .more {
       font-size: .24rem;
       color: $blue-base;

components/mobile/MobileFooter.vue

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

pages/mobile/center/user/index.vue

@@ -38,7 +38,7 @@
             <img src="/images/mobile/center/user/cart.jpg" alt="">
             <p>购物车<span class="text" v-if="carCount > 0">{{carCount && carCount >= 99 ? 99 : carCount || 0}}</span></p>
           </nuxt-link>
-          <nuxt-link tag="li" to="/mobile/center/user/invoice" class="content-line">
+          <nuxt-link tag="li" to="/mobile/center/user/invoice/waitinvoice" class="content-line">
             <img src="/images/mobile/center/user/invoice_icon.png" alt="">
             <p>发票管理</p>
           </nuxt-link>

pages/mobile/center/user/invoice/index.vue

@@ -9,11 +9,6 @@
         </p>
       </div>
     </div>
-    <div class="order-nav">
-      <div class="active" @click="changeTab('')"><span>发票信息</span></div>
-      <nuxt-link to="/mobile/center/user/invoice/waitinvoice" tag="div"><span>待开票订单</span></nuxt-link>
-      <nuxt-link to="/mobile/center/user/invoice/invoiceRecord" tag=div><span>开票记录</span></nuxt-link>
-    </div>
     <div class="invoice-wrapper-el">
       <div class="invoice-top clearfix">
         <div class="pull-left">已设置的发票信息</div>
@@ -273,8 +268,8 @@
     position: absolute;
     width: 100%;
     .invoice-wrapper-el {
-      margin: 2.08rem 0 0.98rem;
-      height: calc(100vh - 1.26rem - 0.98rem - 0.82rem);
+      margin: 1.26rem 0 0.98rem;
+      height: calc(100vh - 1.26rem - 0.98rem);
       overflow-y: scroll;
     }
     /*overflow-y: scroll;*/

pages/mobile/center/user/invoice/invoiceRecord.vue

@@ -1,133 +1,226 @@
 <template>
   <div class="mobile-invoice invoice-wrapper invoice-record" @click="showFilterInvoiceType = false">
     <div class="order-nav">
-      <nuxt-link to="/mobile/center/user/invoice" tag="div"><span>发票信息</span></nuxt-link>
-      <nuxt-link to="/mobile/center/user/invoice/waitinvoice" tag="div"><span>待开票订单</span></nuxt-link>
-      <div class="active"><span>开票记录</span></div>
+      <nuxt-link to="/mobile/center/user/invoice/waitinvoice" tag="div"><span>待申请</span></nuxt-link>
+      <nuxt-link to="/mobile/center/user/invoice/invoiceRecord?status=101" tag="div" :class="status === '101' ? 'active' :''"><span>待卖家开票</span></nuxt-link>
+      <nuxt-link to="/mobile/center/user/invoice/invoiceRecord?status=102" tag="div" :class="status === '102' ? 'active' :''"><span>已开票</span></nuxt-link>
+      <!--<div class="active"><span>已开票</span></div>-->
     </div>
     <div class="invoice-wrapper-el" id="invoice-wrapper-el">
       <div class="search-content mi-search-content">
-        <input type="text" v-model="filterParams.keyword" @keyup.13="onFilter" placeholder="订单号/发票抬头/收票人/联系电话">
+        <input type="text" v-model="filterParams.keyword" @keyup.13="onFilter" placeholder="卖家/物料名称/订单号/收票人/联系电话">
         <span @click="onFilter"><i class="iconfont icon-sousuo"></i></span>
       </div>
       <div class="mi-list-content">
-        <div class="mi-lc-filters clearfix">
-          <span class="multi-check inline-block" :class="{active: filterParams.status === 101}" @click="setFilter('status', 101)">待开票</span>
-          <span class="multi-check inline-block" :class="{active: filterParams.status === 102}" @click="setFilter('status', 102)">已开票</span>
-          <div class="com-select-wrap fr" @click.stop="showFilterInvoiceType = !showFilterInvoiceType">{{filterParams.invoicetype === 1206 ? '普票' : filterParams.invoicetype === 1205 ? '专票' : '全部'}}
-            <ul class="select-list" v-show="showFilterInvoiceType">
-              <li @click.stop="setFilter('invoicetype', null)" v-show="filterParams.invoicetype">全部</li>
-              <li @click.stop="setFilter('invoicetype', 1206)" v-show="filterParams.invoicetype != 1206">普票</li>
-              <li @click.stop="setFilter('invoicetype', 1205)" v-show="filterParams.invoicetype != 1205">专票</li>
-            </ul>
-          </div>
-        </div>
+        <!--<div class="mi-lc-filters clearfix">-->
+          <!--<span class="multi-check inline-block" :class="{active: filterParams.status === 101}" @click="setFilter('status', 101)">待开票</span>-->
+          <!--<span class="multi-check inline-block" :class="{active: filterParams.status === 102}" @click="setFilter('status', 102)">已开票</span>-->
+          <!--<div class="com-select-wrap fr" @click.stop="showFilterInvoiceType = !showFilterInvoiceType">{{filterParams.invoicetype === 1206 ? '普票' : filterParams.invoicetype === 1205 ? '专票' : '全部'}}-->
+            <!--<ul class="select-list" v-show="showFilterInvoiceType">-->
+              <!--<li @click.stop="setFilter('invoicetype', null)" v-show="filterParams.invoicetype">全部</li>-->
+              <!--<li @click.stop="setFilter('invoicetype', 1206)" v-show="filterParams.invoicetype != 1206">普票</li>-->
+              <!--<li @click.stop="setFilter('invoicetype', 1205)" v-show="filterParams.invoicetype != 1205">专票</li>-->
+            <!--</ul>-->
+          <!--</div>-->
+        <!--</div>-->
         <ul class="mi-list" v-if="invoiceList.length">
           <li v-for="inv in invoiceList">
-            <div class="line">
-            <span class="inline-block title">
-              类型：
-            </span>
-              <span class="inline-block content">
-              <i class="inv" :class="{'spec-inv' : inv.invoicetype === 1205}">{{inv.invoicetype === 1206 ? '普票' : '专票'}}</i>
-            </span>
+            <div class="mi-list-top clearfix">
+              <div class="pull-left">{{inv.createTime | date}}</div>
+              <div class="pull-right" style="margin-right: 0.8rem;">{{inv.status == 101 ? '待开票' : '已开票'}}</div>
             </div>
-            <div class="line">
-            <span class="inline-block title">
-              申请时间：
-            </span>
-              <span class="inline-block content">{{inv.createTime | date}}</span>
-            </div>
-            <div class="line">
-            <span class="inline-block title">
-              状态：
-            </span>
-              <span class="inline-block content">{{inv.status == 101 ? '待开票' : '已开票'}}</span>
-            </div>
-            <div class="line">
-            <span class="inline-block title">
-              商家名称：
-            </span>
-              <nuxt-link :to="`/mobile/shop/${inv.storeid}`" class="inline-block content link">{{inv.sellername}}</nuxt-link>
-            </div>
-            <div class="line">
-            <span class="inline-block title">
-              订单号：
-            </span>
-              <span class="inline-block content">
-              <nuxt-link class="block link" :key="id" :to="`/mobile/order/details?uuid=${baseUtils.enidfilter(id)}&type=buyer`" v-for="id in inv.orderids.split(',')">
-                {{id}}
-              </nuxt-link>
-            </span>
-            </div>
-            <div class="line">
-            <span class="inline-block title">
-              可开票金额：
-            </span>
-              <span class="inline-block content price">¥{{inv.price || 0}}</span>
-            </div>
-            <div class="line">
-            <span class="inline-block title">
-              发票抬头：
-            </span>
-              <span class="inline-block content">{{inv.invoicetitle}}</span>
-            </div>
-            <template v-if="inv.invoicetype == 1205">
-              <div class="line">
-            <span class="inline-block title">
-              单位地址：
-            </span>
-                <span class="inline-block content">{{inv.billInfo.companyAddress || '-'}}</span>
+            <div class="mi-list-bottom">
+              <div class="list clearfix">
+                <div class="clearfix pull-left w50">
+                  <div class="pull-left">发票抬头：</div>
+                  <div class="pull-left overhidden" style="width: 1.85rem">{{inv.invoicetitle}}</div>
+                </div>
+                <div class="clearfix pull-left w50">
+                  <div class="pull-left">金额：</div>
+                  <div class="pull-left overhidden" style="width: 2.4rem">¥{{inv.price || 0}}</div>
+                </div>
               </div>
-              <div class="line">
-            <span class="inline-block title">
-              单位电话：
-            </span>
-                <span class="inline-block content">{{inv.billInfo.companyPhone || '-'}}</span>
+
+              <div class="list clearfix">
+                <div class="clearfix pull-left w50">
+                  <div class="pull-left">收票人：</div>
+                  <div class="pull-left overhidden" style="width:2.1rem">{{inv.receiverName}}</div>
+                </div>
+                <div class="clearfix pull-left w50">
+                  <div class="pull-left">电话：</div>
+                  <div class="pull-left overhidden">{{inv.recTel}}</div>
+                </div>
               </div>
-              <div class="line">
-            <span class="inline-block title">
-              税务登记号：
-            </span>
-                <span class="inline-block content">{{inv.billInfo.companyTaxNumber || '-'}}</span>
+
+              <div class="list" v-if="inv.invoicetype === 1205">
+                <div class="clearfix">
+                  <div class="pull-left">单位电话：</div>
+                  <div class="pull-left overhidden" style="width: 4.6rem;">
+                    {{inv.billInfo.companyPhone || '-'}}
+                  </div>
+                </div>
               </div>
-              <div class="line">
-            <span class="inline-block title">
-              开户银行：
-            </span>
-                <span class="inline-block content">{{inv.billInfo.bankName || '-'}}</span>
+
+              <div class="list" v-if="inv.invoicetype === 1205">
+                <div class="clearfix">
+                  <div class="pull-left">开户银行名称：</div>
+                  <div class="pull-left overhidden" style="width: 4.6rem;">
+                    {{inv.billInfo.bankName || '-'}}
+                  </div>
+                </div>
               </div>
-              <div class="line">
-            <span class="inline-block title">
-              开户银行账户：
-            </span>
-                <span class="inline-block content">{{inv.billInfo.bankAccount || '-'}}</span>
+
+              <div class="list" v-if="inv.invoicetype === 1205">
+                <div class="clearfix">
+                  <div class="pull-left">开户银行账户：</div>
+                  <div class="pull-left overhidden" style="width: 4.6rem;">
+                    {{inv.billInfo.bankAccount || '-'}}
+                  </div>
+                </div>
               </div>
-            </template>
-            <div class="line">
-            <span class="inline-block title">
-              收票人：
-            </span>
-              <span class="inline-block content">{{inv.receiverName}}</span>
-            </div>
-            <div class="line">
-            <span class="inline-block title">
-              联系电话：
-            </span>
-              <span class="inline-block content">{{inv.recTel}}</span>
+
+              <div class="list" v-if="inv.invoicetype === 1205">
+                <div class="clearfix">
+                  <div class="pull-left">税务登记号：</div>
+                  <div class="pull-left overhidden" style="width: 4.8rem;">
+                    {{inv.billInfo.companyTaxNumber || '-'}}
+                  </div>
+                </div>
+              </div>
+
+              <div class="list ">
+                <div class="clearfix">
+                  <div class="pull-left">收票地址：</div>
+                  <div class="pull-left" style="width: 5rem;">
+                    {{inv.invoiceAddress}}
+                  </div>
+                </div>
+              </div>
+
+              <div class="list ">
+                <div class="clearfix">
+                  <div class="pull-left">订单号：</div>
+                  <div class="pull-left">
+                    <nuxt-link class="block link" :key="id" :to="`/mobile/order/details?uuid=${baseUtils.enidfilter(id)}&type=buyer`" v-for="id in inv.orderids.split(',')">
+                      {{id}}
+                    </nuxt-link>
+                  </div>
+                </div>
+              </div>
+
             </div>
-            <div class="line">
-            <span class="inline-block title">
-              收票地址：
-            </span>
-              <span class="inline-block content">{{inv.invoiceAddress}}</span>
+            <div class="fixedImg">
+              <img src="/images/mobile/center/invoice-spec2.png" v-if="inv.invoicetype === 1206"/>
+              <img src="/images/mobile/center/invoice-nor2.png" v-else/>
             </div>
           </li>
         </ul>
-        <empty-status
-          :text="'暂无开票信息'"
-          :showLink="false"
-          v-else></empty-status>
+        <!--<ul class="mi-list" v-if="invoiceList.length">-->
+          <!--<li v-for="inv in invoiceList">-->
+            <!--<div class="line">-->
+            <!--<span class="inline-block title">-->
+              <!--类型：-->
+            <!--</span>-->
+              <!--<span class="inline-block content">-->
+              <!--<i class="inv" :class="{'spec-inv' : inv.invoicetype === 1205}">{{inv.invoicetype === 1206 ? '普票' : '专票'}}</i>-->
+            <!--</span>-->
+            <!--</div>-->
+            <!--<div class="line">-->
+            <!--<span class="inline-block title">-->
+              <!--申请时间：-->
+            <!--</span>-->
+              <!--<span class="inline-block content">{{inv.createTime | date}}</span>-->
+            <!--</div>-->
+            <!--<div class="line">-->
+            <!--<span class="inline-block title">-->
+              <!--状态：-->
+            <!--</span>-->
+              <!--<span class="inline-block content">{{inv.status == 101 ? '待开票' : '已开票'}}</span>-->
+            <!--</div>-->
+            <!--<div class="line">-->
+            <!--<span class="inline-block title">-->
+              <!--商家名称：-->
+            <!--</span>-->
+              <!--<nuxt-link :to="`/mobile/shop/${inv.storeid}`" class="inline-block content link">{{inv.sellername}}</nuxt-link>-->
+            <!--</div>-->
+            <!--<div class="line">-->
+            <!--<span class="inline-block title">-->
+              <!--订单号：-->
+            <!--</span>-->
+              <!--<span class="inline-block content">-->
+              <!--<nuxt-link class="block link" :key="id" :to="`/mobile/order/details?uuid=${baseUtils.enidfilter(id)}&type=buyer`" v-for="id in inv.orderids.split(',')">-->
+                <!--{{id}}-->
+              <!--</nuxt-link>-->
+            <!--</span>-->
+            <!--</div>-->
+            <!--<div class="line">-->
+            <!--<span class="inline-block title">-->
+              <!--可开票金额：-->
+            <!--</span>-->
+              <!--<span class="inline-block content price">¥{{inv.price || 0}}</span>-->
+            <!--</div>-->
+            <!--<div class="line">-->
+            <!--<span class="inline-block title">-->
+              <!--发票抬头：-->
+            <!--</span>-->
+              <!--<span class="inline-block content">{{inv.invoicetitle}}</span>-->
+            <!--</div>-->
+            <!--<template v-if="inv.invoicetype == 1205">-->
+              <!--<div class="line">-->
+            <!--<span class="inline-block title">-->
+              <!--单位地址：-->
+            <!--</span>-->
+                <!--<span class="inline-block content">{{inv.billInfo.companyAddress || '-'}}</span>-->
+              <!--</div>-->
+              <!--<div class="line">-->
+            <!--<span class="inline-block title">-->
+              <!--单位电话：-->
+            <!--</span>-->
+                <!--<span class="inline-block content">{{inv.billInfo.companyPhone || '-'}}</span>-->
+              <!--</div>-->
+              <!--<div class="line">-->
+            <!--<span class="inline-block title">-->
+              <!--税务登记号：-->
+            <!--</span>-->
+                <!--<span class="inline-block content">{{inv.billInfo.companyTaxNumber || '-'}}</span>-->
+              <!--</div>-->
+              <!--<div class="line">-->
+            <!--<span class="inline-block title">-->
+              <!--开户银行：-->
+            <!--</span>-->
+                <!--<span class="inline-block content">{{inv.billInfo.bankName || '-'}}</span>-->
+              <!--</div>-->
+              <!--<div class="line">-->
+            <!--<span class="inline-block title">-->
+              <!--开户银行账户：-->
+            <!--</span>-->
+                <!--<span class="inline-block content">{{inv.billInfo.bankAccount || '-'}}</span>-->
+              <!--</div>-->
+            <!--</template>-->
+            <!--<div class="line">-->
+            <!--<span class="inline-block title">-->
+              <!--收票人：-->
+            <!--</span>-->
+              <!--<span class="inline-block content">{{inv.receiverName}}</span>-->
+            <!--</div>-->
+            <!--<div class="line">-->
+            <!--<span class="inline-block title">-->
+              <!--联系电话：-->
+            <!--</span>-->
+              <!--<span class="inline-block content">{{inv.recTel}}</span>-->
+            <!--</div>-->
+            <!--<div class="line">-->
+            <!--<span class="inline-block title">-->
+              <!--收票地址：-->
+            <!--</span>-->
+              <!--<span class="inline-block content">{{inv.invoiceAddress}}</span>-->
+            <!--</div>-->
+          <!--</li>-->
+        <!--</ul>-->
+          <empty-status
+            :text="'暂无开票信息'"
+            :showLink="false"
+            v-else></empty-status>
       </div>
     </div>
     <remind-box :title="remindText" :timeoutCount="timeoutCount"></remind-box>
@@ -151,7 +244,7 @@
           invoicetype: '',
           keyword: '',
           // 101为待开票， 102为已开票
-          status: null
+          status: 101
         },
         showFilterInvoiceType: false
       }
@@ -161,11 +254,23 @@
       PullUp,
       EmptyStatus
     },
-    fetch ({store}) {
+    fetch ({store, route}) {
       return Promise.all([
-        store.dispatch('invoice/getInvoices', {count: 10, page: 1, role: 'BUYER', sorting: {'createTime': 'DESC'}})
+        store.dispatch('invoice/getInvoices', {count: 10, page: 1, role: 'BUYER', sorting: {'createTime': 'DESC'}, status: route.query.status})
       ])
     },
+    asyncData({route}) {
+      let filterParams = {
+        invoicetype: '',
+        keyword: '',
+        // 101为待开票， 102为已开票
+        status: 101
+      }
+      filterParams.status = route.query.status
+      return {
+        filterParams: filterParams
+      }
+    },
     watch: {
       '$store.state.invoice.data.invoices.data': {
         handler: function (val) {
@@ -182,9 +287,21 @@
           }
         },
         immediate: true
+      },
+      '$route.query.status': {
+        handler: function (val) {
+          this.filterParams.keyword = ''
+          this.filterParams.status = val
+          this.page = 0
+          this.isChange = true
+          this.onPullUp()
+        }
       }
     },
     computed: {
+      status() {
+        return this.$route.query.status
+      },
       invoices () {
         return this.$store.state.invoice.data.invoices
       },
@@ -241,6 +358,15 @@
 </script>
 <style lang="scss" scoped>
   @import '~assets/scss/mobileInvoice';
+  @mixin overFlowHidden {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+  @mixin lineHeight($value) {
+    height: $value;
+    line-height: $value;
+  }
   .invoice-record {
     .mi-list {
       padding-bottom: .68rem !important;
@@ -270,7 +396,7 @@
     }
   }
   .invoice-wrapper {
-    background: #fff;
+    background: #f1f3f6;
     /*margin: 1.26rem 0 0 0;*/
     left: 0;
     bottom: .98rem;
@@ -283,9 +409,48 @@
     width: 100%;
     .invoice-wrapper-el {
       /*margin: 0 0 0.98rem;*/
-      height: calc(100vh - 1.26rem - 0.98rem);
+      height: calc(100vh - 1.26rem - 0.98rem - 0.82rem);
       overflow-y: scroll;
       /*padding-bottom: 0.98rem;*/
     }
   }
+  .mobile-invoice.invoice-record .mi-list {
+    li {
+      background: #fff;
+      border-radius: 0.05rem;
+      border: 1px solid #e3e5e8;
+      margin: 0 0.2rem 0.3rem;
+      padding: 0 0.24rem;
+      position: relative;
+      .fixedImg {
+        position: absolute;
+        right: 0;
+        top: 0;
+        img {
+          width: 0.82rem;
+          height: 0.82rem;
+        }
+      }
+      .mi-list-top {
+        @include lineHeight(0.55rem);
+        font-size: 0.28rem;
+        color: #333;
+        border-bottom: 1px solid #d3d3d3;
+      }
+      .mi-list-bottom {
+        font-size: 0.28rem;
+        color: #333;
+        padding: 0.2rem 0;
+        .list {
+          line-height: 0.55rem;
+        }
+        .overhidden {
+          @include overFlowHidden()
+        }
+        .w50 {
+          width: 50%;
+        }
+      }
+    }
+  }
 </style>

pages/mobile/center/user/invoice/waitinvoice.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="invoice-wrapper">
+  <div class="invoice-wrapper mobile-invoice">
     <div class="mobile-nav">
       <div class="mobile-header mobile-center-header">
         <a @click="goLastPage()"><i class="iconfont icon-fanhui"></i></a>
@@ -10,13 +10,18 @@
       </div>
     </div>
     <div class="order-nav">
-      <nuxt-link to="/mobile/center/user/invoice" tag="div"><span>发票信息</span></nuxt-link>
-      <div class="active"><span>待开票订单</span></div>
-      <nuxt-link to="/mobile/center/user/invoice/invoiceRecord" tag=div><span>开票记录</span></nuxt-link>
+      <div class="active"><span>待申请</span></div>
+      <nuxt-link to="/mobile/center/user/invoice/invoiceRecord?status=101" tag="div"><span>待卖家开票</span></nuxt-link>
+      <!--<div class="active"><span>待开票订单</span></div>-->
+      <nuxt-link to="/mobile/center/user/invoice/invoiceRecord?status=102" tag=div><span>已开票</span></nuxt-link>
     </div>
     <div class="invoice-wrapper-el" id="invoicewrapperel">
-      <div class="mobile-invoice">
-        <div class="mi-remind-area" :class="{less: !showMoreRemind}">
+      <div class="search-content mi-search-content">
+        <input type="text" placeholder="商家名称/订单号" v-model="keyword">
+        <span @click="searchMore()"><i class="iconfont icon-sousuo"></i></span>
+      </div>
+      <div class="mobile-invoice" >
+        <div class="mi-remind-area" :class="{less: !showMoreRemind}" style="margin-bottom: 0.15rem;">
           <p class="title">温馨提示</p>
           <p class="content">
             <span class="inline-block">1、</span>
@@ -39,39 +44,43 @@
             <i v-show="!showMoreRemind" class="iconfont icon-xiashuangjiantou"></i>
           </p>
         </div>
-        <div class="search-content mi-search-content">
-          <input type="text" placeholder="商家名称/订单号" v-model="keyword">
-          <span @click="searchMore()"><i class="iconfont icon-sousuo"></i></span>
-        </div>
         <div class="mi-list-content">
           <ul class="mi-list" v-if="invoiceList.length > 0">
             <li v-for="inv in invoiceList" @click.stop="setActive(inv)" :class="{active: inv.$active}">
               <div class="line">
-                <span class="inline-block title">
+                <span class="inline-block">
                    <label class="bottom-modal-check mobile-cart-check" :class="{active: inv.$active}">
                      <!--<input type="checkbox">-->
                    </label>
-                  商家名称：
+                  <!--商家名称：-->
                 </span>
-                <span class="inline-block content" @click.stop="toShopdetails(inv)">{{inv.sellername}}</span>
+                <span class="inline-block content" style="text-align: left;margin-left:0.1rem;color: #333;">{{getTime(inv.paytime)}}</span>
+                <!--<span class="inline-block content" @click.stop="toShopdetails(inv)">{{inv.sellername}}</span>-->
               </div>
-              <div class="line">
-                <span class="inline-block title">
-                  订单号：
-                </span>
-                <span class="inline-block content" @click.stop="lookOrderDetail(inv)">
-                {{inv.orderid}}
-                </span>
-              </div>
-              <div class="line">
-                <span class="inline-block title">
-                  可开票金额：
-                </span>
-                <span class="inline-block content pri">¥{{inv.price}}</span>
+              <div class="line clearfix">
+                <div class="pull-left =" style="width: 65%">
+                  <span class="inline-block">卖家：</span>
+                  <span class="inline-block overhiden" style="width: 3.2rem" @click.stop="toShopdetails(inv)">{{inv.sellername}}</span>
+                </div>
+                <div class="pull-left" style="width: 35%">
+                  <span class="inline-block">
+                    金额：
+                  </span>
+                  <span class="inline-block pri overhiden"  style="width: 1.3rem">¥{{inv.price}}</span>
+                </div>
+                <div style="clear:both"></div>
+                <div style="margin-top: 0.26rem">
+                  <span class="inline-block">
+                   订单号：
+                  </span>
+                    <span class="inline-block content" @click.stop="lookOrderDetail(inv)" style="text-align: left">
+                  {{inv.orderid}}
+                  </span>
+                </div>
               </div>
             </li>
           </ul>
-          <div class="com-none-state" v-if="invoiceList.length === 0">
+          <div class="com-none-state" v-if="invoiceList.length === 0" style="background:rgba(0,0,0,0)">
             <img src="/images/mobile/@2x/empty-collect.png">
             <p>抱歉，暂无发票消息</p>
           </div>
@@ -305,6 +314,9 @@
       }
     },
     methods: {
+      getTime(Time) {
+        return this.baseUtils.formatDate(new Date(Time), 'yyyy-MM-dd hh:mm:ss')
+      },
       setActive (inv) {
         if (inv) {
           inv.$active = !inv.$active
@@ -539,7 +551,7 @@
       }
     }
     .mi-remind-area {
-      margin-top: 0.24rem;
+      /*margin-top: 0.24rem;*/
       background: #fff;
     }
     .mi-list-content .mi-list li {
@@ -548,10 +560,6 @@
         margin-top: 0;
       }
     }
-    .mi-search-content input {
-      width: 7rem;
-      margin: 0;
-    }
     .mobile-invoice .mi-list-content .mi-list li .line .content {
       padding: 0;
       color: #3976f4;
@@ -561,7 +569,7 @@
       }
     }
     .mobile-invoice .mi-list-content .mi-list li .line .title {
-      width: 33%;
+      width: auto
     }
     .applyinvoice_Alert {
       background: #fff;

pages/mobile/center/vendor/invoice/index.vue

@@ -1,11 +1,20 @@
 <template>
-  <div class="mobile-invoice mobile-content mobile-content-long vendor-invoice" :class="{'invoice-record': switchType == 'record'}" @click="showFilterInvoiceType = false">
-    <div class="switch-head">
-      <div class="com-switch-head" style="line-height: 0.78rem">
-        <span class="com-switch-item inline-block" :class="{active: switchType == 'apply'}" @click="setSwitchType('apply')">买家开票申请</span>
-        <span class="com-switch-item inline-block" :class="{active: switchType == 'record'}" @click="setSwitchType('record')">开票记录</span>
+  <div class="mobile-invoice mobile-content mobile-content-long vendor-invoice" style="background: #f1f3f6" :class="{'invoice-record': switchType == 'record'}" @click="showFilterInvoiceType = false">
+    <div class="switch-head" style="border:0">
+      <div class="com-switch-head clearfix" style="line-height: 0.78rem">
+       <div style="width: 50%" class="pull-left">
+         <span style="margin: 0" class="com-switch-item inline-block" :class="{active: switchType == 'apply'}" @click="setSwitchType('apply')">待开票</span>
+       </div>
+        <div style="width: 50%" class="pull-left">
+          <span class="com-switch-item inline-block" :class="{active: switchType == 'record'}" @click="setSwitchType('record')">已开票</span>
+        </div>
+
       </div>
     </div>
+    <div class="search-content mi-search-content">
+      <input type="text" v-model="filterParams.keyword" @keyup.13="onFilter" placeholder="订单号/发票抬头/收票人/联系电话">
+      <span @click="onFilter"><i class="iconfont icon-sousuo"></i></span>
+    </div>
     <div class="mi-remind-area" :class="{less: !showMoreRemind}" v-if="switchType == 'apply'">
       <p class="title">温馨提示</p>
       <p class="content">
@@ -25,113 +34,209 @@
         <i v-show="!showMoreRemind" class="iconfont icon-xiashuangjiantou"></i>
       </p>
     </div>
-    <div class="search-content mi-search-content">
-      <input type="text" v-model="filterParams.keyword" @keyup.13="onFilter" placeholder="订单号/发票抬头/收票人/联系电话">
-      <span @click="onFilter"><i class="iconfont icon-sousuo"></i></span>
-    </div>
-    <div class="mi-list-content">
-      <div class="mi-lc-filters clearfix">
-        <div class="com-select-wrap fr" @click.stop="showFilterInvoiceType = !showFilterInvoiceType">{{filterParams.invoicetype === 1206 ? '普票' : filterParams.invoicetype === 1205 ? '专票' : '全部'}}
-          <ul class="select-list" v-show="showFilterInvoiceType">
-            <li @click.stop="setInvoiceType(null)" v-if="filterParams.invoicetype">全部</li>
-            <li @click.stop="setInvoiceType(1206)" v-if="filterParams.invoicetype != 1206">普票</li>
-            <li @click.stop="setInvoiceType(1205)" v-if="filterParams.invoicetype != 1205">专票</li>
-          </ul>
-        </div>
-      </div>
+    <div class="mi-list-content" style="background: #f1f3f6;" :style="switchType == 'apply' ? 'padding-top: 0.21rem' : ''">
+      <!--<div class="mi-lc-filters clearfix">-->
+        <!--<div class="com-select-wrap fr" @click.stop="showFilterInvoiceType = !showFilterInvoiceType">{{filterParams.invoicetype === 1206 ? '普票' : filterParams.invoicetype === 1205 ? '专票' : '全部'}}-->
+          <!--<ul class="select-list" v-show="showFilterInvoiceType">-->
+            <!--<li @click.stop="setInvoiceType(null)" v-if="filterParams.invoicetype">全部</li>-->
+            <!--<li @click.stop="setInvoiceType(1206)" v-if="filterParams.invoicetype != 1206">普票</li>-->
+            <!--<li @click.stop="setInvoiceType(1205)" v-if="filterParams.invoicetype != 1205">专票</li>-->
+          <!--</ul>-->
+        <!--</div>-->
+      <!--</div>-->
       <ul class="mi-list" v-if="invoiceList.length">
         <li v-for="inv in invoiceList" @click="setActive(inv)" :class="{active: inv.$active && switchType == 'apply'}">
-          <div class="line">
+          <div class="mi-list-top clearfix">
             <span class="inline-block title">
-               <label class="bottom-modal-check mobile-cart-check" :class="{active: inv.$active}">
-                 <!--<input type="checkbox">-->
-               </label>
-              类型：
+              <label class="bottom-modal-check mobile-cart-check" :class="{active: inv.$active}">
+              <!--<input type="checkbox">-->
+              </label>
+              {{inv.createTime | date}}
             </span>
-            <span class="inline-block content">
-              <i class="inv" :class="{'spec-inv' : inv.invoicetype === 1205}">{{inv.invoicetype === 1206 ? '普票' : '专票'}}</i>
+            <span class="inline-block content pull-right" style="margin-right: 0.8rem;">{{inv.status == 101 ? '待开票' : '已开票'}}
             </span>
+            <!--<div class="pull-left"></div>-->
+            <!--<div class="pull-right" style="margin-right: 0.8rem;">{{inv.status == 101 ? '待开票' : '已开票'}}</div>-->
           </div>
-          <div class="line">
-            <span class="inline-block title">
-              申请时间：
-            </span>
-            <span class="inline-block content">{{inv.createTime | date}}</span>
-          </div>
-          <div class="line">
-            <span class="inline-block title">
-              订单号：
-            </span>
-            <span class="inline-block content">
-              <span @click.stop="goOrderDetail(inv, index)" class="block link" :key="id" v-for="(id, index) in inv.orderids.split(',')">
-                {{id}}
-              </span>
-            </span>
-          </div>
-          <div class="line">
-            <span class="inline-block title">
-              可开票金额：
-            </span>
-            <span class="inline-block content price">¥{{inv.price || 0}}</span>
-          </div>
-          <div class="line">
-            <span class="inline-block title">
-              发票抬头：
-            </span>
-            <span class="inline-block content">{{inv.invoicetitle}}</span>
-          </div>
-          <template v-if="inv.invoicetype == 1205">
-            <div class="line">
-            <span class="inline-block title">
-              单位地址：
-            </span>
-              <span class="inline-block content">{{inv.billInfo.companyAddress || '-'}}</span>
+          <div class="mi-list-bottom">
+            <div class="list clearfix">
+              <div class="clearfix pull-left w50">
+                <div class="pull-left">发票抬头：</div>
+                <div class="pull-left overhidden" style="width: 1.85rem">{{inv.invoicetitle}}</div>
+              </div>
+              <div class="clearfix pull-left w50">
+                <div class="pull-left">金额：</div>
+                <div class="pull-left overhidden" style="width: 2.4rem">¥{{inv.price || 0}}</div>
+              </div>
             </div>
-            <div class="line">
-            <span class="inline-block title">
-              单位电话：
-            </span>
-              <span class="inline-block content">{{inv.billInfo.companyPhone || '-'}}</span>
+
+            <div class="list clearfix">
+              <div class="clearfix pull-left w50">
+                <div class="pull-left">收票人：</div>
+                <div class="pull-left overhidden" style="width:2.1rem">{{inv.receiverName}}</div>
+              </div>
+              <div class="clearfix pull-left w50">
+                <div class="pull-left">电话：</div>
+                <div class="pull-left overhidden">{{inv.recTel}}</div>
+              </div>
             </div>
-            <div class="line">
-            <span class="inline-block title">
-              税务登记号：
-            </span>
-              <span class="inline-block content">{{inv.billInfo.companyTaxNumber || '-'}}</span>
+
+            <div class="list" v-if="inv.invoicetype === 1205">
+              <div class="clearfix">
+                <div class="pull-left">单位电话：</div>
+                <div class="pull-left overhidden" style="width: 4.6rem;">
+                  {{inv.billInfo.companyPhone || '-'}}
+                </div>
+              </div>
             </div>
-            <div class="line">
-            <span class="inline-block title">
-              开户银行：
-            </span>
-              <span class="inline-block content">{{inv.billInfo.bankName || '-'}}</span>
+
+            <div class="list" v-if="inv.invoicetype === 1205">
+              <div class="clearfix">
+                <div class="pull-left">开户银行名称：</div>
+                <div class="pull-left overhidden" style="width: 4.6rem;">
+                  {{inv.billInfo.bankName || '-'}}
+                </div>
+              </div>
             </div>
-            <div class="line">
-            <span class="inline-block title">
-              开户银行账户：
-            </span>
-              <span class="inline-block content">{{inv.billInfo.bankAccount || '-'}}</span>
+
+            <div class="list" v-if="inv.invoicetype === 1205">
+              <div class="clearfix">
+                <div class="pull-left">开户银行账户：</div>
+                <div class="pull-left overhidden" style="width: 4.6rem;">
+                  {{inv.billInfo.bankAccount || '-'}}
+                </div>
+              </div>
             </div>
-          </template>
-          <div class="line">
-            <span class="inline-block title">
-              收票人：
-            </span>
-            <span class="inline-block content">{{inv.receiverName}}</span>
-          </div>
-          <div class="line">
-            <span class="inline-block title">
-              联系电话：
-            </span>
-            <span class="inline-block content">{{inv.recTel}}</span>
+
+            <div class="list" v-if="inv.invoicetype === 1205">
+              <div class="clearfix">
+                <div class="pull-left">税务登记号：</div>
+                <div class="pull-left overhidden" style="width: 4.8rem;">
+                  {{inv.billInfo.companyTaxNumber || '-'}}
+                </div>
+              </div>
+            </div>
+
+            <div class="list ">
+              <div class="clearfix">
+                <div class="pull-left">收票地址：</div>
+                <div class="pull-left" style="width: 5rem;">
+                  {{inv.invoiceAddress}}
+                </div>
+              </div>
+            </div>
+
+            <div class="list ">
+              <div class="clearfix">
+                <div class="pull-left">订单号：</div>
+                <div class="pull-left">
+                  <nuxt-link class="block link" :key="id" :to="`/mobile/order/details?uuid=${baseUtils.enidfilter(id)}&type=buyer`" v-for="id in inv.orderids.split(',')">
+                    {{id}}
+                  </nuxt-link>
+                </div>
+              </div>
+            </div>
+
           </div>
-          <div class="line">
-            <span class="inline-block title">
-              收票地址：
-            </span>
-            <span class="inline-block content">{{inv.invoiceAddress}}</span>
+          <div class="fixedImg">
+            <img src="/images/mobile/center/invoice-spec2.png" v-if="inv.invoicetype === 1206"/>
+            <img src="/images/mobile/center/invoice-nor2.png" v-else/>
           </div>
         </li>
       </ul>
+      <!--<ul class="mi-list" v-if="invoiceList.length">-->
+        <!--<li v-for="inv in invoiceList" @click="setActive(inv)" :class="{active: inv.$active && switchType == 'apply'}">-->
+          <!--<div class="line">-->
+            <!--<span class="inline-block title">-->
+               <!--<label class="bottom-modal-check mobile-cart-check" :class="{active: inv.$active}">-->
+                 <!--&lt;!&ndash;<input type="checkbox">&ndash;&gt;-->
+               <!--</label>-->
+              <!--类型：-->
+            <!--</span>-->
+            <!--<span class="inline-block content">-->
+              <!--<i class="inv" :class="{'spec-inv' : inv.invoicetype === 1205}">{{inv.invoicetype === 1206 ? '普票' : '专票'}}</i>-->
+            <!--</span>-->
+          <!--</div>-->
+          <!--<div class="line">-->
+            <!--<span class="inline-block title">-->
+              <!--申请时间：-->
+            <!--</span>-->
+            <!--<span class="inline-block content">{{inv.createTime | date}}</span>-->
+          <!--</div>-->
+          <!--<div class="line">-->
+            <!--<span class="inline-block title">-->
+              <!--订单号：-->
+            <!--</span>-->
+            <!--<span class="inline-block content">-->
+              <!--<span @click.stop="goOrderDetail(inv, index)" class="block link" :key="id" v-for="(id, index) in inv.orderids.split(',')">-->
+                <!--{{id}}-->
+              <!--</span>-->
+            <!--</span>-->
+          <!--</div>-->
+          <!--<div class="line">-->
+            <!--<span class="inline-block title">-->
+              <!--可开票金额：-->
+            <!--</span>-->
+            <!--<span class="inline-block content price">¥{{inv.price || 0}}</span>-->
+          <!--</div>-->
+          <!--<div class="line">-->
+            <!--<span class="inline-block title">-->
+              <!--发票抬头：-->
+            <!--</span>-->
+            <!--<span class="inline-block content">{{inv.invoicetitle}}</span>-->
+          <!--</div>-->
+          <!--<template v-if="inv.invoicetype == 1205">-->
+            <!--<div class="line">-->
+            <!--<span class="inline-block title">-->
+              <!--单位地址：-->
+            <!--</span>-->
+              <!--<span class="inline-block content">{{inv.billInfo.companyAddress || '-'}}</span>-->
+            <!--</div>-->
+            <!--<div class="line">-->
+            <!--<span class="inline-block title">-->
+              <!--单位电话：-->
+            <!--</span>-->
+              <!--<span class="inline-block content">{{inv.billInfo.companyPhone || '-'}}</span>-->
+            <!--</div>-->
+            <!--<div class="line">-->
+            <!--<span class="inline-block title">-->
+              <!--税务登记号：-->
+            <!--</span>-->
+              <!--<span class="inline-block content">{{inv.billInfo.companyTaxNumber || '-'}}</span>-->
+            <!--</div>-->
+            <!--<div class="line">-->
+            <!--<span class="inline-block title">-->
+              <!--开户银行：-->
+            <!--</span>-->
+              <!--<span class="inline-block content">{{inv.billInfo.bankName || '-'}}</span>-->
+            <!--</div>-->
+            <!--<div class="line">-->
+            <!--<span class="inline-block title">-->
+              <!--开户银行账户：-->
+            <!--</span>-->
+              <!--<span class="inline-block content">{{inv.billInfo.bankAccount || '-'}}</span>-->
+            <!--</div>-->
+          <!--</template>-->
+          <!--<div class="line">-->
+            <!--<span class="inline-block title">-->
+              <!--收票人：-->
+            <!--</span>-->
+            <!--<span class="inline-block content">{{inv.receiverName}}</span>-->
+          <!--</div>-->
+          <!--<div class="line">-->
+            <!--<span class="inline-block title">-->
+              <!--联系电话：-->
+            <!--</span>-->
+            <!--<span class="inline-block content">{{inv.recTel}}</span>-->
+          <!--</div>-->
+          <!--<div class="line">-->
+            <!--<span class="inline-block title">-->
+              <!--收票地址：-->
+            <!--</span>-->
+            <!--<span class="inline-block content">{{inv.invoiceAddress}}</span>-->
+          <!--</div>-->
+        <!--</li>-->
+      <!--</ul>-->
       <empty-status
         :text="'暂无开票信息'"
         :showLink="false"
@@ -334,4 +439,58 @@
       }
     }
   }
+  @mixin overFlowHidden {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+  @mixin lineHeight($value) {
+    height: $value;
+    line-height: $value;
+  }
+  .mobile-invoice.invoice-record .mi-list li  .title label {
+    display: none;
+  }
+  .mobile-invoice.vendor-invoice {
+    .mi-list {
+      padding: 0;
+      li {
+        background: #fff;
+        border-radius: 0.05rem;
+        border: 1px solid #e3e5e8;
+        margin: 0 0.2rem 0.3rem;
+        padding: 0 0.24rem;
+        position: relative;
+        .fixedImg {
+          position: absolute;
+          right: 0;
+          top: 0;
+          img {
+            width: 0.82rem;
+            height: 0.82rem;
+          }
+        }
+        .mi-list-top {
+          @include lineHeight(0.55rem);
+          font-size: 0.28rem;
+          color: #333;
+          border-bottom: 1px solid #d3d3d3;
+        }
+        .mi-list-bottom {
+          font-size: 0.28rem;
+          color: #333;
+          padding: 0.2rem 0;
+          .list {
+            line-height: 0.55rem;
+          }
+          .overhidden {
+            @include overFlowHidden()
+          }
+          .w50 {
+            width: 50%;
+          }
+        }
+      }
+    }
+  }
 </style>

pages/mobile/user/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="mobile-center">
     <div class="com-mobile-header">
       <a @click="goLastPage"><i class="iconfont icon-fanhui"></i></a>
       <p>账户中心
@@ -21,33 +21,100 @@
         <div class="img-wrap">
           <img src="/images/mobile/user/icon_01.png" alt="">
         </div>
-       <!-- <span>公司</span>-->
+        <!-- <span>公司</span>-->
         <i class="iconfont icon-xiangyou"></i>
         <span class="l-right inline-block">{{currentEnName}}</span>
       </div>
-      <!--v-if="storeStatus.uuid"-->
-      <div class="line" @click="go('/mobile/user/storeinfo')" v-if="storeStatus.uuid">
-        <div class="img-wrap">
-          <img src="/images/mobile/user/icon_02.png" alt="">
-        </div>
-        <span>店铺信息</span>
-        <i class="iconfont icon-xiangyou"></i>
+
+
+      <div class="block-wrap seek-operation">
+        <p><i></i>更多信息</p>
+        <ul>
+          <li @click="go('/mobile/user/storeinfo')" v-if="storeStatus.uuid">
+            <img src="/images/mobile/user/icon_02.png" alt="">
+            <p>店铺信息</p>
+          </li>
+          <li @click="go('/mobile/user/storeinfo')" v-else>
+            <img src="/images/mobile/user/apply-store.png" alt="">
+            <p>开店申请</p>
+          </li>
+          <li @click="go('/mobile/center/user/invoice?type=frompage')">
+            <img src="/images/mobile/user/fapiao.png" alt="">
+            <p>发票信息</p>
+          </li>
+          <li @click="go('/')">
+            <img src="/images/mobile/user/shoukuan.png" alt="">
+            <p>收款账户</p>
+          </li>
+          <li @click="go('/')">
+            <img src="/images/mobile/user/fukuang.png" alt="">
+            <p>付款账户</p>
+          </li>
+          <li @click="go('/mobile/user/address')">
+            <img src="/images/mobile/user/icon_06.png" alt="">
+            <p>收货地址</p>
+          </li>
+        </ul>
       </div>
-      <div class="line" @click="go('/mobile/user/storeinfo')" v-else>
-        <div class="img-wrap">
-          <img src="/images/mobile/user/apply-store.png" alt="">
-        </div>
-        <span>开店申请</span>
-        <i class="iconfont icon-xiangyou"></i>
-      </div>
-      <div class="line block-line" @click="go('/mobile/user/enterpriseinfo')">
-        <div class="img-wrap">
-          <img src="/images/mobile/user/icon_03.png" alt="">
-        </div>
-        <span>企业信息</span>
-        <i class="iconfont icon-xiangyou"></i>
-        <div class="border-line"></div>
+
+      <div class="block-wrap seek-operation">
+        <p><i></i>更多信息</p>
+        <ul>
+          <li @click="go('/mobile/user/enterpriseinfo')">
+            <img src="/images/mobile/user/icon_03.png" alt="">
+            <p>企业信息</p>
+          </li>
+          <li @click="go('/mobile/user/info/admin')">
+            <img src="/images/mobile/user/icon_05.png" alt="">
+            <p>管理员信息</p>
+          </li>
+          <li @click="go('/')">
+            <img src="/images/mobile/center/vendor/onsale.png" alt="">
+            <p>员工管理</p>
+          </li>
+        </ul>
       </div>
+
+    <!--<div class="mobile-user mobile-fix-content">-->
+      <!--<nuxt-link to="/mobile/user/info/personal" tag="div" class="line img-line">-->
+        <!--<div class="img-wrap">-->
+          <!--<img :src="user.data.imageUrl ? user.data.imageUrl : '/images/component/default.png'" alt="" class="photo"/>-->
+        <!--</div>-->
+        <!--<span>{{user.data.userName}}</span>-->
+        <!--<span class="tel">{{user.data.userTel}}</span>-->
+        <!--<span class="edit" to="/mobile/user/info/personal">-->
+          <!--<img src="/images/mobile/user/edit.png" alt=""/>-->
+        <!--</span>-->
+      <!--</nuxt-link>-->
+      <!--<div class="line" @click="showLogin=true">-->
+        <!--<div class="img-wrap">-->
+          <!--<img src="/images/mobile/user/icon_01.png" alt="">-->
+        <!--</div>-->
+        <!--<i class="iconfont icon-xiangyou"></i>-->
+        <!--<span class="l-right inline-block">{{currentEnName}}</span>-->
+      <!--</div>-->
+      <!--<div class="line" @click="go('/mobile/user/storeinfo')" v-if="storeStatus.uuid">-->
+        <!--<div class="img-wrap">-->
+          <!--<img src="/images/mobile/user/icon_02.png" alt="">-->
+        <!--</div>-->
+        <!--<span>店铺信息</span>-->
+        <!--<i class="iconfont icon-xiangyou"></i>-->
+      <!--</div>-->
+      <!--<div class="line" @click="go('/mobile/user/storeinfo')" v-else>-->
+        <!--<div class="img-wrap">-->
+          <!--<img src="/images/mobile/user/apply-store.png" alt="">-->
+        <!--</div>-->
+        <!--<span>开店申请</span>-->
+        <!--<i class="iconfont icon-xiangyou"></i>-->
+      <!--</div>-->
+      <!--<div class="line block-line" @click="go('/mobile/user/enterpriseinfo')">-->
+        <!--<div class="img-wrap">-->
+          <!--<img src="/images/mobile/user/icon_03.png" alt="">-->
+        <!--</div>-->
+        <!--<span>企业信息</span>-->
+        <!--<i class="iconfont icon-xiangyou"></i>-->
+        <!--<div class="border-line"></div>-->
+      <!--</div>-->
       <!--<nuxt-link to="/mobile/user/info/personal" tag="div" class="line block-line">-->
         <!--<div class="img-wrap">-->
           <!--<img src="/images/mobile/user/icon_04.png" alt="">-->
@@ -56,22 +123,24 @@
         <!--<i class="iconfont icon-xiangyou"></i>-->
         <!--<div class="border-line"></div>-->
       <!--</nuxt-link>-->
-      <div @click="go('/mobile/user/info/admin')" class="line block-line">
-        <div class="img-wrap">
-          <img src="/images/mobile/user/icon_05.png" alt="">
-        </div>
-        <span>管理员信息</span>
-        <i class="iconfont icon-xiangyou"></i>
-        <div class="border-line"></div>
-      </div>
-      <div @click="go('/mobile/user/address')" class="line block-line">
-        <div class="img-wrap">
-          <img src="/images/mobile/user/icon_06.png" alt="">
-        </div>
-        <span>收货地址信息</span>
-        <i class="iconfont icon-xiangyou"></i>
-        <div class="border-line"></div>
-      </div>
+      <!--<div @click="go('/mobile/user/info/admin')" class="line block-line">-->
+        <!--<div class="img-wrap">-->
+          <!--<img src="/images/mobile/user/icon_05.png" alt="">-->
+        <!--</div>-->
+        <!--<span>管理员信息</span>-->
+        <!--<i class="iconfont icon-xiangyou"></i>-->
+        <!--<div class="border-line"></div>-->
+      <!--</div>-->
+      <!--<div @click="go('/mobile/user/address')" class="line block-line">-->
+        <!--<div class="img-wrap">-->
+          <!--<img src="/images/mobile/user/icon_06.png" alt="">-->
+        <!--</div>-->
+        <!--<span>收货地址信息</span>-->
+        <!--<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>
@@ -206,6 +275,12 @@
   }
 </script>
 <style lang="scss" scoped>
+  @import '~assets/scss/mobileCenter';
+  .mobile-center{
+    .collect-block {
+      height: auto;
+    }
+  }
   .mobile-user {
     background: #f1f3f6;
     .line {

utils/baseUtils.js

@@ -211,9 +211,9 @@ const _formatDate = (date, fmt) => {
   let o = {
     'M+': date.getMonth() + 1, // 月份
     'd+': date.getDate(), // 日
-    'h+': 23, // 小时
-    'm+': 59, // 分
-    's+': 59, // 秒
+    'h+': date.getHours(), // 小时
+    'm+': date.getMinutes(), // 分
+    's+': date.getSeconds(), // 秒
     'q+': Math.floor((date.getMonth() + 3) / 3), // 季度
     'S': date.getMilliseconds() // 毫秒
   }