C:/Program Files/Git/city/listinfo

fund_h5/css/typeChoice.css

@@ -35,7 +35,7 @@ nav p {
 }
 
 .list{
-	margin-top: 0.74rem;
+	margin-top: 0.54rem;
 }
 .typeList{
 	background: #FFFFFF;

fund_h5/fund_h5_api.html

@@ -90,7 +90,7 @@
     </div>
     <script src="./js/auto_size.js"></script>
     <script src="./js/tips.js"></script>
-    <script src="./js/fund_h5_api.js?v=10"></script>
+    <script src="./js/fund_h5_api.js?v=11"></script>
 </body>
 
 </html>

fund_h5/js/fund_h5_api.js

@@ -265,11 +265,26 @@ function renderLoginInfo(cityInfo) {
             if (loginField.name.includes('联名卡')) {
                 placeStr = '请输入公积金联名卡号';
             } else if (loginField.name.includes('身份证')) {
-                placeStr = '首次查询请选择联名卡号';
+                placeStr = '请输入身份证';
+            } else if (loginField.name.includes('手机号')) {
+                placeStr = '请输入手机号';
+            } else if (loginField.name.includes('用户名')) {
+                placeStr = '请输入用户名';
+            } else if (loginField.name.includes('账号')) {
+                placeStr = '请输入账号';
+            } else if (loginField.name.includes('姓名')) {
+                placeStr = '请输入姓名';
+            } else if (loginField.name.includes('存折账号')) {
+                placeStr = '请输入存折账号';
             } else if (loginField.name.includes('密码')) {
                 placeStr = '请输入密码';
                 type = 'password';
             }
+            if(qs.name == "北京"){
+            	if (loginField.name.includes('身份证')) {
+	                placeStr = '首次查询请选择联名卡号';
+	            }
+            }
 			if(loginField.name.includes('密码')){
 				tabConHtmlStr += '<div class="input-wrapper inputForget" ><label for="">' + loginField.name + ':</label><input id="' + loginField.code + '" type="' + type + '" placeholder="' + placeStr + '"><div class="forget" onclick="forgetEvent()">忘记密码</div></div>';
 			}else{
@@ -743,18 +758,15 @@ var process = new Process({
 function cituInfoData () {
 	$.ajax({
 		type:"POST",
-		url: "/api/city/info",
-		headers:{
-			'token': '5dac206be8b1f5736285fc03a08adb3c'
-		},
+		url: "/api/city/listinfo",
 		data:{
 			'region': qs.name
 		},
 		dataType:'json',
 		success: function (res) {
 			console.log(res)
-			if(res.errno == 0 && res.rst.data && res.rst.data.city){
-				var data = res.rst.data.city;
+			if(res.errno == 0 && res.rst.city && res.rst.city.city){
+				var data = res.rst.city.city;
 				if(data.pwd_info){
 					$(".dialog-forget").find("p").html(data.pwd_info);
 				}else{

fund_h5/js/queryHelp.js

@@ -55,18 +55,15 @@ function goZhuce () {
 function cituInfoData () {
 	$.ajax({
 		type:"POST",
-		url: "/api/city/info",
-		headers:{
-			'token': '5dac206be8b1f5736285fc03a08adb3c'
-		},
+		url: "/api/city/listinfo",
 		data:{
 			'region': qs.name
 		},
 		dataType:'json',
 		success: function (res) {
 			console.log(res)
-			if(res.errno == 0 && res.rst.data && res.rst.data.city){
-				var data = res.rst.data.city;
+			if(res.errno == 0 && res.rst.city && res.rst.city.city){
+				var data = res.rst.city.city;
 				if(data.help_info && data.help_info != ""){
 					$(".container").html(data.help_info);
 					$(".container").find("p").css({

fund_h5/js/typeChoice.js

@@ -48,17 +48,14 @@ function goBack () {
 function cituInfoData () {
 	$.ajax({
 		type:"POST",
-		url: "/api/city/info",
-		headers:{
-			'token': '5dac206be8b1f5736285fc03a08adb3c'
-		},
+		url: "/api/city/listinfo",
 		data:{
 			'region': name
 		},
 		success: function (res) {
 			console.log(res)
-			if(res.errno == 0 && res.rst.data){
-				var list = res.rst.data.list;
+			if(res.errno == 0 && res.rst.city){
+				var list = res.rst.city.list;
 				var html = '';
 				if(list.length > 0){
 					for(var i = 0 ; i < list.length ; i++){

fund_h5/queryHelp.html

@@ -34,4 +34,4 @@
 </html>
 <script src="./js/auto_size.js"></script>
 <script src="./js/tips.js"></script>
-<script type="text/javascript" src="js/queryHelp.js?v=12"></script>
+<script type="text/javascript" src="js/queryHelp.js?v=13"></script>

fund_h5/typeChoice.html

@@ -5,7 +5,7 @@
 	    <title>类型选择</title>
 	    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no" />
 	    <link rel="stylesheet" href="./css/reset.css">
-	    <link rel="stylesheet" href="./css/typeChoice.css?v=10">
+	    <link rel="stylesheet" href="./css/typeChoice.css?v=11">
 	    <script src="./js/jquery.min.js"></script>
 	    <script type="text/javascript" src="kuxuan/api-url.js"></script>
 	    <script src="./js/common.js"></script>
@@ -37,4 +37,4 @@
 </html>
 <script src="./js/auto_size.js"></script>
 <script src="./js/tips.js"></script>
-<script type="text/javascript" src="js/typeChoice.js?v=10"></script>
+<script type="text/javascript" src="js/typeChoice.js?v=11"></script>

fund_h5_01/css/typeChoice.css

@@ -35,7 +35,7 @@ nav p {
 }
 
 .list{
-	margin-top: 0.74rem;
+	margin-top: 0.54rem;
 }
 .typeList{
 	background: #FFFFFF;

fund_h5_01/fund_h5_api.html

@@ -98,7 +98,7 @@
     </div>
     <script src="./js/auto_size.js"></script>
     <script src="./js/tips.js"></script>
-    <script src="./js/fund_h5_api.js?v=10"></script>
+    <script src="./js/fund_h5_api.js?v=11"></script>
 </body>
 
 </html>

fund_h5_01/js/fund_h5_api.js

@@ -285,11 +285,26 @@ function renderLoginInfo(cityInfo) {
             if (loginField.name.includes('联名卡')) {
                 placeStr = '请输入公积金联名卡号';
             } else if (loginField.name.includes('身份证')) {
-                placeStr = '首次查询请选择联名卡号';
+                placeStr = '请输入身份证';
+            } else if (loginField.name.includes('手机号')) {
+                placeStr = '请输入手机号';
+            } else if (loginField.name.includes('用户名')) {
+                placeStr = '请输入用户名';
+            } else if (loginField.name.includes('账号')) {
+                placeStr = '请输入账号';
+            } else if (loginField.name.includes('姓名')) {
+                placeStr = '请输入姓名';
+            } else if (loginField.name.includes('存折账号')) {
+                placeStr = '请输入存折账号';
             } else if (loginField.name.includes('密码')) {
                 placeStr = '请输入密码';
                 type = 'password';
             }
+            if(qs.name == "北京"){
+            	if (loginField.name.includes('身份证')) {
+	                placeStr = '首次查询请选择联名卡号';
+	            }
+            }
 			if(loginField.name.includes('密码')){
 				tabConHtmlStr += '<div class="input-wrapper inputForget" ><label for="">' + loginField.name + ':</label><input id="' + loginField.code + '" type="' + type + '" placeholder="' + placeStr + '"><div class="forget" onclick="forgetEvent()">忘记密码</div></div>';
 			}else{
@@ -771,18 +786,15 @@ var process = new Process({
 function cituInfoData () {
 	$.ajax({
 		type:"POST",
-		url: "/api/city/info",
-		headers:{
-			'token': '5dac206be8b1f5736285fc03a08adb3c'
-		},
+		url: "/api/city/listinfo",
 		data:{
 			'region': qs.name
 		},
 		dataType:'json',
 		success: function (res) {
 			console.log(res)
-			if(res.errno == 0 && res.rst.data && res.rst.data.city){
-				var data = res.rst.data.city;
+			if(res.errno == 0 && res.rst && res.rst.city){
+				var data = res.rst.city.city;
 				if(data.pwd_info){
 					$(".dialog-forget").find("p").html(data.pwd_info);
 				}else{

fund_h5_01/js/queryHelp.js

@@ -61,18 +61,15 @@ function goZhuce () {
 function cituInfoData () {
 	$.ajax({
 		type:"POST",
-		url: "/api/city/info",
-		headers:{
-			'token': '5dac206be8b1f5736285fc03a08adb3c'
-		},
+		url: "/api/city/listinfo",
 		data:{
 			'region': qs.name
 		},
 		dataType:'json',
 		success: function (res) {
 			console.log(res)
-			if(res.errno == 0 && res.rst.data && res.rst.data.city){
-				var data = res.rst.data.city;
+			if(res.errno == 0 && res.rst.city && res.rst.city.city){
+				var data = res.rst.city.city;
 				if(data.help_info && data.help_info != ""){
 					$(".container").html(data.help_info);
 					$(".container").find("p").css({
@@ -86,7 +83,7 @@ function cituInfoData () {
 						"font-family": "微软雅黑"
 					})
 					$(".container strong").css({"color":"#333333","font-weight":"bold","font-size":"0.16rem"})
-					$(".container strong span").css({"color":"#333333","font-weight":"bold","font-size":"0.16rem"})
+					$(".container strong span").css({"color":"#333333","font-weight":"bold","font-size":"0.1rem"})
 					$(".container strong").find("span").css({"color":"#333333"})
 					$(".goGjj").html(`<div class="ljqw">前往<em>${city_name}</em>公积金官网注册  <span onclick="goZhuce()">复制链接 </span>
             </div>`)

fund_h5_01/js/typeChoice.js

@@ -50,17 +50,14 @@ function cituInfoData () {
 	console.log(name)
 	$.ajax({
 		type:"POST",
-		url: "/api/city/info",
-		headers:{
-			'token': '5dac206be8b1f5736285fc03a08adb3c'
-		},
+		url: "/api/city/listinfo",
 		data:{
 			'region': name
 		},
 		success: function (res) {
 			console.log(res)
-			if(res.errno == 0 && res.rst.data){
-				var list = res.rst.data.list;
+			if(res.errno == 0 && res.rst.city){
+				var list = res.rst.city.list;
 				var html = '';
 				if(list.length > 0){
 					for(var i = 0 ; i < list.length ; i++){

fund_h5_01/queryHelp.html

@@ -41,4 +41,4 @@
 </html>
 <script src="./js/auto_size.js?vv=10"></script>
 <script src="./js/tips.js?vv=10"></script>
-<script type="text/javascript" src="js/queryHelp.js?vv=12"></script>
+<script type="text/javascript" src="js/queryHelp.js?vv=13"></script>

fund_h5_01/typeChoice.html

@@ -5,7 +5,7 @@
 	    <title>类型选择</title>
 	    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no" />
 	    <link rel="stylesheet" href="./css/reset.css?vv=1">
-	    <link rel="stylesheet" href="./css/typeChoice.css?vv=10">
+	    <link rel="stylesheet" href="./css/typeChoice.css?vv=11">
 	    <script src="./js/jquery.min.js"></script>
 	    <script type="text/javascript" src="kuxuan/api-url.js?vv=10"></script>
 	    <div style="display: none;">
@@ -37,4 +37,4 @@
 </html>
 <script src="./js/auto_size.js?vv=10"></script>
 <script src="./js/tips.js?vv=10"></script>
-<script type="text/javascript" src="js/typeChoice.js?vv=10"></script>
+<script type="text/javascript" src="js/typeChoice.js?vv=11"></script>