Merge remote-tracking branch 'origin/release-201818' into release-201818

assets/scss/mobileInvoice.scss

@@ -55,7 +55,7 @@ $blue-base: #3f84f6;
   }
   .mi-list-content {
     .mi-lc-filters {
-      padding: .1rem 0 0 0;
+      padding: .1rem 0;
       margin: 0 .3rem;
       border-bottom: 1px solid #dcdcdc;
       .multi-check {
@@ -83,7 +83,7 @@ $blue-base: #3f84f6;
       li {
         margin: .3rem 0;
         border-radius: .06rem;
-        border: 1px solid #aaa;
+        border: 1px solid #dcdcdc;
         &.active {
           border-color: $blue-base;
         }
@@ -91,6 +91,9 @@ $blue-base: #3f84f6;
           border-bottom: 1px solid #dcdcdc;
           word-break: break-all;
           padding: .26rem;
+          &:last-child {
+            border-bottom: none;
+          }
           .title {
             width: 28%;
             text-align: right;
@@ -105,8 +108,8 @@ $blue-base: #3f84f6;
             color: #333;
             .inv {
               width: .7rem;
-              height: .32rem;
-              line-height: .28rem;
+              height: .34rem;
+              line-height: .3rem;
               text-align: center;
               font-size: .24rem;
               border-radius: .04rem;

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

@@ -13,15 +13,16 @@
       <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 ? '专票' : '类型'}}
+        <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', 1206)">普票</li>
-            <li @click.stop="setFilter('invoicetype', 1205)">专票</li>
+            <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" :class="{active: inv.$active}">
+        <li v-for="inv in invoiceList">
           <div class="line">
             <span class="inline-block title">
               类型：

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

@@ -31,15 +31,16 @@
     </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 ? '专票' : '类型'}}
+        <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(1206)">普票</li>
-            <li @click.stop="setInvoiceType(1205)">专票</li>
+            <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.stop="setActive(inv)" :class="{active: inv.$active}">
+        <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}">
@@ -62,9 +63,9 @@
               订单号：
             </span>
             <span class="inline-block content">
-              <nuxt-link class="block link" :key="id" :to="`/mobile/order/details?uuid=${baseUtils.enidfilter(id)}&type=saler`" v-for="id in inv.orderids.split(',')">
+              <span @click.stop="goOrderDetail(inv, index)" class="block link" :key="id" v-for="(id, index) in inv.orderids.split(',')">
                 {{id}}
-              </nuxt-link>
+              </span>
             </span>
           </div>
           <div class="line">
@@ -165,6 +166,7 @@
             let arr = this.baseUtils.deepCopy(val.content)
             arr.forEach(item => {
 //              item.orderidArr = item.orderids.split(',')
+//              item.purchaseidArr = item.purchaseids ? item.purchaseids.split(',') : null
               item.$active = false
             })
             this.invoiceList = [...this.invoiceList, ...arr]
@@ -273,6 +275,13 @@
 //          .then(() => {
 //          this.switchType = type
 //        })
+      },
+      goOrderDetail (inv, index) {
+        if (inv.purchaseids) {
+          this.$router.push(`/mobile/order/details?uuid=${this.baseUtils.enidfilter(inv.purchaseids.split(',')[index])}&type=saler`)
+        } else {
+          this.setRemindText('获取订单号失败')
+        }
       }
     }
   }