ncs_23818 %!s(int64=2) %!d(string=hai) anos
pai
achega
37c18d7311

+ 1 - 1
src/components/Index/indexHeaders.vue

@@ -10,7 +10,7 @@
       <div class="index-rights">
         <div class="phones">服务热线:400-0000000</div>
         <div class="logins" v-if="!userInfos">请[<span @click="routeTap('/login')">登录</span>]</div>
-        <div class="logins" v-else>你好!<span style="margin-left: 5px">{{userInfos.nickname}}</span>
+        <div class="logins" @click.stop="routeTap('/userCentre')" v-else>你好!<span style="margin-left: 5px">{{userInfos.nickname}}</span>
           <span style="color: #999990;margin-left: 20px" @click="logout">[退出]</span>
         </div>
         <div class="logins" @click="routeTap('/evaluates')">快速报价</div>

+ 1 - 1
src/view/index/index.vue

@@ -166,7 +166,7 @@
       <div class="index-hot-sell scroll-item" v-for="item in categoryGoods.arr" :id="`anchor${item.id}`">
         <div class="index-hot-bg" v-if="item.goods!=''" >
           <img :src="item.img_top" alt="">
-            <div style="position: absolute;top: 20px;left: 160px">
+            <div style="position: absolute;top: 28px;left: 160px">
 
               <div class="title">{{ item.keywords }}</div>
               <div class="text">{{ item.description }}</div>

+ 7 - 3
src/view/login/Login.vue

@@ -33,7 +33,7 @@
           </el-form-item>
           <el-form-item prop="resetMailCode">
             <el-input
-              
+
                 v-model.trim="loginFormState.resetMailCode"
                 placeholder="请输入验证码"
                 maxlength="10"
@@ -216,7 +216,7 @@
            <div class="flex-s">
              <el-form-item prop="yzm">
                <el-input
-                   
+                   class="inputs"
                    v-model.trim="loginFormState.yzm"
                    prefix-icon="el-icon-lock"
                    maxlength="10"
@@ -811,6 +811,9 @@ const routeTap=(url)=>{
 }
 </script>
 <style lang="less" scoped>
