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

components/applyPurchase/SayPrice.vue

@@ -347,8 +347,9 @@
     width: 476px;
     top: 50%;
     left: 50%;
-    margin-top: -162px;
+    margin-top: calc(((80vh - 113px) - 133px - 100vh) / 2);
     margin-left: -238px;
+    max-height: calc(80vh - 113px);
     overflow-y: auto;
     /*-webkit-box-shadow: 0 5px 15px rgba(0,0,0,.5);*/
     /*-moz-box-shadow: 0 5px 15px rgba(0,0,0,.5);*/

components/mobile/center/addinvoice.vue

@@ -3,7 +3,7 @@
     <div class="mobile-nav">
       <div class="mobile-header mobile-center-header">
         <a @click="goBack()"><i class="iconfont icon-fanhui"></i></a>
-        <p v-if="isSaveinvoiceType !== 0">{{joinType === 'update' ? '修改': '新增'}}开票信息</p>
+        <p v-if="!isAddInvoice">{{joinType === 'update' ? '修改': '新增'}}开票信息</p>
         <p v-else>开票信息</p>
         <p class="en-name">
           <img :src="`/images/mobile/center/${user.data.enterprise && user.data.enterprise.uu ? 'en' : 'self'}.png`" alt="">{{currentEnName}}
@@ -121,7 +121,7 @@
             <!--<label for="awesome"></label>-->
           </div>
 
-          <div class="addinvoice-controll clearfix" v-if="isSaveinvoiceType != 0">
+          <div class="addinvoice-controll clearfix" v-if="!isAddInvoice">
             <div class="pull-left" @click="goBack()">取消</div>
             <div class="pull-right" @click="goBack(true)">确认</div>
           </div>
@@ -160,6 +160,10 @@
       joinType: {
         type: String,
         default: 'add'
+      },
+      isAddInvoice: {// 第一次新增
+        type: Boolean,
+        default: false
       }
     },
     computed: {

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>
@@ -161,6 +164,7 @@
      v-if="showAddinvoice"
      :isSaveinvoiceType="$kind"
      :joinType="joinType"
+     :isAddInvoice="isAddInvoice"
    ></addinvoice>
   </div>
 </template>
@@ -176,6 +180,7 @@
     layout: 'mobile',
     data() {
       return {
+        isAddInvoice: false,
         activeType: '',
         invoiceList: [],
         hasnormal: false, // 是否拥有普票
@@ -216,11 +221,6 @@
         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,15 +236,23 @@
           })
           this.invoiceList = _arr
           this.hasnormal = hasnormal
+        } else {
+          if (this.invoiceList.length === 0) {
+            this.goLastPage()
+            return
+          }
         }
+        this.showAddinvoice = false
       },
       updateInvoice(item, index) {
         this.joinType = 'update'
         this.chooseItem = this.baseUtils.deepCopy(item)
         this.$kind = 0
+        this.isAddInvoice = false
         this.showAddinvoice = true
       },
       addInvoiceNew() {
+        this.isAddInvoice = true
         this.joinType = 'add'
         this.$kind = this.invoiceList.length > 0 ? this.invoiceList[0].kind : 0
         this.chooseItem = {}

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

@@ -8,7 +8,7 @@
     </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">

pages/mobile/center/user/pay/_orderId.vue

@@ -395,6 +395,7 @@
       v-if="showAddinvoice"
       :isSaveinvoiceType="$kind"
       :joinType="joinType"
+      :isAddInvoice="isAddInvoice"
     ></addinvoice>
   </div>
 </template>
@@ -440,7 +441,8 @@
         chooseItem: {},
         showAddinvoice: false,
         $kind: 0,
-        joinType: 'add'
+        joinType: 'add',
+        isAddInvoice: false
       }
     },
     mixins: [goodsPurchaseOperate],
@@ -995,12 +997,14 @@
         }
       },
       updateInvoice(item, index) {
+        this.isAddInvoice = false
         this.joinType = 'update'
         this.chooseItem = this.baseUtils.deepCopy(item)
         this.$kind = 0
         this.showAddinvoice = true
       },
       addInvoiceNew() {
+        this.isAddInvoice = true
         this.joinType = 'add'
         this.$kind = this.invoiceData.length > 0 ? this.invoiceData[0].kind : 0
         this.chooseItem = {}

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
       }