xuzhiheng 6 years ago
parent
commit
d84e934c87

+ 1 - 0
src/jfw/modules/app/src/web/staticres/jyapp/dataExport/css/keyWord.css

@@ -7,6 +7,7 @@
 }
 }
 .keyWord .enter .enterOne {
 .keyWord .enter .enterOne {
   min-height: 0.94rem;
   min-height: 0.94rem;
+  display: block;
   width: 100%;
   width: 100%;
   padding: 0 0.3rem;
   padding: 0 0.3rem;
   font-size: .3rem;
   font-size: .3rem;

+ 0 - 2
src/jfw/modules/app/src/web/staticres/jyapp/dataExport/js/additionWord.js

@@ -23,8 +23,6 @@ $(function(){
     
     
     // 添加按钮
     // 添加按钮
     $(".addKeyWord i").on('click',function(){
     $(".addKeyWord i").on('click',function(){
-        $(".addkeyWord").show();
-        $(".showKeyWord").hide();
         window.location.href="/jyapp/front/dataExport/buyerInput";
         window.location.href="/jyapp/front/dataExport/buyerInput";
     });
     });
 
 

+ 1 - 3
src/jfw/modules/app/src/web/templates/dataExport/dataExport_winnerEdit.html

@@ -9,7 +9,7 @@
 	<link rel="stylesheet" href="/jyapp/dataExport/css/base.css?v={{Msg "seo" "version"}}">
 	<link rel="stylesheet" href="/jyapp/dataExport/css/base.css?v={{Msg "seo" "version"}}">
 	<link rel="stylesheet" href="/jyapp/dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
 	<link rel="stylesheet" href="/jyapp/dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
 	<link rel="stylesheet" href="/jyapp/dataExport/css/weui.min.css?v={{Msg "seo" "version"}}">
 	<link rel="stylesheet" href="/jyapp/dataExport/css/weui.min.css?v={{Msg "seo" "version"}}">
-	<link rel="stylesheet" href="/jyapp/dataExport/css/keyWord.css?v={{Msg "seo" "version"}}3">
+	<link rel="stylesheet" href="/jyapp/dataExport/css/keyWord.css?v={{Msg "seo" "version"}}6">
 	<script src="/jyapp/dataExport/js/rem.js?v={{Msg "seo" "version"}}"></script>
 	<script src="/jyapp/dataExport/js/rem.js?v={{Msg "seo" "version"}}"></script>
 	<script src="{{Msg "seo" "cdn"}}/jyapp/js/jquery.js"></script>
 	<script src="{{Msg "seo" "cdn"}}/jyapp/js/jquery.js"></script>
 	<link rel="stylesheet" type="text/css" href="/jyapp/css/font.css?v={{Msg "seo" "version"}}" />
 	<link rel="stylesheet" type="text/css" href="/jyapp/css/font.css?v={{Msg "seo" "version"}}" />
@@ -136,8 +136,6 @@
 
 
 			// 添加按钮
 			// 添加按钮
 			$(".addKeyWord i").on('click',function(){
 			$(".addKeyWord i").on('click',function(){
-				$(".addkeyWord").show();
-				$(".showKeyWord").hide();
 				window.location.href="/jyapp/front/dataExport/winnerInput";
 				window.location.href="/jyapp/front/dataExport/winnerInput";
 			});
 			});
 
 

+ 1 - 1
src/jfw/modules/app/src/web/templates/me/login.html

@@ -285,7 +285,7 @@
 		}
 		}
 		function loginByWeixinCallBack222(){
 		function loginByWeixinCallBack222(){
 			//var wxSign = "D00THAAVRlVFXBkKUlRUQQMHBwFGWUNXSVZdQFRbHQtSVEcbUWhUdEQFEwsjTHliRFswBAcIXBFVZAVXPyZITElWQFlVF05NQVlUTQUGV1RMDkgPVRAHVVIBEU1cTBYdVV4TD1YNEl5VEVcBVABFWhILBBcHVgkEElkRWlxCBVQAABBbRExJVkZJQVBWVUAT";
 			//var wxSign = "D00THAAVRlVFXBkKUlRUQQMHBwFGWUNXSVZdQFRbHQtSVEcbUWhUdEQFEwsjTHliRFswBAcIXBFVZAVXPyZITElWQFlVF05NQVlUTQUGV1RMDkgPVRAHVVIBEU1cTBYdVV4TD1YNEl5VEVcBVABFWhILBBcHVgkEElkRWlxCBVQAABBbRExJVkZJQVBWVUAT";
-			var wxSign="D00THAAVRlVFXBkKUlRUQQQEBwdGXUJeSVZdQFRbHQtSVEdWHhJERhEdGQpHThAFVQQWXUUPAxIGVQUMTF4RCF0QVABTV01NXEwXHVYSCxdFXEBYUBJUUQVQQF4VDFBEC1MBF1hNAwcCGhAKE1ZFVxINBEcBUlIAElgUWwQQUVJVBUNYFgtUF1AJUFYRTVxMEQ1CVRMPRhI=";
+			var wxSign="D00THAAVRlVFXBkKUlRUQQQICAFDXUdYSVZdQFRbHQtSVEdWHhJERhEdGQpHThAFUlASXEZaABELBgVTQFxHXwYXBVICVkdNXEwXHVYSCxdFV0BZVBVWUwEGRl0VCFNNV1VSF1hNAwcCGhAKEwNFDUJaAxEFAwBREg0VDQBHBAkHVk1eEg8ATAFSAwZETVxMEQ1CVRMPRBI=";
       		$.ajax({
       		$.ajax({
 				url: "/jyapp/free/login",
 				url: "/jyapp/free/login",
 				type: "post",
 				type: "post",

+ 1 - 0
src/web/staticres/wx_dataExport/css/keyWord.css

@@ -5,6 +5,7 @@
   line-height: .48rem;
   line-height: .48rem;
 }
 }
 .keyWord .enter .enterOne {
 .keyWord .enter .enterOne {
+  display: block;
   min-height: 0.94rem;
   min-height: 0.94rem;
   width: 100%;
   width: 100%;
   padding: 0 0.3rem;
   padding: 0 0.3rem;

+ 0 - 2
src/web/staticres/wx_dataExport/js/additionWord.js

@@ -23,8 +23,6 @@ $(function(){
     
     
     // 添加按钮
     // 添加按钮
     $(".addKeyWord i").on('click',function(){
     $(".addKeyWord i").on('click',function(){
-        $(".addkeyWord").show();
-        $(".showKeyWord").hide();
         window.location.href="/front/wx_dataExport/buyerInput";
         window.location.href="/front/wx_dataExport/buyerInput";
     });
     });
 
 

+ 1 - 0
src/web/templates/weixin/dataExport/dataExport.html

@@ -558,6 +558,7 @@
             $(".confirm").hide();
             $(".confirm").hide();
             $(".resetOne").show();
             $(".resetOne").show();
         }
         }
+        //
 
 
         //筛选条件发送
         //筛选条件发送
         $(".saveData").on('click', function () {
         $(".saveData").on('click', function () {

+ 1 - 1
src/web/templates/weixin/dataExport/dataExport_keyWord.html

@@ -10,7 +10,7 @@
     <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"}}">
     <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/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/weui.min.css?v={{Msg "seo" "version"}}">
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/weui.min.css?v={{Msg "seo" "version"}}">
-    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/keyWord.css?v={{Msg "seo" "version"}}122">
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/keyWord.css?v={{Msg "seo" "version"}}123">
     <script src="/js/jquery.js"></script>
     <script src="/js/jquery.js"></script>
     {{include "/common/weixin.html"}}
     {{include "/common/weixin.html"}}
     <script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>
     <script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>

+ 0 - 2
src/web/templates/weixin/dataExport/dataExport_winnerEdit.html

@@ -109,8 +109,6 @@
 
 
 			// 添加按钮
 			// 添加按钮
 			$(".addKeyWord i").on('click',function(){
 			$(".addKeyWord i").on('click',function(){
-				$(".addkeyWord").show();
-				$(".showKeyWord").hide();
 				window.location.href="/front/wx_dataExport/winnerInput";
 				window.location.href="/front/wx_dataExport/winnerInput";
 			});
 			});