新增买家订单

components/mobile/center/addinvoice.vue

@@ -16,13 +16,13 @@
           <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') : ''" :class="{'noclick': isSaveinvoiceType === 1205}">
+              <div class="normal pull-left" style="margin-right: 0.2rem;" @click="isSaveinvoiceType === 0 ? changeType('speci') : (isSaveinvoiceType === 1205 ?  setRemindText('已有增值税专票信息') : '')" :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') : ''" :class="{'noclick': isSaveinvoiceType === 1206}">
+              <div class="normal pull-left" @click="isSaveinvoiceType === 0 ? changeType('normal') :  (isSaveinvoiceType === 1206 ?  setRemindText('已有增值税普票信息') : '')" :class="{'noclick': isSaveinvoiceType === 1206}">
                 <div class="icon" v-bind:class="{'active' : invoiceType === 'normal', 'noclick2': isSaveinvoiceType === 1206}">
                   <div class="icon-next"></div>
                 </div>
@@ -81,7 +81,7 @@
           <div class="addinvoice-focus clearfix">
             <div class="pull-left addinvoice-focus-name"><a class="red">*</a>联系电话：</div>
             <div class="pull-left input">
-              <input placeholder="请输入联系电话" type="number" oninput="if(value.length>11)value=value.slice(0,11)" v-model="chooseItem.telephone" />
+              <input placeholder="请输入联系电话" type="text" oninput="if(value.length>11)value=value.slice(0,11)" v-model="chooseItem.telephone" />
             </div>
           </div>
 
