Merge remote-tracking branch 'origin/release-201823-wangcz' into release-201823-wangcz

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

@@ -23,11 +23,13 @@
                 <div class="pull-left overhidden" style="width: 1.85rem">{{item.head}}</div>
               </div>
               <div class="list clearfix">
-                <div class="clearfix pull-left w50">
+                <div class="clearfix">
                   <div class="pull-left">收票人：</div>
                   <div class="pull-left overhidden" style="width:2.1rem">{{item.name}}</div>
                 </div>
-                <div class="clearfix pull-left w50">
+              </div>
+              <div class="list clearfix">
+                <div class="clearfix">
                   <div class="pull-left">联系电话：</div>
                   <div class="pull-left overhidden">{{item.telephone}}</div>
                 </div>
@@ -70,7 +72,7 @@
                   <div class="clearfix">
                     <div class="pull-left">单位地址：</div>
                     <div class="pull-left overhidden" style="width: 4.6rem;">
-                      {{item.bcompanyAddress || '-'}}
+                      {{item.companyAddress || '-'}}
                     </div>
                   </div>
                 </div>
@@ -101,13 +103,14 @@
                     </div>
                   </div>
                 </div>
-
                 <div class="list clearfix">
-                  <div class="clearfix pull-left w50">
+                  <div class="clearfix">
                     <div class="pull-left">收票人：</div>
                     <div class="pull-left overhidden" style="width:2.1rem">{{item.name}}</div>
                   </div>
-                  <div class="clearfix pull-left w50">
+                </div>
+                <div class="list">
+                  <div class="clearfix">
                     <div class="pull-left">收票电话：</div>
                     <div class="pull-left overhidden">{{item.telephone}}</div>
                   </div>
@@ -216,11 +219,7 @@
         this.showDeleteAlert = true
       },
       async addinvoiceFn(ty, item) {
-        if (this.invoiceList.length === 0) {
-          this.goLastPage()
-          return
-        }
-        this.showAddinvoice = false
+
         if (ty) {
           let {data} = await axios.get('/trade/bill/list/personal')
           let _arr = []
@@ -236,7 +235,13 @@
           })
           this.invoiceList = _arr
           this.hasnormal = hasnormal
+        } else {
+          if (this.invoiceList.length === 0) {
+            this.goLastPage()
+            return
+          }
         }
+        this.showAddinvoice = false
       },
       updateInvoice(item, index) {
         this.joinType = 'update'

pages/mobile/shop/index.vue

@@ -238,7 +238,7 @@
       },
       onSearch: function (keyObj) {
         this.keyword = keyObj.keyword
-        this.field = keyObj.type && keyObj.type !== 'store' ? obj.type : null
+        this.field = keyObj.type && keyObj.type !== 'store' ? keyObj.type : ''
         this.onDown('ORIGINAL_FACTORY-DISTRIBUTION-AGENCY-CONSIGNMENT')
         this.down = false
       }