public_service / public_sdk_android

Go to a project
Toggle navigation Toggle navigation pinning
xuguohong
24e0ebad 1 parent 1b0a29bd

更新目录为sys..

Inline Side-by-side
Showing 35 changed files with 973 additions and 329 deletions
...@@ -2,13 +2,13 @@ ...@@ -2,13 +2,13 @@
2 <config> 2 <config>
3 3
4 <sdkconfig 4 <sdkconfig
5 - YA_APPID="58abba4954c21d1275766755" 5 + YA_APPID="58db653e0184553d610527d6"
6 - YA_APPKEY="28ed3cfdcd40d081a5e8dd761f7e344b" 6 + YA_APPKEY="28e614d62b8d4e74757cbf3e15ce5596"
7 channelparameter1="" 7 channelparameter1=""
8 channelparameter2="" 8 channelparameter2=""
9 custom="" 9 custom=""
10 gamechannelid="" 10 gamechannelid=""
11 - gamesimplename="fytx_test" 11 + gamesimplename="qyj1"
12 logincheckurl="http://login.public.sdk.gzyouai.com/logincheck/check" 12 logincheckurl="http://login.public.sdk.gzyouai.com/logincheck/check"
13 paycheckurl="http://pay.public.sdk.gzyouai.com/paycheck/confirm" 13 paycheckurl="http://pay.public.sdk.gzyouai.com/paycheck/confirm"
14 payorderurl="http://pay.public.sdk.gzyouai.com/paycheck/create" 14 payorderurl="http://pay.public.sdk.gzyouai.com/paycheck/create"
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 <html> 2 <html>
3 3
4 <head> 4 <head>
5 - <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no"> 5 + <meta name="viewport" content="width=device-width, user-scalable=no" />
6 <meta name="apple-mobile-web-app-capable" content="yes" /> 6 <meta name="apple-mobile-web-app-capable" content="yes" />
7 <meta name="apple-mobile-web-app-status-bar-style" content="black" /> 7 <meta name="apple-mobile-web-app-status-bar-style" content="black" />
8 <meta http-equiv="Content-type" content="text/html; charset=utf-8" /> 8 <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
...@@ -10,22 +10,20 @@ ...@@ -10,22 +10,20 @@
10 <meta name="screen-orientation" content="portrait"> 10 <meta name="screen-orientation" content="portrait">
11 <meta name="full-screen" content="yes"> 11 <meta name="full-screen" content="yes">
12 <meta http-equiv="x-ua-compatible" content="IE=edge" /> 12 <meta http-equiv="x-ua-compatible" content="IE=edge" />
13 -
14 - <link href="skin/login.css?v=20150923001" type="text/css" rel="stylesheet" />
15 <title> 13 <title>
16 手游平台支付 14 手游平台支付
17 </title> 15 </title>
16 + <style>
17 + h4,p{font-size: 24px;
18 + font-weight: normal;
19 + padding: 0 20px;font-family: "微软雅黑"; width: 100%;}
20 + p{ text-indent: 2em;}
21 + </style>
18 </head> 22 </head>
19 23
20 <body> 24 <body>
21 - <!-- 协议模块 --> 25 + <div class="mask"></div>
22 - <section id="agreement"> 26 + <div class="horizontal" style="height: 220px;">
23 - <div class="new-sdk-container">
24 - <div class="SDK-titlebox"></div>
25 - <div class="new-sdk-logo"><a href="#"><img src="images/new-sdk-logo.png"></a></div>
26 - <div class="new-sdk-content">
27 - <h3>网络服务协议</h3>
28 - <div class="content-main">
29 <h4>1. 账号服务条款的接受</h4> 27 <h4>1. 账号服务条款的接受</h4>
30 <p>1.1 账号由上海星玩网络科技（以下简称“星玩”）及其关联公司所有并合法运营，星玩及其关联公司并在本用户服务协议的条款和要求下提供服务。</p> 28 <p>1.1 账号由上海星玩网络科技（以下简称“星玩”）及其关联公司所有并合法运营，星玩及其关联公司并在本用户服务协议的条款和要求下提供服务。</p>
31 <p>1.2 当用户访问、浏览及使用账号提供的各项服务、业务时，用户便表明其接受了本服务协议的条款，并同意受本服务协议的约束，用户并保证其提交的信息真实、准确、及时和完整；若用户不同意本协议条款的，请停止注册程序。</p> 29 <p>1.2 当用户访问、浏览及使用账号提供的各项服务、业务时，用户便表明其接受了本服务协议的条款，并同意受本服务协议的约束，用户并保证其提交的信息真实、准确、及时和完整；若用户不同意本协议条款的，请停止注册程序。</p>
...@@ -183,20 +181,6 @@ ...@@ -183,20 +181,6 @@
183 <h4>21. 生效条件</h4> 181 <h4>21. 生效条件</h4>
184 <p>本协议自用户访问、浏览及使用账号之时开始生效。</p> 182 <p>本协议自用户访问、浏览及使用账号之时开始生效。</p>
185 </div> 183 </div>
186 - </div>
187 -
188 - <div class="only-btn inline-btn">
189 - <a href="login.html#register" class="submit btn-orange">确定</a>
190 - <div class="agreement l" style="margin-right: 0;">
191 - <div class="checkbox checkbox-2 l" >
192 - <i class="iconfont icon-xuanzhong"></i>
193 - </div>
194 - <p class="l">已阅读</p>
195 - </div>
196 - </div>
197 - </div>
198 -
199 - </section>
200 <!-- end --> 184 <!-- end -->
201 <script type="text/javascript" src="js/fastclick.min.1.0.js?20150923001"></script> 185 <script type="text/javascript" src="js/fastclick.min.1.0.js?20150923001"></script>
202 <script type="text/javascript" src="js/zepto.min.js?20150923001"></script> 186 <script type="text/javascript" src="js/zepto.min.js?20150923001"></script>
...@@ -208,6 +192,10 @@ ...@@ -208,6 +192,10 @@
208 }); 192 });
209 </script> 193 </script>
210 <script type="text/javascript" src="js/core.min.js?20150923001" ></script> 194 <script type="text/javascript" src="js/core.min.js?20150923001" ></script>
195 + <script type="text/javascript" src="js/simpScroller-min.js"></script>
196 + <script>
197 + simpScroller(document.querySelector(".horizontal"), {});
198 + </script>
211 </body> 199 </body>
212 200
213 </html> 201 </html>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -88,9 +88,14 @@ function initMatching(){ ...@@ -88,9 +88,14 @@ function initMatching(){
88 88
89 if (!Core.sdk_w) Core.sdk_w = 600; 89 if (!Core.sdk_w) Core.sdk_w = 600;
90 _scale = 1; 90 _scale = 1;
91 - if (ratio > 1.5){ 91 + if(ratio == 2){//5、6、6s(2.4)
92 - _scale = 2.3 / ratio; 92 + _scale = 2.4 / ratio;
93 - } else if (ratio < 1) { 93 + if(userAgent.indexOf('iPad') != -1){
94 + _scale = 2 / ratio;
95 + }
96 + }else if(ratio >2.5){//6s plus
97 + _scale = 2.7 / ratio;
98 + }else if (ratio < 1) {
94 _scale = 1.5 / ratio; 99 _scale = 1.5 / ratio;
95 } else { 100 } else {
96 _scale = 1; 101 _scale = 1;
...@@ -105,7 +110,6 @@ function initMatching(){ ...@@ -105,7 +110,6 @@ function initMatching(){
105 110
106 Core.ios_w = _w; 111 Core.ios_w = _w;
107 112
108 -
109 $('meta[name="viewport"]').attr('content','width=' + _w + ',maximum-scale=' + _scale + ',user-scalable=no'); 113 $('meta[name="viewport"]').attr('content','width=' + _w + ',maximum-scale=' + _scale + ',user-scalable=no');
110 //$('<meta name="viewport" content="maximum-scale=' + _scale + '"/>').appendTo(_head); 114 //$('<meta name="viewport" content="maximum-scale=' + _scale + '"/>').appendTo(_head);
111 //$('<meta name="viewport" content="width=' + _w + '"/>').appendTo(_head); 115 //$('<meta name="viewport" content="width=' + _w + '"/>').appendTo(_head);
...@@ -141,7 +145,8 @@ function initMatching(){ ...@@ -141,7 +145,8 @@ function initMatching(){
141 145
142 Core.PLATFORM_NAME = '星玩'; 146 Core.PLATFORM_NAME = '星玩';
143 147
144 - Core.server = 'http://sdk.shxingwan.com'; 148 + Core.server = 'https://sdk.shxingwan.com';
149 +
145 var lastServer = localStorage.getItem('last_server'); 150 var lastServer = localStorage.getItem('last_server');
146 if(lastServer && lastServer.indexOf('http:')==0){ 151 if(lastServer && lastServer.indexOf('http:')==0){
147 if(Core.isFile){ 152 if(Core.isFile){
...@@ -191,11 +196,10 @@ function initMatching(){ ...@@ -191,11 +196,10 @@ function initMatching(){
191 var _w = null; 196 var _w = null;
192 if (Core.isIos) { 197 if (Core.isIos) {
193 $('html').attr('data-useragent', 'ios'); 198 $('html').attr('data-useragent', 'ios');
194 -
195 if (!Core.sdk_w) Core.sdk_w = 600; 199 if (!Core.sdk_w) Core.sdk_w = 600;
196 _scale = 1; 200 _scale = 1;
197 - if (ratio > 1.5){ 201 + if (ratio > 1.5){//6s plus,
198 - _scale = 2 / ratio; 202 + _scale = 2.8 / ratio;
199 } else if (ratio < 1) { 203 } else if (ratio < 1) {
200 _scale = 1.5 / ratio; 204 _scale = 1.5 / ratio;
201 } else { 205 } else {
...@@ -211,7 +215,6 @@ function initMatching(){ ...@@ -211,7 +215,6 @@ function initMatching(){
211 215
212 Core.ios_w = _w; 216 Core.ios_w = _w;
213 217
214 -
215 $('meta[name="viewport"]').attr('content','width=' + _w + ',maximum-scale=' + _scale + ',user-scalable=no'); 218 $('meta[name="viewport"]').attr('content','width=' + _w + ',maximum-scale=' + _scale + ',user-scalable=no');
216 //$('<meta name="viewport" content="maximum-scale=' + _scale + '"/>').appendTo(_head); 219 //$('<meta name="viewport" content="maximum-scale=' + _scale + '"/>').appendTo(_head);
217 //$('<meta name="viewport" content="width=' + _w + '"/>').appendTo(_head); 220 //$('<meta name="viewport" content="width=' + _w + '"/>').appendTo(_head);
...@@ -328,7 +331,8 @@ function initMatching(){ ...@@ -328,7 +331,8 @@ function initMatching(){
328 core.updateMod = function(modId) { 331 core.updateMod = function(modId) {
329 if (!modId in modules) { 332 if (!modId in modules) {
330 console.error('没有对应的模块id的section:' + modId); 333 console.error('没有对应的模块id的section:' + modId);
331 - return; 334 + modId = 'home'
335 + //return;
332 } 336 }
333 location.hash = "#" + modId + '&force'; 337 location.hash = "#" + modId + '&force';
334 } 338 }
...@@ -511,7 +515,7 @@ function initMatching(){ ...@@ -511,7 +515,7 @@ function initMatching(){
511 515
512 var options = { 516 var options = {
513 type: action_method, 517 type: action_method,
514 - url: Core.get_url(post_url), 518 + url: post_url,
515 dataType: 'json', 519 dataType: 'json',
516 contentType: "application/x-www-form-urlencoded; charset=utf-8", 520 contentType: "application/x-www-form-urlencoded; charset=utf-8",
517 data: param, 521 data: param,
...@@ -600,7 +604,7 @@ function initMatching(){ ...@@ -600,7 +604,7 @@ function initMatching(){
600 $obj[0].disabled = true; 604 $obj[0].disabled = true;
601 } 605 }
602 Core.showTips('加载中...', true, 5000); 606 Core.showTips('加载中...', true, 5000);
603 - $.ajax(options); 607 + Core.ajax(options);
604 return false; 608 return false;
605 } 609 }
606 610
...@@ -610,9 +614,7 @@ function initMatching(){ ...@@ -610,9 +614,7 @@ function initMatching(){
610 Core.showTips('请求已提交，请稍候。'); 614 Core.showTips('请求已提交，请稍候。');
611 return; 615 return;
612 } 616 }
613 - if(Core.isFile){ 617 +
614 - path = core.server + path;
615 - }
616 var options = { 618 var options = {
617 type: "get", 619 type: "get",
618 url: path, 620 url: path,
...@@ -632,7 +634,7 @@ function initMatching(){ ...@@ -632,7 +634,7 @@ function initMatching(){
632 } 634 }
633 $obj.data('disabled', true); 635 $obj.data('disabled', true);
634 Core.showTips('加载中...', true, 5000); 636 Core.showTips('加载中...', true, 5000);
635 - $.ajax(options); 637 + Core.ajax(options);
636 return false; 638 return false;
637 } 639 }
638 640
...@@ -662,9 +664,7 @@ function initMatching(){ ...@@ -662,9 +664,7 @@ function initMatching(){
662 dataType = 'json'; 664 dataType = 'json';
663 } 665 }
664 var data_result = ''; 666 var data_result = '';
665 - if(Core.isFile){ 667 +
666 - data_url = core.server + data_url;
667 - }
668 var options = { 668 var options = {
669 type: "get", 669 type: "get",
670 url: data_url, 670 url: data_url,
...@@ -710,7 +710,7 @@ function initMatching(){ ...@@ -710,7 +710,7 @@ function initMatching(){
710 } 710 }
711 } 711 }
712 Core.showTips('加载中...', true, 5000); 712 Core.showTips('加载中...', true, 5000);
713 - $.ajax(options); 713 + Core.ajax(options);
714 } 714 }
715 // 判断用户是否登录,使用两个 715 // 判断用户是否登录,使用两个
716 core.isAuths = function() { 716 core.isAuths = function() {
......
1 +var surname="\u8d75|\u94b1|\u5b59|\u674e|\u5468|\u5434|\u90d1|\u738b|\u51af|\u9648|\u891a|\u536b|\u848b|\u6c88|\u97e9|\u6768|\u6731|\u79e6|\u5c24|\u8bb8|\u4f55|\u5415|\u65bd|\u5f20|\u5b54|\u66f9|\u4e25|\u534e|\u91d1|\u9b4f|\u9676|\u59dc|\u621a|\u8c22|\u90b9|\u55bb|\u67cf|\u6c34|\u7aa6|\u7ae0|\u4e91|\u82cf|\u6f58|\u845b|\u595a|\u8303|\u5f6d|\u90ce|\u9c81|\u97e6|\u660c|\u9a6c|\u82d7|\u51e4|\u82b1|\u65b9|\u4fde|\u4efb|\u8881|\u67f3|\u9146|\u9c8d|\u53f2|\u5510|\u8d39|\u5ec9|\u5c91|\u859b|\u96f7|\u8d3a|\u502a|\u6c64|\u6ed5|\u6bb7|\u7f57|\u6bd5|\u90dd|\u90ac|\u5b89|\u5e38|\u4e50|\u4e8e|\u65f6|\u5085|\u76ae|\u535e|\u9f50|\u5eb7|\u4f0d|\u4f59|\u5143|\u535c|\u987e|\u5b5f|\u5e73|\u9ec4|\u548c|\u7a46|\u8427|\u5c39|\u59da|\u90b5|\u6e5b|\u6c6a|\u7941|\u6bdb|\u79b9|\u72c4|\u7c73|\u8d1d|\u660e|\u81e7|\u8ba1|\u4f0f|\u6210|\u6234|\u8c08|\u5b8b|\u8305|\u5e9e|\u718a|\u7eaa|\u8212|\u5c48|\u9879|\u795d|\u8463|\u6881|\u675c|\u962e|\u84dd|\u95f5|\u5e2d|\u5b63|\u9ebb|\u5f3a|\u8d3e|\u8def|\u5a04|\u5371|\u6c5f|\u7ae5|\u989c|\u90ed|\u6885|\u76db|\u6797|\u5201|\u953a|\u5f90|\u90b1|\u9a86|\u9ad8|\u590f|\u8521|\u7530|\u6a0a|\u80e1|\u51cc|\u970d|\u865e|\u4e07|\u652f|\u67ef|\u661d|\u7ba1|\u5362|\u83ab|\u7ecf|\u623f|\u88d8|\u7f2a|\u5e72|\u89e3|\u5e94|\u5b97|\u4e01|\u5ba3|\u8d32|\u9093|\u90c1|\u5355|\u676d|\u6d2a|\u5305|\u8bf8|\u5de6|\u77f3|\u5d14|\u5409|\u94ae|\u9f9a|\u7a0b|\u5d47|\u90a2|\u6ed1|\u88f4|\u9646|\u8363|\u7fc1|\u8340|\u7f8a|\u65bc|\u60e0|\u7504|\u9eb4|\u5bb6|\u5c01|\u82ae|\u7fbf|\u50a8|\u9773|\u6c72|\u90b4|\u7cdc|\u677e|\u4e95|\u6bb5|\u5bcc|\u5deb|\u4e4c|\u7126|\u5df4|\u5f13|\u7267|\u9697|\u5c71|\u8c37|\u8f66|\u4faf|\u5b93|\u84ec|\u5168|\u90d7|\u73ed|\u4ef0|\u79cb|\u4ef2|\u4f0a|\u5bab|\u5b81|\u4ec7|\u683e|\u66b4|\u7518|\u94ad|\u5386|\u620e|\u7956|\u6b66|\u7b26|\u5218|\u666f|\u8a79|\u675f|\u9f99|\u53f6|\u5e78|\u53f8|\u97f6|\u90dc|\u9ece|\u84df|\u6ea5|\u5370|\u5bbf|\u767d|\u6000|\u84b2|\u90b0|\u4ece|\u9102|\u7d22|\u54b8|\u7c4d|\u8d56|\u5353|\u853a|\u5c60|\u8499|\u6c60|\u4e54|\u9633|\u90c1|\u80e5|\u80fd|\u82cd|\u53cc|\u95fb|\u8398|\u515a|\u7fdf|\u8c2d|\u8d21|\u52b3|\u9004|\u59ec|\u7533|\u6276|\u5835|\u5189|\u5bb0|\u90e6|\u96cd|\u5374|\u74a9|\u6851|\u6842|\u6fee|\u725b|\u5bff|\u901a|\u8fb9|\u6248|\u71d5|\u5180|\u50ea|\u6d66|\u5c1a|\u519c|\u6e29|\u522b|\u5e84|\u664f|\u67f4|\u77bf|\u960e|\u5145|\u6155|\u8fde|\u8339|\u4e60|\u5ba6|\u827e|\u9c7c|\u5bb9|\u5411|\u53e4|\u6613|\u614e|\u6208|\u5ed6|\u5ebe|\u7ec8|\u66a8|\u5c45|\u8861|\u6b65|\u90fd|\u803f|\u6ee1|\u5f18|\u5321|\u56fd|\u6587|\u5bc7|\u5e7f|\u7984|\u9619|\u4e1c|\u6b27|\u6bb3|\u6c83|\u5229|\u851a|\u8d8a|\u5914|\u9686|\u5e08|\u5de9|\u538d|\u8042|\u6641|\u52fe|\u6556|\u878d|\u51b7|\u8a3e|\u8f9b|\u961a|\u90a3|\u7b80|\u9976|\u7a7a|\u66fe|\u6bcb|\u6c99|\u4e5c|\u517b|\u97a0|\u987b|\u4e30|\u5de2|\u5173|\u84af|\u76f8|\u67e5|\u540e|\u8346|\u7ea2|\u6e38|\u7afa|\u6743|\u902e|\u76cd|\u76ca|\u6853|\u516c|\u4e07\u4fdf|\u53f8\u9a6c|\u4e0a\u5b98|\u6b27\u9633|\u590f\u4faf|\u8bf8\u845b|\u95fb\u4eba|\u4e1c\u65b9|\u8d6b\u8fde|\u7687\u752b|\u5c09\u8fdf|\u516c\u7f8a|\u6fb9\u53f0|\u516c\u51b6|\u5b97\u653f|\u6fee\u9633|\u6df3\u4e8e|\u5355\u4e8e|\u592a\u53d4|\u7533\u5c60|\u516c\u5b59|\u4ef2\u5b59|\u8f69\u8f95|\u4ee4\u72d0|\u949f\u79bb|\u5b87\u6587|\u957f\u5b59|\u6155\u5bb9|\u53f8\u5f92|\u53f8\u7a7a|\u53ec|\u6709|\u821c|\u53f6\u8d6b\u90a3\u62c9|\u4e1b|\u5cb3|\u5bf8|\u8d30|\u7687|\u4fa8|\u5f64|\u7aed|\u7aef|\u8d6b|\u5b9e|\u752b|\u96c6|\u8c61|\u7fe0|\u72c2|\u8f9f|\u5178|\u826f|\u51fd|\u8292|\u82e6|\u5176|\u4eac|\u4e2d|\u5915|\u4e4b|\u7ae0\u4f73|\u90a3\u62c9|\u51a0|\u5bbe|\u9999|\u679c|\u4f9d\u5c14\u6839\u89c9\u7f57|\u4f9d\u5c14\u89c9\u7f57|\u8428\u561b\u5587|\u8d6b\u820d\u91cc|\u989d\u5c14\u5fb7\u7279|\u8428\u514b\u8fbe|\u94ae\u795c\u7984|\u4ed6\u5854\u5587|\u559c\u5854\u814a|\u8bb7\u6bb7\u5bcc\u5bdf|\u53f6\u8d6b\u90a3\u5170|\u5e93\u96c5\u5587|\u74dc\u5c14\u4f73|\u8212\u7a46\u7984|\u7231\u65b0\u89c9\u7f57|\u7d22\u7ef0\u7edc|\u7eb3\u5587|\u4e4c\u96c5|\u8303\u59dc|\u78a7\u9c81|\u5f20\u5ed6|\u5f20\u7b80|\u56fe\u95e8|\u592a\u53f2|\u516c\u53d4|\u4e4c\u5b59|\u5b8c\u989c|\u9a6c\u4f73|\u4f5f\u4f73|\u5bcc\u5bdf|\u8d39\u83ab|\u8e47|\u79f0|\u8bfa|\u6765|\u591a|\u7e41|\u620a|\u6734|\u56de|\u6bd3|\u7a0e|\u8364|\u9756|\u7eea|\u6108|\u7855|\u7262|\u4e70|\u4f46|\u5de7|\u679a|\u6492|\u6cf0|\u79d8|\u4ea5|\u7ecd|\u4ee5|\u58ec|\u68ee|\u658b|\u91ca|\u5955|\u59d2|\u670b|\u6c42|\u7fbd|\u7528|\u5360|\u771f|\u7a70|\u7fe6|\u95fe|\u6f06|\u8d35|\u4ee3|\u8d2f|\u65c1|\u5d07|\u680b|\u544a|\u4f11|\u8912|\u8c0f|\u9510|\u768b|\u95f3|\u5728|\u6b67|\u79be|\u793a|\u662f|\u59d4|\u948a|\u9891|\u5b34|\u547c|\u5927|\u5a01|\u6602|\u5f8b|\u5192|\u4fdd|\u7cfb|\u6284|\u5b9a|\u5316|\u83b1|\u6821|\u4e48|\u6297|\u7962|\u7da6|\u609f|\u5b8f|\u529f|\u5e9a|\u52a1|\u654f|\u6377|\u62f1|\u5146|\u4e11|\u4e19|\u7545|\u82df|\u968f|\u7c7b|\u536f|\u4fdf|\u53cb|\u7b54|\u4e59|\u5141|\u7532|\u7559|\u5c3e|\u4f7c|\u7384|\u4e58|\u88d4|\u5ef6|\u690d|\u73af|\u77eb|\u8d5b|\u6614|\u4f8d|\u5ea6|\u65f7|\u9047|\u5076|\u524d|\u7531|\u548e|\u585e|\u655b|\u53d7|\u6cf7|\u88ad|\u8845|\u53d4|\u5723|\u5fa1|\u592b|\u4ec6|\u9547|\u85e9|\u90b8|\u5e9c|\u638c|\u9996|\u5458|\u7109|\u620f|\u53ef|\u667a|\u5c14|\u51ed|\u6089|\u8fdb|\u7b03|\u539a|\u4ec1|\u4e1a|\u8087|\u8d44|\u5408|\u4ecd|\u4e5d|\u8877|\u54c0|\u5211|\u4fce|\u4ef5|\u572d|\u5937|\u5fad|\u86ee|\u6c57|\u5b5b|\u4e7e|\u5e16|\u7f55|\u6d1b|\u6de6|\u6d0b|\u90b6|\u90f8|\u90ef|\u9097|\u909b|\u5251|\u8662|\u968b|\u84bf|\u8306|\u83c5|\u82cc|\u6811|\u6850|\u9501|\u949f|\u673a|\u76d8|\u94ce|\u659b|\u7389|\u7ebf|\u9488|\u7b95|\u5eb9|\u7ef3|\u78e8|\u8489|\u74ee|\u5f2d|\u5200|\u758f|\u7275|\u6d51|\u607d|\u52bf|\u4e16|\u4edd|\u540c|\u8681|\u6b62|\u6222|\u7762|\u51bc|\u79cd|\u6d82|\u8096|\u5df1|\u6ce3|\u6f5c|\u5377|\u8131|\u8c2c|\u8e49|\u8d67|\u6d6e|\u987f|\u8bf4|\u6b21|\u9519|\u5ff5|\u5919|\u65af|\u5b8c|\u4e39|\u8868|\u804a|\u6e90|\u59d3|\u543e|\u5bfb|\u5c55|\u51fa|\u4e0d|\u6237|\u95ed|\u624d|\u65e0|\u4e66|\u5b66|\u611a|\u672c|\u6027|\u96ea|\u971c|\u70df|\u5bd2|\u5c11|\u5b57|\u6865|\u677f|\u6590|\u72ec|\u5343|\u8bd7|\u5609|\u626c|\u5584|\u63ed|\u7948|\u6790|\u8d64|\u7d2b|\u9752|\u67d4|\u521a|\u5947|\u62dc|\u4f5b|\u9640|\u5f25|\u963f|\u7d20|\u957f|\u50e7|\u9690|\u4ed9|\u96bd|\u5b87|\u796d|\u9152|\u6de1|\u5854|\u7426|\u95ea|\u59cb|\u661f|\u5357|\u5929|\u63a5|\u6ce2|\u78a7|\u901f|\u799a|\u817e|\u6f6e|\u955c|\u4f3c|\u6f84|\u6f6d|\u8b07|\u7eb5|\u6e20|\u5948|\u98ce|\u6625|\u6fef|\u6c90|\u8302|\u82f1|\u5170|\u6a80|\u85e4|\u679d|\u68c0|\u751f|\u6298|\u767b|\u9a79|\u9a91|\u8c8a|\u864e|\u80a5|\u9e7f|\u96c0|\u91ce|\u79bd|\u98de|\u8282|\u5b9c|\u9c9c|\u7c9f|\u6817|\u8c46|\u5e1b|\u5b98|\u5e03|\u8863|\u85cf|\u5b9d|\u949e|\u94f6|\u95e8|\u76c8|\u5e86|\u559c|\u53ca|\u666e|\u5efa|\u8425|\u5de8|\u671b|\u5e0c|\u9053|\u8f7d|\u58f0|\u6f2b|\u7281|\u529b|\u8d38|\u52e4|\u9769|\u6539|\u5174|\u4e93|\u7766|\u4fee|\u4fe1|\u95fd|\u5317|\u5b88|\u575a|\u52c7|\u6c49|\u7ec3|\u5c09|\u58eb|\u65c5|\u4e94|\u4ee4|\u5c06|\u65d7|\u519b|\u884c|\u5949|\u656c|\u606d|\u4eea|\u6bcd|\u5802|\u4e18|\u4e49|\u793c|\u6148|\u5b5d|\u7406|\u4f26|\u537f|\u95ee|\u6c38|\u8f89|\u4f4d|\u8ba9|\u5c27|\u4f9d|\u72b9|\u4ecb|\u627f|\u5e02|\u6240|\u82d1|\u675e|\u5267|\u7b2c|\u96f6|\u8c0c|\u62db|\u7eed|\u8fbe|\u5ffb|\u516d|\u911e|\u6218|\u8fdf|\u5019|\u5b9b|\u52b1|\u7c98|\u8428|\u909d|\u8983|\u8f9c|\u521d|\u697c|\u57ce|\u533a|\u5c40|\u53f0|\u539f|\u8003|\u59ab|\u7eb3|\u6cc9|\u8001|\u6e05|\u5fb7|\u5351|\u8fc7|\u9ea6|\u66f2|\u7af9|\u767e|\u798f|\u8a00|\u7b2c\u4e94|\u4f5f|\u7231|\u5e74|\u7b2a|\u8c2f|\u54c8|\u58a8|\u5357\u5bab|\u8d4f|\u4f2f|\u4f74|\u4f58|\u725f|\u5546|\u897f\u95e8|\u4e1c\u95e8|\u5de6\u4e18|\u6881\u4e18|\u7434|\u540e|\u51b5|\u4ea2|\u7f11|\u5e05|\u5fae\u751f|\u7f8a\u820c|\u6d77|\u5f52|\u547c\u5ef6|\u5357\u95e8|\u4e1c\u90ed|\u767e\u91cc|\u94a6|\u9122|\u6c5d|\u6cd5|\u95eb|\u695a|\u664b|\u8c37\u6881|\u5bb0\u7236|\u5939\u8c37|\u62d3\u8dcb|\u58e4\u9a77|\u4e50\u6b63|\u6f06\u96d5|\u516c\u897f|\u5deb\u9a6c|\u7aef\u6728|\u989b\u5b59|\u5b50\u8f66|\u7763|\u4ec9|\u53f8\u5bc7|\u4e93\u5b98|\u9c9c\u4e8e|\u953a\u79bb|\u76d6|\u902f|\u5e93|\u90cf|\u9022|\u9634|\u8584|\u5389|\u7a3d|\u95fe\u4e18|\u516c\u826f|\u6bb5\u5e72|\u5f00|\u5149|\u64cd|\u745e|\u772d|\u6ce5|\u8fd0|\u6469|\u4f1f|\u94c1|\u8fee|";
2 +
3 +function IsIdCard(idcard)
4 +{
5 + idcard = idcard.toUpperCase();
6 + var area={11:"北京",12:"天津",13:"河北",14:"山西",15:"内蒙古",21:"辽宁",22:"吉林",23:"黑龙江",
7 + 31:"上海",32:"江苏",33:"浙江",34:"安徽",35:"福建",36:"江西",37:"山东",41:"河南",42:"湖北",
8 + 43:"湖南",44:"广东",45:"广西",46:"海南",50:"重庆",51:"四川",52:"贵州",53:"云南",54:"西藏",
9 + 61:"陕西",62:"甘肃",63:"青海",64:"宁夏",65:"新疆",71:"台湾",81:"香港",82:"澳门",91:"国外"};
10 + var retflag=false;
11 + var idcard,Y,JYM;
12 + var S,M;
13 + var idcard_array = new Array();
14 + idcard_array = idcard.split("");
15 + //地区检验
16 + if(area[parseInt(idcard.substr(0,2))]==null) return false;
17 + //身份号码位数及格式检验
18 + switch(idcard.length)
19 + {
20 + case 15:
21 + if ((parseInt(idcard.substr(6,2))+1900) % 4 == 0 ||
22 + ((parseInt(idcard.substr(6,2))+1900) % 100 == 0 && (parseInt(idcard.substr(6,2))+1900) % 4 == 0 ))
23 + {
24 + ereg=/^[1-9][0-9]{5}[0-9]{2}((01|03|05|07|08|10|12)(0[1-9]|[1-2][0-9]|3[0-1])|(04|06|09|11)(0[1-9]|[1-2][0-9]|30)|02(0[1-9]|[1-2][0-9]))[0-9]{3}$/;//测试出生日期的合法性
25 + }
26 + else
27 + {
28 + ereg=/^[1-9][0-9]{5}[0-9]{2}((01|03|05|07|08|10|12)(0[1-9]|[1-2][0-9]|3[0-1])|(04|06|09|11)(0[1-9]|[1-2][0-9]|30)|02(0[1-9]|1[0-9]|2[0-8]))[0-9]{3}$/;//测试出生日期的合法性
29 + }
30 + if(ereg.test(idcard)) return true;
31 + else return false;
32 + break;
33 + case 18:
34 + //18位身份号码检测
35 + //出生日期的合法性检查
36 + //闰年月日:((01|03|05|07|08|10|12)(0[1-9]|[1-2][0-9]|3[0-1])|(04|06|09|11)(0[1-9]|[1-2][0-9]|30)|02(0[1-9]|[1-2][0-9]))
37 + //平年月日:((01|03|05|07|08|10|12)(0[1-9]|[1-2][0-9]|3[0-1])|(04|06|09|11)(0[1-9]|[1-2][0-9]|30)|02(0[1-9]|1[0-9]|2[0-8]))
38 + if ( parseInt(idcard.substr(6,4)) % 4 == 0 ||
39 + (parseInt(idcard.substr(6,4)) % 100 == 0 &&parseInt(idcard.substr(6,4))%4 == 0 ))
40 + {
41 + ereg=/^[1-9][0-9]{5}19[0-9]{2}((01|03|05|07|08|10|12)(0[1-9]|[1-2][0-9]|3[0-1])|(04|06|09|11)(0[1-9]|[1-2][0-9]|30)|02(0[1-9]|[1-2][0-9]))[0-9]{3}[0-9Xx]$/;//闰年出生日期的合法性正则表达式
42 + }
43 + else
44 + {
45 + ereg=/^[1-9][0-9]{5}19[0-9]{2}((01|03|05|07|08|10|12)(0[1-9]|[1-2][0-9]|3[0-1])|(04|06|09|11)(0[1-9]|[1-2][0-9]|30)|02(0[1-9]|1[0-9]|2[0-8]))[0-9]{3}[0-9Xx]$/;//平年出生日期的合法性正则表达式
46 + }
47 + if(ereg.test(idcard))
48 + {//测试出生日期的合法性
49 + //计算校验位
50 + S = (parseInt(idcard_array[0]) + parseInt(idcard_array[10])) * 7
51 + + (parseInt(idcard_array[1]) + parseInt(idcard_array[11])) * 9
52 + + (parseInt(idcard_array[2]) + parseInt(idcard_array[12])) * 10
53 + + (parseInt(idcard_array[3]) + parseInt(idcard_array[13])) * 5
54 + + (parseInt(idcard_array[4]) + parseInt(idcard_array[14])) * 8
55 + + (parseInt(idcard_array[5]) + parseInt(idcard_array[15])) * 4
56 + + (parseInt(idcard_array[6]) + parseInt(idcard_array[16])) * 2
57 + + parseInt(idcard_array[7]) * 1
58 + + parseInt(idcard_array[8]) * 6
59 + + parseInt(idcard_array[9]) * 3 ;
60 + Y = S % 11;
61 + M = "F";
62 + JYM = "10X98765432";
63 + M = JYM.substr(Y,1);//判断校验位
64 + if(M == idcard_array[17]) true; //检测ID的校验位
65 + else return false;
66 + }
67 + else return false;
68 + break;
69 + default:
70 + return false;
71 + break;
72 + }
73 + return true;
74 +}
...\ No newline at end of file ...\ No newline at end of file
...@@ -69,12 +69,9 @@ ...@@ -69,12 +69,9 @@
69 //如果不尝试自动登录，直接初始化界面 69 //如果不尝试自动登录，直接初始化界面
70 if (!tryAutoLogin) 70 if (!tryAutoLogin)
71 goInit(); 71 goInit();
72 - //请求数据
73 - if (Core.isFile) {
74 - url = Core.server + url;
75 - }
76 72
77 - $.ajax({ 73 +
74 + Core.ajax({
78 type: 'GET', 75 type: 'GET',
79 url: url + '?' + params, 76 url: url + '?' + params,
80 dataType: 'json', 77 dataType: 'json',
......
...@@ -57,7 +57,9 @@ ...@@ -57,7 +57,9 @@
57 Core.showMod('login'); 57 Core.showMod('login');
58 58
59 } 59 }
60 - 60 + Home.prototype.show_after = function(){
61 + $('#login').hide()
62 + }
61 Core.registerMod('home', Home); 63 Core.registerMod('home', Home);
62 64
63 // 帮助信息模块 65 // 帮助信息模块
...@@ -164,6 +166,7 @@ ...@@ -164,6 +166,7 @@
164 Core.updateMod('frame'); 166 Core.updateMod('frame');
165 return false; 167 return false;
166 }); 168 });
169 +
167 } 170 }
168 171
169 Login.prototype.cache = function(n, p) { 172 Login.prototype.cache = function(n, p) {
...@@ -250,10 +253,10 @@ ...@@ -250,10 +253,10 @@
250 $(".pwd_box").children(".step-tab").css("display","block"); 253 $(".pwd_box").children(".step-tab").css("display","block");
251 $(".pwd_box").children(".step-box").css("display","none"); 254 $(".pwd_box").children(".step-box").css("display","none");
252 }); 255 });
253 -
254 - if (names != null) {
255 var names = JSON.parse(names); 256 var names = JSON.parse(names);
256 var userIdx = JSON.parse(user_indexs); 257 var userIdx = JSON.parse(user_indexs);
258 + if (names != null) {
259 +
257 delete names["undefined"]; 260 delete names["undefined"];
258 261
259 this.$c.find('.drop-down').show(); 262 this.$c.find('.drop-down').show();
...@@ -271,11 +274,15 @@ ...@@ -271,11 +274,15 @@
271 this.$c.find("input#js_login_username").val(initUserName); 274 this.$c.find("input#js_login_username").val(initUserName);
272 this.$c.find("input#js_login_password").val(Core.user_names[initUserName]); 275 this.$c.find("input#js_login_password").val(Core.user_names[initUserName]);
273 } 276 }
277 +
274 }else{ 278 }else{
275 this.$c.find("input#js_login_username").val(Core.first_user); 279 this.$c.find("input#js_login_username").val(Core.first_user);
276 this.$c.find("input#js_login_password").val(Core.first_password); 280 this.$c.find("input#js_login_password").val(Core.first_password);
277 } 281 }
278 if (Core.Data.other_login && this.other_login) { 282 if (Core.Data.other_login && this.other_login) {
283 + if(Core.Data.other_login.length > 0){
284 + this.$c.find(".other-login-bx").removeClass("hide");
285 + }
279 //设置第三方登录显示 286 //设置第三方登录显示
280 for (var i = 0, l = Core.Data.other_login.length; i < l; i++) { 287 for (var i = 0, l = Core.Data.other_login.length; i < l; i++) {
281 this.$c.find('.' + Core.Data.other_login[i]).removeClass('hide'); 288 this.$c.find('.' + Core.Data.other_login[i]).removeClass('hide');
...@@ -287,6 +294,14 @@ ...@@ -287,6 +294,14 @@
287 this.$c.find("input#js_login_password").val(loginPassword); 294 this.$c.find("input#js_login_password").val(loginPassword);
288 } 295 }
289 296
297 + var old_pwd = localStorage.getItem('old_pwd');
298 + if(Core.Data.new_pwd != "" && Core.Data.new_pwd == old_pwd & Core.user_names != null){
299 + this.$c.find("input#js_login_password").val(Core.user_names[this.$c.find("input#js_login_username").val()]);
300 + console.log($("input#js_login_password").val());
301 + }
302 +
303 + $("#find_pwd").find(".user-center span").html("找回密码");
304 +
290 } 305 }
291 306
292 Core.registerMod('login', Login); 307 Core.registerMod('login', Login);
...@@ -365,11 +380,18 @@ ...@@ -365,11 +380,18 @@
365 380
366 that.$c.on('click', '[type=submit],.submit', function(e) { 381 that.$c.on('click', '[type=submit],.submit', function(e) {
367 e.preventDefault(); 382 e.preventDefault();
368 - if (that.$c.find('.checkbox-2').length>0 ){ 383 + if(/[A-Z]/.test(that.$c.find("input[name='username']").val())){
369 - Core.ajax_do(that.$c.find('.ajax'), that.register_cb, 384 + Core.showTips("账号不能有大写字母！");
370 - that); 385 + }else if(/[A-Z]/.test(that.$c.find("input[name='password']").val())){
371 - } else{ 386 + Core.showTips("密码不能有大写字母！");
387 + }else if(!that.$c.find('.checkbox-2').length>0){
372 Core.showTips('请同意'+Core.PLATFORM_NAME+'网络协议',1); 388 Core.showTips('请同意'+Core.PLATFORM_NAME+'网络协议',1);
389 + }else{
390 + //如果是游客的话则调用安卓截屏方法
391 + if (that.$c.find('[name="username"]').val() == that.$c.find('[name="old_usernmae"]').val() && window.android != undefined && window.android.screenShot != undefined ){
392 + window.android.screenShot();
393 + }
394 + Core.ajax_do(that.$c.find('.ajax'), that.register_cb, that);
373 } 395 }
374 return false; 396 return false;
375 }); 397 });
...@@ -391,6 +413,7 @@ ...@@ -391,6 +413,7 @@
391 that.$c.find('[name="old_usernmae"]').val(random_name) 413 that.$c.find('[name="old_usernmae"]').val(random_name)
392 that.$c.find('[name="password"]').val(random_passwd) 414 that.$c.find('[name="password"]').val(random_passwd)
393 that.$c.find('[name="type"]').val(-1) 415 that.$c.find('[name="type"]').val(-1)
416 +
394 } 417 }
395 Register.prototype.cache = Login.prototype.cache; 418 Register.prototype.cache = Login.prototype.cache;
396 419
...@@ -404,7 +427,7 @@ ...@@ -404,7 +427,7 @@
404 Core.updateMod('home'); 427 Core.updateMod('home');
405 } 428 }
406 Register.prototype.show_after = function() { 429 Register.prototype.show_after = function() {
407 - this.set_random() 430 + this.set_random();
408 } 431 }
409 Core.registerMod('register', Register); 432 Core.registerMod('register', Register);
410 433
...@@ -443,7 +466,7 @@ ...@@ -443,7 +466,7 @@
443 Core.inherit(Find_pwd, Module); 466 Core.inherit(Find_pwd, Module);
444 Find_pwd.prototype.bind = function() { 467 Find_pwd.prototype.bind = function() {
445 var that = this; 468 var that = this;
446 - var pwd_header=["手机找回密码","密保找回密码","邮箱找回密码","联系客服","重置密码","找回密码"]; 469 + var pwd_header=["手机找回密码","密保找回密码","联系客服","重置密码","找回密码"];
447 var pwd_header_back = { 470 var pwd_header_back = {
448 0 : '<a href="#login" class="lefticon"><i class="iconfont icon-fanhui"></i></a>', 471 0 : '<a href="#login" class="lefticon"><i class="iconfont icon-fanhui"></i></a>',
449 1 : '<a href="javascript:;" class="lefticon back-btn"><i class="iconfont icon-fanhui"></i></a>' 472 1 : '<a href="javascript:;" class="lefticon back-btn"><i class="iconfont icon-fanhui"></i></a>'
...@@ -484,7 +507,6 @@ ...@@ -484,7 +507,6 @@
484 $("#js_kefu_qq").href = "http://wpa.qq.com/msgrd?v=3&uin=2739920773&site=qq&menu=yes"; 507 $("#js_kefu_qq").href = "http://wpa.qq.com/msgrd?v=3&uin=2739920773&site=qq&menu=yes";
485 $("#js_player").href = "http://wpa.qq.com/msgrd?v=3&uin=167355030&site=qq&menu=yes"; 508 $("#js_player").href = "http://wpa.qq.com/msgrd?v=3&uin=167355030&site=qq&menu=yes";
486 } 509 }
487 -
488 that.$c.on("click","#js_findPSW_getcode",function(){//找回密码获取验证码 510 that.$c.on("click","#js_findPSW_getcode",function(){//找回密码获取验证码
489 var $self = $(this) 511 var $self = $(this)
490 phone = $("#js_findPSW_mobile").val(); 512 phone = $("#js_findPSW_mobile").val();
...@@ -516,7 +538,8 @@ ...@@ -516,7 +538,8 @@
516 var code = that.$c.find("#js_findPSW_ranks").val(), 538 var code = that.$c.find("#js_findPSW_ranks").val(),
517 accout = $("#js_findPSW_accout").val(), 539 accout = $("#js_findPSW_accout").val(),
518 phoneTest = $("#js_findPSW_mobile").val(), 540 phoneTest = $("#js_findPSW_mobile").val(),
519 - iphoneReg = /^(((13[0-9]{1})|(15[0-9]{1})|(18[0-9]{1}))+\d{8})$/; 541 + //iphoneReg = /^(((13[0-9]{1})|(15[0-9]{1})|(18[0-9]{1}))+\d{8})$/;
542 + iphoneReg = /^1(3|4|5|7|8)\d{9}$/;
520 if($.trim(accout) == ""){ 543 if($.trim(accout) == ""){
521 Core.showTips('请输入账号!', false); 544 Core.showTips('请输入账号!', false);
522 return false; 545 return false;
...@@ -553,6 +576,9 @@ ...@@ -553,6 +576,9 @@
553 } 576 }
554 }); 577 });
555 }); 578 });
579 + that.$c.on("click","#returnhome",function(){
580 + that.$c.find(".user-center span").html("找回密码");
581 + });
556 that.$c.on("click","#js_confirm_resetnewpsw",function(){ 582 that.$c.on("click","#js_confirm_resetnewpsw",function(){
557 var NewPsw = that.$c.find("#js_reset_newpsw").val(), 583 var NewPsw = that.$c.find("#js_reset_newpsw").val(),
558 NewKey = that.$c.find("input[name='pwd_code']").val(), 584 NewKey = that.$c.find("input[name='pwd_code']").val(),
...@@ -570,6 +596,8 @@ ...@@ -570,6 +596,8 @@
570 $("input[name='loginPassword']").val(NewPsw); 596 $("input[name='loginPassword']").val(NewPsw);
571 names[account] = NewPsw; 597 names[account] = NewPsw;
572 localStorage.setItem('user_names',JSON.stringify(names)); 598 localStorage.setItem('user_names',JSON.stringify(names));
599 + Core.user_names = names;
600 + $("#js_reset_newpsw").val("");
573 setTimeout(function() { 601 setTimeout(function() {
574 Core.updateMod('login'); 602 Core.updateMod('login');
575 }, 500); 603 }, 500);
...@@ -599,6 +627,11 @@ ...@@ -599,6 +627,11 @@
599 that.$c.on('click', '.pwd_box .step-tab li a', function(e) { 627 that.$c.on('click', '.pwd_box .step-tab li a', function(e) {
600 var ipar = $(this).parent("li"), 628 var ipar = $(this).parent("li"),
601 iIndex = ipar.index(); 629 iIndex = ipar.index();
630 +
631 + that.$c.find("#js_findPSW_ranks").val("");
632 + $("#js_findPSW_accout").val("");
633 + $("#js_findPSW_mobile").val("");
634 +
602 that.$c.find('.step-tab').hide().siblings(".step-box").show().children("div").eq(iIndex).removeClass("hide").addClass("fn-icon-2").siblings("div").addClass("hide").removeClass("fn-icon-2"); 635 that.$c.find('.step-tab').hide().siblings(".step-box").show().children("div").eq(iIndex).removeClass("hide").addClass("fn-icon-2").siblings("div").addClass("hide").removeClass("fn-icon-2");
603 that.$c.find(".user-center span").html(pwd_header[iIndex]); 636 that.$c.find(".user-center span").html(pwd_header[iIndex]);
604 that.$c.find(".user-center a").replaceWith(pwd_header_back[1]); 637 that.$c.find(".user-center a").replaceWith(pwd_header_back[1]);
...@@ -606,13 +639,13 @@ ...@@ -606,13 +639,13 @@
606 639
607 that.$c.on('click', '.user-center a.back-btn', function(e) { 640 that.$c.on('click', '.user-center a.back-btn', function(e) {
608 $(this).parents(".new-sdk-container").find(".step-box").hide().siblings(".step-tab").show(); 641 $(this).parents(".new-sdk-container").find(".step-box").hide().siblings(".step-tab").show();
609 - that.$c.find(".user-center span").html(pwd_header[5]); 642 + that.$c.find(".user-center span").html(pwd_header[4]);
610 that.$c.find(".user-center a").replaceWith(pwd_header_back[0]); 643 that.$c.find(".user-center a").replaceWith(pwd_header_back[0]);
611 }); 644 });
612 645
613 that.$c.on('click', '.pwd_box a.kefu_subbtn', function(e) { 646 that.$c.on('click', '.pwd_box a.kefu_subbtn', function(e) {
614 $(this).parents(".step-box").hide().siblings(".step-tab").show(); 647 $(this).parents(".step-box").hide().siblings(".step-tab").show();
615 - that.$c.find(".user-center span").html(pwd_header[5]); 648 + that.$c.find(".user-center span").html(pwd_header[4]);
616 that.$c.find(".user-center a").replaceWith(pwd_header_back[1]); 649 that.$c.find(".user-center a").replaceWith(pwd_header_back[1]);
617 }); 650 });
618 651
...@@ -762,7 +795,7 @@ ...@@ -762,7 +795,7 @@
762 var that = this; 795 var that = this;
763 var SendMsg = { 796 var SendMsg = {
764 mobileReg : function(iphone){ 797 mobileReg : function(iphone){
765 - var iphoneReg = /^(((13[0-9]{1})|(15[0-9]{1})|(18[0-9]{1}))+\d{8})$/, 798 + var iphoneReg = /^1(3|4|5|7|8)\d{9}$/,
766 phoneTest = $(iphone).val(); 799 phoneTest = $(iphone).val();
767 if($.trim(phoneTest) == ""){ 800 if($.trim(phoneTest) == ""){
768 Core.showTips('请输入手机号码!', false); 801 Core.showTips('请输入手机号码!', false);
...@@ -893,6 +926,8 @@ ...@@ -893,6 +926,8 @@
893 if(res.code === 0){ 926 if(res.code === 0){
894 Core.showTips('解绑成功!', true); 927 Core.showTips('解绑成功!', true);
895 Core.Data.bind_phone = ""; 928 Core.Data.bind_phone = "";
929 + $("#js_iphone").val("");
930 + $("#js_ranks").val("");
896 setTimeout(function() { 931 setTimeout(function() {
897 Core.updateMod('home'); 932 Core.updateMod('home');
898 }, 500); 933 }, 500);
...@@ -912,6 +947,97 @@ ...@@ -912,6 +947,97 @@
912 } 947 }
913 Core.registerMod('unbindMobile', UnBindMobile); 948 Core.registerMod('unbindMobile', UnBindMobile);
914 949
950 + //实名认证
951 + var IdentityCard = function(modId) {
952 + Module.call(this, modId);
953 + }
954 + // 继承基础模块
955 + Core.inherit(IdentityCard, Module);
956 + IdentityCard.prototype.bind = function() {
957 + var that = this;
958 + this.$c.on('click', '.submit', function() {
959 + var identityCard = that.$c.find("input[name='identity_card']").val(),//身份证
960 + compellationName = that.$c.find("input[name='compellation_name']").val(),//姓名
961 + compellationNameReg = /^[\u4e00-\u9fa5]{2,10}$/i;//2-10位汉字
962 + if($.trim(identityCard) == ""){
963 + Core.showTips("请输入身份证号码",false);
964 + return false;
965 + }else if(IsIdCard(identityCard) == false){
966 + Core.showTips("请输入正确的身份证信息",false);
967 + return false;
968 + }else if($.trim(compellationName) == ""){
969 + Core.showTips("请输入姓名",false);
970 + return false;
971 + }else if(!compellationNameReg.test(compellationName)){
972 + Core.showTips("请输入正确的中文姓名",false);
973 + return false;
974 + }
975 + Core.ajax({
976 + type:"post",
977 + url:"/user/bind_identity_card?identity_card="+identityCard+"&compellation_name="+compellationName,
978 + data:{format:"json"},
979 + dataType:"json",
980 + success:function(res){
981 + if(res.code === 0){
982 + Core.showTips('认证成功!', true);
983 + Core.Data.compellation_name = compellationName;
984 + Core.Data.identity_card = identityCard;
985 + setTimeout(function() {
986 + Core.updateMod('home');
987 + }, 500);
988 + }else{
989 + Core.showTips(res.msg, true);
990 + }
991 + }
992 + });
993 + });
994 + }
995 + IdentityCard.prototype.show_after = function(){
996 +
997 + }
998 + Core.registerMod('identityCard', IdentityCard);
999 +
1000 + //已认证
1001 + var IdentityCardOk = function(modId) {
1002 + Module.call(this, modId);
1003 + }
1004 + // 继承基础模块
1005 + Core.inherit(IdentityCardOk, Module);
1006 + IdentityCardOk.prototype.show_after = function(){
1007 + var compellation_name = Core.Data.compellation_name,//姓名
1008 + identity_card = Core.Data.identity_card;//身份证
1009 + if(compellation_name.length == 2){
1010 + var getBefore = compellation_name.substring(0,1),
1011 + nameHtml = getBefore+"*";
1012 + }else if(compellation_name.length == 3){
1013 + var getBefore = compellation_name.substring(0,1),
1014 + nameHtml = getBefore+"**";
1015 + }else if(compellation_name.length == 4){
1016 + var getBefore = compellation_name.substring(0,2),
1017 + nameHtml = getBefore+"**";
1018 + }else if(compellation_name.length > 4){
1019 + var getBefore = compellation_name.substring(0,2),
1020 + starNum = compellation_name.length,
1021 + star = "";
1022 + for(var i = 0;i<starNum - 2;i++){
1023 + star += "*";
1024 + }
1025 + nameHtml = getBefore+star;
1026 + };
1027 + if(identity_card.length == 15){
1028 + var getBefore = identity_card.substring(0,1),
1029 + getAfter = identity_card.substring(14,15),
1030 + cardHtml = getBefore+"*************"+getAfter;
1031 + }else if(identity_card.length == 18){
1032 + var getBefore = identity_card.substring(0,1),
1033 + getAfter = identity_card.substring(17,18),
1034 + cardHtml = getBefore+"****************"+getAfter;
1035 + };
1036 + this.$c.find(".compellation_name").html(nameHtml);
1037 + this.$c.find(".identity_card").html(cardHtml);
1038 + };
1039 + Core.registerMod('identityCard_ok', IdentityCardOk);
1040 +
915 // Mail模块 1041 // Mail模块
916 var Mail = function(modId) { 1042 var Mail = function(modId) {
917 Module.call(this, modId); 1043 Module.call(this, modId);
...@@ -982,24 +1108,27 @@ ...@@ -982,24 +1108,27 @@
982 }); 1108 });
983 } 1109 }
984 Answer_question.prototype.aq_cb = function(data) { 1110 Answer_question.prototype.aq_cb = function(data) {
1111 + console.log(data);
985 var code = data.code; 1112 var code = data.code;
986 var msg = data.msg; 1113 var msg = data.msg;
987 var name = localStorage.getItem('user_names'); 1114 var name = localStorage.getItem('user_names');
988 Core.updateData(msg); 1115 Core.updateData(msg);
989 Core.Data.new_pwd = msg.password; 1116 Core.Data.new_pwd = msg.password;
990 1117
1118 + name = JSON.parse(name);
991 if(name == null){ 1119 if(name == null){
992 name = null; 1120 name = null;
993 }else{ 1121 }else{
994 - name = JSON.parse(name);
995 - }
996 name[msg.nickname] = msg.password; 1122 name[msg.nickname] = msg.password;
1123 + }
1124 +
997 localStorage.setItem('user_names',JSON.stringify(name)); 1125 localStorage.setItem('user_names',JSON.stringify(name));
998 Core.user_names = name; 1126 Core.user_names = name;
999 1127
1000 // 强制更新显示重置密码模块 1128 // 强制更新显示重置密码模块
1001 Core.updateMod('reset_pwd'); 1129 Core.updateMod('reset_pwd');
1002 - Core.showTips('重置成功.',true,1000) 1130 + Core.showTips('重置成功.',true,1000);
1131 + localStorage.setItem('old_pwd',Core.Data.new_pwd);
1003 } 1132 }
1004 Core.registerMod('answer_question', Answer_question); 1133 Core.registerMod('answer_question', Answer_question);
1005 1134
...@@ -1012,7 +1141,14 @@ ...@@ -1012,7 +1141,14 @@
1012 var that = this; 1141 var that = this;
1013 that.$c.on('click', '[type=submit],.submit', function(e) { 1142 that.$c.on('click', '[type=submit],.submit', function(e) {
1014 e.preventDefault(); 1143 e.preventDefault();
1144 + if(/[A-Z]/.test(that.$c.find("input[name='username']").val())){
1145 + Core.showTips("账号不能有大写字母！");
1146 + }else if(/[A-Z]/.test(that.$c.find("input[name='newpwd']").val())){
1147 + Core.showTips("密码不能有大写字母！");
1148 + }else{
1015 Core.ajax_do(that.$c.find('.ajax'), that.modify_cb, that); 1149 Core.ajax_do(that.$c.find('.ajax'), that.modify_cb, that);
1150 + }
1151 +
1016 return false; 1152 return false;
1017 }); 1153 });
1018 that.$c.on('click', '.op-logout', function(e) { 1154 that.$c.on('click', '.op-logout', function(e) {
...@@ -1310,11 +1446,11 @@ ...@@ -1310,11 +1446,11 @@
1310 1446
1311 var names = localStorage.getItem("user_names"), 1447 var names = localStorage.getItem("user_names"),
1312 userIndexs = localStorage.getItem("user_indexs"); 1448 userIndexs = localStorage.getItem("user_indexs");
1313 -
1314 - if (names == null)
1315 - names = null;
1316 - else {
1317 names = JSON.parse(names); 1449 names = JSON.parse(names);
1450 + if (names == null){
1451 + names = null
1452 + }
1453 + else {
1318 delete names["undefined"]; 1454 delete names["undefined"];
1319 var user_indexs = []; 1455 var user_indexs = [];
1320 for (var item in names){//遍历对象，排序 1456 for (var item in names){//遍历对象，排序
......
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
17 } 17 }
18 Core.inherit(Home, Module); 18 Core.inherit(Home, Module);
19 Home.prototype.bind = function() { 19 Home.prototype.bind = function() {
20 + $('#loading').click(function(){$(this).hide()})
20 var that = this; 21 var that = this;
21 that.$c.on('click', 'input[type=button]', function(e) { 22 that.$c.on('click', 'input[type=button]', function(e) {
22 // 更新要兑换的元宝 23 // 更新要兑换的元宝
...@@ -30,6 +31,7 @@ ...@@ -30,6 +31,7 @@
30 Core.Data.money = Core.Data.youai_star / Core.Data.rate; 31 Core.Data.money = Core.Data.youai_star / Core.Data.rate;
31 Core.updateMod('exchange'); 32 Core.updateMod('exchange');
32 } else { 33 } else {
34 +
33 // 用户游爱星不足够兑换，进入充值渠道列表 35 // 用户游爱星不足够兑换，进入充值渠道列表
34 Core.Data.money = youai_star_need / Core.Data.rate; 36 Core.Data.money = youai_star_need / Core.Data.rate;
35 Core.Data.youai_star = youai_star_need; 37 Core.Data.youai_star = youai_star_need;
...@@ -38,7 +40,12 @@ ...@@ -38,7 +40,12 @@
38 return false; 40 return false;
39 }); 41 });
40 } 42 }
43 + Home.prototype.show_after = function(){
41 44
45 + setTimeout(function(){
46 + $('#back-btn').show();
47 + },3000)
48 + }
42 Core.registerMod('home', Home); 49 Core.registerMod('home', Home);
43 50
44 /** 51 /**
...@@ -143,7 +150,7 @@ ...@@ -143,7 +150,7 @@
143 var reload = false; 150 var reload = false;
144 var list = Core.Data.game_pay_channel_list; 151 var list = Core.Data.game_pay_channel_list;
145 var $c = $(e.target); 152 var $c = $(e.target);
146 - var id = $c.attr('data-id'); 153 + var id = $(this).attr('data-id');
147 for ( var index in list) { 154 for ( var index in list) {
148 var item = list[index]; 155 var item = list[index];
149 if (id == item.id) { 156 if (id == item.id) {
...@@ -908,22 +915,23 @@ ...@@ -908,22 +915,23 @@
908 Core.Data.enter_amount = Core.Data.enter_game_amount / Core.Data.exchange_rate; 915 Core.Data.enter_amount = Core.Data.enter_game_amount / Core.Data.exchange_rate;
909 Core.Data.pay_again = 0; 916 Core.Data.pay_again = 0;
910 } 917 }
911 - if (Core.Data.enter_game_amount > 0 918 + //if (Core.Data.enter_game_amount > 0
912 - && Core.Data.enter_amount <= Core.Data.total_amount) { 919 + // && Core.Data.enter_amount <= Core.Data.total_amount) {
913 - // 需要进入兑换页面 920 + // // 需要进入兑换页面
914 - Core.start_page = "exchange"; 921 + // Core.start_page = "exchange";
915 - Core.Data.game_amount = Core.Data.enter_game_amount; 922 + // Core.Data.game_amount = Core.Data.enter_game_amount;
916 - Core.Data.youai_star = Core.Data.enter_amount; 923 + // Core.Data.youai_star = Core.Data.enter_amount;
917 - Core.Data.money = Core.Data.youai_star / Core.Data.rate; 924 + // Core.Data.money = Core.Data.youai_star / Core.Data.rate;
918 - } else if (Core.Data.enter_game_amount > 0) { 925 + //} else
926 + //if (Core.Data.enter_game_amount > 0) {
919 // 需要进入渠道充值页面 927 // 需要进入渠道充值页面
920 Core.start_page = "channel_list"; 928 Core.start_page = "channel_list";
921 Core.Data.game_amount = Core.Data.enter_game_amount; 929 Core.Data.game_amount = Core.Data.enter_game_amount;
922 Core.Data.youai_star = Core.Data.enter_amount; 930 Core.Data.youai_star = Core.Data.enter_amount;
923 Core.Data.money = Core.Data.youai_star / Core.Data.rate; 931 Core.Data.money = Core.Data.youai_star / Core.Data.rate;
924 - } else { 932 + //} else {
925 - // 没有输入充值数量，进入选择数量的界面 933 + // // 没有输入充值数量，进入选择数量的界面
926 - } 934 + //}
927 } 935 }
928 936
929 function onBridgeReady() { 937 function onBridgeReady() {
......
1 +/*!
2 +** create by zhangxinxu(.com) 2013-07-15
3 +** a simple method for custom scrolling
4 +** it can be used on both mobile and parts desktop browser IE9+/FF/Chrome/...
5 +*/
6 +var simpScroller=(function(){var c=!((window.DocumentTouch&&document instanceof window.DocumentTouch)||"ontouchstart" in window)*1,b={start:["touchstart","mousedown"][c],move:["touchmove","mousemove"][c],end:["touchend","mouseup"][c]};var a=function(e,l,f){var n="top",o="Top",p="height",g="Height",d="pageY";if(l=="horizontal"){n="left";o="Left";p="width";g="Width";d="pageX"}var i=null;if(f.hideScrollBar==false){i=document.createElement("div");i.className="scroller_"+l;f.container.appendChild(i)}var m=e["client"+g],h=0;var j=function(){if(i==null){return}var r=i.style[p].replace("px",""),q=e["scroll"+o]/(h-m)*(m-r);if(m-r-q<=0){q=m-r}i.style[n]=q+"px"};var k={};e.addEventListener(b.start,function(q){h=this["scroll"+g];k[d]=q.touches?q.touches[0][d]:q[d];k[n]=this["scroll"+o];document.moveFollow=true;if(i&&h>m){i.style.opacity=1;i.style[p]=(m*m/h)+"px";j()}c&&q.preventDefault()});e.addEventListener(b.move,function(q){if(c==false||(document.moveFollow==true)){this["scroll"+o]=k[n]+(k[d]-(q.touches?q.touches[0][d]:q[d]));j();f.onScroll.call(this,q)}q.preventDefault()});e.addEventListener(b.end,function(q){i&&(i.style.opacity=0)});if(c==true){document.addEventListener("mouseup",function(){this.moveFollow=false})}};return function(d,f){f=f||{};var j=new Object({verticalScroll:true,horizontalScroll:false,hideScrollBar:false,onScroll:function(){}}),g;for(g in f){j[g]=f[g]}if(window.getComputedStyle(d).position=="static"){d.style.position="relative"}var i=d.childNodes,e=document.createDocumentFragment();[].slice.call(i).forEach(function(k){e.appendChild(k)});var h=document.createElement("div");h.style.height="100%";h.style.width="100%";h.style.overflow="hidden";d.appendChild(h);h.appendChild(e);j.container=d;if(j.verticalScroll==true){a(h,"vertical",j)}if(j.horizontalScroll==true){a(h,"horizontal",j)}}})();
...\ No newline at end of file ...\ No newline at end of file
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
33 <span></span> 33 <span></span>
34 </div> 34 </div>
35 <!-- 登录模块 --> 35 <!-- 登录模块 -->
36 -<section id="login" class="hide" data-replace="1"> 36 +<section id="login" class="" data-replace="1">
37 <div class="new-sdk-container"> 37 <div class="new-sdk-container">
38 <div class="new-container-box"> 38 <div class="new-container-box">
39 <div class="SDK-titlebox"></div> 39 <div class="SDK-titlebox"></div>
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
49 <i class="iconfont icon-xiangxia"></i> 49 <i class="iconfont icon-xiangxia"></i>
50 </div> 50 </div>
51 </div> 51 </div>
52 - <div class="pull-box"> 52 + <div class="pull-box horizontall">
53 <ul class="drop-ul"> 53 <ul class="drop-ul">
54 54
55 </ul> 55 </ul>
...@@ -60,17 +60,17 @@ ...@@ -60,17 +60,17 @@
60 <div class="iright"><input type="password" name="password" placeholder="请输入密码" id="js_login_password"></div> 60 <div class="iright"><input type="password" name="password" placeholder="请输入密码" id="js_login_password"></div>
61 </div> 61 </div>
62 <div class="other-login clearfix"> 62 <div class="other-login clearfix">
63 - <!--<p>第三方登录 63 + <p class="other-login-bx hide">第三方登录
64 - <a title="新浪微博帐号登录" data-replace="href" href="/user/auth2/sina/login/?next=/static/sdk_3/login.html&app_id={app_id}" class="sina hide"> 64 + <a title="新浪微博帐号登录" data-replace="href" href="/user/auth2/sina/login/?next=/static/sdk/login.html&app_id={app_id}" class="sina hide">
65 <i class=" iconfont icon-unie61d"></i> 65 <i class=" iconfont icon-unie61d"></i>
66 </a> 66 </a>
67 67
68 - <a title="QQ号码登录" data-replace="href" href="/user/auth2/qq/login/?next=/static/sdk_3/login.html&app_id={app_id}" class="qq iframe hide"> 68 + <a title="QQ号码登录" data-replace="href" href="/user/auth2/qq/login/?next=/static/sdk/login.html&app_id={app_id}" class="qq iframe hide">
69 </a> 69 </a>
70 70
71 - <a title="微信登录" data-replace="href" href="sdk://weixinlogin?app_id={app_id}&next=/static/sdk_3/login.html" class="weixin hide"> 71 + <a title="微信登录" data-replace="href" href="sdk://weixinlogin?app_id={app_id}&next=/static/sdk/login.html" class="weixin hide">
72 </a> 72 </a>
73 - </p>--> 73 + </p>
74 74
75 <label><a href="#find_pwd" class="forgetpsw">找回密码</a></label> 75 <label><a href="#find_pwd" class="forgetpsw">找回密码</a></label>
76 <div class="clear"></div> 76 <div class="clear"></div>
...@@ -136,9 +136,9 @@ ...@@ -136,9 +136,9 @@
136 <div class="ileft">账号：</div> 136 <div class="ileft">账号：</div>
137 <div class="iright"> 137 <div class="iright">
138 <input type="text" name="username" placeholder="帐号由3-18个英文、数字、点、减号、下划线组成" required> 138 <input type="text" name="username" placeholder="帐号由3-18个英文、数字、点、减号、下划线组成" required>
139 - <div class="bottom-icon drop-down"> 139 + <!--<div class="bottom-icon drop-down">
140 <i class="iconfont icon-xiangxia"></i> 140 <i class="iconfont icon-xiangxia"></i>
141 - </div> 141 + </div>-->
142 </div> 142 </div>
143 </div> 143 </div>
144 <div class="inputbox clearfix"> 144 <div class="inputbox clearfix">
...@@ -150,7 +150,7 @@ ...@@ -150,7 +150,7 @@
150 <div class="checkbox checkbox-2 l" > 150 <div class="checkbox checkbox-2 l" >
151 <i class="iconfont icon-xuanzhong"></i> 151 <i class="iconfont icon-xuanzhong"></i>
152 </div> 152 </div>
153 - <p class="l">接受<a href="agreement.html">网络服务协议</a></p> 153 + <p class="l">接受<a href="#agreement">网络服务协议</a></p>
154 </span> 154 </span>
155 155
156 </div> 156 </div>
...@@ -173,14 +173,12 @@ ...@@ -173,14 +173,12 @@
173 <div class="new-sdk-container"> 173 <div class="new-sdk-container">
174 <div class="SDK-titlebox"></div> 174 <div class="SDK-titlebox"></div>
175 <div class="new-sdk-logo"><a href="#"><img src="images/new-sdk-logo.png"></a></div> 175 <div class="new-sdk-logo"><a href="#"><img src="images/new-sdk-logo.png"></a></div>
176 - <div class="new-sdk-content"> 176 + <div class="new-sdk-content" style="overflow: hidden;">
177 <h3>网络服务协议</h3> 177 <h3>网络服务协议</h3>
178 - <div class="content-main"> 178 + <div class="content-main" style="height: 220px;">
179 - <p>欢迎申请手游平台（下列简称为”本平台“）提供的服务。请仔细阅读以下全部内容。如用户不同意本服务条款任意内容，请不要注册或使用本平台服务。一旦注册成功，即表示用户与平台已达成协议，自愿接受本服务条款的所有内容。此后，用户不得以阅读本服务条款内容作任何形式的抗辩。</p> 179 +
180 - <h4>一、账号注册</h4> 180 + <iframe src="agreement.html" name="myiframe" id="iframepage" frameborder="0" scrolling="auto" width="100%"></iframe>
181 - <p>欢迎申请手游平台（下列简称为”本平台“）提供的服务。请仔细阅读以下全部内容。如用户不同意本服务条款任意内容，请不要注册或使用本平台服务。一旦注册成功，即表示用户与平台已达成协议，自愿接受本服务条款的所有内容。此后，用户不得以阅读本服务条款内容作任何形式的抗辩。</p> 181 +
182 - <h4>二、账号注册</h4>
183 - <p>欢迎申请手游平台（下列简称为”本平台“）提供的服务。请仔细阅读以下全部内容。如用户不同意本服务条款任意内容，请不要注册或使用本平台服务。一旦注册成功，即表示用户与平台已达成协议，自愿接受本服务条款的所有内容。此后，用户不得以阅读本服务条款内容作任何形式的抗辩。</p>
184 </div> 182 </div>
185 </div> 183 </div>
186 184
...@@ -254,6 +252,10 @@ ...@@ -254,6 +252,10 @@
254 <!-- end --> 252 <!-- end -->
255 <section id="message_detail" class="hide" data-attr="dot"> 253 <section id="message_detail" class="hide" data-attr="dot">
256 </section> 254 </section>
255 +<section id="identityCard" class="hide" data-attr="dot">
256 +</section>
257 +<section id="identityCard_ok" class="hide" data-attr="dot">
258 +</section>
257 <!-- 找回密码模块 --> 259 <!-- 找回密码模块 -->
258 <section id="find_pwd" class="hide" data-replace="1"> 260 <section id="find_pwd" class="hide" data-replace="1">
259 <input type="hidden" name="pwd_code" value=""> 261 <input type="hidden" name="pwd_code" value="">
...@@ -290,7 +292,7 @@ ...@@ -290,7 +292,7 @@
290 </div> 292 </div>
291 <ul class="inline-btn" style="margin-top: 15px;"> 293 <ul class="inline-btn" style="margin-top: 15px;">
292 <li style="background: none;"><a class="larg btn btn-orange" value="" id="js_findPSW_confirm">确定</a></li> 294 <li style="background: none;"><a class="larg btn btn-orange" value="" id="js_findPSW_confirm">确定</a></li>
293 - <li style="background: none; border-radius: 20px;"><a class="btn" href="#home">返回</a></li> 295 + <li style="background: none; border-radius: 20px;"><a class="btn" href="#home" id="returnhome">返回</a></li>
294 </ul> 296 </ul>
295 </div> 297 </div>
296 </div> 298 </div>
...@@ -313,7 +315,7 @@ ...@@ -313,7 +315,7 @@
313 </div>--> 315 </div>-->
314 <div class="function-list-content hide"> 316 <div class="function-list-content hide">
315 <div class="pwd_txt"> 317 <div class="pwd_txt">
316 - <div class="default_text" style="display: none;"> 318 + <div class="default_text">
317 <p>客服QQ：<a href="javascript:;" id="js_kefu_qq"></a></p> 319 <p>客服QQ：<a href="javascript:;" id="js_kefu_qq"></a></p>
318 <p>客服电话：<a href="tel:"></a></p> 320 <p>客服电话：<a href="tel:"></a></p>
319 <p>玩家交流群：<a href="javascript:;" id="js_player"></a></p> 321 <p>玩家交流群：<a href="javascript:;" id="js_player"></a></p>
...@@ -433,7 +435,7 @@ ...@@ -433,7 +435,7 @@
433 </div> 435 </div>
434 </div> 436 </div>
435 </div> 437 </div>
436 - {{?? Core.Data.is_guest == 2}} 438 + {{?? Core.Data.is_guest == 2}}<!--1:游客登录；2：第三方登录；0：正式用户登录-->
437 <div class="user-center-box"> 439 <div class="user-center-box">
438 <div class="top clearfix" style="border-bottom: none;"> 440 <div class="top clearfix" style="border-bottom: none;">
439 <div class="pull-left txt w_45"> 441 <div class="pull-left txt w_45">
...@@ -444,18 +446,24 @@ ...@@ -444,18 +446,24 @@
444 <a href="javascript:Core.finishLogin()" class="btn btn-orange">进入游戏</a> 446 <a href="javascript:Core.finishLogin()" class="btn btn-orange">进入游戏</a>
445 </div> 447 </div>
446 </div> 448 </div>
447 - <ul class="list-item clearfix">
448 {{? Core.Data.bind_phone === ""}} 449 {{? Core.Data.bind_phone === ""}}
450 + <ul class="list-item clearfix">
449 <li style="position: relative;"><a href="#bindMobile">绑定手机</a><span class="redround"></span></li> 451 <li style="position: relative;"><a href="#bindMobile">绑定手机</a><span class="redround"></span></li>
450 - {{??}}
451 - <li><a href="#unbindMobile">解绑手机</a></li>
452 - {{?}}
453 - <!--<li><a href="#mail">绑定邮箱</a></li>-->
454 <li><a href="#mibao">设置密保</a></li> 452 <li><a href="#mibao">设置密保</a></li>
455 <li><a href="#modify_pwd">修改密码</a></li> 453 <li><a href="#modify_pwd">修改密码</a></li>
456 </ul> 454 </ul>
457 - </div>
458 {{??}} 455 {{??}}
456 + <ul class="list-item clearfix">
457 + <li style="width:50%;"><a href="#unbindMobile">解绑手机</a></li>
458 + <li style="width:50%;"><a href="#mibao">设置密保</a></li>
459 + </ul>
460 + <ul class="list-item clearfix" style="border-top:none;">
461 + <li style="width:50%;"><a href="#modify_pwd">修改密码</a></li>
462 + <li style="width:50%;"><a href="#identityCard">实名认证</a></li>
463 + </ul>
464 + {{?}}
465 + </div>
466 + {{?? Core.Data.is_guest == 0}}
459 <div class="user-center-box"> 467 <div class="user-center-box">
460 <div class="top clearfix" style="border-bottom: none;"> 468 <div class="top clearfix" style="border-bottom: none;">
461 <div class="pull-left txt w_45"> 469 <div class="pull-left txt w_45">
...@@ -466,16 +474,40 @@ ...@@ -466,16 +474,40 @@
466 <a href="javascript:Core.finishLogin()" class="btn btn-orange">进入游戏</a> 474 <a href="javascript:Core.finishLogin()" class="btn btn-orange">进入游戏</a>
467 </div> 475 </div>
468 </div> 476 </div>
477 +
478 + {{? Core.Data.bind_phone === ""}}
469 <ul class="list-item clearfix"> 479 <ul class="list-item clearfix">
480 + <li style="position: relative;"><a href="#bindMobile">绑定手机</a><span class="redround"></span></li>
481 + <li><a href="#mibao">设置密保</a></li>
482 + <li><a href="#modify_pwd">修改密码</a></li>
483 + </ul>
484 + {{??}}
485 + <ul class="list-item clearfix">
486 + <li style="width:50%;"><a href="#unbindMobile">解绑手机</a></li>
487 + <li style="width:50%;"><a href="#mibao">设置密保</a></li>
488 + </ul>
489 + <ul class="list-item clearfix" style="border-top:none;">
490 + <li style="width:50%;"><a href="#modify_pwd">修改密码</a></li>
491 + {{? Core.Data.compellation_name === "" && Core.Data.identity_card === ""}}
492 + <li style="width:50%;"><a href="#identityCard">实名认证</a></li>
493 + {{??}}
494 + <li style="width:50%;position:relative;"><a href="#identityCard_ok">实名认证
495 + <span style="position:absolute;right:5px;top:5px;color:#fff;background:#ff9600;padding:3px 10px;border-radius:10px;font-size:20px;">已认证</span>
496 + </a></li>
497 + {{?}}
498 + </ul>
499 + {{?}}
500 + <!--<ul class="list-item clearfix">
470 {{? Core.Data.bind_phone === ""}} 501 {{? Core.Data.bind_phone === ""}}
471 <li style="position: relative;"><a href="#bindMobile">绑定手机</a><span class="redround"></span></li> 502 <li style="position: relative;"><a href="#bindMobile">绑定手机</a><span class="redround"></span></li>
472 {{??}} 503 {{??}}
473 <li><a href="#unbindMobile">解绑手机</a></li> 504 <li><a href="#unbindMobile">解绑手机</a></li>
505 + <li><a href="#">实名认证</a></li>
474 {{?}} 506 {{?}}
475 - <!--<li><a href="#mail">绑定邮箱</a></li> -->
476 <li><a href="#mibao">设置密保</a></li> 507 <li><a href="#mibao">设置密保</a></li>
477 <li><a href="#modify_pwd">修改密码</a></li> 508 <li><a href="#modify_pwd">修改密码</a></li>
478 - </ul> 509 +
510 + </ul>-->
479 </div> 511 </div>
480 512
481 {{?}} 513 {{?}}
...@@ -610,6 +642,28 @@ ...@@ -610,6 +642,28 @@
610 642
611 643
612 </script> 644 </script>
645 +
646 +<script id="identityCard_template" type="text/x-jquery-tmpl" >
647 + <div class="new-sdk-container">
648 + <div class="SDK-titlebox"></div>
649 + <div class="user-center">
650 + <a href="#home" class="lefticon">
651 + <i class="iconfont icon-fanhui"></i>
652 + </a>
653 + 实名认证
654 + </div>
655 + <form action="/user/bind_identity_card" method="post" class="ajax" onkeydown="if(event.keyCode==13) return false;" >
656 + <div class="new-sdk-box">
657 + <div class="input" style="padding:0 25px;"><input type="text" name="identity_card" required placeholder="请输入注册身份证号码" style="text-align: left;"></div>
658 + <div class="input" style="padding:0 25px;"><input type="text" name="compellation_name" required placeholder="请输入姓名" style="text-align: left;"></div>
659 + </div>
660 + <ul class="inline-btn">
661 + <li style="padding: 1em 0; float: none; margin: 0 auto;"><a class="submit btn larg btn-orange" autocomplete="off">提交</a></li>
662 + </ul>
663 + </form>
664 + </div>
665 +</script>
666 +
613 <script id="mibao_template" type="text/x-jquery-tmpl" > 667 <script id="mibao_template" type="text/x-jquery-tmpl" >
614 {{? Core.Data.safe_question == "" }} 668 {{? Core.Data.safe_question == "" }}
615 <div class="new-sdk-container"> 669 <div class="new-sdk-container">
...@@ -620,21 +674,25 @@ ...@@ -620,21 +674,25 @@
620 </a> 674 </a>
621 设置密保 675 设置密保
622 </div> 676 </div>
623 - <form action="/sdk/set_mibao" mthod="post" class="ajax" todo="mibao_callback" > 677 + <form action="/sdk/set_mibao" mthod="post" class="ajax" todo="mibao_callback" onkeydown="if(event.keyCode==13) return false;" >
624 <div class="new-sdk-box"> 678 <div class="new-sdk-box">
625 - <div class="input select" style="padding: 25px;"> 679 + <div class="input select" style="padding:0 25px; position: relative;">
626 <select name="question" class="" > 680 <select name="question" class="" >
627 {{~ Core.Data.question_list :item:index }} 681 {{~ Core.Data.question_list :item:index }}
628 <option value='{{=item}}'>{{=item}}</option> 682 <option value='{{=item}}'>{{=item}}</option>
629 {{~}} 683 {{~}}
630 -
631 </select> 684 </select>
685 + <i class="iconfont icon-xiangxia" style="
686 + position: absolute;
687 + right: -25px;
688 + top: 21px;
689 + "></i>
632 </div> 690 </div>
633 <div class="input" style="padding:0 25px;"><input type="text" name="answer" required placeholder="输入密保保护答案" style="text-align: left;"></div> 691 <div class="input" style="padding:0 25px;"><input type="text" name="answer" required placeholder="输入密保保护答案" style="text-align: left;"></div>
634 <p style="color: #595757; font-size: 18px; margin-top: 10px;">设置密保，能通过回答问题找回忘记的密码</p> 692 <p style="color: #595757; font-size: 18px; margin-top: 10px;">设置密保，能通过回答问题找回忘记的密码</p>
635 </div> 693 </div>
636 <ul class="inline-btn"> 694 <ul class="inline-btn">
637 - <li style="padding: 1em 0; float: none; margin: 0 auto;"><a class="submit btn larg btn-orange ">保存设置</a></li> 695 + <li style="padding: 1em 0; float: none; margin: 0 auto;"><a class="submit btn larg btn-orange" autocomplete="off">保存设置</a></li>
638 </ul> 696 </ul>
639 </form> 697 </form>
640 </div> 698 </div>
...@@ -663,7 +721,7 @@ ...@@ -663,7 +721,7 @@
663 <div class="new-sdk-container"> 721 <div class="new-sdk-container">
664 <div class="SDK-titlebox"></div> 722 <div class="SDK-titlebox"></div>
665 <div class="user-center"> 723 <div class="user-center">
666 - <a href="#login" class="lefticon"> 724 + <a href="#login" class="lefticon back-btn">
667 <i class="iconfont icon-fanhui"></i> 725 <i class="iconfont icon-fanhui"></i>
668 </a> 726 </a>
669 密保找回密码 727 密保找回密码
...@@ -817,6 +875,23 @@ ...@@ -817,6 +875,23 @@
817 </div> 875 </div>
818 </div> 876 </div>
819 </script> 877 </script>
878 +<script id="identityCard_ok_template" type="text/x-jquery-tmpl">
879 + <div class="new-sdk-container">
880 + <div class="SDK-titlebox"></div>
881 + <div class="user-center">
882 + <a href="#home" class="lefticon">
883 + <i class="iconfont icon-fanhui"></i>
884 + </a>
885 + 实名认证
886 + </div>
887 + <div class="new-sdk-box">
888 + <div class="acount-name">
889 + <p style="margin-top: 0;">姓名：<span class="compellation_name"></span></p>
890 + <p>身份证：<span class="identity_card"></span></p>
891 + </div>
892 + </div>
893 + </div>
894 +</script>
820 <script id="message_detail_template" type="text/x-jquery-tmpl"> 895 <script id="message_detail_template" type="text/x-jquery-tmpl">
821 <div class="header"> 896 <div class="header">
822 <a class="btn pull-left op-back" href="#message">返回</a> 897 <a class="btn pull-left op-back" href="#message">返回</a>
...@@ -921,6 +996,7 @@ ...@@ -921,6 +996,7 @@
921 <script type="text/javascript" src="js/doT.min.js?20150923001" ></script> 996 <script type="text/javascript" src="js/doT.min.js?20150923001" ></script>
922 <script type="text/javascript" src="js/iscroll.min.1.0.js?20150923001" ></script> 997 <script type="text/javascript" src="js/iscroll.min.1.0.js?20150923001" ></script>
923 <script type="text/javascript"> 998 <script type="text/javascript">
999 +
924 window.isGetData = 0; 1000 window.isGetData = 0;
925 $(function() { 1001 $(function() {
926 FastClick.attach(document.body); 1002 FastClick.attach(document.body);
...@@ -929,13 +1005,14 @@ FastClick.attach(document.body); ...@@ -929,13 +1005,14 @@ FastClick.attach(document.body);
929 <script type="text/javascript" src="js/core.min.js?20150923001" ></script> 1005 <script type="text/javascript" src="js/core.min.js?20150923001" ></script>
930 <script type="text/javascript" src="js/login.min.js?2016111" ></script> 1006 <script type="text/javascript" src="js/login.min.js?2016111" ></script>
931 <script type="text/javascript" src="js/loader.min.js?20150923001"></script> 1007 <script type="text/javascript" src="js/loader.min.js?20150923001"></script>
932 - 1008 +<script type="text/javascript" src="js/simpScroller-min.js"></script>
1009 +<script type="text/javascript" src="js/identity_id.js" ></script>
933 <script type="text/javascript"> 1010 <script type="text/javascript">
934 window.onload = window.onresize = initMatching; 1011 window.onload = window.onresize = initMatching;
935 (function(){ 1012 (function(){
936 getData('/sdk/login/json'); 1013 getData('/sdk/login/json');
937 })(); 1014 })();
938 - 1015 +simpScroller(document.querySelector(".horizontall"), {});
939 // $(document).ready(function(){ 1016 // $(document).ready(function(){
940 // setTimeout(function(){Core.showTips($("meta[name='viewport']")[0].getAttribute("content"));}, 2000) 1017 // setTimeout(function(){Core.showTips($("meta[name='viewport']")[0].getAttribute("content"));}, 2000)
941 // }) 1018 // })
......
...@@ -160,29 +160,28 @@ ...@@ -160,29 +160,28 @@
160 <div class="container"> 160 <div class="container">
161 <div class="box_info_center"> 161 <div class="box_info_center">
162 <h2 class="align-left"> 162 <h2 class="align-left">
163 - 请选择要充值{{=Core.Data.game_unit_name || ''}}的数量 163 +
164 </h2> 164 </h2>
165 <p class="align-left text-muted"> 165 <p class="align-left text-muted">
166 - 注：充值 <span class="text-info">1</span>元可购买 <span class="text-info">{{=Core.Data.exchange_rate*Core.Data.rate || ''}}</span>{{=Core.Data.game_unit || ''}}{{=Core.Data.game_unit_name || ''}} 166 +
167 </p> 167 </p>
168 - <div class="amount_level align-left" > 168 + <br>
169 - {{~ Core.Data.amount_level :item:index }}
170 - {{? parseInt(item) }}
171 - <input type="button" value="{{=parseInt(item)}}" class="btn" data="{{=item}}" />
172 - {{?}}
173 - {{~}}
174 - </div>
175 <p class="align-left text-success tips9133"> 169 <p class="align-left text-success tips9133">
176 {{? Core.Data.pay_only != 1 }} 170 {{? Core.Data.pay_only != 1 }}
177 {{? Core.Data.is_guest == 1}} 171 {{? Core.Data.is_guest == 1}}
178 亲爱的<span class="text-info">游客</span>玩家,为确保账号资金安全,请先<a href="#modify_pwd">免费升级账号</a>再充值。 172 亲爱的<span class="text-info">游客</span>玩家,为确保账号资金安全,请先<a href="#modify_pwd">免费升级账号</a>再充值。
179 {{??}} 173 {{??}}
180 - {{? Core.Data.vip > 0}} 174 +
181 - {{??}}
182 - {{?}}
183 {{?}} 175 {{?}}
184 {{?}} 176 {{?}}
185 </p> 177 </p>
178 +
179 + <br>
180 + <div class="amount_level align-left" >
181 + <a href="javascript:Core.finishPay()" id="back-btn" class="btn larg conBtn " style="text-align: center;display:none">请返回游戏</a>
182 + <br>
183 + </div>
184 +
186 </div> 185 </div>
187 </div> 186 </div>
188 </script> 187 </script>
...@@ -202,7 +201,7 @@ ...@@ -202,7 +201,7 @@
202 </form> 201 </form>
203 <p class="text-warning align-left">游客账号是系统临时生成，存在风险，为了您的账号安全建议升级永久账号。</p> 202 <p class="text-warning align-left">游客账号是系统临时生成，存在风险，为了您的账号安全建议升级永久账号。</p>
204 {{??}} 203 {{??}}
205 - <p class="text-success align-left">您的账号已经成功升级成手游平台永久账号，登录<a href="sdk://open?url=http://m.9133.com">9133.com</a>可以了解更多特权。</p> 204 + <p class="text-success align-left">您的账号已经成功升级成手游平台永久账号。</p>
206 {{?}} 205 {{?}}
207 </div> 206 </div>
208 </div> 207 </div>
...@@ -234,7 +233,7 @@ ...@@ -234,7 +233,7 @@
234 <p> 233 <p>
235 <input class="larg" type="text" name="pay_message" placeholder="给他留言···" /> 234 <input class="larg" type="text" name="pay_message" placeholder="给他留言···" />
236 </p> 235 </p>
237 - <input class="larg btn" type="submit" value="发起代付" /> 236 +
238 <p class="align-left small"><span class="error">*</span>注：手游平台登录帐号，不是游戏角色名称</p> 237 <p class="align-left small"><span class="error">*</span>注：手游平台登录帐号，不是游戏角色名称</p>
239 </div> 238 </div>
240 </div> 239 </div>
...@@ -269,7 +268,7 @@ ...@@ -269,7 +268,7 @@
269 <input type="number" name="vdcode" id="vdcode" required="" placeholder="输入验证码"> 268 <input type="number" name="vdcode" id="vdcode" required="" placeholder="输入验证码">
270 <img id="vdimgck1" src="{{=Core.server}}/validate_code/" onclick="this.src=this.src+'?'+(new Date()).getTime()" style="cursor: pointer;" alt="看不清？点击更换" /> 269 <img id="vdimgck1" src="{{=Core.server}}/validate_code/" onclick="this.src=this.src+'?'+(new Date()).getTime()" style="cursor: pointer;" alt="看不清？点击更换" />
271 </div> 270 </div>
272 - <input class="larg btn" type="submit" value="确认兑换" /> 271 +
273 <hr/> 272 <hr/>
274 <div class="clearfix"> 273 <div class="clearfix">
275 <a href="#channel_list&force" class="btn width100" >使用支付宝、银行卡、神州行充值</a> 274 <a href="#channel_list&force" class="btn width100" >使用支付宝、银行卡、神州行充值</a>
...@@ -312,7 +311,7 @@ ...@@ -312,7 +311,7 @@
312 311
313 <div class="channel_list align-left" > 312 <div class="channel_list align-left" >
314 {{? Core.Data.youai_star <= Core.Data.total_amount }} 313 {{? Core.Data.youai_star <= Core.Data.total_amount }}
315 - /*<a href="#exchange" class="btn btn-block">游爱星兑换 <span style="float:right;color:#d2d2d2">＞</span></a>*/ 314 + <!--<a href="#exchange" class="btn btn-block">游爱星兑换 <span style="float:right;color:#d2d2d2">＞</span></a>-->
316 {{?}} 315 {{?}}
317 {{~Core.Data.game_pay_channel_list :item:index }} 316 {{~Core.Data.game_pay_channel_list :item:index }}
318 {{?item.name}} 317 {{?item.name}}
...@@ -383,7 +382,7 @@ ...@@ -383,7 +382,7 @@
383 <input type="hidden" name="role_name" value="{{=Core.Data.role_name}}" /> 382 <input type="hidden" name="role_name" value="{{=Core.Data.role_name}}" />
384 {{? Core.Data.current_pay_channel }} 383 {{? Core.Data.current_pay_channel }}
385 <input type="hidden" name="pay_channel_id" value="{{=Core.Data.current_pay_channel.id}}" /> 384 <input type="hidden" name="pay_channel_id" value="{{=Core.Data.current_pay_channel.id}}" />
386 - {{?}} 385 +
387 <input type="hidden" name="game_amount" value="{{? Core.Data.game_amount}}{{=Core.Data.game_amount}}{{?}}" /> 386 <input type="hidden" name="game_amount" value="{{? Core.Data.game_amount}}{{=Core.Data.game_amount}}{{?}}" />
388 <input type="hidden" name="money" value="{{=Core.Data.money}}" /> 387 <input type="hidden" name="money" value="{{=Core.Data.money}}" />
389 <div class="require_input "> 388 <div class="require_input ">
...@@ -435,6 +434,7 @@ ...@@ -435,6 +434,7 @@
435 <input class="larg btn zhifubaoBtn" type="submit" value="前往付款" /> 434 <input class="larg btn zhifubaoBtn" type="submit" value="前往付款" />
436 {{?}} 435 {{?}}
437 </div> 436 </div>
437 + {{?}}
438 </form> 438 </form>
439 </div> 439 </div>
440 440
...@@ -516,26 +516,10 @@ ...@@ -516,26 +516,10 @@
516 </div> 516 </div>
517 <div class="container align-left"> 517 <div class="container align-left">
518 <div class="box_info_center"> 518 <div class="box_info_center">
519 - <p id="share" class="clearfix"> 519 +
520 - <span>分享到：</span>
521 - <a class="s_qzone" href="http://sns.qzone.qq.com/cgi-bin/qzshare/cgi_qzshare_onekey" title="QQ空间"></a>
522 - <a class="s_tqq" data-appkey="0af6f17f08f3ab2b52c6df3a3ed9b60b" href="http://share.v.t.qq.com/index.php" title="腾讯微博"></a>
523 - </p>
524 - <p id="share_weixin" class="clearfix">
525 - <span>分享到微信：</span>
526 - 点击右上角按钮，选择“<span class="text-info">发送给朋友</span>”或者“<span class="text-info">分享到朋友圈</span>”即可完成分享;
527 - </p>
528 <div class="fs_box invite_box"> 520 <div class="fs_box invite_box">
529 <h3 class="text-info">奖励说明:</h3> 521 <h3 class="text-info">奖励说明:</h3>
530 - <p> 522 +
531 - 1.成功邀请好友一起玩游戏，您可获得<span class="text-info">5{{=Core.Data.game_unit_name}}</span>的奖励。
532 - </p>
533 - <p>
534 - 2.好友若充值(限前10笔)，您可获得<span class="text-info">5%</span>充值奖励。
535 - </p>
536 - <p>
537 - 3.好友首次充值，因被您邀请可额外获得<span class="text-info">10%</span>充值返利。
538 - </p>
539 </div> 523 </div>
540 </div> 524 </div>
541 </div> 525 </div>
...@@ -564,11 +548,11 @@ ...@@ -564,11 +548,11 @@
564 </ol> 548 </ol>
565 </div> 549 </div>
566 <div class="sec sec_invtite"> 550 <div class="sec sec_invtite">
567 - <p class="title-fs">方式二：邀请好友可获得{{=Core.Data.game_unit_name}}&nbsp;&nbsp;<a href="#invite_friend">立即去邀请</a></p> 551 +
568 </div> 552 </div>
569 {{??}} 553 {{??}}
570 <div class="sec sec_invtite"> 554 <div class="sec sec_invtite">
571 - <p class="title-fs">方式一：邀请好友可获得{{=Core.Data.game_unit_name}}&nbsp;&nbsp;<a href="#invite_friend">立即去邀请</a></p> 555 +
572 </div> 556 </div>
573 {{?}} 557 {{?}}
574 </div> 558 </div>
...@@ -805,6 +789,11 @@ FastClick.attach(document.body); ...@@ -805,6 +789,11 @@ FastClick.attach(document.body);
805 (function(){ 789 (function(){
806 getData('/sdk/pay/json'); 790 getData('/sdk/pay/json');
807 })(); 791 })();
792 +$(function(){
793 + if (Core.isIos) {
794 + $('meta[name="viewport"]').attr('content','width=800,maximum-scale=1,user-scalable=no');
795 + }
796 +});
808 </script> 797 </script>
809 798
810 </body> 799 </body>
......
1 +date:2017-4-11
2 +author
3 +:lizenghua
4 +instructions
5 +:与星玩SDK同步
6 +
7 +date:2017-4-12
8 +author:lizenghua
9 +instructions:修复当账户及密码为空时（本地存储的账号密码数据为空），通过密保找回密码时一直处于加载中无法跳转的问题
10 +
11 +date:2017-4-21
12 +author:lizenghua
13 +instructions:
14 + 1、当用户是正式用户并绑定了手机后进行实名认证；身份证校验js：identity_id.js
15 + 改动的文件有：login.html、login.js（同步在sdk_xingwan、sdk_6）
16 + 2、改动注释了pay.js里面的911行到918行：进入sdk要购买的游戏币>0时强制进入渠道充值页面（已同步在sdk_xingwan、sdk_6）
17 +
18 +date:2017-4-24
19 +author:lizenghua
20 +instructions:
21 + 1、处理绑定手机的手机验证规则（176），
22 + 2、手机找回密码中重置密码残留旧密码问题
23 +
24 +
25 +date:2017-5-3
26 +author:lizenghua
27 +instructions:
28 + 1、注释掉pay.html中的“游爱星”兑换入口
29 + 2、处理支付方式切换中出现 input_item 为undefind 的bug （将383行的{{?}}移至435行）
30 + 3、去掉设置密保中select默认的下拉图标（login.css）
31 + 4、如果没有第三方登录则隐藏掉“第三方登录”字眼
32 +
33 +date:2017-5-8
34 +author:lizenghua
35 +instructions:处理支付方式点击支付图标出现 input_item 为undefind 的bug（将150行$c改成$(this)）
36 +
37 +date:2017-5-12
38 +author:lizenghua
39 +instructions:与游娱同步
...\ No newline at end of file ...\ No newline at end of file
...@@ -27,6 +27,11 @@ a:focus { ...@@ -27,6 +27,11 @@ a:focus {
27 outline:thin dotted; /* 处理“outline”在Chrome浏览器中和其它浏览器之间的不一致 */ 27 outline:thin dotted; /* 处理“outline”在Chrome浏览器中和其它浏览器之间的不一致 */
28 } 28 }
29 .red{ color: red;} 29 .red{ color: red;}
30 +select{
31 + -moz-appearance: none;
32 + -webkit-appearance:none;
33 + appearance:none;
34 +}
30 /*字体图标*/ 35 /*字体图标*/
31 @font-face {font-family: "iconfont"; 36 @font-face {font-family: "iconfont";
32 src: url('../font/iconfont.eot?t=1468997064'); /* IE9*/ 37 src: url('../font/iconfont.eot?t=1468997064'); /* IE9*/
...@@ -287,8 +292,8 @@ body{ ...@@ -287,8 +292,8 @@ body{
287 } 292 }
288 .new-sdk-container .new-sdk-box .input select{ 293 .new-sdk-container .new-sdk-box .input select{
289 width: 100%; 294 width: 100%;
290 - height: 38px; 295 + height: 88px;
291 - line-height: 38px; 296 + line-height: 88px;
292 background: none; 297 background: none;
293 border: none; 298 border: none;
294 color: #434343; 299 color: #434343;
...@@ -678,7 +683,8 @@ body{ ...@@ -678,7 +683,8 @@ body{
678 display: none; 683 display: none;
679 font-family: 宋体; 684 font-family: 宋体;
680 max-height: 11em; 685 max-height: 11em;
681 - overflow-y: scroll; 686 + /*overflow-y: scroll;*/
687 + height: 150px;
682 } 688 }
683 .new-sdk-container .pull-box ul{ 689 .new-sdk-container .pull-box ul{
684 margin-left: 65px; 690 margin-left: 65px;
...@@ -914,11 +920,11 @@ button.close { ...@@ -914,11 +920,11 @@ button.close {
914 } 920 }
915 .user-center a{ 921 .user-center a{
916 position: absolute; 922 position: absolute;
917 - right: 37px; 923 + right: 27px;
918 - bottom:17px; 924 + bottom:7px;
919 color: #ff9600; 925 color: #ff9600;
920 font-size: 24px; 926 font-size: 24px;
921 - 927 + padding:10px;
922 } 928 }
923 .user-center a.lefticon{ 929 .user-center a.lefticon{
924 right: auto; 930 right: auto;
...@@ -1168,6 +1174,7 @@ input::-webkit-input-placeholder, textarea::-webkit-input-placeholder { ...@@ -1168,6 +1174,7 @@ input::-webkit-input-placeholder, textarea::-webkit-input-placeholder {
1168 font-size: 24px; 1174 font-size: 24px;
1169 font-family: "Microsoft YaHei","微软雅黑"; 1175 font-family: "Microsoft YaHei","微软雅黑";
1170 vertical-align: -webkit-baseline-middle; 1176 vertical-align: -webkit-baseline-middle;
1177 + padding: 10px;
1171 } 1178 }
1172 .pwd_box .step-box .question-input-box{ 1179 .pwd_box .step-box .question-input-box{
1173 background: #fff; 1180 background: #fff;
......
1 #!/bin/sh 1 #!/bin/sh
2 #js css压缩,生成更新包打包 2 #js css压缩,生成更新包打包
3 3
4 -CDN_SERVER='http://youyu.9133.com/static' 4 +CDN_SERVER='http://cdn.9133.com/static'
5 5
6 6
7 DIR_PATH="$( cd "$( dirname "$0" )" && pwd )" 7 DIR_PATH="$( cd "$( dirname "$0" )" && pwd )"
......
1 -20161117
...\ No newline at end of file ...\ No newline at end of file
1 +20170111
......
1 SERVER_URL=http://sdk.shxingwan.com 1 SERVER_URL=http://sdk.shxingwan.com
2 CDN_SERVER_URL=http://sdk.shxingwan.com 2 CDN_SERVER_URL=http://sdk.shxingwan.com
3 +SDK_TYPE=.sys_config_xingwan
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 <html> 2 <html>
3 3
4 <head> 4 <head>
5 - <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no"> 5 + <meta name="viewport" content="width=device-width, user-scalable=no" />
6 <meta name="apple-mobile-web-app-capable" content="yes" /> 6 <meta name="apple-mobile-web-app-capable" content="yes" />
7 <meta name="apple-mobile-web-app-status-bar-style" content="black" /> 7 <meta name="apple-mobile-web-app-status-bar-style" content="black" />
8 <meta http-equiv="Content-type" content="text/html; charset=utf-8" /> 8 <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
...@@ -10,22 +10,20 @@ ...@@ -10,22 +10,20 @@
10 <meta name="screen-orientation" content="portrait"> 10 <meta name="screen-orientation" content="portrait">
11 <meta name="full-screen" content="yes"> 11 <meta name="full-screen" content="yes">
12 <meta http-equiv="x-ua-compatible" content="IE=edge" /> 12 <meta http-equiv="x-ua-compatible" content="IE=edge" />
13 -
14 - <link href="skin/login.css?v=20150923001" type="text/css" rel="stylesheet" />
15 <title> 13 <title>
16 手游平台支付 14 手游平台支付
17 </title> 15 </title>
16 + <style>
17 + h4,p{font-size: 24px;
18 + font-weight: normal;
19 + padding: 0 20px;font-family: "微软雅黑"; width: 100%;}
20 + p{ text-indent: 2em;}
21 + </style>
18 </head> 22 </head>
19 23
20 <body> 24 <body>
21 - <!-- 协议模块 --> 25 + <div class="mask"></div>
22 - <section id="agreement"> 26 + <div class="horizontal" style="height: 220px;">
23 - <div class="new-sdk-container">
24 - <div class="SDK-titlebox"></div>
25 - <div class="new-sdk-logo"><a href="#"><img src="images/new-sdk-logo.png"></a></div>
26 - <div class="new-sdk-content">
27 - <h3>网络服务协议</h3>
28 - <div class="content-main">
29 <h4>1. 账号服务条款的接受</h4> 27 <h4>1. 账号服务条款的接受</h4>
30 <p>1.1 账号由上海星玩网络科技（以下简称“星玩”）及其关联公司所有并合法运营，星玩及其关联公司并在本用户服务协议的条款和要求下提供服务。</p> 28 <p>1.1 账号由上海星玩网络科技（以下简称“星玩”）及其关联公司所有并合法运营，星玩及其关联公司并在本用户服务协议的条款和要求下提供服务。</p>
31 <p>1.2 当用户访问、浏览及使用账号提供的各项服务、业务时，用户便表明其接受了本服务协议的条款，并同意受本服务协议的约束，用户并保证其提交的信息真实、准确、及时和完整；若用户不同意本协议条款的，请停止注册程序。</p> 29 <p>1.2 当用户访问、浏览及使用账号提供的各项服务、业务时，用户便表明其接受了本服务协议的条款，并同意受本服务协议的约束，用户并保证其提交的信息真实、准确、及时和完整；若用户不同意本协议条款的，请停止注册程序。</p>
...@@ -183,20 +181,6 @@ ...@@ -183,20 +181,6 @@
183 <h4>21. 生效条件</h4> 181 <h4>21. 生效条件</h4>
184 <p>本协议自用户访问、浏览及使用账号之时开始生效。</p> 182 <p>本协议自用户访问、浏览及使用账号之时开始生效。</p>
185 </div> 183 </div>
186 - </div>
187 -
188 - <div class="only-btn inline-btn">
189 - <a href="login.html#register" class="submit btn-orange">确定</a>
190 - <div class="agreement l" style="margin-right: 0;">
191 - <div class="checkbox checkbox-2 l" >
192 - <i class="iconfont icon-xuanzhong"></i>
193 - </div>
194 - <p class="l">已阅读</p>
195 - </div>
196 - </div>
197 - </div>
198 -
199 - </section>
200 <!-- end --> 184 <!-- end -->
201 <script type="text/javascript" src="js/fastclick.min.1.0.js?20150923001"></script> 185 <script type="text/javascript" src="js/fastclick.min.1.0.js?20150923001"></script>
202 <script type="text/javascript" src="js/zepto.min.js?20150923001"></script> 186 <script type="text/javascript" src="js/zepto.min.js?20150923001"></script>
...@@ -208,6 +192,10 @@ ...@@ -208,6 +192,10 @@
208 }); 192 });
209 </script> 193 </script>
210 <script type="text/javascript" src="js/core.min.js?20150923001" ></script> 194 <script type="text/javascript" src="js/core.min.js?20150923001" ></script>
195 + <script type="text/javascript" src="js/simpScroller-min.js"></script>
196 + <script>
197 + simpScroller(document.querySelector(".horizontal"), {});
198 + </script>
211 </body> 199 </body>
212 200
213 </html> 201 </html>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -88,9 +88,14 @@ function initMatching(){ ...@@ -88,9 +88,14 @@ function initMatching(){
88 88
89 if (!Core.sdk_w) Core.sdk_w = 600; 89 if (!Core.sdk_w) Core.sdk_w = 600;
90 _scale = 1; 90 _scale = 1;
91 - if (ratio > 1.5){ 91 + if(ratio == 2){//5、6、6s(2.4)
92 - _scale = 2.3 / ratio; 92 + _scale = 2.4 / ratio;
93 - } else if (ratio < 1) { 93 + if(userAgent.indexOf('iPad') != -1){
94 + _scale = 2 / ratio;
95 + }
96 + }else if(ratio >2.5){//6s plus
97 + _scale = 2.7 / ratio;
98 + }else if (ratio < 1) {
94 _scale = 1.5 / ratio; 99 _scale = 1.5 / ratio;
95 } else { 100 } else {
96 _scale = 1; 101 _scale = 1;
...@@ -105,7 +110,6 @@ function initMatching(){ ...@@ -105,7 +110,6 @@ function initMatching(){
105 110
106 Core.ios_w = _w; 111 Core.ios_w = _w;
107 112
108 -
109 $('meta[name="viewport"]').attr('content','width=' + _w + ',maximum-scale=' + _scale + ',user-scalable=no'); 113 $('meta[name="viewport"]').attr('content','width=' + _w + ',maximum-scale=' + _scale + ',user-scalable=no');
110 //$('<meta name="viewport" content="maximum-scale=' + _scale + '"/>').appendTo(_head); 114 //$('<meta name="viewport" content="maximum-scale=' + _scale + '"/>').appendTo(_head);
111 //$('<meta name="viewport" content="width=' + _w + '"/>').appendTo(_head); 115 //$('<meta name="viewport" content="width=' + _w + '"/>').appendTo(_head);
...@@ -141,7 +145,8 @@ function initMatching(){ ...@@ -141,7 +145,8 @@ function initMatching(){
141 145
142 Core.PLATFORM_NAME = '星玩'; 146 Core.PLATFORM_NAME = '星玩';
143 147
144 - Core.server = 'http://sdk.shxingwan.com'; 148 + Core.server = 'https://sdk.shxingwan.com';
149 +
145 var lastServer = localStorage.getItem('last_server'); 150 var lastServer = localStorage.getItem('last_server');
146 if(lastServer && lastServer.indexOf('http:')==0){ 151 if(lastServer && lastServer.indexOf('http:')==0){
147 if(Core.isFile){ 152 if(Core.isFile){
...@@ -191,11 +196,10 @@ function initMatching(){ ...@@ -191,11 +196,10 @@ function initMatching(){
191 var _w = null; 196 var _w = null;
192 if (Core.isIos) { 197 if (Core.isIos) {
193 $('html').attr('data-useragent', 'ios'); 198 $('html').attr('data-useragent', 'ios');
194 -
195 if (!Core.sdk_w) Core.sdk_w = 600; 199 if (!Core.sdk_w) Core.sdk_w = 600;
196 _scale = 1; 200 _scale = 1;
197 - if (ratio > 1.5){ 201 + if (ratio > 1.5){//6s plus,
198 - _scale = 2 / ratio; 202 + _scale = 2.8 / ratio;
199 } else if (ratio < 1) { 203 } else if (ratio < 1) {
200 _scale = 1.5 / ratio; 204 _scale = 1.5 / ratio;
201 } else { 205 } else {
...@@ -211,7 +215,6 @@ function initMatching(){ ...@@ -211,7 +215,6 @@ function initMatching(){
211 215
212 Core.ios_w = _w; 216 Core.ios_w = _w;
213 217
214 -
215 $('meta[name="viewport"]').attr('content','width=' + _w + ',maximum-scale=' + _scale + ',user-scalable=no'); 218 $('meta[name="viewport"]').attr('content','width=' + _w + ',maximum-scale=' + _scale + ',user-scalable=no');
216 //$('<meta name="viewport" content="maximum-scale=' + _scale + '"/>').appendTo(_head); 219 //$('<meta name="viewport" content="maximum-scale=' + _scale + '"/>').appendTo(_head);
217 //$('<meta name="viewport" content="width=' + _w + '"/>').appendTo(_head); 220 //$('<meta name="viewport" content="width=' + _w + '"/>').appendTo(_head);
...@@ -328,7 +331,8 @@ function initMatching(){ ...@@ -328,7 +331,8 @@ function initMatching(){
328 core.updateMod = function(modId) { 331 core.updateMod = function(modId) {
329 if (!modId in modules) { 332 if (!modId in modules) {
330 console.error('没有对应的模块id的section:' + modId); 333 console.error('没有对应的模块id的section:' + modId);
331 - return; 334 + modId = 'home'
335 + //return;
332 } 336 }
333 location.hash = "#" + modId + '&force'; 337 location.hash = "#" + modId + '&force';
334 } 338 }
...@@ -511,7 +515,7 @@ function initMatching(){ ...@@ -511,7 +515,7 @@ function initMatching(){
511 515
512 var options = { 516 var options = {
513 type: action_method, 517 type: action_method,
514 - url: Core.get_url(post_url), 518 + url: post_url,
515 dataType: 'json', 519 dataType: 'json',
516 contentType: "application/x-www-form-urlencoded; charset=utf-8", 520 contentType: "application/x-www-form-urlencoded; charset=utf-8",
517 data: param, 521 data: param,
...@@ -600,7 +604,7 @@ function initMatching(){ ...@@ -600,7 +604,7 @@ function initMatching(){
600 $obj[0].disabled = true; 604 $obj[0].disabled = true;
601 } 605 }
602 Core.showTips('加载中...', true, 5000); 606 Core.showTips('加载中...', true, 5000);
603 - $.ajax(options); 607 + Core.ajax(options);
604 return false; 608 return false;
605 } 609 }
606 610
...@@ -610,9 +614,7 @@ function initMatching(){ ...@@ -610,9 +614,7 @@ function initMatching(){
610 Core.showTips('请求已提交，请稍候。'); 614 Core.showTips('请求已提交，请稍候。');
611 return; 615 return;
612 } 616 }
613 - if(Core.isFile){ 617 +
614 - path = core.server + path;
615 - }
616 var options = { 618 var options = {
617 type: "get", 619 type: "get",
618 url: path, 620 url: path,
...@@ -632,7 +634,7 @@ function initMatching(){ ...@@ -632,7 +634,7 @@ function initMatching(){
632 } 634 }
633 $obj.data('disabled', true); 635 $obj.data('disabled', true);
634 Core.showTips('加载中...', true, 5000); 636 Core.showTips('加载中...', true, 5000);
635 - $.ajax(options); 637 + Core.ajax(options);
636 return false; 638 return false;
637 } 639 }
638 640
...@@ -662,9 +664,7 @@ function initMatching(){ ...@@ -662,9 +664,7 @@ function initMatching(){
662 dataType = 'json'; 664 dataType = 'json';
663 } 665 }
664 var data_result = ''; 666 var data_result = '';
665 - if(Core.isFile){ 667 +
666 - data_url = core.server + data_url;
667 - }
668 var options = { 668 var options = {
669 type: "get", 669 type: "get",
670 url: data_url, 670 url: data_url,
...@@ -710,7 +710,7 @@ function initMatching(){ ...@@ -710,7 +710,7 @@ function initMatching(){
710 } 710 }
711 } 711 }
712 Core.showTips('加载中...', true, 5000); 712 Core.showTips('加载中...', true, 5000);
713 - $.ajax(options); 713 + Core.ajax(options);
714 } 714 }
715 // 判断用户是否登录,使用两个 715 // 判断用户是否登录,使用两个
716 core.isAuths = function() { 716 core.isAuths = function() {
......
1 +var surname="\u8d75|\u94b1|\u5b59|\u674e|\u5468|\u5434|\u90d1|\u738b|\u51af|\u9648|\u891a|\u536b|\u848b|\u6c88|\u97e9|\u6768|\u6731|\u79e6|\u5c24|\u8bb8|\u4f55|\u5415|\u65bd|\u5f20|\u5b54|\u66f9|\u4e25|\u534e|\u91d1|\u9b4f|\u9676|\u59dc|\u621a|\u8c22|\u90b9|\u55bb|\u67cf|\u6c34|\u7aa6|\u7ae0|\u4e91|\u82cf|\u6f58|\u845b|\u595a|\u8303|\u5f6d|\u90ce|\u9c81|\u97e6|\u660c|\u9a6c|\u82d7|\u51e4|\u82b1|\u65b9|\u4fde|\u4efb|\u8881|\u67f3|\u9146|\u9c8d|\u53f2|\u5510|\u8d39|\u5ec9|\u5c91|\u859b|\u96f7|\u8d3a|\u502a|\u6c64|\u6ed5|\u6bb7|\u7f57|\u6bd5|\u90dd|\u90ac|\u5b89|\u5e38|\u4e50|\u4e8e|\u65f6|\u5085|\u76ae|\u535e|\u9f50|\u5eb7|\u4f0d|\u4f59|\u5143|\u535c|\u987e|\u5b5f|\u5e73|\u9ec4|\u548c|\u7a46|\u8427|\u5c39|\u59da|\u90b5|\u6e5b|\u6c6a|\u7941|\u6bdb|\u79b9|\u72c4|\u7c73|\u8d1d|\u660e|\u81e7|\u8ba1|\u4f0f|\u6210|\u6234|\u8c08|\u5b8b|\u8305|\u5e9e|\u718a|\u7eaa|\u8212|\u5c48|\u9879|\u795d|\u8463|\u6881|\u675c|\u962e|\u84dd|\u95f5|\u5e2d|\u5b63|\u9ebb|\u5f3a|\u8d3e|\u8def|\u5a04|\u5371|\u6c5f|\u7ae5|\u989c|\u90ed|\u6885|\u76db|\u6797|\u5201|\u953a|\u5f90|\u90b1|\u9a86|\u9ad8|\u590f|\u8521|\u7530|\u6a0a|\u80e1|\u51cc|\u970d|\u865e|\u4e07|\u652f|\u67ef|\u661d|\u7ba1|\u5362|\u83ab|\u7ecf|\u623f|\u88d8|\u7f2a|\u5e72|\u89e3|\u5e94|\u5b97|\u4e01|\u5ba3|\u8d32|\u9093|\u90c1|\u5355|\u676d|\u6d2a|\u5305|\u8bf8|\u5de6|\u77f3|\u5d14|\u5409|\u94ae|\u9f9a|\u7a0b|\u5d47|\u90a2|\u6ed1|\u88f4|\u9646|\u8363|\u7fc1|\u8340|\u7f8a|\u65bc|\u60e0|\u7504|\u9eb4|\u5bb6|\u5c01|\u82ae|\u7fbf|\u50a8|\u9773|\u6c72|\u90b4|\u7cdc|\u677e|\u4e95|\u6bb5|\u5bcc|\u5deb|\u4e4c|\u7126|\u5df4|\u5f13|\u7267|\u9697|\u5c71|\u8c37|\u8f66|\u4faf|\u5b93|\u84ec|\u5168|\u90d7|\u73ed|\u4ef0|\u79cb|\u4ef2|\u4f0a|\u5bab|\u5b81|\u4ec7|\u683e|\u66b4|\u7518|\u94ad|\u5386|\u620e|\u7956|\u6b66|\u7b26|\u5218|\u666f|\u8a79|\u675f|\u9f99|\u53f6|\u5e78|\u53f8|\u97f6|\u90dc|\u9ece|\u84df|\u6ea5|\u5370|\u5bbf|\u767d|\u6000|\u84b2|\u90b0|\u4ece|\u9102|\u7d22|\u54b8|\u7c4d|\u8d56|\u5353|\u853a|\u5c60|\u8499|\u6c60|\u4e54|\u9633|\u90c1|\u80e5|\u80fd|\u82cd|\u53cc|\u95fb|\u8398|\u515a|\u7fdf|\u8c2d|\u8d21|\u52b3|\u9004|\u59ec|\u7533|\u6276|\u5835|\u5189|\u5bb0|\u90e6|\u96cd|\u5374|\u74a9|\u6851|\u6842|\u6fee|\u725b|\u5bff|\u901a|\u8fb9|\u6248|\u71d5|\u5180|\u50ea|\u6d66|\u5c1a|\u519c|\u6e29|\u522b|\u5e84|\u664f|\u67f4|\u77bf|\u960e|\u5145|\u6155|\u8fde|\u8339|\u4e60|\u5ba6|\u827e|\u9c7c|\u5bb9|\u5411|\u53e4|\u6613|\u614e|\u6208|\u5ed6|\u5ebe|\u7ec8|\u66a8|\u5c45|\u8861|\u6b65|\u90fd|\u803f|\u6ee1|\u5f18|\u5321|\u56fd|\u6587|\u5bc7|\u5e7f|\u7984|\u9619|\u4e1c|\u6b27|\u6bb3|\u6c83|\u5229|\u851a|\u8d8a|\u5914|\u9686|\u5e08|\u5de9|\u538d|\u8042|\u6641|\u52fe|\u6556|\u878d|\u51b7|\u8a3e|\u8f9b|\u961a|\u90a3|\u7b80|\u9976|\u7a7a|\u66fe|\u6bcb|\u6c99|\u4e5c|\u517b|\u97a0|\u987b|\u4e30|\u5de2|\u5173|\u84af|\u76f8|\u67e5|\u540e|\u8346|\u7ea2|\u6e38|\u7afa|\u6743|\u902e|\u76cd|\u76ca|\u6853|\u516c|\u4e07\u4fdf|\u53f8\u9a6c|\u4e0a\u5b98|\u6b27\u9633|\u590f\u4faf|\u8bf8\u845b|\u95fb\u4eba|\u4e1c\u65b9|\u8d6b\u8fde|\u7687\u752b|\u5c09\u8fdf|\u516c\u7f8a|\u6fb9\u53f0|\u516c\u51b6|\u5b97\u653f|\u6fee\u9633|\u6df3\u4e8e|\u5355\u4e8e|\u592a\u53d4|\u7533\u5c60|\u516c\u5b59|\u4ef2\u5b59|\u8f69\u8f95|\u4ee4\u72d0|\u949f\u79bb|\u5b87\u6587|\u957f\u5b59|\u6155\u5bb9|\u53f8\u5f92|\u53f8\u7a7a|\u53ec|\u6709|\u821c|\u53f6\u8d6b\u90a3\u62c9|\u4e1b|\u5cb3|\u5bf8|\u8d30|\u7687|\u4fa8|\u5f64|\u7aed|\u7aef|\u8d6b|\u5b9e|\u752b|\u96c6|\u8c61|\u7fe0|\u72c2|\u8f9f|\u5178|\u826f|\u51fd|\u8292|\u82e6|\u5176|\u4eac|\u4e2d|\u5915|\u4e4b|\u7ae0\u4f73|\u90a3\u62c9|\u51a0|\u5bbe|\u9999|\u679c|\u4f9d\u5c14\u6839\u89c9\u7f57|\u4f9d\u5c14\u89c9\u7f57|\u8428\u561b\u5587|\u8d6b\u820d\u91cc|\u989d\u5c14\u5fb7\u7279|\u8428\u514b\u8fbe|\u94ae\u795c\u7984|\u4ed6\u5854\u5587|\u559c\u5854\u814a|\u8bb7\u6bb7\u5bcc\u5bdf|\u53f6\u8d6b\u90a3\u5170|\u5e93\u96c5\u5587|\u74dc\u5c14\u4f73|\u8212\u7a46\u7984|\u7231\u65b0\u89c9\u7f57|\u7d22\u7ef0\u7edc|\u7eb3\u5587|\u4e4c\u96c5|\u8303\u59dc|\u78a7\u9c81|\u5f20\u5ed6|\u5f20\u7b80|\u56fe\u95e8|\u592a\u53f2|\u516c\u53d4|\u4e4c\u5b59|\u5b8c\u989c|\u9a6c\u4f73|\u4f5f\u4f73|\u5bcc\u5bdf|\u8d39\u83ab|\u8e47|\u79f0|\u8bfa|\u6765|\u591a|\u7e41|\u620a|\u6734|\u56de|\u6bd3|\u7a0e|\u8364|\u9756|\u7eea|\u6108|\u7855|\u7262|\u4e70|\u4f46|\u5de7|\u679a|\u6492|\u6cf0|\u79d8|\u4ea5|\u7ecd|\u4ee5|\u58ec|\u68ee|\u658b|\u91ca|\u5955|\u59d2|\u670b|\u6c42|\u7fbd|\u7528|\u5360|\u771f|\u7a70|\u7fe6|\u95fe|\u6f06|\u8d35|\u4ee3|\u8d2f|\u65c1|\u5d07|\u680b|\u544a|\u4f11|\u8912|\u8c0f|\u9510|\u768b|\u95f3|\u5728|\u6b67|\u79be|\u793a|\u662f|\u59d4|\u948a|\u9891|\u5b34|\u547c|\u5927|\u5a01|\u6602|\u5f8b|\u5192|\u4fdd|\u7cfb|\u6284|\u5b9a|\u5316|\u83b1|\u6821|\u4e48|\u6297|\u7962|\u7da6|\u609f|\u5b8f|\u529f|\u5e9a|\u52a1|\u654f|\u6377|\u62f1|\u5146|\u4e11|\u4e19|\u7545|\u82df|\u968f|\u7c7b|\u536f|\u4fdf|\u53cb|\u7b54|\u4e59|\u5141|\u7532|\u7559|\u5c3e|\u4f7c|\u7384|\u4e58|\u88d4|\u5ef6|\u690d|\u73af|\u77eb|\u8d5b|\u6614|\u4f8d|\u5ea6|\u65f7|\u9047|\u5076|\u524d|\u7531|\u548e|\u585e|\u655b|\u53d7|\u6cf7|\u88ad|\u8845|\u53d4|\u5723|\u5fa1|\u592b|\u4ec6|\u9547|\u85e9|\u90b8|\u5e9c|\u638c|\u9996|\u5458|\u7109|\u620f|\u53ef|\u667a|\u5c14|\u51ed|\u6089|\u8fdb|\u7b03|\u539a|\u4ec1|\u4e1a|\u8087|\u8d44|\u5408|\u4ecd|\u4e5d|\u8877|\u54c0|\u5211|\u4fce|\u4ef5|\u572d|\u5937|\u5fad|\u86ee|\u6c57|\u5b5b|\u4e7e|\u5e16|\u7f55|\u6d1b|\u6de6|\u6d0b|\u90b6|\u90f8|\u90ef|\u9097|\u909b|\u5251|\u8662|\u968b|\u84bf|\u8306|\u83c5|\u82cc|\u6811|\u6850|\u9501|\u949f|\u673a|\u76d8|\u94ce|\u659b|\u7389|\u7ebf|\u9488|\u7b95|\u5eb9|\u7ef3|\u78e8|\u8489|\u74ee|\u5f2d|\u5200|\u758f|\u7275|\u6d51|\u607d|\u52bf|\u4e16|\u4edd|\u540c|\u8681|\u6b62|\u6222|\u7762|\u51bc|\u79cd|\u6d82|\u8096|\u5df1|\u6ce3|\u6f5c|\u5377|\u8131|\u8c2c|\u8e49|\u8d67|\u6d6e|\u987f|\u8bf4|\u6b21|\u9519|\u5ff5|\u5919|\u65af|\u5b8c|\u4e39|\u8868|\u804a|\u6e90|\u59d3|\u543e|\u5bfb|\u5c55|\u51fa|\u4e0d|\u6237|\u95ed|\u624d|\u65e0|\u4e66|\u5b66|\u611a|\u672c|\u6027|\u96ea|\u971c|\u70df|\u5bd2|\u5c11|\u5b57|\u6865|\u677f|\u6590|\u72ec|\u5343|\u8bd7|\u5609|\u626c|\u5584|\u63ed|\u7948|\u6790|\u8d64|\u7d2b|\u9752|\u67d4|\u521a|\u5947|\u62dc|\u4f5b|\u9640|\u5f25|\u963f|\u7d20|\u957f|\u50e7|\u9690|\u4ed9|\u96bd|\u5b87|\u796d|\u9152|\u6de1|\u5854|\u7426|\u95ea|\u59cb|\u661f|\u5357|\u5929|\u63a5|\u6ce2|\u78a7|\u901f|\u799a|\u817e|\u6f6e|\u955c|\u4f3c|\u6f84|\u6f6d|\u8b07|\u7eb5|\u6e20|\u5948|\u98ce|\u6625|\u6fef|\u6c90|\u8302|\u82f1|\u5170|\u6a80|\u85e4|\u679d|\u68c0|\u751f|\u6298|\u767b|\u9a79|\u9a91|\u8c8a|\u864e|\u80a5|\u9e7f|\u96c0|\u91ce|\u79bd|\u98de|\u8282|\u5b9c|\u9c9c|\u7c9f|\u6817|\u8c46|\u5e1b|\u5b98|\u5e03|\u8863|\u85cf|\u5b9d|\u949e|\u94f6|\u95e8|\u76c8|\u5e86|\u559c|\u53ca|\u666e|\u5efa|\u8425|\u5de8|\u671b|\u5e0c|\u9053|\u8f7d|\u58f0|\u6f2b|\u7281|\u529b|\u8d38|\u52e4|\u9769|\u6539|\u5174|\u4e93|\u7766|\u4fee|\u4fe1|\u95fd|\u5317|\u5b88|\u575a|\u52c7|\u6c49|\u7ec3|\u5c09|\u58eb|\u65c5|\u4e94|\u4ee4|\u5c06|\u65d7|\u519b|\u884c|\u5949|\u656c|\u606d|\u4eea|\u6bcd|\u5802|\u4e18|\u4e49|\u793c|\u6148|\u5b5d|\u7406|\u4f26|\u537f|\u95ee|\u6c38|\u8f89|\u4f4d|\u8ba9|\u5c27|\u4f9d|\u72b9|\u4ecb|\u627f|\u5e02|\u6240|\u82d1|\u675e|\u5267|\u7b2c|\u96f6|\u8c0c|\u62db|\u7eed|\u8fbe|\u5ffb|\u516d|\u911e|\u6218|\u8fdf|\u5019|\u5b9b|\u52b1|\u7c98|\u8428|\u909d|\u8983|\u8f9c|\u521d|\u697c|\u57ce|\u533a|\u5c40|\u53f0|\u539f|\u8003|\u59ab|\u7eb3|\u6cc9|\u8001|\u6e05|\u5fb7|\u5351|\u8fc7|\u9ea6|\u66f2|\u7af9|\u767e|\u798f|\u8a00|\u7b2c\u4e94|\u4f5f|\u7231|\u5e74|\u7b2a|\u8c2f|\u54c8|\u58a8|\u5357\u5bab|\u8d4f|\u4f2f|\u4f74|\u4f58|\u725f|\u5546|\u897f\u95e8|\u4e1c\u95e8|\u5de6\u4e18|\u6881\u4e18|\u7434|\u540e|\u51b5|\u4ea2|\u7f11|\u5e05|\u5fae\u751f|\u7f8a\u820c|\u6d77|\u5f52|\u547c\u5ef6|\u5357\u95e8|\u4e1c\u90ed|\u767e\u91cc|\u94a6|\u9122|\u6c5d|\u6cd5|\u95eb|\u695a|\u664b|\u8c37\u6881|\u5bb0\u7236|\u5939\u8c37|\u62d3\u8dcb|\u58e4\u9a77|\u4e50\u6b63|\u6f06\u96d5|\u516c\u897f|\u5deb\u9a6c|\u7aef\u6728|\u989b\u5b59|\u5b50\u8f66|\u7763|\u4ec9|\u53f8\u5bc7|\u4e93\u5b98|\u9c9c\u4e8e|\u953a\u79bb|\u76d6|\u902f|\u5e93|\u90cf|\u9022|\u9634|\u8584|\u5389|\u7a3d|\u95fe\u4e18|\u516c\u826f|\u6bb5\u5e72|\u5f00|\u5149|\u64cd|\u745e|\u772d|\u6ce5|\u8fd0|\u6469|\u4f1f|\u94c1|\u8fee|";
2 +
3 +function IsIdCard(idcard)
4 +{
5 + idcard = idcard.toUpperCase();
6 + var area={11:"北京",12:"天津",13:"河北",14:"山西",15:"内蒙古",21:"辽宁",22:"吉林",23:"黑龙江",
7 + 31:"上海",32:"江苏",33:"浙江",34:"安徽",35:"福建",36:"江西",37:"山东",41:"河南",42:"湖北",
8 + 43:"湖南",44:"广东",45:"广西",46:"海南",50:"重庆",51:"四川",52:"贵州",53:"云南",54:"西藏",
9 + 61:"陕西",62:"甘肃",63:"青海",64:"宁夏",65:"新疆",71:"台湾",81:"香港",82:"澳门",91:"国外"};
10 + var retflag=false;
11 + var idcard,Y,JYM;
12 + var S,M;
13 + var idcard_array = new Array();
14 + idcard_array = idcard.split("");
15 + //地区检验
16 + if(area[parseInt(idcard.substr(0,2))]==null) return false;
17 + //身份号码位数及格式检验
18 + switch(idcard.length)
19 + {
20 + case 15:
21 + if ((parseInt(idcard.substr(6,2))+1900) % 4 == 0 ||
22 + ((parseInt(idcard.substr(6,2))+1900) % 100 == 0 && (parseInt(idcard.substr(6,2))+1900) % 4 == 0 ))
23 + {
24 + ereg=/^[1-9][0-9]{5}[0-9]{2}((01|03|05|07|08|10|12)(0[1-9]|[1-2][0-9]|3[0-1])|(04|06|09|11)(0[1-9]|[1-2][0-9]|30)|02(0[1-9]|[1-2][0-9]))[0-9]{3}$/;//测试出生日期的合法性
25 + }
26 + else
27 + {
28 + ereg=/^[1-9][0-9]{5}[0-9]{2}((01|03|05|07|08|10|12)(0[1-9]|[1-2][0-9]|3[0-1])|(04|06|09|11)(0[1-9]|[1-2][0-9]|30)|02(0[1-9]|1[0-9]|2[0-8]))[0-9]{3}$/;//测试出生日期的合法性
29 + }
30 + if(ereg.test(idcard)) return true;
31 + else return false;
32 + break;
33 + case 18:
34 + //18位身份号码检测
35 + //出生日期的合法性检查
36 + //闰年月日:((01|03|05|07|08|10|12)(0[1-9]|[1-2][0-9]|3[0-1])|(04|06|09|11)(0[1-9]|[1-2][0-9]|30)|02(0[1-9]|[1-2][0-9]))
37 + //平年月日:((01|03|05|07|08|10|12)(0[1-9]|[1-2][0-9]|3[0-1])|(04|06|09|11)(0[1-9]|[1-2][0-9]|30)|02(0[1-9]|1[0-9]|2[0-8]))
38 + if ( parseInt(idcard.substr(6,4)) % 4 == 0 ||
39 + (parseInt(idcard.substr(6,4)) % 100 == 0 &&parseInt(idcard.substr(6,4))%4 == 0 ))
40 + {
41 + ereg=/^[1-9][0-9]{5}19[0-9]{2}((01|03|05|07|08|10|12)(0[1-9]|[1-2][0-9]|3[0-1])|(04|06|09|11)(0[1-9]|[1-2][0-9]|30)|02(0[1-9]|[1-2][0-9]))[0-9]{3}[0-9Xx]$/;//闰年出生日期的合法性正则表达式
42 + }
43 + else
44 + {
45 + ereg=/^[1-9][0-9]{5}19[0-9]{2}((01|03|05|07|08|10|12)(0[1-9]|[1-2][0-9]|3[0-1])|(04|06|09|11)(0[1-9]|[1-2][0-9]|30)|02(0[1-9]|1[0-9]|2[0-8]))[0-9]{3}[0-9Xx]$/;//平年出生日期的合法性正则表达式
46 + }
47 + if(ereg.test(idcard))
48 + {//测试出生日期的合法性
49 + //计算校验位
50 + S = (parseInt(idcard_array[0]) + parseInt(idcard_array[10])) * 7
51 + + (parseInt(idcard_array[1]) + parseInt(idcard_array[11])) * 9
52 + + (parseInt(idcard_array[2]) + parseInt(idcard_array[12])) * 10
53 + + (parseInt(idcard_array[3]) + parseInt(idcard_array[13])) * 5
54 + + (parseInt(idcard_array[4]) + parseInt(idcard_array[14])) * 8
55 + + (parseInt(idcard_array[5]) + parseInt(idcard_array[15])) * 4
56 + + (parseInt(idcard_array[6]) + parseInt(idcard_array[16])) * 2
57 + + parseInt(idcard_array[7]) * 1
58 + + parseInt(idcard_array[8]) * 6
59 + + parseInt(idcard_array[9]) * 3 ;
60 + Y = S % 11;
61 + M = "F";
62 + JYM = "10X98765432";
63 + M = JYM.substr(Y,1);//判断校验位
64 + if(M == idcard_array[17]) true; //检测ID的校验位
65 + else return false;
66 + }
67 + else return false;
68 + break;
69 + default:
70 + return false;
71 + break;
72 + }
73 + return true;
74 +}
...\ No newline at end of file ...\ No newline at end of file
...@@ -69,12 +69,9 @@ ...@@ -69,12 +69,9 @@
69 //如果不尝试自动登录，直接初始化界面 69 //如果不尝试自动登录，直接初始化界面
70 if (!tryAutoLogin) 70 if (!tryAutoLogin)
71 goInit(); 71 goInit();
72 - //请求数据
73 - if (Core.isFile) {
74 - url = Core.server + url;
75 - }
76 72
77 - $.ajax({ 73 +
74 + Core.ajax({
78 type: 'GET', 75 type: 'GET',
79 url: url + '?' + params, 76 url: url + '?' + params,
80 dataType: 'json', 77 dataType: 'json',
......
...@@ -57,7 +57,9 @@ ...@@ -57,7 +57,9 @@
57 Core.showMod('login'); 57 Core.showMod('login');
58 58
59 } 59 }
60 - 60 + Home.prototype.show_after = function(){
61 + $('#login').hide()
62 + }
61 Core.registerMod('home', Home); 63 Core.registerMod('home', Home);
62 64
63 // 帮助信息模块 65 // 帮助信息模块
...@@ -164,6 +166,7 @@ ...@@ -164,6 +166,7 @@
164 Core.updateMod('frame'); 166 Core.updateMod('frame');
165 return false; 167 return false;
166 }); 168 });
169 +
167 } 170 }
168 171
169 Login.prototype.cache = function(n, p) { 172 Login.prototype.cache = function(n, p) {
...@@ -250,10 +253,10 @@ ...@@ -250,10 +253,10 @@
250 $(".pwd_box").children(".step-tab").css("display","block"); 253 $(".pwd_box").children(".step-tab").css("display","block");
251 $(".pwd_box").children(".step-box").css("display","none"); 254 $(".pwd_box").children(".step-box").css("display","none");
252 }); 255 });
253 -
254 - if (names != null) {
255 var names = JSON.parse(names); 256 var names = JSON.parse(names);
256 var userIdx = JSON.parse(user_indexs); 257 var userIdx = JSON.parse(user_indexs);
258 + if (names != null) {
259 +
257 delete names["undefined"]; 260 delete names["undefined"];
258 261
259 this.$c.find('.drop-down').show(); 262 this.$c.find('.drop-down').show();
...@@ -271,11 +274,15 @@ ...@@ -271,11 +274,15 @@
271 this.$c.find("input#js_login_username").val(initUserName); 274 this.$c.find("input#js_login_username").val(initUserName);
272 this.$c.find("input#js_login_password").val(Core.user_names[initUserName]); 275 this.$c.find("input#js_login_password").val(Core.user_names[initUserName]);
273 } 276 }
277 +
274 }else{ 278 }else{
275 this.$c.find("input#js_login_username").val(Core.first_user); 279 this.$c.find("input#js_login_username").val(Core.first_user);
276 this.$c.find("input#js_login_password").val(Core.first_password); 280 this.$c.find("input#js_login_password").val(Core.first_password);
277 } 281 }
278 if (Core.Data.other_login && this.other_login) { 282 if (Core.Data.other_login && this.other_login) {
283 + if(Core.Data.other_login.length > 0){
284 + this.$c.find(".other-login-bx").removeClass("hide");
285 + }
279 //设置第三方登录显示 286 //设置第三方登录显示
280 for (var i = 0, l = Core.Data.other_login.length; i < l; i++) { 287 for (var i = 0, l = Core.Data.other_login.length; i < l; i++) {
281 this.$c.find('.' + Core.Data.other_login[i]).removeClass('hide'); 288 this.$c.find('.' + Core.Data.other_login[i]).removeClass('hide');
...@@ -287,6 +294,14 @@ ...@@ -287,6 +294,14 @@
287 this.$c.find("input#js_login_password").val(loginPassword); 294 this.$c.find("input#js_login_password").val(loginPassword);
288 } 295 }
289 296
297 + var old_pwd = localStorage.getItem('old_pwd');
298 + if(Core.Data.new_pwd != "" && Core.Data.new_pwd == old_pwd & Core.user_names != null){
299 + this.$c.find("input#js_login_password").val(Core.user_names[this.$c.find("input#js_login_username").val()]);
300 + console.log($("input#js_login_password").val());
301 + }
302 +
303 + $("#find_pwd").find(".user-center span").html("找回密码");
304 +
290 } 305 }
291 306
292 Core.registerMod('login', Login); 307 Core.registerMod('login', Login);
...@@ -365,11 +380,18 @@ ...@@ -365,11 +380,18 @@
365 380
366 that.$c.on('click', '[type=submit],.submit', function(e) { 381 that.$c.on('click', '[type=submit],.submit', function(e) {
367 e.preventDefault(); 382 e.preventDefault();
368 - if (that.$c.find('.checkbox-2').length>0 ){ 383 + if(/[A-Z]/.test(that.$c.find("input[name='username']").val())){
369 - Core.ajax_do(that.$c.find('.ajax'), that.register_cb, 384 + Core.showTips("账号不能有大写字母！");
370 - that); 385 + }else if(/[A-Z]/.test(that.$c.find("input[name='password']").val())){
371 - } else{ 386 + Core.showTips("密码不能有大写字母！");
387 + }else if(!that.$c.find('.checkbox-2').length>0){
372 Core.showTips('请同意'+Core.PLATFORM_NAME+'网络协议',1); 388 Core.showTips('请同意'+Core.PLATFORM_NAME+'网络协议',1);
389 + }else{
390 + //如果是游客的话则调用安卓截屏方法
391 + if (that.$c.find('[name="username"]').val() == that.$c.find('[name="old_usernmae"]').val() && window.android != undefined && window.android.screenShot != undefined ){
392 + window.android.screenShot();
393 + }
394 + Core.ajax_do(that.$c.find('.ajax'), that.register_cb, that);
373 } 395 }
374 return false; 396 return false;
375 }); 397 });
...@@ -391,6 +413,7 @@ ...@@ -391,6 +413,7 @@
391 that.$c.find('[name="old_usernmae"]').val(random_name) 413 that.$c.find('[name="old_usernmae"]').val(random_name)
392 that.$c.find('[name="password"]').val(random_passwd) 414 that.$c.find('[name="password"]').val(random_passwd)
393 that.$c.find('[name="type"]').val(-1) 415 that.$c.find('[name="type"]').val(-1)
416 +
394 } 417 }
395 Register.prototype.cache = Login.prototype.cache; 418 Register.prototype.cache = Login.prototype.cache;
396 419
...@@ -404,7 +427,7 @@ ...@@ -404,7 +427,7 @@
404 Core.updateMod('home'); 427 Core.updateMod('home');
405 } 428 }
406 Register.prototype.show_after = function() { 429 Register.prototype.show_after = function() {
407 - this.set_random() 430 + this.set_random();
408 } 431 }
409 Core.registerMod('register', Register); 432 Core.registerMod('register', Register);
410 433
...@@ -443,7 +466,7 @@ ...@@ -443,7 +466,7 @@
443 Core.inherit(Find_pwd, Module); 466 Core.inherit(Find_pwd, Module);
444 Find_pwd.prototype.bind = function() { 467 Find_pwd.prototype.bind = function() {
445 var that = this; 468 var that = this;
446 - var pwd_header=["手机找回密码","密保找回密码","邮箱找回密码","联系客服","重置密码","找回密码"]; 469 + var pwd_header=["手机找回密码","密保找回密码","联系客服","重置密码","找回密码"];
447 var pwd_header_back = { 470 var pwd_header_back = {
448 0 : '<a href="#login" class="lefticon"><i class="iconfont icon-fanhui"></i></a>', 471 0 : '<a href="#login" class="lefticon"><i class="iconfont icon-fanhui"></i></a>',
449 1 : '<a href="javascript:;" class="lefticon back-btn"><i class="iconfont icon-fanhui"></i></a>' 472 1 : '<a href="javascript:;" class="lefticon back-btn"><i class="iconfont icon-fanhui"></i></a>'
...@@ -484,7 +507,6 @@ ...@@ -484,7 +507,6 @@
484 $("#js_kefu_qq").href = "http://wpa.qq.com/msgrd?v=3&uin=2739920773&site=qq&menu=yes"; 507 $("#js_kefu_qq").href = "http://wpa.qq.com/msgrd?v=3&uin=2739920773&site=qq&menu=yes";
485 $("#js_player").href = "http://wpa.qq.com/msgrd?v=3&uin=167355030&site=qq&menu=yes"; 508 $("#js_player").href = "http://wpa.qq.com/msgrd?v=3&uin=167355030&site=qq&menu=yes";
486 } 509 }
487 -
488 that.$c.on("click","#js_findPSW_getcode",function(){//找回密码获取验证码 510 that.$c.on("click","#js_findPSW_getcode",function(){//找回密码获取验证码
489 var $self = $(this) 511 var $self = $(this)
490 phone = $("#js_findPSW_mobile").val(); 512 phone = $("#js_findPSW_mobile").val();
...@@ -516,7 +538,8 @@ ...@@ -516,7 +538,8 @@
516 var code = that.$c.find("#js_findPSW_ranks").val(), 538 var code = that.$c.find("#js_findPSW_ranks").val(),
517 accout = $("#js_findPSW_accout").val(), 539 accout = $("#js_findPSW_accout").val(),
518 phoneTest = $("#js_findPSW_mobile").val(), 540 phoneTest = $("#js_findPSW_mobile").val(),
519 - iphoneReg = /^(((13[0-9]{1})|(15[0-9]{1})|(18[0-9]{1}))+\d{8})$/; 541 + //iphoneReg = /^(((13[0-9]{1})|(15[0-9]{1})|(18[0-9]{1}))+\d{8})$/;
542 + iphoneReg = /^1(3|4|5|7|8)\d{9}$/;
520 if($.trim(accout) == ""){ 543 if($.trim(accout) == ""){
521 Core.showTips('请输入账号!', false); 544 Core.showTips('请输入账号!', false);
522 return false; 545 return false;
...@@ -553,6 +576,9 @@ ...@@ -553,6 +576,9 @@
553 } 576 }
554 }); 577 });
555 }); 578 });
579 + that.$c.on("click","#returnhome",function(){
580 + that.$c.find(".user-center span").html("找回密码");
581 + });
556 that.$c.on("click","#js_confirm_resetnewpsw",function(){ 582 that.$c.on("click","#js_confirm_resetnewpsw",function(){
557 var NewPsw = that.$c.find("#js_reset_newpsw").val(), 583 var NewPsw = that.$c.find("#js_reset_newpsw").val(),
558 NewKey = that.$c.find("input[name='pwd_code']").val(), 584 NewKey = that.$c.find("input[name='pwd_code']").val(),
...@@ -570,6 +596,8 @@ ...@@ -570,6 +596,8 @@
570 $("input[name='loginPassword']").val(NewPsw); 596 $("input[name='loginPassword']").val(NewPsw);
571 names[account] = NewPsw; 597 names[account] = NewPsw;
572 localStorage.setItem('user_names',JSON.stringify(names)); 598 localStorage.setItem('user_names',JSON.stringify(names));
599 + Core.user_names = names;
600 + $("#js_reset_newpsw").val("");
573 setTimeout(function() { 601 setTimeout(function() {
574 Core.updateMod('login'); 602 Core.updateMod('login');
575 }, 500); 603 }, 500);
...@@ -599,6 +627,11 @@ ...@@ -599,6 +627,11 @@
599 that.$c.on('click', '.pwd_box .step-tab li a', function(e) { 627 that.$c.on('click', '.pwd_box .step-tab li a', function(e) {
600 var ipar = $(this).parent("li"), 628 var ipar = $(this).parent("li"),
601 iIndex = ipar.index(); 629 iIndex = ipar.index();
630 +
631 + that.$c.find("#js_findPSW_ranks").val("");
632 + $("#js_findPSW_accout").val("");
633 + $("#js_findPSW_mobile").val("");
634 +
602 that.$c.find('.step-tab').hide().siblings(".step-box").show().children("div").eq(iIndex).removeClass("hide").addClass("fn-icon-2").siblings("div").addClass("hide").removeClass("fn-icon-2"); 635 that.$c.find('.step-tab').hide().siblings(".step-box").show().children("div").eq(iIndex).removeClass("hide").addClass("fn-icon-2").siblings("div").addClass("hide").removeClass("fn-icon-2");
603 that.$c.find(".user-center span").html(pwd_header[iIndex]); 636 that.$c.find(".user-center span").html(pwd_header[iIndex]);
604 that.$c.find(".user-center a").replaceWith(pwd_header_back[1]); 637 that.$c.find(".user-center a").replaceWith(pwd_header_back[1]);
...@@ -606,13 +639,13 @@ ...@@ -606,13 +639,13 @@
606 639
607 that.$c.on('click', '.user-center a.back-btn', function(e) { 640 that.$c.on('click', '.user-center a.back-btn', function(e) {
608 $(this).parents(".new-sdk-container").find(".step-box").hide().siblings(".step-tab").show(); 641 $(this).parents(".new-sdk-container").find(".step-box").hide().siblings(".step-tab").show();
609 - that.$c.find(".user-center span").html(pwd_header[5]); 642 + that.$c.find(".user-center span").html(pwd_header[4]);
610 that.$c.find(".user-center a").replaceWith(pwd_header_back[0]); 643 that.$c.find(".user-center a").replaceWith(pwd_header_back[0]);
611 }); 644 });
612 645
613 that.$c.on('click', '.pwd_box a.kefu_subbtn', function(e) { 646 that.$c.on('click', '.pwd_box a.kefu_subbtn', function(e) {
614 $(this).parents(".step-box").hide().siblings(".step-tab").show(); 647 $(this).parents(".step-box").hide().siblings(".step-tab").show();
615 - that.$c.find(".user-center span").html(pwd_header[5]); 648 + that.$c.find(".user-center span").html(pwd_header[4]);
616 that.$c.find(".user-center a").replaceWith(pwd_header_back[1]); 649 that.$c.find(".user-center a").replaceWith(pwd_header_back[1]);
617 }); 650 });
618 651
...@@ -762,7 +795,7 @@ ...@@ -762,7 +795,7 @@
762 var that = this; 795 var that = this;
763 var SendMsg = { 796 var SendMsg = {
764 mobileReg : function(iphone){ 797 mobileReg : function(iphone){
765 - var iphoneReg = /^(((13[0-9]{1})|(15[0-9]{1})|(18[0-9]{1}))+\d{8})$/, 798 + var iphoneReg = /^1(3|4|5|7|8)\d{9}$/,
766 phoneTest = $(iphone).val(); 799 phoneTest = $(iphone).val();
767 if($.trim(phoneTest) == ""){ 800 if($.trim(phoneTest) == ""){
768 Core.showTips('请输入手机号码!', false); 801 Core.showTips('请输入手机号码!', false);
...@@ -893,6 +926,8 @@ ...@@ -893,6 +926,8 @@
893 if(res.code === 0){ 926 if(res.code === 0){
894 Core.showTips('解绑成功!', true); 927 Core.showTips('解绑成功!', true);
895 Core.Data.bind_phone = ""; 928 Core.Data.bind_phone = "";
929 + $("#js_iphone").val("");
930 + $("#js_ranks").val("");
896 setTimeout(function() { 931 setTimeout(function() {
897 Core.updateMod('home'); 932 Core.updateMod('home');
898 }, 500); 933 }, 500);
...@@ -912,6 +947,97 @@ ...@@ -912,6 +947,97 @@
912 } 947 }
913 Core.registerMod('unbindMobile', UnBindMobile); 948 Core.registerMod('unbindMobile', UnBindMobile);
914 949
950 + //实名认证
951 + var IdentityCard = function(modId) {
952 + Module.call(this, modId);
953 + }
954 + // 继承基础模块
955 + Core.inherit(IdentityCard, Module);
956 + IdentityCard.prototype.bind = function() {
957 + var that = this;
958 + this.$c.on('click', '.submit', function() {
959 + var identityCard = that.$c.find("input[name='identity_card']").val(),//身份证
960 + compellationName = that.$c.find("input[name='compellation_name']").val(),//姓名
961 + compellationNameReg = /^[\u4e00-\u9fa5]{2,10}$/i;//2-10位汉字
962 + if($.trim(identityCard) == ""){
963 + Core.showTips("请输入身份证号码",false);
964 + return false;
965 + }else if(IsIdCard(identityCard) == false){
966 + Core.showTips("请输入正确的身份证信息",false);
967 + return false;
968 + }else if($.trim(compellationName) == ""){
969 + Core.showTips("请输入姓名",false);
970 + return false;
971 + }else if(!compellationNameReg.test(compellationName)){
972 + Core.showTips("请输入正确的中文姓名",false);
973 + return false;
974 + }
975 + Core.ajax({
976 + type:"post",
977 + url:"/user/bind_identity_card?identity_card="+identityCard+"&compellation_name="+compellationName,
978 + data:{format:"json"},
979 + dataType:"json",
980 + success:function(res){
981 + if(res.code === 0){
982 + Core.showTips('认证成功!', true);
983 + Core.Data.compellation_name = compellationName;
984 + Core.Data.identity_card = identityCard;
985 + setTimeout(function() {
986 + Core.updateMod('home');
987 + }, 500);
988 + }else{
989 + Core.showTips(res.msg, true);
990 + }
991 + }
992 + });
993 + });
994 + }
995 + IdentityCard.prototype.show_after = function(){
996 +
997 + }
998 + Core.registerMod('identityCard', IdentityCard);
999 +
1000 + //已认证
1001 + var IdentityCardOk = function(modId) {
1002 + Module.call(this, modId);
1003 + }
1004 + // 继承基础模块
1005 + Core.inherit(IdentityCardOk, Module);
1006 + IdentityCardOk.prototype.show_after = function(){
1007 + var compellation_name = Core.Data.compellation_name,//姓名
1008 + identity_card = Core.Data.identity_card;//身份证
1009 + if(compellation_name.length == 2){
1010 + var getBefore = compellation_name.substring(0,1),
1011 + nameHtml = getBefore+"*";
1012 + }else if(compellation_name.length == 3){
1013 + var getBefore = compellation_name.substring(0,1),
1014 + nameHtml = getBefore+"**";
1015 + }else if(compellation_name.length == 4){
1016 + var getBefore = compellation_name.substring(0,2),
1017 + nameHtml = getBefore+"**";
1018 + }else if(compellation_name.length > 4){
1019 + var getBefore = compellation_name.substring(0,2),
1020 + starNum = compellation_name.length,
1021 + star = "";
1022 + for(var i = 0;i<starNum - 2;i++){
1023 + star += "*";
1024 + }
1025 + nameHtml = getBefore+star;
1026 + };
1027 + if(identity_card.length == 15){
1028 + var getBefore = identity_card.substring(0,1),
1029 + getAfter = identity_card.substring(14,15),
1030 + cardHtml = getBefore+"*************"+getAfter;
1031 + }else if(identity_card.length == 18){
1032 + var getBefore = identity_card.substring(0,1),
1033 + getAfter = identity_card.substring(17,18),
1034 + cardHtml = getBefore+"****************"+getAfter;
1035 + };
1036 + this.$c.find(".compellation_name").html(nameHtml);
1037 + this.$c.find(".identity_card").html(cardHtml);
1038 + };
1039 + Core.registerMod('identityCard_ok', IdentityCardOk);
1040 +
915 // Mail模块 1041 // Mail模块
916 var Mail = function(modId) { 1042 var Mail = function(modId) {
917 Module.call(this, modId); 1043 Module.call(this, modId);
...@@ -982,24 +1108,27 @@ ...@@ -982,24 +1108,27 @@
982 }); 1108 });
983 } 1109 }
984 Answer_question.prototype.aq_cb = function(data) { 1110 Answer_question.prototype.aq_cb = function(data) {
1111 + console.log(data);
985 var code = data.code; 1112 var code = data.code;
986 var msg = data.msg; 1113 var msg = data.msg;
987 var name = localStorage.getItem('user_names'); 1114 var name = localStorage.getItem('user_names');
988 Core.updateData(msg); 1115 Core.updateData(msg);
989 Core.Data.new_pwd = msg.password; 1116 Core.Data.new_pwd = msg.password;
990 1117
1118 + name = JSON.parse(name);
991 if(name == null){ 1119 if(name == null){
992 name = null; 1120 name = null;
993 }else{ 1121 }else{
994 - name = JSON.parse(name);
995 - }
996 name[msg.nickname] = msg.password; 1122 name[msg.nickname] = msg.password;
1123 + }
1124 +
997 localStorage.setItem('user_names',JSON.stringify(name)); 1125 localStorage.setItem('user_names',JSON.stringify(name));
998 Core.user_names = name; 1126 Core.user_names = name;
999 1127
1000 // 强制更新显示重置密码模块 1128 // 强制更新显示重置密码模块
1001 Core.updateMod('reset_pwd'); 1129 Core.updateMod('reset_pwd');
1002 - Core.showTips('重置成功.',true,1000) 1130 + Core.showTips('重置成功.',true,1000);
1131 + localStorage.setItem('old_pwd',Core.Data.new_pwd);
1003 } 1132 }
1004 Core.registerMod('answer_question', Answer_question); 1133 Core.registerMod('answer_question', Answer_question);
1005 1134
...@@ -1012,7 +1141,14 @@ ...@@ -1012,7 +1141,14 @@
1012 var that = this; 1141 var that = this;
1013 that.$c.on('click', '[type=submit],.submit', function(e) { 1142 that.$c.on('click', '[type=submit],.submit', function(e) {
1014 e.preventDefault(); 1143 e.preventDefault();
1144 + if(/[A-Z]/.test(that.$c.find("input[name='username']").val())){
1145 + Core.showTips("账号不能有大写字母！");
1146 + }else if(/[A-Z]/.test(that.$c.find("input[name='newpwd']").val())){
1147 + Core.showTips("密码不能有大写字母！");
1148 + }else{
1015 Core.ajax_do(that.$c.find('.ajax'), that.modify_cb, that); 1149 Core.ajax_do(that.$c.find('.ajax'), that.modify_cb, that);
1150 + }
1151 +
1016 return false; 1152 return false;
1017 }); 1153 });
1018 that.$c.on('click', '.op-logout', function(e) { 1154 that.$c.on('click', '.op-logout', function(e) {
...@@ -1310,11 +1446,11 @@ ...@@ -1310,11 +1446,11 @@
1310 1446
1311 var names = localStorage.getItem("user_names"), 1447 var names = localStorage.getItem("user_names"),
1312 userIndexs = localStorage.getItem("user_indexs"); 1448 userIndexs = localStorage.getItem("user_indexs");
1313 -
1314 - if (names == null)
1315 - names = null;
1316 - else {
1317 names = JSON.parse(names); 1449 names = JSON.parse(names);
1450 + if (names == null){
1451 + names = null
1452 + }
1453 + else {
1318 delete names["undefined"]; 1454 delete names["undefined"];
1319 var user_indexs = []; 1455 var user_indexs = [];
1320 for (var item in names){//遍历对象，排序 1456 for (var item in names){//遍历对象，排序
......
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
17 } 17 }
18 Core.inherit(Home, Module); 18 Core.inherit(Home, Module);
19 Home.prototype.bind = function() { 19 Home.prototype.bind = function() {
20 + $('#loading').click(function(){$(this).hide()})
20 var that = this; 21 var that = this;
21 that.$c.on('click', 'input[type=button]', function(e) { 22 that.$c.on('click', 'input[type=button]', function(e) {
22 // 更新要兑换的元宝 23 // 更新要兑换的元宝
...@@ -30,6 +31,7 @@ ...@@ -30,6 +31,7 @@
30 Core.Data.money = Core.Data.youai_star / Core.Data.rate; 31 Core.Data.money = Core.Data.youai_star / Core.Data.rate;
31 Core.updateMod('exchange'); 32 Core.updateMod('exchange');
32 } else { 33 } else {
34 +
33 // 用户游爱星不足够兑换，进入充值渠道列表 35 // 用户游爱星不足够兑换，进入充值渠道列表
34 Core.Data.money = youai_star_need / Core.Data.rate; 36 Core.Data.money = youai_star_need / Core.Data.rate;
35 Core.Data.youai_star = youai_star_need; 37 Core.Data.youai_star = youai_star_need;
...@@ -38,7 +40,12 @@ ...@@ -38,7 +40,12 @@
38 return false; 40 return false;
39 }); 41 });
40 } 42 }
43 + Home.prototype.show_after = function(){
41 44
45 + setTimeout(function(){
46 + $('#back-btn').show();
47 + },3000)
48 + }
42 Core.registerMod('home', Home); 49 Core.registerMod('home', Home);
43 50
44 /** 51 /**
...@@ -143,7 +150,7 @@ ...@@ -143,7 +150,7 @@
143 var reload = false; 150 var reload = false;
144 var list = Core.Data.game_pay_channel_list; 151 var list = Core.Data.game_pay_channel_list;
145 var $c = $(e.target); 152 var $c = $(e.target);
146 - var id = $c.attr('data-id'); 153 + var id = $(this).attr('data-id');
147 for ( var index in list) { 154 for ( var index in list) {
148 var item = list[index]; 155 var item = list[index];
149 if (id == item.id) { 156 if (id == item.id) {
...@@ -908,22 +915,23 @@ ...@@ -908,22 +915,23 @@
908 Core.Data.enter_amount = Core.Data.enter_game_amount / Core.Data.exchange_rate; 915 Core.Data.enter_amount = Core.Data.enter_game_amount / Core.Data.exchange_rate;
909 Core.Data.pay_again = 0; 916 Core.Data.pay_again = 0;
910 } 917 }
911 - if (Core.Data.enter_game_amount > 0 918 + //if (Core.Data.enter_game_amount > 0
912 - && Core.Data.enter_amount <= Core.Data.total_amount) { 919 + // && Core.Data.enter_amount <= Core.Data.total_amount) {
913 - // 需要进入兑换页面 920 + // // 需要进入兑换页面
914 - Core.start_page = "exchange"; 921 + // Core.start_page = "exchange";
915 - Core.Data.game_amount = Core.Data.enter_game_amount; 922 + // Core.Data.game_amount = Core.Data.enter_game_amount;
916 - Core.Data.youai_star = Core.Data.enter_amount; 923 + // Core.Data.youai_star = Core.Data.enter_amount;
917 - Core.Data.money = Core.Data.youai_star / Core.Data.rate; 924 + // Core.Data.money = Core.Data.youai_star / Core.Data.rate;
918 - } else if (Core.Data.enter_game_amount > 0) { 925 + //} else
926 + //if (Core.Data.enter_game_amount > 0) {
919 // 需要进入渠道充值页面 927 // 需要进入渠道充值页面
920 Core.start_page = "channel_list"; 928 Core.start_page = "channel_list";
921 Core.Data.game_amount = Core.Data.enter_game_amount; 929 Core.Data.game_amount = Core.Data.enter_game_amount;
922 Core.Data.youai_star = Core.Data.enter_amount; 930 Core.Data.youai_star = Core.Data.enter_amount;
923 Core.Data.money = Core.Data.youai_star / Core.Data.rate; 931 Core.Data.money = Core.Data.youai_star / Core.Data.rate;
924 - } else { 932 + //} else {
925 - // 没有输入充值数量，进入选择数量的界面 933 + // // 没有输入充值数量，进入选择数量的界面
926 - } 934 + //}
927 } 935 }
928 936
929 function onBridgeReady() { 937 function onBridgeReady() {
......
1 +/*!
2 +** create by zhangxinxu(.com) 2013-07-15
3 +** a simple method for custom scrolling
4 +** it can be used on both mobile and parts desktop browser IE9+/FF/Chrome/...
5 +*/
6 +var simpScroller=(function(){var c=!((window.DocumentTouch&&document instanceof window.DocumentTouch)||"ontouchstart" in window)*1,b={start:["touchstart","mousedown"][c],move:["touchmove","mousemove"][c],end:["touchend","mouseup"][c]};var a=function(e,l,f){var n="top",o="Top",p="height",g="Height",d="pageY";if(l=="horizontal"){n="left";o="Left";p="width";g="Width";d="pageX"}var i=null;if(f.hideScrollBar==false){i=document.createElement("div");i.className="scroller_"+l;f.container.appendChild(i)}var m=e["client"+g],h=0;var j=function(){if(i==null){return}var r=i.style[p].replace("px",""),q=e["scroll"+o]/(h-m)*(m-r);if(m-r-q<=0){q=m-r}i.style[n]=q+"px"};var k={};e.addEventListener(b.start,function(q){h=this["scroll"+g];k[d]=q.touches?q.touches[0][d]:q[d];k[n]=this["scroll"+o];document.moveFollow=true;if(i&&h>m){i.style.opacity=1;i.style[p]=(m*m/h)+"px";j()}c&&q.preventDefault()});e.addEventListener(b.move,function(q){if(c==false||(document.moveFollow==true)){this["scroll"+o]=k[n]+(k[d]-(q.touches?q.touches[0][d]:q[d]));j();f.onScroll.call(this,q)}q.preventDefault()});e.addEventListener(b.end,function(q){i&&(i.style.opacity=0)});if(c==true){document.addEventListener("mouseup",function(){this.moveFollow=false})}};return function(d,f){f=f||{};var j=new Object({verticalScroll:true,horizontalScroll:false,hideScrollBar:false,onScroll:function(){}}),g;for(g in f){j[g]=f[g]}if(window.getComputedStyle(d).position=="static"){d.style.position="relative"}var i=d.childNodes,e=document.createDocumentFragment();[].slice.call(i).forEach(function(k){e.appendChild(k)});var h=document.createElement("div");h.style.height="100%";h.style.width="100%";h.style.overflow="hidden";d.appendChild(h);h.appendChild(e);j.container=d;if(j.verticalScroll==true){a(h,"vertical",j)}if(j.horizontalScroll==true){a(h,"horizontal",j)}}})();
...\ No newline at end of file ...\ No newline at end of file
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
33 <span></span> 33 <span></span>
34 </div> 34 </div>
35 <!-- 登录模块 --> 35 <!-- 登录模块 -->
36 -<section id="login" class="hide" data-replace="1"> 36 +<section id="login" class="" data-replace="1">
37 <div class="new-sdk-container"> 37 <div class="new-sdk-container">
38 <div class="new-container-box"> 38 <div class="new-container-box">
39 <div class="SDK-titlebox"></div> 39 <div class="SDK-titlebox"></div>
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
49 <i class="iconfont icon-xiangxia"></i> 49 <i class="iconfont icon-xiangxia"></i>
50 </div> 50 </div>
51 </div> 51 </div>
52 - <div class="pull-box"> 52 + <div class="pull-box horizontall">
53 <ul class="drop-ul"> 53 <ul class="drop-ul">
54 54
55 </ul> 55 </ul>
...@@ -60,17 +60,17 @@ ...@@ -60,17 +60,17 @@
60 <div class="iright"><input type="password" name="password" placeholder="请输入密码" id="js_login_password"></div> 60 <div class="iright"><input type="password" name="password" placeholder="请输入密码" id="js_login_password"></div>
61 </div> 61 </div>
62 <div class="other-login clearfix"> 62 <div class="other-login clearfix">
63 - <!--<p>第三方登录 63 + <p class="other-login-bx hide">第三方登录
64 - <a title="新浪微博帐号登录" data-replace="href" href="/user/auth2/sina/login/?next=/static/sdk_3/login.html&app_id={app_id}" class="sina hide"> 64 + <a title="新浪微博帐号登录" data-replace="href" href="/user/auth2/sina/login/?next=/static/sdk/login.html&app_id={app_id}" class="sina hide">
65 <i class=" iconfont icon-unie61d"></i> 65 <i class=" iconfont icon-unie61d"></i>
66 </a> 66 </a>
67 67
68 - <a title="QQ号码登录" data-replace="href" href="/user/auth2/qq/login/?next=/static/sdk_3/login.html&app_id={app_id}" class="qq iframe hide"> 68 + <a title="QQ号码登录" data-replace="href" href="/user/auth2/qq/login/?next=/static/sdk/login.html&app_id={app_id}" class="qq iframe hide">
69 </a> 69 </a>
70 70
71 - <a title="微信登录" data-replace="href" href="sdk://weixinlogin?app_id={app_id}&next=/static/sdk_3/login.html" class="weixin hide"> 71 + <a title="微信登录" data-replace="href" href="sdk://weixinlogin?app_id={app_id}&next=/static/sdk/login.html" class="weixin hide">
72 </a> 72 </a>
73 - </p>--> 73 + </p>
74 74
75 <label><a href="#find_pwd" class="forgetpsw">找回密码</a></label> 75 <label><a href="#find_pwd" class="forgetpsw">找回密码</a></label>
76 <div class="clear"></div> 76 <div class="clear"></div>
...@@ -136,9 +136,9 @@ ...@@ -136,9 +136,9 @@
136 <div class="ileft">账号：</div> 136 <div class="ileft">账号：</div>
137 <div class="iright"> 137 <div class="iright">
138 <input type="text" name="username" placeholder="帐号由3-18个英文、数字、点、减号、下划线组成" required> 138 <input type="text" name="username" placeholder="帐号由3-18个英文、数字、点、减号、下划线组成" required>
139 - <div class="bottom-icon drop-down"> 139 + <!--<div class="bottom-icon drop-down">
140 <i class="iconfont icon-xiangxia"></i> 140 <i class="iconfont icon-xiangxia"></i>
141 - </div> 141 + </div>-->
142 </div> 142 </div>
143 </div> 143 </div>
144 <div class="inputbox clearfix"> 144 <div class="inputbox clearfix">
...@@ -150,7 +150,7 @@ ...@@ -150,7 +150,7 @@
150 <div class="checkbox checkbox-2 l" > 150 <div class="checkbox checkbox-2 l" >
151 <i class="iconfont icon-xuanzhong"></i> 151 <i class="iconfont icon-xuanzhong"></i>
152 </div> 152 </div>
153 - <p class="l">接受<a href="agreement.html">网络服务协议</a></p> 153 + <p class="l">接受<a href="#agreement">网络服务协议</a></p>
154 </span> 154 </span>
155 155
156 </div> 156 </div>
...@@ -173,14 +173,12 @@ ...@@ -173,14 +173,12 @@
173 <div class="new-sdk-container"> 173 <div class="new-sdk-container">
174 <div class="SDK-titlebox"></div> 174 <div class="SDK-titlebox"></div>
175 <div class="new-sdk-logo"><a href="#"><img src="images/new-sdk-logo.png"></a></div> 175 <div class="new-sdk-logo"><a href="#"><img src="images/new-sdk-logo.png"></a></div>
176 - <div class="new-sdk-content"> 176 + <div class="new-sdk-content" style="overflow: hidden;">
177 <h3>网络服务协议</h3> 177 <h3>网络服务协议</h3>
178 - <div class="content-main"> 178 + <div class="content-main" style="height: 220px;">
179 - <p>欢迎申请手游平台（下列简称为”本平台“）提供的服务。请仔细阅读以下全部内容。如用户不同意本服务条款任意内容，请不要注册或使用本平台服务。一旦注册成功，即表示用户与平台已达成协议，自愿接受本服务条款的所有内容。此后，用户不得以阅读本服务条款内容作任何形式的抗辩。</p> 179 +
180 - <h4>一、账号注册</h4> 180 + <iframe src="agreement.html" name="myiframe" id="iframepage" frameborder="0" scrolling="auto" width="100%"></iframe>
181 - <p>欢迎申请手游平台（下列简称为”本平台“）提供的服务。请仔细阅读以下全部内容。如用户不同意本服务条款任意内容，请不要注册或使用本平台服务。一旦注册成功，即表示用户与平台已达成协议，自愿接受本服务条款的所有内容。此后，用户不得以阅读本服务条款内容作任何形式的抗辩。</p> 181 +
182 - <h4>二、账号注册</h4>
183 - <p>欢迎申请手游平台（下列简称为”本平台“）提供的服务。请仔细阅读以下全部内容。如用户不同意本服务条款任意内容，请不要注册或使用本平台服务。一旦注册成功，即表示用户与平台已达成协议，自愿接受本服务条款的所有内容。此后，用户不得以阅读本服务条款内容作任何形式的抗辩。</p>
184 </div> 182 </div>
185 </div> 183 </div>
186 184
...@@ -254,6 +252,10 @@ ...@@ -254,6 +252,10 @@
254 <!-- end --> 252 <!-- end -->
255 <section id="message_detail" class="hide" data-attr="dot"> 253 <section id="message_detail" class="hide" data-attr="dot">
256 </section> 254 </section>
255 +<section id="identityCard" class="hide" data-attr="dot">
256 +</section>
257 +<section id="identityCard_ok" class="hide" data-attr="dot">
258 +</section>
257 <!-- 找回密码模块 --> 259 <!-- 找回密码模块 -->
258 <section id="find_pwd" class="hide" data-replace="1"> 260 <section id="find_pwd" class="hide" data-replace="1">
259 <input type="hidden" name="pwd_code" value=""> 261 <input type="hidden" name="pwd_code" value="">
...@@ -290,7 +292,7 @@ ...@@ -290,7 +292,7 @@
290 </div> 292 </div>
291 <ul class="inline-btn" style="margin-top: 15px;"> 293 <ul class="inline-btn" style="margin-top: 15px;">
292 <li style="background: none;"><a class="larg btn btn-orange" value="" id="js_findPSW_confirm">确定</a></li> 294 <li style="background: none;"><a class="larg btn btn-orange" value="" id="js_findPSW_confirm">确定</a></li>
293 - <li style="background: none; border-radius: 20px;"><a class="btn" href="#home">返回</a></li> 295 + <li style="background: none; border-radius: 20px;"><a class="btn" href="#home" id="returnhome">返回</a></li>
294 </ul> 296 </ul>
295 </div> 297 </div>
296 </div> 298 </div>
...@@ -313,7 +315,7 @@ ...@@ -313,7 +315,7 @@
313 </div>--> 315 </div>-->
314 <div class="function-list-content hide"> 316 <div class="function-list-content hide">
315 <div class="pwd_txt"> 317 <div class="pwd_txt">
316 - <div class="default_text" style="display: none;"> 318 + <div class="default_text">
317 <p>客服QQ：<a href="javascript:;" id="js_kefu_qq"></a></p> 319 <p>客服QQ：<a href="javascript:;" id="js_kefu_qq"></a></p>
318 <p>客服电话：<a href="tel:"></a></p> 320 <p>客服电话：<a href="tel:"></a></p>
319 <p>玩家交流群：<a href="javascript:;" id="js_player"></a></p> 321 <p>玩家交流群：<a href="javascript:;" id="js_player"></a></p>
...@@ -433,7 +435,7 @@ ...@@ -433,7 +435,7 @@
433 </div> 435 </div>
434 </div> 436 </div>
435 </div> 437 </div>
436 - {{?? Core.Data.is_guest == 2}} 438 + {{?? Core.Data.is_guest == 2}}<!--1:游客登录；2：第三方登录；0：正式用户登录-->
437 <div class="user-center-box"> 439 <div class="user-center-box">
438 <div class="top clearfix" style="border-bottom: none;"> 440 <div class="top clearfix" style="border-bottom: none;">
439 <div class="pull-left txt w_45"> 441 <div class="pull-left txt w_45">
...@@ -444,18 +446,24 @@ ...@@ -444,18 +446,24 @@
444 <a href="javascript:Core.finishLogin()" class="btn btn-orange">进入游戏</a> 446 <a href="javascript:Core.finishLogin()" class="btn btn-orange">进入游戏</a>
445 </div> 447 </div>
446 </div> 448 </div>
447 - <ul class="list-item clearfix">
448 {{? Core.Data.bind_phone === ""}} 449 {{? Core.Data.bind_phone === ""}}
450 + <ul class="list-item clearfix">
449 <li style="position: relative;"><a href="#bindMobile">绑定手机</a><span class="redround"></span></li> 451 <li style="position: relative;"><a href="#bindMobile">绑定手机</a><span class="redround"></span></li>
450 - {{??}}
451 - <li><a href="#unbindMobile">解绑手机</a></li>
452 - {{?}}
453 - <!--<li><a href="#mail">绑定邮箱</a></li>-->
454 <li><a href="#mibao">设置密保</a></li> 452 <li><a href="#mibao">设置密保</a></li>
455 <li><a href="#modify_pwd">修改密码</a></li> 453 <li><a href="#modify_pwd">修改密码</a></li>
456 </ul> 454 </ul>
457 - </div>
458 {{??}} 455 {{??}}
456 + <ul class="list-item clearfix">
457 + <li style="width:50%;"><a href="#unbindMobile">解绑手机</a></li>
458 + <li style="width:50%;"><a href="#mibao">设置密保</a></li>
459 + </ul>
460 + <ul class="list-item clearfix" style="border-top:none;">
461 + <li style="width:50%;"><a href="#modify_pwd">修改密码</a></li>
462 + <li style="width:50%;"><a href="#identityCard">实名认证</a></li>
463 + </ul>
464 + {{?}}
465 + </div>
466 + {{?? Core.Data.is_guest == 0}}
459 <div class="user-center-box"> 467 <div class="user-center-box">
460 <div class="top clearfix" style="border-bottom: none;"> 468 <div class="top clearfix" style="border-bottom: none;">
461 <div class="pull-left txt w_45"> 469 <div class="pull-left txt w_45">
...@@ -466,16 +474,40 @@ ...@@ -466,16 +474,40 @@
466 <a href="javascript:Core.finishLogin()" class="btn btn-orange">进入游戏</a> 474 <a href="javascript:Core.finishLogin()" class="btn btn-orange">进入游戏</a>
467 </div> 475 </div>
468 </div> 476 </div>
477 +
478 + {{? Core.Data.bind_phone === ""}}
469 <ul class="list-item clearfix"> 479 <ul class="list-item clearfix">
480 + <li style="position: relative;"><a href="#bindMobile">绑定手机</a><span class="redround"></span></li>
481 + <li><a href="#mibao">设置密保</a></li>
482 + <li><a href="#modify_pwd">修改密码</a></li>
483 + </ul>
484 + {{??}}
485 + <ul class="list-item clearfix">
486 + <li style="width:50%;"><a href="#unbindMobile">解绑手机</a></li>
487 + <li style="width:50%;"><a href="#mibao">设置密保</a></li>
488 + </ul>
489 + <ul class="list-item clearfix" style="border-top:none;">
490 + <li style="width:50%;"><a href="#modify_pwd">修改密码</a></li>
491 + {{? Core.Data.compellation_name === "" && Core.Data.identity_card === ""}}
492 + <li style="width:50%;"><a href="#identityCard">实名认证</a></li>
493 + {{??}}
494 + <li style="width:50%;position:relative;"><a href="#identityCard_ok">实名认证
495 + <span style="position:absolute;right:5px;top:5px;color:#fff;background:#ff9600;padding:3px 10px;border-radius:10px;font-size:20px;">已认证</span>
496 + </a></li>
497 + {{?}}
498 + </ul>
499 + {{?}}
500 + <!--<ul class="list-item clearfix">
470 {{? Core.Data.bind_phone === ""}} 501 {{? Core.Data.bind_phone === ""}}
471 <li style="position: relative;"><a href="#bindMobile">绑定手机</a><span class="redround"></span></li> 502 <li style="position: relative;"><a href="#bindMobile">绑定手机</a><span class="redround"></span></li>
472 {{??}} 503 {{??}}
473 <li><a href="#unbindMobile">解绑手机</a></li> 504 <li><a href="#unbindMobile">解绑手机</a></li>
505 + <li><a href="#">实名认证</a></li>
474 {{?}} 506 {{?}}
475 - <!--<li><a href="#mail">绑定邮箱</a></li> -->
476 <li><a href="#mibao">设置密保</a></li> 507 <li><a href="#mibao">设置密保</a></li>
477 <li><a href="#modify_pwd">修改密码</a></li> 508 <li><a href="#modify_pwd">修改密码</a></li>
478 - </ul> 509 +
510 + </ul>-->
479 </div> 511 </div>
480 512
481 {{?}} 513 {{?}}
...@@ -610,6 +642,28 @@ ...@@ -610,6 +642,28 @@
610 642
611 643
612 </script> 644 </script>
645 +
646 +<script id="identityCard_template" type="text/x-jquery-tmpl" >
647 + <div class="new-sdk-container">
648 + <div class="SDK-titlebox"></div>
649 + <div class="user-center">
650 + <a href="#home" class="lefticon">
651 + <i class="iconfont icon-fanhui"></i>
652 + </a>
653 + 实名认证
654 + </div>
655 + <form action="/user/bind_identity_card" method="post" class="ajax" onkeydown="if(event.keyCode==13) return false;" >
656 + <div class="new-sdk-box">
657 + <div class="input" style="padding:0 25px;"><input type="text" name="identity_card" required placeholder="请输入注册身份证号码" style="text-align: left;"></div>
658 + <div class="input" style="padding:0 25px;"><input type="text" name="compellation_name" required placeholder="请输入姓名" style="text-align: left;"></div>
659 + </div>
660 + <ul class="inline-btn">
661 + <li style="padding: 1em 0; float: none; margin: 0 auto;"><a class="submit btn larg btn-orange" autocomplete="off">提交</a></li>
662 + </ul>
663 + </form>
664 + </div>
665 +</script>
666 +
613 <script id="mibao_template" type="text/x-jquery-tmpl" > 667 <script id="mibao_template" type="text/x-jquery-tmpl" >
614 {{? Core.Data.safe_question == "" }} 668 {{? Core.Data.safe_question == "" }}
615 <div class="new-sdk-container"> 669 <div class="new-sdk-container">
...@@ -620,21 +674,25 @@ ...@@ -620,21 +674,25 @@
620 </a> 674 </a>
621 设置密保 675 设置密保
622 </div> 676 </div>
623 - <form action="/sdk/set_mibao" mthod="post" class="ajax" todo="mibao_callback" > 677 + <form action="/sdk/set_mibao" mthod="post" class="ajax" todo="mibao_callback" onkeydown="if(event.keyCode==13) return false;" >
624 <div class="new-sdk-box"> 678 <div class="new-sdk-box">
625 - <div class="input select" style="padding: 25px;"> 679 + <div class="input select" style="padding:0 25px; position: relative;">
626 <select name="question" class="" > 680 <select name="question" class="" >
627 {{~ Core.Data.question_list :item:index }} 681 {{~ Core.Data.question_list :item:index }}
628 <option value='{{=item}}'>{{=item}}</option> 682 <option value='{{=item}}'>{{=item}}</option>
629 {{~}} 683 {{~}}
630 -
631 </select> 684 </select>
685 + <i class="iconfont icon-xiangxia" style="
686 + position: absolute;
687 + right: -25px;
688 + top: 21px;
689 + "></i>
632 </div> 690 </div>
633 <div class="input" style="padding:0 25px;"><input type="text" name="answer" required placeholder="输入密保保护答案" style="text-align: left;"></div> 691 <div class="input" style="padding:0 25px;"><input type="text" name="answer" required placeholder="输入密保保护答案" style="text-align: left;"></div>
634 <p style="color: #595757; font-size: 18px; margin-top: 10px;">设置密保，能通过回答问题找回忘记的密码</p> 692 <p style="color: #595757; font-size: 18px; margin-top: 10px;">设置密保，能通过回答问题找回忘记的密码</p>
635 </div> 693 </div>
636 <ul class="inline-btn"> 694 <ul class="inline-btn">
637 - <li style="padding: 1em 0; float: none; margin: 0 auto;"><a class="submit btn larg btn-orange ">保存设置</a></li> 695 + <li style="padding: 1em 0; float: none; margin: 0 auto;"><a class="submit btn larg btn-orange" autocomplete="off">保存设置</a></li>
638 </ul> 696 </ul>
639 </form> 697 </form>
640 </div> 698 </div>
...@@ -663,7 +721,7 @@ ...@@ -663,7 +721,7 @@
663 <div class="new-sdk-container"> 721 <div class="new-sdk-container">
664 <div class="SDK-titlebox"></div> 722 <div class="SDK-titlebox"></div>
665 <div class="user-center"> 723 <div class="user-center">
666 - <a href="#login" class="lefticon"> 724 + <a href="#login" class="lefticon back-btn">
667 <i class="iconfont icon-fanhui"></i> 725 <i class="iconfont icon-fanhui"></i>
668 </a> 726 </a>
669 密保找回密码 727 密保找回密码
...@@ -817,6 +875,23 @@ ...@@ -817,6 +875,23 @@
817 </div> 875 </div>
818 </div> 876 </div>
819 </script> 877 </script>
878 +<script id="identityCard_ok_template" type="text/x-jquery-tmpl">
879 + <div class="new-sdk-container">
880 + <div class="SDK-titlebox"></div>
881 + <div class="user-center">
882 + <a href="#home" class="lefticon">
883 + <i class="iconfont icon-fanhui"></i>
884 + </a>
885 + 实名认证
886 + </div>
887 + <div class="new-sdk-box">
888 + <div class="acount-name">
889 + <p style="margin-top: 0;">姓名：<span class="compellation_name"></span></p>
890 + <p>身份证：<span class="identity_card"></span></p>
891 + </div>
892 + </div>
893 + </div>
894 +</script>
820 <script id="message_detail_template" type="text/x-jquery-tmpl"> 895 <script id="message_detail_template" type="text/x-jquery-tmpl">
821 <div class="header"> 896 <div class="header">
822 <a class="btn pull-left op-back" href="#message">返回</a> 897 <a class="btn pull-left op-back" href="#message">返回</a>
...@@ -921,6 +996,7 @@ ...@@ -921,6 +996,7 @@
921 <script type="text/javascript" src="js/doT.min.js?20150923001" ></script> 996 <script type="text/javascript" src="js/doT.min.js?20150923001" ></script>
922 <script type="text/javascript" src="js/iscroll.min.1.0.js?20150923001" ></script> 997 <script type="text/javascript" src="js/iscroll.min.1.0.js?20150923001" ></script>
923 <script type="text/javascript"> 998 <script type="text/javascript">
999 +
924 window.isGetData = 0; 1000 window.isGetData = 0;
925 $(function() { 1001 $(function() {
926 FastClick.attach(document.body); 1002 FastClick.attach(document.body);
...@@ -929,13 +1005,14 @@ FastClick.attach(document.body); ...@@ -929,13 +1005,14 @@ FastClick.attach(document.body);
929 <script type="text/javascript" src="js/core.min.js?20150923001" ></script> 1005 <script type="text/javascript" src="js/core.min.js?20150923001" ></script>
930 <script type="text/javascript" src="js/login.min.js?2016111" ></script> 1006 <script type="text/javascript" src="js/login.min.js?2016111" ></script>
931 <script type="text/javascript" src="js/loader.min.js?20150923001"></script> 1007 <script type="text/javascript" src="js/loader.min.js?20150923001"></script>
932 - 1008 +<script type="text/javascript" src="js/simpScroller-min.js"></script>
1009 +<script type="text/javascript" src="js/identity_id.js" ></script>
933 <script type="text/javascript"> 1010 <script type="text/javascript">
934 window.onload = window.onresize = initMatching; 1011 window.onload = window.onresize = initMatching;
935 (function(){ 1012 (function(){
936 getData('/sdk/login/json'); 1013 getData('/sdk/login/json');
937 })(); 1014 })();
938 - 1015 +simpScroller(document.querySelector(".horizontall"), {});
939 // $(document).ready(function(){ 1016 // $(document).ready(function(){
940 // setTimeout(function(){Core.showTips($("meta[name='viewport']")[0].getAttribute("content"));}, 2000) 1017 // setTimeout(function(){Core.showTips($("meta[name='viewport']")[0].getAttribute("content"));}, 2000)
941 // }) 1018 // })
......
...@@ -160,29 +160,28 @@ ...@@ -160,29 +160,28 @@
160 <div class="container"> 160 <div class="container">
161 <div class="box_info_center"> 161 <div class="box_info_center">
162 <h2 class="align-left"> 162 <h2 class="align-left">
163 - 请选择要充值{{=Core.Data.game_unit_name || ''}}的数量 163 +
164 </h2> 164 </h2>
165 <p class="align-left text-muted"> 165 <p class="align-left text-muted">
166 - 注：充值 <span class="text-info">1</span>元可购买 <span class="text-info">{{=Core.Data.exchange_rate*Core.Data.rate || ''}}</span>{{=Core.Data.game_unit || ''}}{{=Core.Data.game_unit_name || ''}} 166 +
167 </p> 167 </p>
168 - <div class="amount_level align-left" > 168 + <br>
169 - {{~ Core.Data.amount_level :item:index }}
170 - {{? parseInt(item) }}
171 - <input type="button" value="{{=parseInt(item)}}" class="btn" data="{{=item}}" />
172 - {{?}}
173 - {{~}}
174 - </div>
175 <p class="align-left text-success tips9133"> 169 <p class="align-left text-success tips9133">
176 {{? Core.Data.pay_only != 1 }} 170 {{? Core.Data.pay_only != 1 }}
177 {{? Core.Data.is_guest == 1}} 171 {{? Core.Data.is_guest == 1}}
178 亲爱的<span class="text-info">游客</span>玩家,为确保账号资金安全,请先<a href="#modify_pwd">免费升级账号</a>再充值。 172 亲爱的<span class="text-info">游客</span>玩家,为确保账号资金安全,请先<a href="#modify_pwd">免费升级账号</a>再充值。
179 {{??}} 173 {{??}}
180 - {{? Core.Data.vip > 0}} 174 +
181 - {{??}}
182 - {{?}}
183 {{?}} 175 {{?}}
184 {{?}} 176 {{?}}
185 </p> 177 </p>
178 +
179 + <br>
180 + <div class="amount_level align-left" >
181 + <a href="javascript:Core.finishPay()" id="back-btn" class="btn larg conBtn " style="text-align: center;display:none">请返回游戏</a>
182 + <br>
183 + </div>
184 +
186 </div> 185 </div>
187 </div> 186 </div>
188 </script> 187 </script>
...@@ -202,7 +201,7 @@ ...@@ -202,7 +201,7 @@
202 </form> 201 </form>
203 <p class="text-warning align-left">游客账号是系统临时生成，存在风险，为了您的账号安全建议升级永久账号。</p> 202 <p class="text-warning align-left">游客账号是系统临时生成，存在风险，为了您的账号安全建议升级永久账号。</p>
204 {{??}} 203 {{??}}
205 - <p class="text-success align-left">您的账号已经成功升级成手游平台永久账号，登录<a href="sdk://open?url=http://m.9133.com">9133.com</a>可以了解更多特权。</p> 204 + <p class="text-success align-left">您的账号已经成功升级成手游平台永久账号。</p>
206 {{?}} 205 {{?}}
207 </div> 206 </div>
208 </div> 207 </div>
...@@ -234,7 +233,7 @@ ...@@ -234,7 +233,7 @@
234 <p> 233 <p>
235 <input class="larg" type="text" name="pay_message" placeholder="给他留言···" /> 234 <input class="larg" type="text" name="pay_message" placeholder="给他留言···" />
236 </p> 235 </p>
237 - <input class="larg btn" type="submit" value="发起代付" /> 236 +
238 <p class="align-left small"><span class="error">*</span>注：手游平台登录帐号，不是游戏角色名称</p> 237 <p class="align-left small"><span class="error">*</span>注：手游平台登录帐号，不是游戏角色名称</p>
239 </div> 238 </div>
240 </div> 239 </div>
...@@ -269,7 +268,7 @@ ...@@ -269,7 +268,7 @@
269 <input type="number" name="vdcode" id="vdcode" required="" placeholder="输入验证码"> 268 <input type="number" name="vdcode" id="vdcode" required="" placeholder="输入验证码">
270 <img id="vdimgck1" src="{{=Core.server}}/validate_code/" onclick="this.src=this.src+'?'+(new Date()).getTime()" style="cursor: pointer;" alt="看不清？点击更换" /> 269 <img id="vdimgck1" src="{{=Core.server}}/validate_code/" onclick="this.src=this.src+'?'+(new Date()).getTime()" style="cursor: pointer;" alt="看不清？点击更换" />
271 </div> 270 </div>
272 - <input class="larg btn" type="submit" value="确认兑换" /> 271 +
273 <hr/> 272 <hr/>
274 <div class="clearfix"> 273 <div class="clearfix">
275 <a href="#channel_list&force" class="btn width100" >使用支付宝、银行卡、神州行充值</a> 274 <a href="#channel_list&force" class="btn width100" >使用支付宝、银行卡、神州行充值</a>
...@@ -312,7 +311,7 @@ ...@@ -312,7 +311,7 @@
312 311
313 <div class="channel_list align-left" > 312 <div class="channel_list align-left" >
314 {{? Core.Data.youai_star <= Core.Data.total_amount }} 313 {{? Core.Data.youai_star <= Core.Data.total_amount }}
315 - /*<a href="#exchange" class="btn btn-block">游爱星兑换 <span style="float:right;color:#d2d2d2">＞</span></a>*/ 314 + <!--<a href="#exchange" class="btn btn-block">游爱星兑换 <span style="float:right;color:#d2d2d2">＞</span></a>-->
316 {{?}} 315 {{?}}
317 {{~Core.Data.game_pay_channel_list :item:index }} 316 {{~Core.Data.game_pay_channel_list :item:index }}
318 {{?item.name}} 317 {{?item.name}}
...@@ -383,7 +382,7 @@ ...@@ -383,7 +382,7 @@
383 <input type="hidden" name="role_name" value="{{=Core.Data.role_name}}" /> 382 <input type="hidden" name="role_name" value="{{=Core.Data.role_name}}" />
384 {{? Core.Data.current_pay_channel }} 383 {{? Core.Data.current_pay_channel }}
385 <input type="hidden" name="pay_channel_id" value="{{=Core.Data.current_pay_channel.id}}" /> 384 <input type="hidden" name="pay_channel_id" value="{{=Core.Data.current_pay_channel.id}}" />
386 - {{?}} 385 +
387 <input type="hidden" name="game_amount" value="{{? Core.Data.game_amount}}{{=Core.Data.game_amount}}{{?}}" /> 386 <input type="hidden" name="game_amount" value="{{? Core.Data.game_amount}}{{=Core.Data.game_amount}}{{?}}" />
388 <input type="hidden" name="money" value="{{=Core.Data.money}}" /> 387 <input type="hidden" name="money" value="{{=Core.Data.money}}" />
389 <div class="require_input "> 388 <div class="require_input ">
...@@ -435,6 +434,7 @@ ...@@ -435,6 +434,7 @@
435 <input class="larg btn zhifubaoBtn" type="submit" value="前往付款" /> 434 <input class="larg btn zhifubaoBtn" type="submit" value="前往付款" />
436 {{?}} 435 {{?}}
437 </div> 436 </div>
437 + {{?}}
438 </form> 438 </form>
439 </div> 439 </div>
440 440
...@@ -516,26 +516,10 @@ ...@@ -516,26 +516,10 @@
516 </div> 516 </div>
517 <div class="container align-left"> 517 <div class="container align-left">
518 <div class="box_info_center"> 518 <div class="box_info_center">
519 - <p id="share" class="clearfix"> 519 +
520 - <span>分享到：</span>
521 - <a class="s_qzone" href="http://sns.qzone.qq.com/cgi-bin/qzshare/cgi_qzshare_onekey" title="QQ空间"></a>
522 - <a class="s_tqq" data-appkey="0af6f17f08f3ab2b52c6df3a3ed9b60b" href="http://share.v.t.qq.com/index.php" title="腾讯微博"></a>
523 - </p>
524 - <p id="share_weixin" class="clearfix">
525 - <span>分享到微信：</span>
526 - 点击右上角按钮，选择“<span class="text-info">发送给朋友</span>”或者“<span class="text-info">分享到朋友圈</span>”即可完成分享;
527 - </p>
528 <div class="fs_box invite_box"> 520 <div class="fs_box invite_box">
529 <h3 class="text-info">奖励说明:</h3> 521 <h3 class="text-info">奖励说明:</h3>
530 - <p> 522 +
531 - 1.成功邀请好友一起玩游戏，您可获得<span class="text-info">5{{=Core.Data.game_unit_name}}</span>的奖励。
532 - </p>
533 - <p>
534 - 2.好友若充值(限前10笔)，您可获得<span class="text-info">5%</span>充值奖励。
535 - </p>
536 - <p>
537 - 3.好友首次充值，因被您邀请可额外获得<span class="text-info">10%</span>充值返利。
538 - </p>
539 </div> 523 </div>
540 </div> 524 </div>
541 </div> 525 </div>
...@@ -564,11 +548,11 @@ ...@@ -564,11 +548,11 @@
564 </ol> 548 </ol>
565 </div> 549 </div>
566 <div class="sec sec_invtite"> 550 <div class="sec sec_invtite">
567 - <p class="title-fs">方式二：邀请好友可获得{{=Core.Data.game_unit_name}}&nbsp;&nbsp;<a href="#invite_friend">立即去邀请</a></p> 551 +
568 </div> 552 </div>
569 {{??}} 553 {{??}}
570 <div class="sec sec_invtite"> 554 <div class="sec sec_invtite">
571 - <p class="title-fs">方式一：邀请好友可获得{{=Core.Data.game_unit_name}}&nbsp;&nbsp;<a href="#invite_friend">立即去邀请</a></p> 555 +
572 </div> 556 </div>
573 {{?}} 557 {{?}}
574 </div> 558 </div>
...@@ -805,6 +789,11 @@ FastClick.attach(document.body); ...@@ -805,6 +789,11 @@ FastClick.attach(document.body);
805 (function(){ 789 (function(){
806 getData('/sdk/pay/json'); 790 getData('/sdk/pay/json');
807 })(); 791 })();
792 +$(function(){
793 + if (Core.isIos) {
794 + $('meta[name="viewport"]').attr('content','width=800,maximum-scale=1,user-scalable=no');
795 + }
796 +});
808 </script> 797 </script>
809 798
810 </body> 799 </body>
......
1 +date:2017-4-11
2 +author
3 +:lizenghua
4 +instructions
5 +:与星玩SDK同步
6 +
7 +date:2017-4-12
8 +author:lizenghua
9 +instructions:修复当账户及密码为空时（本地存储的账号密码数据为空），通过密保找回密码时一直处于加载中无法跳转的问题
10 +
11 +date:2017-4-21
12 +author:lizenghua
13 +instructions:
14 + 1、当用户是正式用户并绑定了手机后进行实名认证；身份证校验js：identity_id.js
15 + 改动的文件有：login.html、login.js（同步在sdk_xingwan、sdk_6）
16 + 2、改动注释了pay.js里面的911行到918行：进入sdk要购买的游戏币>0时强制进入渠道充值页面（已同步在sdk_xingwan、sdk_6）
17 +
18 +date:2017-4-24
19 +author:lizenghua
20 +instructions:
21 + 1、处理绑定手机的手机验证规则（176），
22 + 2、手机找回密码中重置密码残留旧密码问题
23 +
24 +
25 +date:2017-5-3
26 +author:lizenghua
27 +instructions:
28 + 1、注释掉pay.html中的“游爱星”兑换入口
29 + 2、处理支付方式切换中出现 input_item 为undefind 的bug （将383行的{{?}}移至435行）
30 + 3、去掉设置密保中select默认的下拉图标（login.css）
31 + 4、如果没有第三方登录则隐藏掉“第三方登录”字眼
32 +
33 +date:2017-5-8
34 +author:lizenghua
35 +instructions:处理支付方式点击支付图标出现 input_item 为undefind 的bug（将150行$c改成$(this)）
36 +
37 +date:2017-5-12
38 +author:lizenghua
39 +instructions:与游娱同步
...\ No newline at end of file ...\ No newline at end of file
...@@ -27,6 +27,11 @@ a:focus { ...@@ -27,6 +27,11 @@ a:focus {
27 outline:thin dotted; /* 处理“outline”在Chrome浏览器中和其它浏览器之间的不一致 */ 27 outline:thin dotted; /* 处理“outline”在Chrome浏览器中和其它浏览器之间的不一致 */
28 } 28 }
29 .red{ color: red;} 29 .red{ color: red;}
30 +select{
31 + -moz-appearance: none;
32 + -webkit-appearance:none;
33 + appearance:none;
34 +}
30 /*字体图标*/ 35 /*字体图标*/
31 @font-face {font-family: "iconfont"; 36 @font-face {font-family: "iconfont";
32 src: url('../font/iconfont.eot?t=1468997064'); /* IE9*/ 37 src: url('../font/iconfont.eot?t=1468997064'); /* IE9*/
...@@ -287,8 +292,8 @@ body{ ...@@ -287,8 +292,8 @@ body{
287 } 292 }
288 .new-sdk-container .new-sdk-box .input select{ 293 .new-sdk-container .new-sdk-box .input select{
289 width: 100%; 294 width: 100%;
290 - height: 38px; 295 + height: 88px;
291 - line-height: 38px; 296 + line-height: 88px;
292 background: none; 297 background: none;
293 border: none; 298 border: none;
294 color: #434343; 299 color: #434343;
...@@ -678,7 +683,8 @@ body{ ...@@ -678,7 +683,8 @@ body{
678 display: none; 683 display: none;
679 font-family: 宋体; 684 font-family: 宋体;
680 max-height: 11em; 685 max-height: 11em;
681 - overflow-y: scroll; 686 + /*overflow-y: scroll;*/
687 + height: 150px;
682 } 688 }
683 .new-sdk-container .pull-box ul{ 689 .new-sdk-container .pull-box ul{
684 margin-left: 65px; 690 margin-left: 65px;
...@@ -914,11 +920,11 @@ button.close { ...@@ -914,11 +920,11 @@ button.close {
914 } 920 }
915 .user-center a{ 921 .user-center a{
916 position: absolute; 922 position: absolute;
917 - right: 37px; 923 + right: 27px;
918 - bottom:17px; 924 + bottom:7px;
919 color: #ff9600; 925 color: #ff9600;
920 font-size: 24px; 926 font-size: 24px;
921 - 927 + padding:10px;
922 } 928 }
923 .user-center a.lefticon{ 929 .user-center a.lefticon{
924 right: auto; 930 right: auto;
...@@ -1168,6 +1174,7 @@ input::-webkit-input-placeholder, textarea::-webkit-input-placeholder { ...@@ -1168,6 +1174,7 @@ input::-webkit-input-placeholder, textarea::-webkit-input-placeholder {
1168 font-size: 24px; 1174 font-size: 24px;
1169 font-family: "Microsoft YaHei","微软雅黑"; 1175 font-family: "Microsoft YaHei","微软雅黑";
1170 vertical-align: -webkit-baseline-middle; 1176 vertical-align: -webkit-baseline-middle;
1177 + padding: 10px;
1171 } 1178 }
1172 .pwd_box .step-box .question-input-box{ 1179 .pwd_box .step-box .question-input-box{
1173 background: #fff; 1180 background: #fff;
......
1 #!/bin/sh 1 #!/bin/sh
2 #js css压缩,生成更新包打包 2 #js css压缩,生成更新包打包
3 3
4 -CDN_SERVER='http://youyu.9133.com/static' 4 +CDN_SERVER='http://cdn.9133.com/static'
5 5
6 6
7 DIR_PATH="$( cd "$( dirname "$0" )" && pwd )" 7 DIR_PATH="$( cd "$( dirname "$0" )" && pwd )"
......
1 -20161117
...\ No newline at end of file ...\ No newline at end of file
1 +20170111
......
1 SERVER_URL=http://sdk.shxingwan.com 1 SERVER_URL=http://sdk.shxingwan.com
2 CDN_SERVER_URL=http://sdk.shxingwan.com 2 CDN_SERVER_URL=http://sdk.shxingwan.com
3 +SDK_TYPE=.sys_config_xingwan
...\ No newline at end of file ...\ No newline at end of file
......