tijiaodaima

src/view/user/invoiceManage/index.vue

@@ -267,7 +267,7 @@
 
         </div>
         <div class="tops">
-          <div class="tops-order-text">开票类型</div>
+          <div class="tops-order-text">发票类型</div>
           <div class="tops-order-text">发票抬头</div>
           <div class="tops-order-text">税号人识别号</div>
           <div class="tops-order-text" >操作</div>
@@ -281,8 +281,8 @@
         <div class="list" v-for="(item,index) in userTax.arr" :key="index">
           <div>
             <div class="evaluate-goods">
-              <div class="order-money color-s">{{ item.tax.paper_type==1?'电子发票':'纸质发票' }}</div>
               <div class="order-money color-s">{{ item.tax.self_type==1?'专票':'普票' }}</div>
+              <div class="order-money color-s">{{ item.tax.com_name }}</div>
               <div class="order-money color-s">{{ item.tax.tax_no||''}} </div>
               <div class=" order-money " style="line-height: 0;padding: 40px 0">
                 <div class="class1" @click="details(item.id)">查看详情</div>

src/view/user/order/submit/index.vue

@@ -464,20 +464,20 @@
                 {{mineAddress}}
               </div>
 <!--              <div class="address-add">添加收货地址</div>-->
-              <div class="address-right" @click="selectAddress">
+              <div class="address-right" style="right: 40px" @click="selectAddress">
                 选择/新增
               </div>
           </div>
-          <div class="submit-view">
-            <div class="submit-name">发票开具：</div>
-            <div class="address-right" @click="invoiceFlag=true">
+          <div class="submit-view" style="position: relative;margin-top: 30px">
+            <div class="submit-name" style="position: absolute;top: 8px">发票开具：</div>
+            <div class="address-right" style="right: 0;top: 10px" @click="invoiceFlag=true">
               选择/新增
             </div>
 
 <!--           <div class="submit-button" @click="invoideTexts(0)">填充上次开票信息</div>-->
 <!--            <div class="check" @click="invoiceFlag=true">查看信息</div>-->
           </div>
-          <div class="invoice-contents" style="margin-top: -40px;position: relative" v-if="invoiceFlags">
+          <div class="invoice-contents" style="margin-top: -20px;position: relative" v-if="invoiceFlags">
             <div v-if="checkText1" style="position: absolute;color: #fff;background-color: #dcdfe6;left:0;top:0;margin:-15px 0 0 -20px;border-radius: 12px;width: 45px;text-align: center;height: 20px;line-height: 20px;font-size: 14px;
 " >默认</div>
             <div class="flex-s">
@@ -513,25 +513,29 @@
                 <div>{{FormState.selfType==1?'专票':'普票'}}/</div>
               </div>
               <div class="divs">
-<!--                <div>开户行：</div>-->
-                <div>{{FormState.cardBank}}/</div>
+                <!--                <div>单位名称：</div>-->
+                <div>{{FormState.comName}}/</div>
               </div>
+<!--              <div class="divs">-->
+<!--&lt;!&ndash;                <div>开户行：</div>&ndash;&gt;-->
+<!--                <div>{{FormState.cardBank}}/</div>-->
+<!--              </div>-->
               <div class="divs">
 <!--                <div>开户行账号：</div>-->
-                <div>{{FormState.cardNo}}/</div>
-              </div>
-              <div class="divs">
-<!--                <div>纳税人识别号：</div>-->
-                <div>{{FormState.cardNumber}}/</div>
-              </div>
-              <div class="divs">
-<!--                <div>注册地址：</div>-->
-                <div>{{FormState.regAddr}}/</div>
-              </div>
-              <div class="divs">
-<!--                <div>注册电话：</div>-->
-                <div>{{FormState.regPhone}}</div>
+                <div>{{FormState.cardNo}}</div>
               </div>
+<!--              <div class="divs">-->
+<!--&lt;!&ndash;                <div>纳税人识别号：</div>&ndash;&gt;-->
+<!--                <div>{{FormState.cardNumber}}/</div>-->
+<!--              </div>-->
+<!--              <div class="divs">-->
+<!--&lt;!&ndash;                <div>注册地址：</div>&ndash;&gt;-->
+<!--                <div>{{FormState.regAddr}}/</div>-->
+<!--              </div>-->
+<!--              <div class="divs">-->
+<!--&lt;!&ndash;                <div>注册电话：</div>&ndash;&gt;-->
+<!--                <div>{{FormState.regPhone}}</div>-->
+<!--              </div>-->
             </div>
           </div>
 <!--          <div class="invoice-from" v-if="invoiceIndex!=2 && flags">-->
@@ -1139,11 +1143,14 @@ const invoideTexts=(index)=>{
 			let data=res.data.data[index].tax;
 			sourceIndex.value=data.self_type-1;
 			typeIndex.value=data.u_type==2?0:1;
-
 			// invoiceIndex.value=data.paper_type-1;
-
       FormState.paperType=data.paper_type;
       FormState.selfType=data.self_type;
+      if(res.data.data[index].is_default==0){
+        checkText1.value=false
+      }else{
+        checkText1.value=true
+      }
 
 			FormState.name=data.name;
       FormState.id=data.id;
@@ -1169,7 +1176,6 @@ const invoiceLists=()=>{
             res.data.data[i].check=true;
             invoiceFlags.value=true;
             checkText1.value=true
-
           }
         }
         // res.data.data[0].check=true;
@@ -1354,6 +1360,11 @@ const addressBtn = () => {
   mineAddress.value = list[indexs].name + ' ' + list[indexs].mobile + ' ' + list[indexs].full_address
 
   addressId.value = list[indexs].id
+  if(list[indexs].is_default==0){
+    checkText.value=false
+  }else{
+    checkText.value=true
+  }
 }
 const handleChange = (label) => {
   userAddress.value = label[2]
@@ -2361,7 +2372,7 @@ isLogin()
           //height: 500px;
           background: #FFFFFF;
           position: relative;
-          padding: 30px 40px 10px;
+          padding: 30px 40px 20px;
 
           .submit-view{
             cursor: pointer;
@@ -2373,6 +2384,7 @@ isLogin()
             }
             .submit-name{
               margin-right: 10px;
+
             }
             .check{
               color: #999;