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

src/jfw/modules/app/src/web/staticres/jyapp/dataExport/css/dataExport.css

@@ -50,7 +50,7 @@ html .page .progress .p-item .p-item-icon {
 }
 html .page .progress .p-item .p-item-icon i {
   color: #fff;
-  font-size: .11rem;
+  font-size: .25rem;
 }
 html .page .progress .p-item .icon-gray {
   background: #DCDADD;

src/jfw/modules/app/src/web/templates/dataExport/dataExport.html

@@ -8,7 +8,7 @@
     <title>数据导出</title>
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/css/base.css?v={{Msg "seo" "version"}}">
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
-    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/css/dataExport.css?v={{Msg "seo" "version"}}3">
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/css/dataExport.css?v={{Msg "seo" "version"}}6">
     <link rel="stylesheet" type="text/css" href="/jyapp/css/font.css?v={{Msg "seo" "version"}}" />
     <script src="{{Msg "seo" "cdn"}}/jyapp/dataExport/js/rem.js?v={{Msg "seo" "version"}}"></script>
     <script src="{{Msg "seo" "cdn"}}/jyapp/js/jquery.js"></script>

src/jfw/modules/app/src/web/templates/dataExport/dataExport_appended.html

@@ -228,9 +228,9 @@
                 var keyWord = tokens;
                 // sessionStorage.removeItem("keyWord");
                 if(token.indexOf("_in")===-1){
-                    window.location.href="/front/wx_dataExport/appendedInput?keyWord="+keyWord;
+                    window.location.href="/jyapp/front/dataExport/appendedInput?keyWord="+keyWord;
                 }else{
-                    window.location.href="/front/wx_dataExport/appendedInput?keyWord="+keyWord+"_in";
+                    window.location.href="/jyapp/front/dataExport/appendedInput?keyWord="+keyWord+"_in";
                 }
             });
 

src/jfw/modules/app/src/web/templates/dataExport/dataExport_exclude.html

@@ -228,9 +228,9 @@
                 var keyWord = tokens;
                 // sessionStorage.removeItem("keyWord");
                 if(token.indexOf("_in")===-1){
-                    window.location.href="/front/wx_dataExport/excludeInput?keyWord="+keyWord;
+                    window.location.href="/jyapp/front/dataExport/excludeInput?keyWord="+keyWord;
                 }else{
-                    window.location.href="/front/wx_dataExport/excludeInput?keyWord="+keyWord+"_in";
+                    window.location.href="/jyapp/front/dataExport/excludeInput?keyWord="+keyWord+"_in";
                 }
             });
 

src/jfw/modules/app/src/web/templates/dataExport/dataExport_keyWordInput.html

@@ -271,7 +271,7 @@
             var keys = JSON.parse(sessionStorage.keyWord);
             for(var i in keys){
                 if(keys[i].keyWord===keyWord){
-                    window.location.href = "/front/wx_dataExport/appended?keyWord="+keyWord;
+                    window.location.href = "/jyapp/front/dataExport/appended?keyWord="+keyWord;
                     return
                 }
             }
@@ -279,7 +279,7 @@
         //
         var obj = [{"keyWord":keyWord}];
         sessionStorage.keyWord = JSON.stringify(obj);
-        window.location.href = "/front/wx_dataExport/appended?keyWord="+keyWord;
+        window.location.href = "/jyapp/front/dataExport/appended?keyWord="+keyWord;
     });
     $(".exclude").on('click', function () {
         var keyWord = $(this).parent().prev().val();
@@ -290,7 +290,7 @@
             var keys = JSON.parse(sessionStorage.keyWord);
             for(var i in keys){
                 if(keys[i].keyWord===keyWord){
-                    window.location.href = "/front/wx_dataExport/exclude?keyWord="+keyWord;
+                    window.location.href = "/jyapp/front/dataExport/exclude?keyWord="+keyWord;
                     return
                 }
             }
@@ -298,7 +298,7 @@
         //
         var obj = [{"keyWord":keyWord}];
         sessionStorage.keyWord = JSON.stringify(obj);
-        window.location.href = "/front/wx_dataExport/exclude?keyWord="+keyWord;
+        window.location.href = "/jyapp/front/dataExport/exclude?keyWord="+keyWord;
     });
     $(".app-back").on("click", function () {
         history.back();

src/jfw/modules/app/src/web/templates/dataExport/dataExport_payOrder.html

@@ -32,7 +32,7 @@
 	</div>
 	<div class="app-layout-header">
 		<span class="app-back jyapp-icon jyapp-icon-zuojiantou"></span>
-		支付订单
+		数据导出
 	</div>
 	<div id="pay_order">
 		<main class="main">
@@ -123,7 +123,7 @@
                     <div class="form-control" style="display: none;border-top: 1px solid #e0e0e0;margin-top: 0.06rem;">
 <!--                            <label for="">验证码：</label>-->
                         <div class="input" id="codeinput">
-                            <input type="text" value="" readonly=true class="verity_input" id="code" maxlength="6" placeholder="验证码">
+                            <input id="yzm" type="text" value="" readonly=true class="verity_input" id="code" maxlength="6" placeholder="验证码">
 				<div id="devinput">
 					<i class="icon iconfont code_check_ok"></i>
 					<span class="code_err_msg">验证码错误</span>
@@ -172,7 +172,7 @@
                     <ul class="info">
                         <li>
                             <label>·标准字段包</label>
-                            <p>公告标题、公告内容、剑鱼标讯地址、省份城市、发布时间、项目名称、采购单位、中标单位、中标价、币种、公告类别</p>
+                            <p>公告标题、公告内容、剑鱼标讯地址、省份、城市、发布时间、项目名称、采购单位、中标单位、中标价、币种、公告类别</p>
                         </li>
                         <li>
                             <label>·高级字段包</label>
@@ -474,6 +474,12 @@
 					$(".email_check_ok").hide();
 					$(".email_err_msg").hide();
 				});
