Home Explore Help
Sign In
qmx
/
jy
14
0
Fork 0
Files Issues 2 Pull Requests 0 Wiki
Browse Source

修改缺陷

zhangxinlei1996 5 years ago
parent
0d0e5a281d
commit
7c313ce21e
7 changed files with 41 additions and 13 deletions
Split View Show Diff Stats
  1. 1 1
      src/jfw/modules/app/src/app/front/swordfish.go
  2. 24 6
      src/jfw/modules/app/src/web/templates/dataExport/dataExport_applyInvoice.html
  3. 3 1
      src/jfw/modules/app/src/web/templates/dataExport/dataExport_payOrder.html
  4. 2 2
      src/jfw/modules/app/src/web/templates/dataExport/dataExport_toOrderDetail.html
  5. 5 0
      src/web/templates/weixin/dataExport/dataExport_applyInvoice.html
  6. 4 1
      src/web/templates/weixin/dataExport/dataExport_payOrder.html
  7. 2 2
      src/web/templates/weixin/dataExport/dataExport_toOrderDetail.html

+ 1 - 1
src/jfw/modules/app/src/app/front/swordfish.go
View File 

@@ -469,7 +469,7 @@ func (m *Front) WxsearchlistPaging() {
 
 					listSize = len(*list)
 
 				}
 
 				if len([]rune(s_word)) > 3 && listSize < wx_pageSize && pageNum == 1 {
 
-					secondKWS = jy.HttpEs(searchvalue, "ik_smart", config.Sysconfig["elasticsearch"].(string))
 
+					secondKWS = jy.HttpEs(s_word, "ik_smart", config.Sysconfig["elasticsearch"].(string))
 
 					findfields := `"title"`
 
 					qstr := getSearchQuery(secondKWS, industry, minprice, maxprice, findfields, getBidSearchQuery(scope, publishtime, subtype))
 
 					secondLimit := 2*wx_pageSize - listSize

+ 24 - 6
src/jfw/modules/app/src/web/templates/dataExport/dataExport_applyInvoice.html
View File 

@@ -19,18 +19,22 @@
 
     </head>
 
     <body>
 
     	<style>
 
+	    	.flex_applyInvoice{
 
+    		    width: 100%;
 
+			    height: 100%;
 
+			    display: flex;
 
+			    flex-direction: column;
 
+			    justify-content: space-between;
 
+			    overflow: hidden;
 
+	    	}
 
 			.app-layout-header{
 
 				line-height: 44px;
 
 			    background-color: #FFFFFF;
 
 			    text-align: center;
 
 			    border-bottom: 1px solid #E6E6E6;
 
 			    font-size: 17px;
 
-			    position: absolute;
 
 			    padding-top: 20px;
 
 			    z-index: 99999;
 
-			    left: 0;
 
-			    right: 0;
 
-			    top: 0;
 
 				color: #444444;
 
 			}
 
 			.app-layout-header>.app-back{
 
@@ -90,7 +94,9 @@
 
 			    padding: 0 0.4rem;
 
 			}
 
 			#invoice{
 
-				padding-top:64px;
 
+				/*padding-top:64px;*/
 
+				flex: 1;
 
+   				overflow-y: scroll;
 
 			}
 
 			.weui-actionsheet_cancel{
 
 				color:#2DB7CA;
 
@@ -113,7 +119,12 @@
 
 			#unit-info{
 
 				margin-bottom: 200px;
 
 			}
 
-    	</style>		
+			input{
 
+				-webkit-appearance: none;
 
+			}
 
+
 
+    	</style>
 
+    	<div class="flex_applyInvoice">
 
 		<div class="app-layout-header">
 
 			<span class="app-back jyapp-icon jyapp-icon-zuojiantou"></span>
 
 			开发票
 
@@ -161,6 +172,7 @@
 
 	        <i class="iconfont  icon-warning"></i>
 
 	        <span>系统异常，请稍后重试</span>
 
 	    </div>
 
+	    </div>
 
         <script src="/jyapp/js/myorder/fastclick.js"></script>
 
         <script>
 
             // 解决ios系统click 事件300毫秒的延迟
 
@@ -170,6 +182,7 @@
 
         </script>
 
         <script src="/jyapp/js/myorder/jquery-weui.min.js"></script>
 
         <script>
 
+       		
         	//公司发票正则
 
             var companyName_reg = /^(?![0-9]+$)(?![a-zA-Z]+$)[\u4e00-\u9fa5a-zA-Z0-9()（）]{4,}$/;
 
 			var taxNumer_reg =/^[0-9A-Z]{18}$/;
 
@@ -315,6 +328,11 @@
 
 											sessionStorage.applysuccess="1";
 
 											sessionStorage.companyName=companyName;
 
 											sessionStorage.taxNumer=taxNumer;
 
