Browse Source

1、修改新增发票空状态
2、新增微信验证码登录
3、修改报价规格字段显示问题

shenjj 7 years ago
parent
commit
e630eb504e

+ 6 - 2
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: {

+ 4 - 1
pages/mobile/center/user/invoice/index.vue

@@ -164,6 +164,7 @@
      v-if="showAddinvoice"
      :isSaveinvoiceType="$kind"
      :joinType="joinType"
+     :isAddInvoice="isAddInvoice"
    ></addinvoice>
   </div>
 </template>
@@ -179,6 +180,7 @@
     layout: 'mobile',
     data() {
       return {
+        isAddInvoice: false,
         activeType: '',
         invoiceList: [],
         hasnormal: false, // 是否拥有普票
@@ -219,7 +221,6 @@
         this.showDeleteAlert = true
       },
       async addinvoiceFn(ty, item) {
-
         if (ty) {
           let {data} = await axios.get('/trade/bill/list/personal')
           let _arr = []
@@ -247,9 +248,11 @@
         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 = {}

+ 1 - 1
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">

+ 5 - 1
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 = {}