Merge branch 'dev2.5.6' of http://192.168.3.207:10080/qmx/jy into dev2.5.6

src/web/templates/pc/dataExport_invoice.html

@@ -19,7 +19,7 @@
     <script src="//cdn.bootcss.com/jquery-confirm/3.1.0/jquery-confirm.min.js"></script>
 	
 	<link rel="stylesheet" href="/dataExport/css/order_twoleave.css">
-	<link rel="stylesheet" href="//at.alicdn.com/t/font_624651_wz9gl1vebtf.css">
+	<link rel="stylesheet" href="//at.alicdn.com/t/font_624651_pkolpjt0k5a.css">
     <title>订单详情-申请发票</title>
     <style type="text/css">
          #order_two .nav a {
@@ -32,7 +32,7 @@
         .demo--radio{display:none}
         .demo--radioInput{background-color:#fff;border:1px solid rgba(0,0,0,0.15);border-radius:100%;display:inline-block;height:12px;margin-right:10px;margin-top:-1px;vertical-align:middle;width:12px;line-height:1}
         .demo--radio:checked + .demo--radioInput {border-color: #2eb8ca;}
-        .demo--radio:checked + .demo--radioInput:after{background-color:#2eb8ca;border-radius:100%;content:"";display:inline-block;height:6px;margin:3px;width:6px}
+        .demo--radio:checked + .demo--radioInput:after{background-color:#2eb8ca;border-radius:100%;content:"";display:inline-block;height:6px;margin: 0px 3px 3px 2px;width:6px;margin-bottom: 3.5px;}
         .demo--checkbox.demo--radioInput,.demo--radio:checked + .demo--checkbox.demo--radioInput:after{border-radius:0}
         .demo--label + .demo--label {
             margin-left: 28px;
@@ -140,12 +140,26 @@
             color: #52c4d4;
             font-weight: bold;
         }
+		
+		.iconfont {
+		  font-family: "iconfont" !important;
+		  font-size: 16px;
+		  font-style: normal;
+		  -webkit-font-smoothing: antialiased;
+		  -moz-osx-font-smoothing: grayscale;
+		}
         .icon-input.email::before {
             content: '\e6fb';
         }
+		
 		.disno{
 			display:none;
 		}
+		.incorrect{
+			color: #FE737A;
+			margin-left:7px;
+		}
+		.icon-cuowu:before { content: "\e632"; }
         /* --end-- */
     </style>
 </head>
@@ -153,9 +167,9 @@
 {{include "/common/pchead.html"}}
 <section id="order_two" class="w">
     <div class="nav" style="margin-top: 80px;">
-        <a href="#">我的订单></a>
-        <a href="#">订单详情></a>
-        <a href="#">申请开票</a>
+        <a href="/front/dataExport/toMyOrder" style="text-decoration:none;">我的订单></a>
+        <a href="/front/dataExport/toOrderDetail/{{.T.order_code}}" style="text-decoration:none;">订单详情></a>
+        <a href="#" class="noLine" style="text-decoration:none;">申请开票</a>
     </div>
     <div class="c-info" style="margin-top: 17px;">
         <div class="title">
@@ -201,6 +215,7 @@
                 </div>
                 <div class="r fl">
                     <input type="text" class="input-c" name="applyBill_company" id="companyName"  maxlength="50">
+					<span class="incorrect iconfont icon-cuowu disno" id="gsmc">&nbsp公司名称格式不正确</span>
                 </div>
             </div>
             <div class="item clearfix  c-i" style="display: none;">
@@ -209,6 +224,7 @@
                 </div>
                 <div class="r fl">
                     <input type="text" class="input-c" name="applyBill_taxnum" id="taxNumer">
+					<span class="incorrect iconfont icon-cuowu disno" id="sbh">&nbsp纳税人识别号格式不正确</span>
                 </div>
             </div>
             <div class="item clearfix">
@@ -226,16 +242,21 @@
         <i class="iconfont icon-zhifuwancheng"></i>
         <span>发票提交成功</span>
     </div>
-    <div class="dialog-box type-a disno"  >发票提交成功</div>
-	<div class="dialog-box type-a disno"   id="gsyw">格式有误</div>
-	<div class="dialog-box type-a disno"   id="tjsb">提交失败</div>
-	<div class="dialog-box type-a disno"   id="sbhcw">纳税人识别号格式错误</div>
+	
+	<div class="dialog-box type-b disno" id="tjsb" >
+        <i class="iconfont  icon-warning"></i>
+        <span>系统异常，请稍后重试</span>
+    </div>
 	
 </section>
 {{include "/common/pcbottom.html"}}
 {{include "/common/baiducc.html"}}
 <script src="https://cdn.bootcss.com/jquery/3.3.1/jquery.min.js"></script>
 <script>
+    var companyName_reg = /^(?![0-9]+$)(?![a-zA-Z]+$)[\u4e00-\u9fa5a-zA-Z0-9]{4,}$/;
+	//var taxNumer_reg = /^[0-9LX]{15}$|^[0-9LX]{18}$|^[0-9LX]{20}$/
+	var taxNumer_reg =/^[0-9A-Z]{18}$/
+
 $(function(){
         selcetIndexNav(4);
         haslogin({{.T.logid}});
@@ -254,6 +275,39 @@ $(".demo--radio").on('change',function(){
 })
 
 
+var taxNumer = document.getElementById("taxNumer");
+var companyName =document.getElementById("companyName");
+//纳税人识别正则
+   taxNumer.onblur = function(){
+    	var taxNumerValue = taxNumer.value;
+    	var b = taxNumer_reg.test(taxNumerValue);
+	if(taxNumerValue == ""){
+		sbh.classList.add("disno");
+    	}else{
+    		if(!b){
+    			sbh.classList.remove("disno");
+    		}else{
+			sbh.classList.add("disno");
+			}
+    	}
+}
+//公司识别正则
+   companyName.onblur = function(){
+    	var companyNameValue = companyName.value;
+    	var b = companyName_reg.test(companyNameValue);
+    	if (companyNameValue == "")	{
+		gsmc.classList.add("disno");
+	}else{
+		if(!b){
+    			gsmc.classList.remove("disno");
+    		}else{
+			gsmc.classList.add("disno");
+			}
+    	}	
+	}
+
+
+
 
 function updateAjax(){
 	var formParam =$("#saveinvoice").serialize();
@@ -261,25 +315,13 @@ function updateAjax(){
 	
 	var companyName = $("#companyName").val();
 	var taxNumer = $("#taxNumer").val();
-    var companyName_reg = /^(?![0-9]+$)(?![a-zA-Z]+$)[\u4e00-\u9fa5a-zA-Z0-9]{6,}$/;
-	//var taxNumer_reg =/^[0-9a-zA-Z]{15,20}$/;
-	var taxNumer_reg = /^[0-9LlXx]{15}$|^[0-9LlXx]{18}$|^[0-9LlXx]{20}$/
+
 	
 	if ($('input:radio:checked').val()=="个人") {
 		submitBl =true;
 	}else if ($('input:radio:checked').val()=="单位"){
 		if (companyName_reg.test(companyName)&& taxNumer_reg.test(taxNumer)){
 			submitBl =true;
-		}else if ( taxNumer_reg.test(taxNumer)==false &&companyName_reg.test(companyName)){
-			$("#sbhcw").removeClass("disno");
-			setTimeout(function () {
-				$("#sbhcw").addClass("disno");
-			}, 2000);
-		}else{
-			$("#tjsb").removeClass("disno");
-			setTimeout(function () {
-				$("#tjsb").addClass("disno");
-			}, 2000);
 		}
 	}
 	

src/web/templates/pc/orderDetail.html

@@ -38,13 +38,16 @@
             text-decoration: none !important;
         }
 		.btn_sqfp{
-			background-color: rgb(44, 183, 202);
-			color:#fff;
-			border: 1px solid transparent;
+			height:35px;
+			width:110px;
+			background-color: #fff;
+			color:rgb(56, 187, 205);
+			border: 1px   solid rgb(56, 187, 205);
 			border-radius: 6px;
 			cursor: pointer;
 			font-size:14px;
-			margin-left:255px
+			margin-left:247px;
+			margin-top: 20px;
 		}
 		#order_two .dd-info .inner .item {
 		    box-sizing: border-box;
@@ -94,15 +97,17 @@
 				<p>手机号：{{.T.o.user_phone}}</p>
             </div>
             <div class="item">
-                <p>发票类型：普通发票（电子发票）</p>
 				{{if .T.o.applybill_status}}
 				{{if eq .T.o.applybill_status "F"}}
+                 <p>发票类型：</p>
+				 <p>发票内容：</p>
 				 <p>发票抬头：</p>
 				{{else}}
+				 <p>发票类型：普通发票（电子发票）</p>
+				 <p>发票内容：明细</p>
 				 <p>发票抬头：{{.T.o.applybill_type}}</p>
 				{{end}}
 				{{end}}
-                <p>发票内容：明细</p>
 				{{if .T.o.applybill_type}}
 				{{if eq .T.o.applybill_type "单位"}}
 				<p>单位名称：{{.T.o.applybill_company}}</p>
@@ -113,7 +118,7 @@
 				{{if eq .T.o.order_status 1}}
 				{{if .T.o.applybill_status}}
 				{{if eq .T.o.applybill_status "F"}}
-				<button class="btn_sqfp" onclick="invoice()">申请发票</button>
+				<button class="btn_sqfp" onclick="invoice()">开发票</button>
 				{{end}}
 				{{end}}
 				{{end}}