Startsida Utforska Hjälp
Logga in
qmx
/
jy
14
0
Fork 0
Filer Ärenden 2 Pull-förfrågningar 0 Wiki
Bläddra i källkod

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

xuzhiheng 5 år sedan
förälder
c78ce78c2a 0c03e20b68
incheckning
83de0b3cfe
16 ändrade filer med 110 tillägg och 47 borttagningar
Delad Vy Visa Diff Statistik
  1. 0 1
      src/jfw/modules/app/src/app/front/myorder.go
  2. 4 0
      src/jfw/modules/app/src/web/staticres/jyapp/js/wxSupersearch.js
  3. 3 0
      src/jfw/modules/app/src/web/templates/dataExport/dataExport.html
  4. 1 1
      src/jfw/modules/app/src/web/templates/dataExport/dataExport_applyInvoice.html
  5. 49 11
      src/jfw/modules/app/src/web/templates/dataExport/dataExport_payOrder.html
  6. 5 1
      src/jfw/modules/app/src/web/templates/dataExport/dataExport_previewData.html
  7. 1 1
      src/jfw/modules/app/src/web/templates/dataExport/dataExport_price.html
  8. 13 8
      src/jfw/modules/app/src/web/templates/weixin/search/mainSearch.html
  9. 10 12
      src/web/staticres/js/wxSupersearch.js
  10. 2 2
      src/web/staticres/wx_dataExport/css/base.css
  11. 2 2
      src/web/staticres/wx_dataExport/css/pay_order.css
  12. 4 1
      src/web/templates/weixin/dataExport/dataExport.html
  13. 7 1
      src/web/templates/weixin/dataExport/dataExport_payOrder.html
  14. 2 2
      src/web/templates/weixin/dataExport/dataExport_previewData.html
  15. 1 1
      src/web/templates/weixin/dataExport/dataExport_toOrderDetail.html
  16. 6 3
      src/web/templates/weixin/search/mainSearch.html

+ 0 - 1
src/jfw/modules/app/src/app/front/myorder.go
Visa fil 

@@ -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"])
 
 		}()

+ 4 - 0
src/jfw/modules/app/src/web/staticres/jyapp/js/wxSupersearch.js
Visa fil 

