xiuli.gao 6 年 前
コミット
12ac877a8b
共有4 個のファイルを変更した39 個の追加30 個の削除を含む
  1. 1 1
      fund_h5/agreement.html
  2. 14 12
      fund_h5/css/fund_h5_api.css
  3. 0 12
      fund_h5/fund_h5_api.html
  4. 24 5
      fund_h5/js/fund_h5_api.js

+ 1 - 1
fund_h5/agreement.html

@@ -15,7 +15,7 @@
15 15
 
16 16
     .content {
17 17
         padding: 0.44rem 0.14rem 0;
18
-        padding-top: 0.64rem;
18
+        padding-top: 0.44rem;
19 19
     }
20 20
 
21 21
     h2,

+ 14 - 12
fund_h5/css/fund_h5_api.css

@@ -248,13 +248,15 @@ nav p em{
248 248
 }
249 249
 
250 250
 .dialog-wrapper {
251
-    width: 3.40rem;
252
-    /*height: 2.38rem;*/
251
+    width: 2.9rem;
252
+    /* height: 2.38rem; */
253 253
     text-align: center;
254
-    margin: 1.50rem 0.20rem 0 0.20rem;
254
+    margin: auto;
255
+    margin-top: 1.50rem;
255 256
     background-color: #fff;
256 257
     font-size: 0;
257
-    padding-bottom: 0.2rem;
258
+    padding-bottom: 0.14rem;
259
+    border-radius: 0.12rem;
258 260
 }
259 261
 
260 262
 .dialog-wrapper img {
@@ -271,16 +273,16 @@ nav p em{
271 273
 }
272 274
 
273 275
 .dialog-wrapper input{
274
-    margin-top: 0.20rem;
275
-    width: 0.88rem;
276
-    height: 0.34rem;
277
-    background-color: #5d7dff;
276
+    margin-top: 0.14rem;
277
+    padding-top: 0.16rem;
278
+    width: 100%;
278 279
     border: none;
280
+    border-radius: 0;
281
+    border-top: 0.01rem solid #D8D8D8;
279 282
     outline: none;
280
-    color: #fff;
281
-    border-radius: 0.17rem;
282
-    -webkit-box-shadow: 0 0 6px 0 rgba(93, 125, 255, 0.7);
283
-    box-shadow: 0 0 6px 0 rgba(93, 125, 255, 0.7);
283
+    color: #5D7DFF;
284
+    font-size: 0.18rem;
285
+    background: transparent;
284 286
 }
285 287
 
286 288
 .alert-info {

+ 0 - 12
fund_h5/fund_h5_api.html

@@ -9,18 +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" src="kuxuan/api-url.js"></script>
12
-    <!--<script type="text/javascript">
13
-		$.ajax({
14
-			type:"post",
15
-			url:"/api/token/getToken?token=fb24519c1e37ebbf807c3e9102f01ed0",
16
-			success: function (res){
17
-				console.log(res)
18
-			},
19
-			fail: function (err) {
20
-				console.log(err)
21
-			}
22
-		});
23
-	</script>-->
24 12
     <script src="./js/common.js"></script>
25 13
 </head>
26 14
 

+ 24 - 5
fund_h5/js/fund_h5_api.js

@@ -3,6 +3,7 @@ var tid = '';
3 3
 var returnUrl = '';
4 4
 var cityInfo = '';
5 5
 var retrievePwd = '';
6
+var appName = '';
6 7
 var qs = parseQueryString(window.location.href);
7 8
 
8 9
 var httpStr=location.href.substr(0,location.href.indexOf("?") + 1); //str得到?之前的字符串
@@ -11,7 +12,11 @@ $().ready(function() {
11 12
     if (qs.returnUrl) {
12 13
         returnUrl = qs.returnUrl;
13 14
     }
14
-
15
+	
16
+	if (qs.appName) {
17
+        appName = qs.appName;
18
+    }
19
+	
15 20
     if (qs.token) {
16 21
         token = qs.token;
17 22
     } else {
@@ -21,7 +26,9 @@ $().ready(function() {
21 26
     if (qs.name && qs.code) {
22 27
         $('.city-name').text(qs.name).attr('data-code', qs.code);
23 28
     }
24
-	httpStr += "returnUrl=" + returnUrl;
29
+    var agreementLink = $('.agreement-wrapper a');
30
+    agreementLink.attr('href', agreementLink.attr('href') + '?appName=' + appName);
31
+	httpStr += "returnUrl=" + returnUrl + "&appName=" + appName;
25 32
     httpStr = encodeURIComponent(httpStr)
26 33
  console.log(httpStr)
27 34
     getLoginInfo();
@@ -67,7 +74,7 @@ function showDialog(type) {
67 74
     $('.dialog-wrapper div').hide();
68 75
     if (type === 'failed') {
69 76
         $('.dialog-failed').show();
70
-        $('.mask').addClass('bg-white').siblings().hide();
77
+        $('.mask').siblings().hide();
71 78
     } else if (type === 'maintain') {
72 79
         $('.dialog-maintain').show();
73 80
     } else if (type === 'timeout') {
@@ -86,7 +93,6 @@ function showDialog(type) {
86 93
 						retrievePwd = item.URL.password;
87 94
 //						window.location.href=retrievePwd;
88 95
     					window.webkit.messageHandlers.OutPushMessageHandler.postMessage({'name':qs.name,'url':retrievePwd});
89
-						
90 96
 					}else{
91 97
 						retrievePwd = item.URL.web;
92 98
 //						window.location.href=retrievePwd;
@@ -162,7 +168,20 @@ function initEvent() {
162 168
         $('.alert-info').hide();
163 169
         $('.loading-wrapper').hide();
164 170
     })
165
-
171
+	
172
+	//阻止冒泡
173
+	$(".dialog-wrapper").click(function (){
174
+		return false
175
+	})
176
+	
177
+	//点击mask阴影
178
+	$(".mask").click(function() {
179
+		$('.mask').removeClass('bg-white').hide().siblings().show();
180
+        $('#tid').hide();
181
+        $('.alert-info').hide();
182
+        $('.loading-wrapper').hide();
183
+	})
184
+	
166 185
     // 解析协议checkBox选中/取消选中事件
167 186
     $('.check').click(function() {
168 187
         var currentItem = $(this);