@@ -204,6 +204,8 @@
             this.setRemindText('发票抬头不能为空')
           } else if (this.invoiceType !== 'normal' && (this.chooseItem.companyAddress === '' || !this.chooseItem.companyAddress)) {
             this.setRemindText('单位地址不能为空')
+          } else if (this.invoiceType !== 'normal' && (this.chooseItem.companyPhone === '' || !this.chooseItem.companyPhone)) {
+            this.setRemindText('单位电话不能为空')
           } else if (this.invoiceType !== 'normal' && (!/^0\d{2,3}-\d{7,8}$/.test(this.chooseItem.companyPhone))) {
             this.setRemindText('单位电话不正确')
           } else if (this.invoiceType !== 'normal' && (this.chooseItem.companyTaxNumber === '' || !this.chooseItem.companyTaxNumber)) {
@@ -220,6 +222,8 @@
             this.setRemindText('联系电话不能为空')
           } else if (!/^1\d{10}$/.test(this.chooseItem.telephone)) {
             this.setRemindText('联系电话不正确')
+          } else if (this.chooseItem.area === '' || !this.chooseItem.area) {
+            this.setRemindText('地址区域未选择')
           } else if (this.chooseItem.detailAddress === '' || !this.chooseItem.detailAddress) {
             this.setRemindText('详细地址不能为空')
           } else if (!this.agreeInfo) {

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

@@ -16,7 +16,7 @@
     </div>
     <div class="invoice-wrapper-el">
       <div class="invoice-top clearfix">
-        <div class="pull-left">已设置的开票信息</div>
+        <div class="pull-left">已设置的发票信息</div>
         <div class="pull-right" v-if="invoiceList.length !== 2" @click="addInvoiceNew()"><img src="/images/mobile/center/user/icon-rm-invoice.png"/>新增发票</div>
       </div>
       <div class="invoice-middle" v-if="invoiceList.length > 0">
@@ -47,7 +47,7 @@
               <div class="invoice-list-title pull-left">收票地址：</div>
               <div class="pull-right">
                 <p>{{item.area}}</p>
-                <p>{{item.detailAddress}}</p>
+                <p style="max-width: 4.4rem" class="overhiden">{{item.detailAddress}}</p>
               </div>
             </div>
 
@@ -107,7 +107,8 @@
               <div class="invoice-list-title pull-left">收票地址：</div>
               <div class="pull-right">
                 <p>{{item.area}}</p>
-                <p>{{item.detailAddress}}</p>
+                <!--<p>{{item.detailAddress}}</p>-->
+                <p style="max-width: 4.4rem" class="overhiden">{{item.detailAddress}}</p>
               </div>
             </div>
 

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

@@ -125,49 +125,49 @@
               </div>
               <div class="addinvoice-focus clearfix">
                 <div class="pull-left addinvoice-focus-name">发票抬头：</div>
-                <div class="pull-left clearfix">
+                <div class="pull-left clearfix overhiden" style="width: 5rem">
                   {{chooseItem.head}}
                 </div>
               </div>
               <div class="addinvoice-focus clearfix" v-if="chooseItem.kind === 1205">
                 <div class="pull-left addinvoice-focus-name">单位地址：</div>
-                <div class="pull-left clearfix">
+                <div class="pull-left clearfix overhiden" style="width: 5rem">
                   {{chooseItem.companyAddress}}
                 </div>
               </div>
               <div class="addinvoice-focus clearfix" v-if="chooseItem.kind === 1205">
                 <div class="pull-left addinvoice-focus-name">单位电话：</div>
-                <div class="pull-left clearfix">
+                <div class="pull-left clearfix overhiden" style="width: 5rem">
                   {{chooseItem.companyPhone}}
                 </div>
               </div>
               <div class="addinvoice-focus clearfix" v-if="chooseItem.kind === 1205">
                 <div class="pull-left addinvoice-focus-name">税务登记号：</div>
-                <div class="pull-left clearfix">
+                <div class="pull-left clearfix overhiden" style="width: 5rem">
                   {{chooseItem.companyTaxNumber}}
                 </div>
               </div>
               <div class="addinvoice-focus clearfix" v-if="chooseItem.kind === 1205">
                 <div class="pull-left addinvoice-focus-name">开户银行：</div>
-                <div class="pull-left clearfix">
+                <div class="pull-left clearfix overhiden" style="width: 5rem">
                   {{chooseItem.bankName}}
                 </div>
               </div>
               <div class="addinvoice-focus clearfix" v-if="chooseItem.kind === 1205">
                 <div class="pull-left addinvoice-focus-name">开户银行账号：</div>
-                <div class="pull-left clearfix">
+                <div class="pull-left clearfix overhiden" style="width: 5rem">
                   {{chooseItem.bankAccount}}
                 </div>
               </div>
               <div class="addinvoice-focus clearfix" >
                 <div class="pull-left addinvoice-focus-name">收票人：</div>
-                <div class="pull-left clearfix">
+                <div class="pull-left clearfix overhiden" style="width: 5rem">
                   {{chooseItem.name}}
                 </div>
               </div>
               <div class="addinvoice-focus clearfix" >
                 <div class="pull-left addinvoice-focus-name">联系电话：</div>
-                <div class="pull-left clearfix">
+                <div class="pull-left clearfix overhiden" style="width: 5rem">
                   {{chooseItem.telephone}}
                 </div>
               </div>
@@ -175,14 +175,15 @@
                 <div class="pull-left addinvoice-focus-name">收票地址：</div>
                 <div class="pull-left clearfix">
                   <p style="line-height:0.4rem">{{chooseItem.area}}</p>
-                  <p style="line-height:0.4rem">{{chooseItem.detailAddress}}</p>
+                  <!--<div class="pull-left clearfix overhiden" style="width: 5rem">-->
+                  <p style="line-height:0.4rem;width: 5rem" class='overhiden'>{{chooseItem.detailAddress}}</p>
                 </div>
               </div>
             </div>
             <div class="applyinvoice-ul" v-else>
               <div class="addinvoice-focus clearfix">
                 <div class="pull-left addinvoice-focus-name">暂无发票信息：</div>
-                <div class="pull-left clearfix" @click="addInvoiceNew()">
+                <div class="pull-left clearfix" @click="addInvoiceNew()" style="color: #3e82f5">
                   <img src="/images/mobile/center/user/icon-rm-invoice.png"/>新增发票
                 </div>
               </div>
@@ -454,6 +455,9 @@
     height: $value;
     line-height: $value;
   }
+  .overhiden {
+    @include overFlowHidden()
+  }
   .invoice-wrapper {
     background: #f1f3f6;
     /*margin: 1.26rem 0 0 0;*/
@@ -647,7 +651,7 @@
           @include overFlowHidden()
         }
         .pull-right {
-          width: 3.4rem;
+          width: 3.3rem;
           @include overFlowHidden()
         }
       }