xiuli.gao 6 years ago
parent
commit
6e21d60367

+ 2 - 0
fund_h5/agreement.html

@@ -15,6 +15,7 @@
15 15
 
16 16
     .content {
17 17
         padding: 0.44rem 0.14rem 0;
18
+        padding-top: 0.64rem;
18 19
     }
19 20
 
20 21
     h2,
@@ -52,6 +53,7 @@
52 53
         height: 0.44rem;
53 54
         width: 100%;
54 55
         background-color: #5d7dff;
56
+        padding-top: 0.2rem;
55 57
     }
56 58
 
57 59
     nav i {

+ 2 - 2
fund_h5/choose_city.html

@@ -12,10 +12,10 @@
12 12
 </head>
13 13
 
14 14
 <body style='display: none;'>
15
-    <!--<nav>
15
+    <nav>
16 16
         <i id='back'></i>
17 17
         <p>选择城市</p>
18
-    </nav>-->
18
+    </nav>
19 19
     <div class="current-city-wrapper" id="top">
20 20
         <p>当前定位城市</p>
21 21
         <div class="current-city">

+ 2 - 1
fund_h5/css/choose_city.css

@@ -12,6 +12,7 @@ nav {
12 12
     height: 0.44rem;
13 13
     width: 100%;
14 14
     background-color: #5d7dff;
15
+    padding-top: 0.2rem;
15 16
 }
16 17
 
17 18
 nav i {
@@ -36,7 +37,7 @@ nav p {
36 37
 
37 38
 .current-city-wrapper {
38 39
     margin: 0.54rem 0.10rem 0;
39
-    margin-top: 0;
40
+    margin-top: 0.74rem;
40 41
 }
41 42
 
42 43
 .current-city-wrapper>p {

+ 48 - 2
fund_h5/css/fund_h5_api.css

@@ -9,27 +9,73 @@ nav {
9 9
     height: 0.44rem;
10 10
     width: 100%;
11 11
     background-color: #5d7dff;
12
+    position: relative;
13
+    padding-top: 0.2rem;
12 14
 }
13 15
 
14 16
 nav i {
15
-    display: inline-block;
17
+    /*display: inline-block;
16 18
     width: 0.16rem;
17 19
     height: 0.16rem;
18 20
     line-height: 0.44rem;
19 21
     margin-left: 0.1rem;
20 22
     background-image: url(../img/back.png);
21 23
     background-repeat: no-repeat;
24
+    background-size: 100% auto;*/
25
+    display: inline-block;
26
+    width: 0.16rem;
27
+    height: 0.16rem;
28
+    line-height: 0.44rem;
29
+    background-image: url(../img/back.png);
30
+    background-repeat: no-repeat;
22 31
     background-size: 100% auto;
32
+    position: absolute;
33
+    top: 0.2rem;
34
+    bottom: 0;
35
+    margin: auto;
36
+	margin-left: 0.1rem;
37
+}
23 38
 
39
+nav span{
40
+	font-size: 0.13rem;
41
+    padding-right: 0.13rem;
42
+    float: right;
43
+    line-height: 0.44rem;
44
+    color: #fff;
45
+}
46
+
47
+nav span a{
48
+	color: #FFFFFF;
24 49
 }
25 50
 
26 51
 nav p {
27
-    display: inline-block;
52
+    /*display: inline-block;
28 53
     width: 90%;
29 54
     text-align: center;
30 55
     line-height: 0.44rem;
31 56
     color: #fff;
57
+    font-size: 0.17rem;*/
58
+    
59
+    display: inline-block;
60
+    text-align: center;
61
+    line-height: 0.44rem;
62
+    color: #fff;
32 63
     font-size: 0.17rem;
64
+    position: absolute;
65
+    left: 0;
66
+    right: 0;
67
+    margin: auto;
68
+    width: 40%;
69
+}
70
+
71
+nav p em{
72
+	border: 0.08rem solid transparent;
73
+	border-top: 0.08rem solid #fff;
74
+	width: 0;
75
+	height: 0;
76
+	position: absolute;
77
+	top: 0.18rem;
78
+	margin-left: 0.06rem;
33 79
 }
34 80
 
35 81
 .container {

+ 34 - 0
fund_h5/css/query-help.css

@@ -3,6 +3,40 @@ body{
3 3
 	padding: 0.2rem 0.23rem;
4 4
 	height: 100%;
5 5
 }
6
+nav {
7
+    position: fixed;
8
+    top: 0;
9
+    left: 0;
10
+    z-index: 9999;
11
+    font-size: 0rem;
12
+    height: 0.44rem;
13
+    width: 100%;
14
+    background-color: #5d7dff;
15
+    padding-top:0.2rem ;
16
+}
17
+
18
+nav i {
19
+    display: inline-block;
20
+    width: 0.16rem;
21
+    height: 0.16rem;
22
+    line-height: 0.44rem;
23
+    margin-left: 0.1rem;
24
+    background-image: url(../img/back.png);
25
+    background-repeat: no-repeat;
26
+    background-size: 100% auto;
27
+}
28
+
29
+nav p {
30
+    display: inline-block;
31
+    width: 90%;
32
+    text-align: center;
33
+    line-height: 0.44rem;
34
+    color: #fff;
35
+    font-size: 0.17rem;
36
+}
37
+.content{
38
+	margin-top: 0.64rem;
39
+}
6 40
 .title{
7 41
 	font-size: .15rem;
8 42
 	color: #333333;

+ 35 - 0
fund_h5/css/typeChoice.css

@@ -3,6 +3,41 @@ body{
3 3
 	height: 100%;
4 4
 	background: #F3F3F3;
5 5
 }
6
+nav {
7
+    position: fixed;
8
+    top: 0;
9
+    left: 0;
10
+    z-index: 9999;
11
+    font-size: 0rem;
12
+    height: 0.44rem;
13
+    width: 100%;
14
+    background-color: #5d7dff;
15
+    padding-top:0.2rem ;
16
+}
17
+
18
+nav i {
19
+    display: inline-block;
20
+    width: 0.16rem;
21
+    height: 0.16rem;
22
+    line-height: 0.44rem;
23
+    margin-left: 0.1rem;
24
+    background-image: url(../img/back.png);
25
+    background-repeat: no-repeat;
26
+    background-size: 100% auto;
27
+}
28
+
29
+nav p {
30
+    display: inline-block;
31
+    width: 90%;
32
+    text-align: center;
33
+    line-height: 0.44rem;
34
+    color: #fff;
35
+    font-size: 0.17rem;
36
+}
37
+
38
+.list{
39
+	margin-top: 0.74rem;
40
+}
6 41
 .typeList{
7 42
 	background: #FFFFFF;
8 43
 	padding: 0.12rem 0.23rem;

+ 6 - 6
fund_h5/fund_h5_api.html

@@ -9,7 +9,6 @@
9 9
     <link rel="stylesheet" href="./css/fund_h5_api.css">
10 10
     <script src="./js/jquery.min.js"></script>
11 11
     <script type="text/javascript">
12
-    	console.log("k")
13 12
 		$.ajax({
14 13
 			type:"post",
15 14
 			url:"https://api.security.726p.com/api/token/getToken?token=fb24519c1e37ebbf807c3e9102f01ed0",
@@ -26,18 +25,19 @@
26 25
 </head>
27 26
 
28 27
 <body>
29
-    <!--<nav>
28
+    <nav>
30 29
         <i id="back"></i>
31
-        <p>公积金查询</p>
32
-    </nav>-->
30
+        <p>公积金查询<em></em></p>
31
+        <span><a href="./choose_city.html">切换城市</a></span>
32
+    </nav>
33 33
     <div class="container">
34 34
         <div class="header-wrapper">
35 35
             <div class="choose-city"> 
36
-                <a href="./choose_city.html">
36
+                <!--<a href="./choose_city.html">-->
37 37
                     <!-- 选择的城市 -->
38 38
                     <i class="location"></i>
39 39
                     <span class="city-name" data-code="00111000">北京</span>
40
-                </a>
40
+                <!--</a>-->
41 41
             </div>
42 42
         </div>
43 43
         <div class="login-wrapper">

+ 21 - 2
fund_h5/js/fund_h5_api.js

@@ -1,8 +1,9 @@
1 1
 var token = '';
2 2
 var tid = '';
3 3
 var returnUrl = '';
4
+var cityInfo = '';
5
+var qs = parseQueryString(window.location.href);
4 6
 $().ready(function() {
5
-    var qs = parseQueryString(window.location.href);
6 7
 
7 8
     if (qs.returnUrl) {
8 9
         returnUrl = qs.returnUrl;
@@ -19,8 +20,22 @@ $().ready(function() {
19 20
     }
20 21
 
21 22
     getLoginInfo();
23
+    //头部切换公积金类型
24
+    switchingType();
22 25
 });
23 26
 
27
+//头部切换公积金类型
28
+function switchingType() {
29
+	var btn = $("nav p");
30
+	btn.click(function () {
31
+		console.log(cityInfo)
32
+		if(cityInfo !='' && cityInfo){
33
+			window.location.href = './typeChoice.html?name=' + cityInfo.region + '&code=' + cityInfo.regionCode + (token ? ('&token=' + token) : '');
34
+		}else{
35
+			showMsg('获取城市信息失败');
36
+		}
37
+	})
38
+}
24 39
 /**
25 40
  * [showMsg 提示各种错误信息,3s后消失]
26 41
  */
@@ -56,7 +71,9 @@ function showDialog(type) {
56 71
             redirectToFailedReturnUrl(tid, 'failed', 1020, '无效的token, 会话不存在或已过期');
57 72
         })
58 73
     } else if (type === 'forget') {
74
+    	var html = '如果您忘记密码,需前往' + qs.name+ '公积金官网<br>重置密码'
59 75
         $('.dialog-forget').show();
76
+        $('.dialog-forget').find('p').html(html)
60 77
         $('.dialog-wrapper input').val('立即前往').click(function() {
61 78
 //          redirectToFailedReturnUrl(tid, 'failed', 1020, '无效的token, 会话不存在或已过期');
62 79
         })
@@ -163,6 +180,7 @@ function getLoginInfo() {
163 180
 //      url: '../../city_list?type=fund&token=' + token + '&regionCode=' + regionCode + '&time=' + Math.round(Date.now() / 1000),
164 181
         contentType: 'application/json;charset=utf-8',
165 182
         success: function(data) {
183
+        	cityInfo = data;
166 184
             return renderLoginInfo(data);
167 185
         },
168 186
         error: function(err) {
@@ -182,7 +200,8 @@ function renderLoginInfo(cityInfo) {
182 200
     var tabConHtmlStr = '';
183 201
 
184 202
     $('.city-name').text(cityInfo.region).attr('data-code', cityInfo.regionCode);
185
-    $('.choose-city a').attr('href', './choose_city.html?name=' + cityInfo.region + '&code=' + cityInfo.regionCode + (token ? ('&token=' + token) : ''));
203
+//  $('.choose-city a').attr('href', './choose_city.html?name=' + cityInfo.region + '&code=' + cityInfo.regionCode + (token ? ('&token=' + token) : ''));
204
+    $('nav span a').attr('href', './choose_city.html?name=' + cityInfo.region + '&code=' + cityInfo.regionCode + (token ? ('&token=' + token) : ''));
186 205
 
187 206
     for (var index in cityInfo.loginTypes) {
188 207
         var loginType = cityInfo.loginTypes[index];

+ 10 - 0
fund_h5/js/queryHelp.js

@@ -0,0 +1,10 @@
1
+$().ready(function () {
2
+	goBack()
3
+})
4
+
5
+//nav返回上一页
6
+function goBack () {
7
+	$("nav i").click(function () {
8
+		history.go(-1)
9
+	})
10
+}

+ 27 - 11
fund_h5/js/typeChoice.js

@@ -1,16 +1,32 @@
1
+var name = '';
2
+var regionCode = '';
3
+var token = '';
1 4
 $().ready(function() {
5
+	$(".typeListRight").css('background','#D7D7D7')
6
+					   .find('.disc').css('background','#FFFFFF');
7
+	$(".typeListRight").eq(0).css('background','#5D7DFF')
8
+					   .find('.disc').css('background','#5D7DFF');
9
+   var qs = parseQueryString(window.location.href);
10
+   console.log(qs)
11
+   name = qs.name;
12
+   regionCode = qs.code;
13
+   token = qs.token;
14
+   goBack();
15
+   selectionTypes();
16
+})
17
+
18
+//点击进行公积金类型选择
19
+function selectionTypes () {
20
+	$(".typeListRight").click(function () {
2 21
 		$(".typeListRight").css('background','#D7D7D7')
3 22
 						   .find('.disc').css('background','#FFFFFF');
4
-		$(".typeListRight").eq(0).css('background','#5D7DFF')
23
+		$(this).css('background','#5D7DFF')
5 24
 						   .find('.disc').css('background','#5D7DFF');
6 25
 	})
7
-	selectionTypes();
8
-	//点击进行公积金类型选择
9
-	function selectionTypes () {
10
-		$(".typeListRight").click(function () {
11
-			$(".typeListRight").css('background','#D7D7D7')
12
-							   .find('.disc').css('background','#FFFFFF');
13
-			$(this).css('background','#5D7DFF')
14
-							   .find('.disc').css('background','#5D7DFF');
15
-		})
16
-	}
26
+}
27
+//nav返回上一页
28
+function goBack () {
29
+	$("nav i").click(function () {
30
+		history.go(-1)
31
+	})
32
+}

+ 11 - 4
fund_h5/queryHelp.html

@@ -10,10 +10,17 @@
10 10
 	    <script src="./js/common.js"></script>
11 11
 	</head>
12 12
 	<body>
13
-		<h3 class="title">如何获取查询密码/公积金帐号</h3>
14
-		<p class="goOfficialNetwork">如果您还未在最新版,北京公积金官网主注册并设置相关信息;<span>立即前往 >></span></p>
15
-		<p class="goOfficialNetwork">注册完成后即可使用APP查询。</p>
13
+		<nav>
14
+	        <i id='back'></i>
15
+	        <p>查询帮助</p>
16
+	    </nav>
17
+	    <div class="content">
18
+	    	<h3 class="title">如何获取查询密码/公积金帐号</h3>
19
+	    	<p class="goOfficialNetwork">如果您还未在最新版,北京公积金官网主注册并设置相关信息;<span>立即前往 >></span></p>
20
+	    	<p class="goOfficialNetwork">注册完成后即可使用APP查询。</p>
21
+	    </div>
16 22
 	</body>
17 23
 </html>
18 24
 <script src="./js/auto_size.js"></script>
19
-<script src="./js/tips.js"></script>
25
+<script src="./js/tips.js"></script>
26
+<script type="text/javascript" src="js/queryHelp.js"></script>

+ 6 - 2
fund_h5/typeChoice.html

@@ -10,7 +10,11 @@
10 10
 	    <script src="./js/common.js"></script>
11 11
 	</head>
12 12
 	<body>
13
-		<div>
13
+		<nav>
14
+	        <i id='back'></i>
15
+	        <p>类型选择</p>
16
+	    </nav>
17
+		<div class="list">
14 18
 			<div class="typeList">
15 19
 				<div class="typeListLeft">
16 20
 					<h4>北京公积金</h4>
@@ -46,9 +50,9 @@
46 50
 				</div>
47 51
 				
48 52
 			</div>
53
+		</div>
49 54
 			<div class="nextStep">下一步</div>
50 55
 			
51
-		</div>
52 56
 	</body>
53 57
 </html>
54 58
 <script src="./js/auto_size.js"></script>