@@ -886,6 +886,10 @@ var SuperSearch = {
 
 			$(".newdialog .sub-search-title").find("li").removeClass("active");
 
 			$(".selected-export .options .search-title").find("em").text("标题搜索");
 
 			$(".newdialog .sub-search-title").find("li[dataval='searchtitle']").addClass("active");
 
+			
+			$(".newdialog .sub-show-list").find("li").removeClass("active");
 
+			$(".selected-export .show-list").find("em").text("列表显示");
 
+			$(".newdialog .sub-show-list").find("li[dataval='showlist']").addClass("active");
 
 		}
 
 		//
 
 		$.ajax({

+ 3 - 0
src/jfw/modules/app/src/web/templates/dataExport/dataExport.html
Visa fil 

@@ -271,6 +271,9 @@
 
 
 <script>
 
     $(function(){
 
+		//清除我已阅读缓存
 
+		sessionStorage.removeItem("readClause");
 
+		sessionStorage.removeItem("index");
 
         $(window).bind("pageshow", function(event){
 
             if(event.originalEvent.persisted){
 
                 window.location.reload();

+ 1 - 1
src/jfw/modules/app/src/web/templates/dataExport/dataExport_applyInvoice.html
Visa fil 

@@ -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;

+ 49 - 11
src/jfw/modules/app/src/web/templates/dataExport/dataExport_payOrder.html
Visa fil 

@@ -24,6 +24,17 @@
 
 		.weui-check__label:active {
 
 		    background-color: #fff;
 
 		}
 
+		.app-layout-header>.app-back_{
 
+			position: absolute;
 
+		    font-size: 19px;
 
+		    padding-top: 20px;
 
+		    padding-left: 11px;
 
+			padding-right: 40px;
 
+		    padding-bottom: 7px;
 
+		    left: 0px;
 
+		    top: 18px;
 
+			color: #444444;
 
+		}
 
 		</style>
 
 	</head>
 
   <body>
 
@@ -31,7 +42,7 @@
 
 		<p><span></span></p>
 
 	</div>
 
 	<div class="app-layout-header">
 
-		<span class="app-back jyapp-icon jyapp-icon-zuojiantou"></span>
 
+		<span class="app-back_ jyapp-icon jyapp-icon-zuojiantou"></span>
 
 		数据导出
 
 	</div>
 
 	<div id="pay_order">
 
@@ -280,6 +291,18 @@
 
 				$(".pay_before").text("￥" + beforePay)
 
 			}
 
 			$(function() {            	
+				//返回键
 
+					$(".app-layout-header .app-back_").unbind("tap").on("tap",function(){
 
+							setTimeout(function(){
 
+								window.history.back();
 
+							},300)
 
+					});
 
+				if(sessionStorage.pay_way){
 
+					if(sessionStorage.pay_way=="ali_app"){
 
+						$(".payment").text("支付宝支付");
 
+					}
 
+				}
 
+				
 				if(sessionStorage.index=="1"){
 
             		$(".choose .choose-item").eq(sessionStorage.index).addClass("active").siblings().removeClass("active");
 
             		dataType=2;
 
@@ -324,16 +347,23 @@
 
 				//
 
 				$('#choose_way').click(function() {
 
 					$('.pay_way').slideDown('slow')
 
+					if(sessionStorage.pay_way=="ali_app"){
 
+						$("#zfb").prop("checked",true);
 
+						$("#wx").prop("checked",false);
 
+						 pay_way=sessionStorage.pay_way;
 
+					}
 
+						sessionStorage.removeItem("pay_way");
 
 				})
 
 				/* 选择支付方式*/
 
 				$('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)
 
+					sessionStorage.pay_way=pay_way;
 
 					$('.payment').html(checkValue)
 
 				});
 
 				$(".cancel").click(function() {
 
@@ -572,18 +602,23 @@
 
 				$(".toPay").on("click", function() {
 
 					if (!finishEmailVerity || !readClause || !canpay || !finishPhoneVerity) {
 
 						return
 
-					}else{
 
-				      //清除我已阅读缓存
 
-				      sessionStorage.removeItem("readClause");
 
-					  sessionStorage.removeItem("index");
 
-				     }
 
+					}
 
+//					}else{
 
+//				      //清除我已阅读缓存
 
+//				      sessionStorage.removeItem("readClause");
 
+//					  sessionStorage.removeItem("index");
 
+//				     }
 
 					$(".loading_").show();
 
 					canpay = false;
 
 					var param = {};
 
 					param.pay_way = pay_way;
 
+					if (sessionStorage.pay_way){
 
+						param.pay_way=sessionStorage.pay_way;
 
+					}
 
 					param.data_spec = dataType == 2 ? "senior" : "standard";
 
 					param.id = {{.T._id}}
 
 					console.log(param.id)
 
+					alert(param.pay_way);
 
 					param.sourcePage = "weixin"
 
 					//先去创建预支付订单
 
 					/*-----------------*/
 
@@ -595,6 +630,9 @@
 
 				                }else{
 
 				                  JyObj.aliPay(data.data)
 
 				                }
 
+				                 //清除我已阅读缓存
 
+						      sessionStorage.removeItem("readClause");
 
+							  sessionStorage.removeItem("index");
 
 				                checkPaySuccess(data.order)
 
 							} catch (e) {
 
 								alert(e)

+ 5 - 1
src/jfw/modules/app/src/web/templates/dataExport/dataExport_previewData.html
Visa fil 

@@ -241,9 +241,13 @@
 
 							}
 
 						});
 
 						makeP();
 
+					}else if(r.res.msg){
 
+						$(".tabs").css({"min-width":"0px","display": "none"});
 
+						$(".noData").text("今日已超出预览次数").show();
 
+						loading(false);
 
 					}else{
 
 						$(".tabs").css({"min-width":"0px","display": "none"});
 
-						$(".noData").show();
 
+						$(".noData").text("暂无数据").show();
 
 						loading(false);
 
 					}
 
 				})

+ 1 - 1
src/jfw/modules/app/src/web/templates/dataExport/dataExport_price.html
Visa fil 

@@ -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>

+ 13 - 8
src/jfw/modules/app/src/web/templates/weixin/search/mainSearch.html
Visa fil 

@@ -14,7 +14,7 @@
 
 <script src="/jyapp/mobiscroll/mobiscroll.min.js"></script>
 
 <script src="/jyapp/js/dropload.js?v={{Msg "seo" "version"}}"></script>
 
 <script type="text/javascript" src="/jyapp/js/wxEntsesearch.js?v={{Msg "seo" "version"}}"></script>
 
-<script type="text/javascript" src="/jyapp/js/wxSupersearch.js?v={{Msg "seo" "version"}}22"></script>
 
+<script type="text/javascript" src="/jyapp/js/wxSupersearch.js?v={{Msg "seo" "version"}}2211"></script>
 
 <script type="text/javascript" src="/jyapp/js/bootstrap.min.js?v={{Msg "seo" "version"}}"></script>
 
 <script type="text/javascript" src="/jyapp/js/popup/tap.js?v={{Msg "seo" "version"}}1"></script>
 
 <!--2.8-->
 
@@ -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(){

+ 10 - 12
src/web/staticres/js/wxSupersearch.js
Visa fil 

@@ -455,10 +455,10 @@ var SuperSearch = {
 
 		});
 
 		SuperSearch.initMobiscroll();
 
 		//返回时 是否显示table的查看更多
 
-		if($(".showlist").hasClass("on")){
 
-			//SuperSearch.isTable(false);
 
+		if($(".newdialog .tab-box .sub-show-list").find("li.active").attr('dataVal')=="showlist"){
 
+			SuperSearch.isTable(false);
 
 		}else{
 
-			//SuperSearch.isTable(true);
 
+			SuperSearch.isTable(true);
 
 		}
 
 	},
 
 	recoveryPage: function(){
 
@@ -614,7 +614,7 @@ var SuperSearch = {
 
 		});
 
 		//判断是否是table  (2.7.5table只显示20条数据)
 
 		if(!sessionStorage.superSearch_showType){
 
-			if($(".newdialog .tab-box .sub-show-list").find("li.active").attr('dataVal')=="showtable"){
 
+			if($(".newdialog .tab-box .sub-show-list").find("li.active").attr('dataVal')=="showlist"){
 
 				SuperSearch.isTable(false);
 
 			}else{
 
 				SuperSearch.isTable(true);
 
@@ -818,13 +818,8 @@ var SuperSearch = {
 
 		} else {
 
 			//判断显示信息方式  列表or表格
 
 			$("#supersearchPage #wrapper").removeClass("hidden");
 
-			if($("#supersearchPage .showType .showlist").hasClass("on")){
 
-				$("#supersearchPage #list").removeClass("hidden");
 
-				$("#supersearchPage #table").addClass("hidden");
 
-			}else{
 
-				$("#supersearchPage #list").addClass("hidden");
 
-				$("#supersearchPage #table").removeClass("hidden");
 
-			}
 
+			$("#supersearchPage #list").removeClass("hidden");
 
+			$("#supersearchPage #table").addClass("hidden");
 
 		}
 
 	},
 
 	formSubmit: function (nw){    //提交表单，获取数据
 
@@ -857,6 +852,10 @@ var SuperSearch = {
 
 			$(".newdialog .sub-search-title").find("li").removeClass("active");
 
 			$(".selected-export .options .search-title").find("em").text("标题搜索");
 
 			$(".newdialog .sub-search-title").find("li[dataval='searchtitle']").addClass("active");
 
+			
+			$(".newdialog .sub-show-list").find("li").removeClass("active");
 
+			$(".selected-export .show-list").find("em").text("列表显示");
 
+			$(".newdialog .sub-show-list").find("li[dataval='showlist']").addClass("active");
 
 		}
 
 		$.ajax({
 
 			type: "post",
 
@@ -1382,7 +1381,6 @@ var SuperSearch = {
 
 		  	$("#supersearchPage #wrapper #list").addClass("hidden");
 
 			SuperSearch.isTable(true);
 
 		},300)
 
-		
 	},
 
 	isTable:function(flag){
 
 		if(flag){ //table

+ 2 - 2
src/web/staticres/wx_dataExport/css/base.css
Visa fil 

@@ -8,7 +8,7 @@ body, div, dl, dt, dd, ul, ol, li, h1, h2, h3, h4, h5, h6, pre, code, form, fiel
 
     padding: 0;
 
 }
 
 html,body {
 
-     max-width: 750px;
 
+    /* max-width: 750px;
 
     -webkit-text-size-adjust: 100%;
 
     margin: 0 auto;
 
     height: 100%;
 
@@ -18,7 +18,7 @@ html,body {
 
     font-size: .24rem;
 
     background:rgba(245,244,249,1);;
 
     color: #3d3d3d;
 
-    font-family:  "Microsoft YaHei","Helvetica Neue", "Roboto", "Segoe UI", "PingFang SC", "Hiragino Sans GB", sans-serif;
 
+    font-family:  "Microsoft YaHei","Helvetica Neue", "Roboto", "Segoe UI", "PingFang SC", "Hiragino Sans GB", sans-serif;*/
 
 }
 
 
 ul,ol {

+ 2 - 2
src/web/staticres/wx_dataExport/css/pay_order.css
Visa fil 

@@ -1,6 +1,6 @@
 
 .main {
 
-  width: 100%;
 
-  overflow: scroll;
 
+  /*width: 100%;*/
 
+  /*overflow: scroll;*/
 
 }
 
 
 .main::-webkit-scrollbar {

+ 4 - 1
src/web/templates/weixin/dataExport/dataExport.html
Visa fil 

@@ -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){

+ 7 - 1
src/web/templates/weixin/dataExport/dataExport_payOrder.html
Visa fil 

@@ -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"}}33">
 
         <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"}}
 
@@ -290,6 +290,9 @@
 
 					readClause=true;
 
 					sessionStorage.readClause="true";
 
 					$(".toPay").removeAttr("disabled");
 
+					$(".fixed-bottom-box .weui-check").attr("checked",true);
 
+				}else{
 
+					$(".fixed-bottom-box .weui-check").attr("checked",false);
 
 				}
 
 				//软键盘弹起 
 				var oHeight = $(document).height(); //浏览器当前的高度
 
@@ -541,6 +544,9 @@
 
 					if(previewDataTime<50){
 
 						previewDataTime++
 
 						var dataType = $(".choose").find("div.active").index()+1;
 
+						//清除我已阅读缓存
 
+						sessionStorage.removeItem("readClause");
 
+						sessionStorage.removeItem("index");
 
 						window.open("/front/wx_dataExport/toPreview/"+{{.T._id}}+"?dataType="+dataType);
 
 					}else{
 
 						EasyAlert.show("预览数据次数超出今日上限！","",3000);

+ 2 - 2
src/web/templates/weixin/dataExport/dataExport_previewData.html
Visa fil 

@@ -162,13 +162,13 @@
 
 				$(".buttons-tab .tab-link").each(function() {
 
 					var index = $(this).index();
 
 					$(".buttons-tab .tab-link").eq(0).addClass("active");
 
-
 
 					$(this).click(function() {
 
 						loading(true);
 
 						tab(parseInt(index)+1);
 
 						$(this).addClass("active").siblings().removeClass("active");
 
 					})
 
-				})
 
+				});
 
+				$(".buttons-tab .tab-link").eq((parseInt({{.T.dataType}})-parseInt(1))).addClass("active").siblings().removeClass("active");
 
 			})
 
 			//
 
 			function tab(t){

+ 1 - 1
src/web/templates/weixin/dataExport/dataExport_toOrderDetail.html
Visa fil 

@@ -25,7 +25,7 @@
 
 			    -webkit-box-sizing: border-box;
 
 			    box-sizing: border-box;
 
 			    font-size: .24rem;
 
-			    background: #fff !important;
 
+			    background: #F5F4F9 !important;
 
 			    color: #3d3d3d;
 
 			    font-family: "Microsoft YaHei","Helvetica Neue", "Roboto", "Segoe UI", "PingFang SC", "Hiragino Sans GB", sans-serif;
 
 			}

+ 6 - 3
src/web/templates/weixin/search/mainSearch.html
Visa fil 

@@ -22,9 +22,9 @@
 
 <script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>
 
 <script src="{{Msg "seo" "cdn"}}/js/dropload.js?v={{Msg "seo" "version"}}"></script>
 
 <script type="text/javascript" src="{{Msg "seo" "cdn"}}/js/wxEntsesearch.js?v={{Msg "seo" "version"}}"></script>
 
-<script type="text/javascript" src="{{Msg "seo" "cdn"}}/js/wxSupersearch.js?v={{Msg "seo" "version"}}21"></script>
 
+<script type="text/javascript" src="{{Msg "seo" "cdn"}}/js/wxSupersearch.js?v={{Msg "seo" "version"}}41"></script>
 
 <!--2.8-->
 
-<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/base.css?v={{Msg "seo" "version"}}">
 
+<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/base.css?v={{Msg "seo" "version"}}1">
 
 <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
 
 <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/search_tab.css?v={{Msg "seo" "version"}}">
 
 <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/weui.min.css">
 
@@ -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>