5 years ago · b96ed7ce7a
--- a/src/jfw/modules/app/src/app/front/myorder.go
+++ b/src/jfw/modules/app/src/app/front/myorder.go
@@ -343,7 +343,6 @@ func (m *MyOrder) ToOrderDetail() error {
 
															 			}
														
 
															 			wxPayMap := map[string]interface{}{}
														
 
															 			wxPayMap["out_trade_no"] = orderDetail["out_trade_no"]
														
 
															-			log.Println("-------")
														
 
															 			wxpay := public.Mysql.FindOne(table, wxPayMap, "", "")
														
 
															 			return util.ObjToString((*wxpay)["transaction_id"])
														
 
															 		}()
														
--- a/src/jfw/modules/app/src/web/templates/dataExport/dataExport.html
+++ b/src/jfw/modules/app/src/web/templates/dataExport/dataExport.html
@@ -271,6 +271,9 @@
 
															 <script>
														
 
															     $(function(){
														
 
															+		//清除我已阅读缓存
														
 
															+		sessionStorage.removeItem("readClause");
														
 
															+		sessionStorage.removeItem("index");
														
 
															         $(window).bind("pageshow", function(event){
														
 
															             if(event.originalEvent.persisted){
														
 
															                 window.location.reload();
														
--- a/src/jfw/modules/app/src/web/templates/dataExport/dataExport_applyInvoice.html
+++ b/src/jfw/modules/app/src/web/templates/dataExport/dataExport_applyInvoice.html
@@ -25,7 +25,7 @@
 
															 			    text-align: center;
														
 
															 			    border-bottom: 1px solid #E6E6E6;
														
 
															 			    font-size: 17px;
														
 
															-			    position: fixed;
														
 
															+			    position: absolute;
														
 
															 			    padding-top: 20px;
														
 
															 			    z-index: 99999;
														
 
															 			    left: 0;
														
--- a/src/jfw/modules/app/src/web/templates/dataExport/dataExport_payOrder.html
+++ b/src/jfw/modules/app/src/web/templates/dataExport/dataExport_payOrder.html
@@ -328,11 +328,11 @@
 
															 				/* 选择支付方式*/
														
 
															 				$('input:radio[name="way"]').click(function() {
														
 
															 					var checkValue = $('input:radio[name="way"]:checked').val();
														
 
															-          if(checkValue=="微信支付"){
														
 
															-            pay_way="wx_app";
														
 
															-          }else{
														
 
															-            pay_way="ali_app";
														
 
															-          }
														
 
															+			          if(checkValue=="微信支付"){
														
 
															+			            pay_way="wx_app";
														
 
															+			          }else{
														
 
															+			            pay_way="ali_app";
														
 
															+			          }
														
 
															 					$('.pay_way').hide(200)
														
 
															 					$('.payment').html(checkValue)
														
 
															 				});
														
--- a/src/jfw/modules/app/src/web/templates/dataExport/dataExport_price.html
+++ b/src/jfw/modules/app/src/web/templates/dataExport/dataExport_price.html
@@ -56,7 +56,7 @@
 
															         <div class="connect">
														
 
															             <h3>价格区间</h3>
														
 
															-            <div class="connectMain">
														
 
															+            <div class="connectMain" style="overflow: hidden;">
														
 
															                 <span>
														
 
															                     <input type="text" id="min" >万元
														
 
															                 </span>
														
--- a/src/jfw/modules/app/src/web/templates/weixin/search/mainSearch.html
+++ b/src/jfw/modules/app/src/web/templates/weixin/search/mainSearch.html
@@ -131,7 +131,7 @@
 
															         })
														
 
															 		//
														
 
															-		$(".export").on("click",function(){
														
 
															+		$(".export").on("tap",function(){
														
 
															 			toSearchExport();
														
 
															 		})
														
 
															 	})
														
@@ -162,6 +162,11 @@
 
															 </script>
														
 
															 </head>
														
 
															 <body>
														
 
															+	<style>
														
 
															+	#dqbtn{
														
 
															+		width: 5.5em !important;
														
 
															+	}
														
 
															+</style>
														
 
															 <!--主题内容-->
														
 
															 <section id="searchIndex" class="hidden">
														
 
															 	<!--头部-->
														
@@ -441,15 +446,15 @@
 
															 									<button class="btn active">全部</button>
														
 
															 								</li>
														
 
															 								<li>
														
 
															-									<div id="dqbtn" style="width:81px;position:relative;float:left;" data-value="拟建">拟建项目</div><img style="float:left;" class="q-mark" src="/jyapp/images/wx/q-mark.png"/>
														
 
															+									<div id="dqbtn" style="width:7em;position:relative;float:left;" data-value="拟建">拟建项目</div><img style="float:left;" class="q-mark" src="/jyapp/images/wx/q-mark.png"/>
														
 
															 									<button class="btn hidden" style="clear:both;">拟建</button>
														
 
															 								</li>
														
 
															 								<li>
														
 
															-									<div id="dqbtn" style="width:81px;" data-value="预告">招标预告</div>
														
 
															+									<div id="dqbtn" style="width:7em" data-value="预告">招标预告</div>
														
 
															 									<button class="btn hidden">预告</button>
														
 
															 								</li>
														
 
															 								<li>
														
 
															-									<div id="dqbtn" style="width:81px;" data-value="招标">招标公告</div>
														
 
															+									<div id="dqbtn" style="width:7em" data-value="招标">招标公告</div>
														
 
															 									<button class="btn">招标</button>
														
 
															 									<button class="btn">邀标</button>
														
 
															 									<button class="btn">询价</button>
														
@@ -460,14 +465,14 @@
 
															 									<button class="btn">其它</button>
														
 
															 								</li>
														
 
															 								<li>
														
 
															-									<div id="dqbtn" style="width:81px;" data-value="结果">招标结果</div>
														
 
															+									<div id="dqbtn" style="width:5.6em" data-value="结果">招标结果</div>
														
 
															 									<button class="btn">中标</button>
														
 
															 									<button class="btn">成交</button>
														
 
															 									<button class="btn">废标</button>
														
 
															 									<button class="btn">流标</button>
														
 
															 								</li>
														
 
															 								<li>
														
 
															-									<div id="dqbtn" style="width:111px;" data-value="其它">招标信用信息</div>
														
 
															+									<div id="dqbtn" style="width:7.5em !important; " data-value="其它">招标信用信息</div>
														
 
															 									<button class="btn">合同</button>
														
 
															 									<button class="btn">验收</button>
														
 
															 									<button class="btn">违规</button>
														
@@ -815,7 +820,7 @@
 
															 				}else{
														
 
															 					window.location.href='/jyapp/front/dataExport/toSieve';
														
 
															 				}
														
 
															-			},100);
														
 
															+			},300);
														
 
															 	    });
														
 
															 	});
														
 
															 	function checkIsOpen(){
														
--- a/src/web/templates/weixin/dataExport/dataExport.html
+++ b/src/web/templates/weixin/dataExport/dataExport.html
@@ -219,7 +219,10 @@
 
															 <script>
														
 
															     initShare({{.T.signature}},{{.T.openid}},2,"jy_wxmyorder",{{.T.nickname}},{{.T.avatar}});
														
 
															-    $(function(){
														
 
															+    $(function(){		
														
 
															+    	//清除我已阅读缓存
														
 
															+		sessionStorage.removeItem("readClause");
														
 
															+		sessionStorage.removeItem("index");
														
 
															         //
														
 
															         $(window).bind("pageshow", function(event){
														
 
															             if(event.originalEvent.persisted){
														
--- a/src/web/templates/weixin/dataExport/dataExport_payOrder.html
+++ b/src/web/templates/weixin/dataExport/dataExport_payOrder.html
@@ -10,7 +10,7 @@
 
															         <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/weui.min.css?v={{Msg "seo" "version"}}">
														
 
															         <link rel="stylesheet" type="text/css" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/base.css?v={{Msg "seo" "version"}}" />
														
 
															         <link rel="stylesheet" type="text/css" href="{{Msg "seo" "cdn"}}/wx_dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}" />
														
 
															-        <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/pay_order.css?v={{Msg "seo" "version"}}21">
														
 
															+        <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/pay_order.css?v={{Msg "seo" "version"}}22">
														
 
															         <script src="{{Msg "seo" "cdn"}}/js/jquery-3.2.1.min.js"></script>
														
 
															         <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/weui.min.js"></script>
														
 
															 		{{include "/common/weixin.html"}}
														
--- a/src/web/templates/weixin/search/mainSearch.html
+++ b/src/web/templates/weixin/search/mainSearch.html
@@ -217,6 +217,9 @@
 
															 		  100% {
														
 
															 		    transform: rotate(360deg); } 
														
 
															 		}
														
 
															+	#dqbtn{
														
 
															+		width: 5.5em !important;
														
 
															+	}
														
 
															 	</style>
														
 
															 </head>
														
 
															 <body>
														
@@ -519,7 +522,7 @@
 
															 								<button class="btn">流标</button>
														
 
															 							</li>
														
 
															 							<li>
														
 
															-								<div id="dqbtn" style="width:111px;" data-value="其它">招标信用信息</div>
														
 
															+								<div id="dqbtn" style="width:7.5em !important;" data-value="其它">招标信用信息</div>
														
 
															 								<button class="btn">合同</button>
														
 
															 								<button class="btn">验收</button>
														
 
															 								<button class="btn">违规</button>