+											if($(".type").html()=="单位"){
 
+												sessionStorage.type="danwei";
 
+											}else if($(".type").html()=="个人"){
 
+												sessionStorage.type="geren";
 
+											}
 
 											window.location.replace("/jyapp/front/myorder/paySuccess/" + {{.T.order_code}})
 
 										}else{
 
 											$("#tjsb").removeClass("disno");

+ 3 - 1
src/jfw/modules/app/src/web/templates/dataExport/dataExport_payOrder.html
View File 

@@ -361,9 +361,11 @@
 
 				
 				$(window).resize(function(){
 
 					 if($(document).height() < oHeight){
 
-					    $("#bottombox").css("position","static");
 
+					   $("#bottombox").css("position","static");
 
+					  $("#pay_order").css("padding-bottom","0rem");
 
 					}else{
 
 					    $("#bottombox").css("position","fixed");
 
+					    $("#pay_order").css("padding-bottom","2.7rem");
 
 					}
 
 			   	});

+ 2 - 2
src/jfw/modules/app/src/web/templates/dataExport/dataExport_toOrderDetail.html
View File 

@@ -394,14 +394,14 @@
 
 					$(".person_").hide()
 
 					$(".invoiceP").hide();
 
 					$(".person").show();
 
-					if(sessionStorage.taxNumer!=""){
 
+					if((sessionStorage.taxNumer!="")&&(sessionStorage.type=="danwei")){
 
 						$(".notpersontaitou").show();
 
 						$(".persontaitou").hide();
 
 						$(".company").text("单位名称："+sessionStorage.companyName);
 
 						$(".company").show();
 
 						$(".tax").text("纳税人识别号："+sessionStorage.taxNumer);
 
 						$(".tax").show();
 
-					}else{
 
+					}else if(sessionStorage.type=="geren"){
 
 						$(".persontaitou").show();
 
 					}
 
 					sessionStorage.removeItem("applysuccess");

+ 5 - 0
src/web/templates/weixin/dataExport/dataExport_applyInvoice.html
View File 

@@ -286,6 +286,11 @@
 
 											sessionStorage.applysuccess="1";
 
 											sessionStorage.companyName=companyName;
 
 											sessionStorage.taxNumer=taxNumer;
 
+											if($(".type").html()=="单位"){
 
+												sessionStorage.type="danwei";
 
+											}else if($(".type").html()=="个人"){
 
+												sessionStorage.type="geren";
 
+											}
 
 											window.location.replace("/front/wxMyorder/wxPaySuccess/" + {{.T.order_code}})
 
 										}else{
 
 											$("#tjsb").removeClass("disno");

+ 4 - 1
src/web/templates/weixin/dataExport/dataExport_payOrder.html
View File 

@@ -329,11 +329,14 @@
 
 				var oHeight = $(document).height(); //浏览器当前的高度
 
 				$(window).resize(function(){
 
 					 if($(document).height() < oHeight){
 
-					    $("#bottombox").css("position","static");
 
+					   $("#bottombox").css("position","static");
 
+					  $("#pay_order").css("padding-bottom","0rem");
 
 					}else{
 
 					    $("#bottombox").css("position","fixed");
 
+					    $("#pay_order").css("padding-bottom","2.7rem");
 
 					}
 
 			   	});
 
+			   	
 				if (sessionStorage.getItem("send_email_"+{{.T._id}})!=null&&sessionStorage.getItem("send_code_"+{{.T._id}})!=null&&sessionStorage.getItem("send_email_"+{{.T._id}})!=email_lastInput){
 
 					$(".email_check_ok").hide();
 
 					$(".email_input").val(sessionStorage.getItem("send_email_"+{{.T._id}}));

+ 2 - 2
src/web/templates/weixin/dataExport/dataExport_toOrderDetail.html
View File 

@@ -312,14 +312,14 @@
 
 					$(".person_").hide()
 
 					$(".invoiceP").hide();
 
 					$(".person").show();
 
-					if(sessionStorage.taxNumer != "") {
 
+					if((sessionStorage.taxNumer!="")&&(sessionStorage.type=="danwei")){
 
 						$(".notpersontaitou").show();
 
 						$(".persontaitou").hide();
 
 						$(".company").text("单位名称：" + sessionStorage.companyName);
 
 						$(".company").show();
 
 						$(".tax").text("纳税人识别号：" + sessionStorage.taxNumer);
 
 						$(".tax").show();
 
-					} else {
 
+					} else if (sessionStorage.type=="geren"){
 
 						$(".persontaitou").show();
 
 					}
 
 					sessionStorage.removeItem("applysuccess");