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

components/mobile/center/addinvoice.vue

@@ -16,14 +16,14 @@
           <div class="addinvoice-focus clearfix" v-if="joinType === 'add'">
             <div class="pull-left addinvoice-focus-name"><a class="red">*</a>发票类型：</div>
             <div class="pull-left clearfix">
-              <div class="normal pull-left" style="margin-right: 0.2rem;" @click="isSaveinvoiceType === 0 ? changeType('speci') : ''">
-                <div class="icon" :class="invoiceType === 'speci' ? 'active' : ''">
+              <div class="normal pull-left" style="margin-right: 0.2rem;" @click="isSaveinvoiceType === 0 ? changeType('speci') : ''" :class="{'noclick': isSaveinvoiceType === 1205}">
+                <div class="icon" :class="{'active': invoiceType === 'speci', 'noclick2': isSaveinvoiceType === 1205}">
                   <div class="icon-next"></div>
                 </div>
                 增值税专票
               </div>
-              <div class="normal pull-left" @click="isSaveinvoiceType === 0 ? changeType('normal') : ''">
-                <div class="icon" :class="invoiceType === 'normal' ? 'active' : ''">
+              <div class="normal pull-left" @click="isSaveinvoiceType === 0 ? changeType('normal') : ''" :class="{'noclick': isSaveinvoiceType === 1206}">
+                <div class="icon" v-bind:class="{'active' : invoiceType === 'normal', 'noclick2': isSaveinvoiceType === 1206}">
                   <div class="icon-next"></div>
                 </div>
                 增值税普票
@@ -341,6 +341,9 @@
         .red {
           color: #ff0000;
         }
+        .noclick {
+          color: #999;
+        }
         .normal {
           .icon {
             font-size: 0.28rem;
@@ -356,6 +359,10 @@
             &.active {
               border: 1px solid #226ce7;
             }
+            &.noclick2 {
+              border: 1px solid #999;
+              color: #999;
+            }
             &.active .icon-next {
               background: #226ce7;
               width: 0.3rem;

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

@@ -2,7 +2,7 @@
   <div class="invoice-wrapper">
     <div class="mobile-nav">
       <div class="mobile-header mobile-center-header">
-        <a @click="goBack()"><i class="iconfont icon-fanhui"></i></a>
+        <a @click="goLastPage()"><i class="iconfont icon-fanhui"></i></a>
         <p>发票管理</p>
         <p class="en-name">
           <img :src="`/images/mobile/center/${user.data.enterprise && user.data.enterprise.uu ? 'en' : 'self'}.png`" alt="">{{currentEnName}}
@@ -199,24 +199,26 @@
       },
       async addinvoiceFn(ty, item) {
         this.showAddinvoice = false
-        let { data } = await axios.get('/trade/bill/list/personal')
-        let _arr = []
-        data.forEach(obj => {
-          if (obj.kind === 1206) {
-            _arr.splice(0, 0, obj)
-          } else {
-            _arr.push(obj)
-          }
-        })
-        let hasnormal = data.find(item => {
-          return item.kind === 1206
-        })
-        this.invoiceList = _arr
-        this.hasnormal = hasnormal
+        if (ty) {
+          let {data} = await axios.get('/trade/bill/list/personal')
+          let _arr = []
+          data.forEach(obj => {
+            if (obj.kind === 1206) {
+              _arr.splice(0, 0, obj)
+            } else {
+              _arr.push(obj)
+            }
+          })
+          let hasnormal = data.find(item => {
+            return item.kind === 1206
+          })
+          this.invoiceList = _arr
+          this.hasnormal = hasnormal
+        }
       },
       updateInvoice(item, index) {
         this.joinType = 'update'
-        this.chooseItem = item
+        this.chooseItem = this.baseUtils.deepCopy(item)
         this.$kind = 0
         this.showAddinvoice = true
       },
@@ -271,9 +273,8 @@
     width: 100%;
     .invoice-wrapper-el {
       margin: 2.08rem 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;
     }
     /*overflow-y: scroll;*/
     .mobile-header{

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

@@ -2,7 +2,7 @@
   <div class="invoice-wrapper">
     <div class="mobile-nav">
       <div class="mobile-header mobile-center-header">
-        <a @click="goBack()"><i class="iconfont icon-fanhui"></i></a>
+        <a @click="goLastPage()"><i class="iconfont icon-fanhui"></i></a>
         <p>发票管理</p>
         <p class="en-name">
           <img :src="`/images/mobile/center/${user.data.enterprise && user.data.enterprise.uu ? 'en' : 'self'}.png`" alt="">{{currentEnName}}
@@ -194,13 +194,12 @@
                 <div class="pull-right">金额：¥{{info.orderAllPrice}}</div>
               </div>
             </div>
-            <div class="applyinvoice_controll clearfix">
-              <div @click="showSend = false" class="pull-left">取消</div>
-              <div class="pull-right" @click="applyInvoiceFn()">确认</div>
-            </div>
           </div>
         </div>
-
+        <div class="applyinvoice_controll clearfix">
+          <div @click="showSend = false" class="pull-left">取消</div>
+          <div class="pull-right" @click="applyInvoiceFn()">确认</div>
+        </div>
       </div>
     </div>
   </div>
@@ -653,7 +652,8 @@
         }
       }
       .applyinvoice_controll {
-        padding: 0 0.3rem;
+        padding: 0.2rem 0.3rem 0;
+        border-top: 1px solid #dcdcdc;
         div {
           width: 3.29rem;
           @include lineHeight(0.77rem);