+/deep/ .inputs {
+  width: 478px!important;
+}
 .border-s{
   width: 20px;
   height: 20px;
@@ -1067,6 +1070,7 @@ const routeTap=(url)=>{
       .phone-style{
         display: flex;
         border: 1px solid #D8D8D8;
+        background-color: #fff;
         justify-content: space-between;
         width: 476px;
         height: 50px;
@@ -1106,7 +1110,7 @@ const routeTap=(url)=>{
             .el-input__inner{
               height: 100%;
               border: none;
-              background-color:#F7F8FA;
+              background-color:#fff;
               width: 200px !important;
           }
         }

+ 3 - 0
src/view/publicity/cloundPlatform/index.vue

@@ -594,6 +594,8 @@ const indexSortOut = () =>{
       .name{
         color: #fff;
         margin: 60px 0 0 50px;
+        width: 900px;
+        line-height: 24px;
       }
     }
     .repeat-content{
@@ -731,6 +733,7 @@ const indexSortOut = () =>{
       color: #333;
       font-size: 20px;
       margin: 30px 0;
+
     }
     .desc{
       color: #999;

+ 4 - 2
src/view/publicity/financial/index.vue

@@ -75,8 +75,8 @@
       <div class="repeat-bg4">
         <img :src="indexPage.e.bg">
         <div class="content-s" style="width: 100%;text-align: center;padding-top: 88px">
-          <div style="color: #fff;font-size: 45px">{{indexPage.d.title}}</div>
-          <div style="color: #999;font-size: 20px;margin-top: 32px">{{indexPage.d.title_en}}</div>
+          <div style="color: #fff;font-size: 45px">{{indexPage.e.title}}</div>
+          <div style="color: #999;font-size: 20px;margin-top: 32px">{{indexPage.e.title_en}}</div>
 
         </div>
         <div class="repeat-bg4-cen">
@@ -436,6 +436,8 @@ const indexSortOut = () =>{
       .name{
         color: #fff;
         margin: 60px 0 0 50px;
+        width: 900px;
+        line-height: 24px;
       }
     }
     .repeat-content{

+ 5 - 3
src/view/publicity/gallery/index.vue

@@ -38,7 +38,7 @@
                   <img :src="item.icon">
                 </div>
                 <div style="margin: 30px 0;font-size: 26px;line-height: 30px;padding: 0 40px">{{item.title}}</div>
-                <div style="color: #999;font-size: 18px;padding: 0 40px">{{item.desc}}</div>
+                <div style="color: #999;font-size: 18px;padding: 0 40px;line-height: 24px;margin: 0 auto;text-align: center;width: 320px">{{item.desc}}</div>
 
             </div>
           </div>
@@ -77,8 +77,8 @@
       <div class="repeat-bg4">
         <img :src="indexPage.e.bg">
         <div class="content-s" style="width: 100%;text-align: center;padding-top: 88px">
-          <div style="color: #fff;font-size: 45px">{{indexPage.d.title}}</div>
-          <div style="color: #999;font-size: 20px;margin-top: 32px">{{indexPage.d.title_en}}</div>
+          <div style="color: #fff;font-size: 45px">{{indexPage.e.title}}</div>
+          <div style="color: #999;font-size: 20px;margin-top: 32px">{{indexPage.e.desc}}</div>
 
         </div>
         <div class="repeat-bg4-cen">
@@ -437,6 +437,8 @@ const indexSortOut = () =>{
       .name{
         color: #fff;
         margin: 60px 0 0 50px;
+        width: 900px;
+        line-height: 24px;
       }
     }
     .repeat-content{

+ 2 - 0
src/view/publicity/medical/index.vue

@@ -512,6 +512,8 @@ const indexSortOut = () =>{
       .name{
         color: #fff;
         margin: 60px 0 0 50px;
+        width: 900px;
+        line-height: 24px;
       }
     }
     .repeat-content{

+ 2 - 0
src/view/publicity/repast/index.vue

@@ -378,6 +378,8 @@ const indexSortOut = () =>{
       .name{
         color: #fff;
         margin: 60px 0 0 50px;
+        width: 900px;
+        line-height: 24px;
       }
     }
     .repeat-content{

+ 2 - 0
src/view/publicity/security/index.vue

@@ -378,6 +378,8 @@ const indexSortOut = () =>{
       .name{
         color: #fff;
         margin: 60px 0 0 50px;
+        width: 900px;
+        line-height: 24px;
       }
     }
     .repeat-content{

+ 16 - 16
src/view/user/invoiceManage/index.vue

@@ -1,14 +1,14 @@
 <template>
   <div class="login-wrapper">
     <el-dialog @close="clearForm"  v-model="invoiceFlags" :show-close="true" align-center title="发票详情">
-      <div>
-        <text style="margin-right: 10px">发票开具:</text>
+<!--      <div>-->
+<!--        <text style="margin-right: 10px">发票开具:</text>-->
 
-        <el-radio-group  v-model="paper_type" class="ml-46">
-          <el-radio label="1" disabled size="large">电子发票</el-radio>
-          <el-radio label="2" disabled size="large">纸质发票</el-radio>
-        </el-radio-group>
-      </div>
+<!--        <el-radio-group  v-model="paper_type" class="ml-46">-->
+<!--          <el-radio label="1" disabled size="large">电子发票</el-radio>-->
+<!--          <el-radio label="2" disabled size="large">纸质发票</el-radio>-->
+<!--        </el-radio-group>-->
+<!--      </div>-->
       <div>
         <text style="margin-right: 10px">发票类型:</text>
 
@@ -74,7 +74,7 @@
             ></el-input>
           </el-form-item>
           <el-form-item prop="bankName">
-            <span>单位名称:</span>
+            <span>开户银行:</span>
             <el-input
                 disabled
                 style="margin-left: 50px"
@@ -125,13 +125,13 @@
       </div>
     </el-dialog>
     <el-dialog v-model="invoiceFlag" @close="clearForm" :show-close="true" align-center :title="texts">
-      <div>
-        <text style="margin-right: 10px">发票开具:</text>
-        <el-radio-group @change="change1"   v-model="paper_type" class="ml-46">
-          <el-radio label="1" size="large">电子发票</el-radio>
-          <el-radio label="2" size="large">纸质发票</el-radio>
-        </el-radio-group>
-      </div>
+<!--      <div>-->
+<!--        <text style="margin-right: 10px">发票开具:</text>-->
+<!--        <el-radio-group @change="change1"   v-model="paper_type" class="ml-46">-->
+<!--          <el-radio label="1" size="large">电子发票</el-radio>-->
+<!--          <el-radio label="2" size="large">纸质发票</el-radio>-->
+<!--        </el-radio-group>-->
+<!--      </div>-->
       <div>
         <text style="margin-right: 10px">发票类型:</text>
         <el-radio-group @change="changes()" v-model="self_type" class="ml-4">
@@ -198,7 +198,7 @@
             ></el-input>
           </el-form-item>
           <el-form-item prop="bankName">
-            <span>单位名称:</span>
+            <span>开户银行:</span>
             <el-input
                 style="margin-left: 50px"
                 placeholder="开户银行"

+ 30 - 19
src/view/user/order/pay/index.vue

@@ -337,8 +337,6 @@
             </div>
           </div>
           <div class="base64" >
-<!--           {{qrCode}}-->
-            <!-- <img v-if="qrCode.qr.qr!='' && payIndex==1 || payIndex==2" :src="qrCode.qr.qr"> -->
             <div class="code_right" v-if="qrCode.qr.qr!='' && payIndex==1 || payIndex==2">
               <div class="left">
                 <div class="title">{{payIndex == 1?'微信支付':'支付宝支付'}}</div>
@@ -358,21 +356,33 @@
               </div>
             </div>
           </div>
+          <div class="base64" style="margin-left: 160px" >
+            <div class="code_right" v-if="payIndex==5">
+              <div class="left">
+                <div class="title">线下支付</div>
+                <div class="pay">应付金额<span class="money">{{ payOrder.arr.amount_pay ||0}}</span>元</div>
+              </div>
+              <div class="center">
+                <div class="info">订单提交成功,请尽快付款!</div>
+                <div class="box">
+<!--                  <div class="name">收款信息</div>-->
+                  <div class="view">
+                    公司名称:{{info.account_name}}
+                  </div>
+                  <div class="view">
+                    银行名称:{{info.bank_name}}
+                  </div>
+                  <div class="view">
+                    收款账号:{{splices(info.bank_no)}}
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
           <div v-if="payIndex==3 || payIndex==0" class="pay-s" @click="paySubmit()">立即支付</div>
           <div v-if="payIndex==4" class="pay-s" @click="copyUrl()">复制链接</div>
           <div v-if="payIndex==5">
-            <div class="box">
-                <div class="name">收款信息</div>
-                <div class="view">
-                  公司名称:{{info.account_name}}
-                </div>
-                <div class="view">
-                  银行名称:{{info.bank_name}}
-                </div>
-                <div class="view">
-                  银行账号:{{splices(info.bank_no)}}
-                </div>
-            </div>
+
             <div style="display: flex">
               <div class="submits" v-if="!flags" @click="submit_s()">提交</div>
               <div class="submits" style="margin-left: 20px" v-if="!flags" @click="addressFlags=true">上传打款凭证</div>
@@ -741,12 +751,12 @@ isLogin()
   cursor: pointer;
 }
 .box{
-  width: 480px;
-  border:1px solid #3171B8;
+  //width: 480px;
+  //border:1px solid #3171B8;
   //height: 174px;
   //background: #D8D8D8;
-  padding: 30px;
-  margin-left: 100px;
+  padding: 10px;
+  margin-left:30px;
   //opacity: 0.18;
   .name{
     color:#333;
@@ -755,7 +765,7 @@ isLogin()
   }
   .view{
     color: #999;
-    font-size: 16px;
+    font-size: 14px;
     margin-top: 20px;
     text-align: center;
   }
@@ -763,6 +773,7 @@ isLogin()
 }
 .base64{
   display: flex;
+  margin-left: 110px;
   img{
     width: 200px;
     height: 200px;

+ 52 - 43
src/view/user/order/submit/index.vue

@@ -1,12 +1,12 @@
 <template>
   <el-dialog v-model="invoiceFlag1" @close="clearForm" center="true" :show-close="true" align-center :title="texts">
-    <div style="margin-bottom: 5px">
-      <text style="margin-right: 10px">发票开具:</text>
-      <el-radio-group @change="change1"   v-model="paper_type1" class="ml-46">
-        <el-radio label="1" size="large">电子发票</el-radio>
-        <el-radio label="2" size="large">纸质发票</el-radio>
-      </el-radio-group>
-    </div>
+<!--    <div style="margin-bottom: 5px">-->
+<!--      <text style="margin-right: 10px">发票开具:</text>-->
+<!--      <el-radio-group @change="change1"   v-model="paper_type1" class="ml-46">-->
+<!--        <el-radio label="1" size="large">电子发票</el-radio>-->
+<!--        <el-radio label="2" size="large">纸质发票</el-radio>-->
+<!--      </el-radio-group>-->
+<!--    </div>-->
     <div style="margin-bottom: 5px">
       <text style="margin-right: 10px">发票类型:</text>
       <el-radio-group @change="changes()" v-model="self_type1" class="ml-4">
@@ -81,7 +81,7 @@
           ></el-input>
         </el-form-item>
         <el-form-item prop="bankName">
-          <span>单位名称:</span>
+          <span>开户银行:</span>
           <el-input
               style="margin-left:50px;width: 300px"
               placeholder="开户银行"
@@ -270,7 +270,7 @@
 
   <el-dialog class="address" :show-close="true" center v-model="invoiceFlag" title="选择发票信息">
     <div class="address submit-lable" @click="addInvoice"
-         style="margin-left: 30px;color: #4171B3;position: absolute;right: 140px;top: 25px;font-size: 16px;cursor: pointer">
+         style="margin-left: 30px;color: #4171B3;position: absolute;right: 140px;top: 25px;font-size: 14px;cursor: pointer">
       新增
     </div>
     <div style="display: flex;justify-content: center">
@@ -291,39 +291,39 @@
         </div>
         <div class="user-info" style="width: 400px;flex: 1;justify-content: flex-start">
 			<text v-if="item.tax.self_type==1 && item.tax.u_type==2">
-				专票:
-				<text v-if="item.tax.open_name">
-							 发票抬头:{{item.tax.open_name}}
-				</text>
-				<text v-if="item.tax.tax_no">
-					税号:{{item.tax.tax_no}}
+				专票/
+				<text v-if="item.tax.com_name">
+							 {{item.tax.com_name}}
 				</text>
+<!--				<text v-if="item.tax.tax_no">-->
+<!--					税号:{{item.tax.tax_no}}-->
+<!--				</text>-->
 				<!-- <text v-if="item.tax.bank_name">
 							  开户行:{{item.tax.bank_name}}
 				</text> -->
 
 			</text>
-			<text v-if="item.tax.u_type==1">
-				个人{{item.tax.self_type==1?'专票':'普票'}}
+			<text v-if="item.tax.u_type==1 && item.tax.u_type==1">
+				个人{{item.tax.self_type==1?'专票':'普票'}}/
 				<text>
-							 姓名:{{item.tax.name}}
+							 {{item.tax.name}}
 				</text>
 			</text>
-			<text v-if="item.tax.self_type==2">
-<!--				普票:-->
-				<text v-if="item.tax.open_name">
-					发票抬头:{{item.tax.open_name}}
-				</text>
-				<text v-if="item.tax.tax_no">
-					税号:{{item.tax.tax_no}}
+			<text v-if="item.tax.self_type==2 && item.tax.u_type==2">
+        普票/
+				<text v-if="item.tax.com_name">
+					{{item.tax.com_name}}
 				</text>
+<!--				<text v-if="item.tax.tax_no">-->
+<!--					税号:{{item.tax.tax_no}}-->
+<!--				</text>-->
 				<!-- <text v-if="item.tax.bank_name">
 							  开户行:{{item.tax.bank_name}}
 				</text> -->
 
 			</text>
         </div>
-        <div style="font-size: 16px;color: #4171B3">
+        <div style="font-size: 14px;color: #4171B3">
           <span @click.stop="update_fp(item.id)">修改</span>
           <span @click.stop="deletes(item.id)" style="margin-left: 10px;">删除</span>
           <span @click.stop="update_fp_s(item,index)" style="margin-left: 10px;">设为默认</span>
@@ -392,7 +392,7 @@
   </el-dialog>
   <el-dialog class="address" :show-close="true" center v-model="addressSel" title="选择地址" style="position: relative">
     <div class="address submit-lable" @click="addressFlags=true"
-         style="margin-left: 30px;color: #4171B3;position: absolute;right: 140px;top: 25px;font-size: 16px;cursor: pointer">
+         style="margin-left: 30px;color: #4171B3;position: absolute;right: 140px;top: 25px;font-size: 14px;cursor: pointer">
       新增
     </div>
 
@@ -414,7 +414,7 @@
 
               </text>
 			</div>
-			<div style="font-size: 16px;color: #4171B3">
+			<div style="font-size: 14px;color: #4171B3">
 				<span @click.stop="update(item)">修改</span>
 				<span @click.stop="dels(item.id)" style="margin-left: 10px;">删除</span>
         <span @click.stop="updateAddress(item)" style="margin-left: 10px;">设为默认</span>
@@ -468,32 +468,34 @@
                 选择/新增
               </div>
           </div>
-          <div class="submit-view" style="position: relative;margin-top: 30px">
+          <div class="submit-view" style="position: relative;margin-top: 30px;height: 20px;padding-bottom: 10px">
             <div class="submit-name" style="position: absolute;top: 8px">发票开具:</div>
+            <div class="" v-if="invoiceIndex==2" style="margin: 8px 0 0 90px;font-size: 14px;color: #333">不需要</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: -20px;position: relative" v-if="invoiceFlags">
+          <div class="invoice-contents" style="margin-top: -40px;position: relative" v-if="invoiceFlags &&invoiceIndex!=2">
             <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">
 <!--              <div style="color: #333">发票信息</div>-->
 <!--              <div style="color: #4171B3" @click="updates">修改</div>-->
             </div>
-            <div class="flex-content" v-if="typeIndex==1">
+
+            <div class="flex-content" v-if="typeIndex==1 && invoiceIndex!=2">
               <div class="divs">
                 <div>{{FormState.name}}/</div>
               </div>
               <div class="divs">
-<!--                <div>身份证号码:</div>-->
                 <div>{{FormState.id}}</div>
               </div>
             </div>
-            <div class="flex-content" v-if="typeIndex==0 && sourceIndex==1">
+            <div class="flex-content" v-if="typeIndex==0 && sourceIndex==1 && invoiceIndex!=2">
+              <div class="divs" v-if="invoiceIndex!=2">
+                <!--                <div>单位名称:</div>-->
+                <div>{{invoiceIndex==0?'电子发票':'纸质发票'}}/</div>
+              </div>
               <div class="divs">
 <!--                <div>单位名称:</div>-->
                 <div>{{FormState.comName}}/</div>
@@ -503,7 +505,7 @@
                 <div>{{FormState.cardNumber}}</div>
               </div>
             </div>
-            <div class="flex-content" v-if="typeIndex==0 && sourceIndex==0">
+            <div class="flex-content" v-if="typeIndex==0 && sourceIndex==0 && invoiceIndex!=2">
               <div class="divs" v-if="invoiceIndex!=2">
                 <!--                <div>单位名称:</div>-->
                 <div>{{invoiceIndex==0?'电子发票':'纸质发票'}}/</div>
@@ -1180,6 +1182,11 @@ const invoiceLists=()=>{
         }
         // res.data.data[0].check=true;
         invoiceList.arr=res.data.data
+      }else if(res.data.data==''){
+        invoiceList.arr=''
+        clearIndex();
+        checkText1.value=false;
+        invoiceFlags.value=false
       }
 		}
 	})
@@ -1735,7 +1742,7 @@ isLogin()
 	color:#4171B3;
 }
 .user-info text{
-	font-size: 15px;
+	font-size: 14px;
 }
 .boxs{
 	//border-radius: 2px;
@@ -1831,16 +1838,18 @@ isLogin()
 }
 .invoice-contents{
   border: 1px solid #CECECE;
-  padding: 10px 20px 0 20px;
-  max-width:400px;
-  margin-left: 90px;
+  //max-width:500px;
+  width: fit-content;
+  //margin-left: 100px;
+  left: 0;
+  margin-left: 5.68rem;
   .flex-content{
     color: #999;
-    padding: 5px 10px 5px 0;
+    padding: 9px 10px 9px 10px;
     display: flex;
     .divs{
       display: flex;
-      padding-bottom: 10px;
+      //padding-bottom: 10px;
       font-size: 14px;
     }
   }