+			   	//验证码
+//			   	$("#yzm").on("focus",function(){
+//			   		var mainh=$(".main").height()
+//			   		console.log(mainh+"----"+mainh/2)
+//			   		  $("#yzm").scrollTop(mainh/2);
+//			   	})
 				//点击发送验证码-邮箱验证
 				var canVerify = true;
 				$(".sendCode").on("click", function() {

src/jfw/modules/app/src/web/templates/dataExport/dataExport_paySuccess.html

@@ -3,7 +3,7 @@
    {{include "/common/meta.html"}}
 		<meta charset="utf-8">
 		<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
-		<title>支付成功</title>
+		<title>数据导出</title>
 		<script src="{{Msg "seo" "cdn"}}/jyapp/js/rem.js"></script>
     <link href="/jyapp/css/layout.css?v={{Msg "seo" "version"}}" rel="stylesheet">
     <link href="/jyapp/css/font.css?v={{Msg "seo" "version"}}" rel="stylesheet">
@@ -34,7 +34,7 @@
 		</div>
 		<div class="app-layout-header">
 			<span class="app-back jyapp-icon jyapp-icon-zuojiantou"></span>
-			支付订单
+			数据导出
 		</div>
 		<div id="pay_success">
 			<main class="main">

src/jfw/modules/app/src/web/templates/dataExport/dataExport_toMyOrder.html

@@ -259,8 +259,9 @@
 				margin-right:30px;
 				color: #fff;
 				float: right;
+				background-color:#BFBFC3;
 			}
-			.jconfirm .jconfirm-box .jconfirm-buttons>btn-primary-0 {
+			.jconfirm .jconfirm-box .jconfirm-buttons>.btn-primary-0 {
 			    margin-bottom: 4px;
 			    margin-left: 30px;
 			}

src/web/staticres/wx_dataExport/css/dataExport.css

@@ -50,7 +50,7 @@ html .page .progress .p-item .p-item-icon {
 }
 html .page .progress .p-item .p-item-icon i {
   color: #fff;
-  font-size: .11rem;
+  font-size: .25rem;
 }
 html .page .progress .p-item .icon-gray {
   background: #DCDADD;

src/web/templates/weixin/dataExport/dataExport.html

@@ -9,7 +9,7 @@
     <title>数据导出</title>
     <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/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
-    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/dataExport.css?v={{Msg "seo" "version"}}3">
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/dataExport.css?v={{Msg "seo" "version"}}8">
     <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/rem.js?v={{Msg "seo" "version"}}"></script>
     {{include "/common/weixin.html"}}
     <script src="/js/jquery.js"></script>

src/web/templates/weixin/dataExport/dataExport_payOrder.html

@@ -182,7 +182,7 @@
                         <ul class="info">
                             <li>
                                 <label>·标准字段包</label>
-                                <p>公告标题、公告内容、剑鱼标讯地址、省份城市、发布时间、项目名称、采购单位、中标单位、中标价、币种、公告类别</p>
+                                <p>公告标题、公告内容、剑鱼标讯地址、省份、城市、发布时间、项目名称、采购单位、中标单位、中标价、币种、公告类别</p>
                             </li>
                             <li>
                                 <label>·高级字段包</label>

src/web/templates/weixin/dataExport/dataExport_paySuccess.html

@@ -2,7 +2,7 @@
 	<head>
 		<meta charset="utf-8">
 		<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
-		<title>支付成功</title>
+		<title>数据导出</title>
 		<script src="{{Msg "seo" "cdn"}}/js/rem.js"></script>
 		<link rel="stylesheet" type="text/css" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/base.css"/>
 		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/pay_success.css">

src/web/templates/weixin/dataExport/dataExport_toMyOrder.html

@@ -138,6 +138,7 @@
 				color: #fff;
 				/*float: right;*/
 				margin-left: 30px;
+				background-color:#BFBFC3;
 			}
 			.jconfirm .jconfirm-box .jconfirm-buttons>.btn-primary-0 {
 			    margin-bottom: 4px;