bijinnan / sdk_public_android

Go to a project
Toggle navigation Toggle navigation pinning
lizhihui
59cf61a8 1 parent 600c1e52

更新资源文件

Expand all
Inline Side-by-side
Showing 81 changed files with 139 additions and 236 deletions
...@@ -2,8 +2,9 @@ ...@@ -2,8 +2,9 @@
2 <config> 2 <config>
3 3
4 <sdkconfig 4 <sdkconfig
5 - YA_APPID="59351848d8aa0f0e115a0d7a" 5 + YA_APPID="5b6bf23e665fff5f47475e56"
6 - YA_APPKEY="8cec1d074d3bb8bb012fd3f013c0acaa" 6 + YA_APPKEY="a6050ea63e9b3c4cfedbe6d8c629240f"
7 + styleName="sdk_11"
7 gamesimplename="fytx_test" 8 gamesimplename="fytx_test"
8 sdksimplename="i9133" 9 sdksimplename="i9133"
9 sdkversioncode="V1_0" 10 sdkversioncode="V1_0"
......
No preview for this file type
1 -<?xml version="1.0" encoding="UTF-8"?>
2 -<projectDescription>
3 - <name>sdk_3</name>
4 - <comment></comment>
5 - <projects>
6 - </projects>
7 - <buildSpec>
8 - <buildCommand>
9 - <name>com.aptana.editor.php.aptanaPhpBuilder</name>
10 - <arguments>
11 - </arguments>
12 - </buildCommand>
13 - <buildCommand>
14 - <name>com.aptana.ide.core.unifiedBuilder</name>
15 - <arguments>
16 - </arguments>
17 - </buildCommand>
18 - </buildSpec>
19 - <natures>
20 - <nature>com.aptana.projects.webnature</nature>
21 - <nature>com.aptana.editor.php.phpNature</nature>
22 - </natures>
23 - <filteredResources>
24 - <filter>
25 - <id>1489975865951</id>
26 - <name></name>
27 - <type>26</type>
28 - <matcher>
29 - <id>org.eclipse.ui.ide.multiFilter</id>
30 - <arguments>1.0-name-matches-false-false-node_modules</arguments>
31 - </matcher>
32 - </filter>
33 - </filteredResources>
34 -</projectDescription>
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
1 -20170815
...\ No newline at end of file ...\ No newline at end of file
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
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>
40 - <form action="/sdk/login" method="post" class="ajax align-left clearfix"> 40 + <form action="/sdk/login2" method="post" class="ajax align-left clearfix">
41 <div class="new-sdk-logo"><a href="#"><img src="images/new-sdk-logo.png"></a></div> 41 <div class="new-sdk-logo"><a href="#"><img src="images/new-sdk-logo.png"></a></div>
42 <div class="new-sdk-main"> 42 <div class="new-sdk-main">
43 <div class="inputbox clearfix" style="position: relative;"> 43 <div class="inputbox clearfix" style="position: relative;">
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
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_3/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://wxlogin?app_id={app_id}&next=/static/sdk_3/login.html" class="wx hide">
72 </a> 72 </a>
73 </p>--> 73 </p>-->
74 74
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
87 87
88 </li> 88 </li>
89 <li> 89 <li>
90 -<!-- <a class="op-guest" data-replace="href" method="post" href="/sdk/register?type=-1&app_id={app_id}">一键注册</a> --> 90 +<!-- <a class="op-guest" data-replace="href" method="post" href="/sdk/register2?type=-1&app_id={app_id}">一键注册</a> -->
91 91
92 <a class="btn larg btn-orange submit" utocomplete="off" >登录</a> 92 <a class="btn larg btn-orange submit" utocomplete="off" >登录</a>
93 </li> 93 </li>
...@@ -130,7 +130,7 @@ ...@@ -130,7 +130,7 @@
130 <div class="new-sdk-container"> 130 <div class="new-sdk-container">
131 <div class="SDK-titlebox"></div> 131 <div class="SDK-titlebox"></div>
132 <div class="new-sdk-logo"><a href="#"><img src="images/new-sdk-logo.png"></a></div> 132 <div class="new-sdk-logo"><a href="#"><img src="images/new-sdk-logo.png"></a></div>
133 - <form action="/sdk/register" class="ajax clearfix"> 133 + <form action="/sdk/register2" class="ajax clearfix">
134 <div class="new-sdk-main"> 134 <div class="new-sdk-main">
135 <div class="inputbox clearfix"> 135 <div class="inputbox clearfix">
136 <div class="ileft">账号：</div> 136 <div class="ileft">账号：</div>
......
...@@ -13,14 +13,14 @@ var concat_with_mtime = [ ...@@ -13,14 +13,14 @@ var concat_with_mtime = [
13 'js/core.min.js', 13 'js/core.min.js',
14 'js/loader.min.js', 14 'js/loader.min.js',
15 'js/center.min.js', 15 'js/center.min.js',
16 - 'js/pay.min.js', 16 + 'js/zf.min.js',
17 'js/login.min.js' 17 'js/login.min.js'
18 ] 18 ]
19 19
20 var htmls = [ 20 var htmls = [
21 'login.html', 21 'login.html',
22 'center.html', 22 'center.html',
23 - 'pay.html', 23 + 'zf.html',
24 'share.html' 24 'share.html'
25 ] 25 ]
26 26
......
...@@ -31,7 +31,7 @@ function initMatching(){ ...@@ -31,7 +31,7 @@ function initMatching(){
31 Core.isIos = userAgent.match(/i[^;]+;( U;)? CPU.+Mac OS X/) != null; 31 Core.isIos = userAgent.match(/i[^;]+;( U;)? CPU.+Mac OS X/) != null;
32 Core.isAndroid = userAgent.indexOf('Android') > -1 || userAgent.indexOf('Linux') > -1; 32 Core.isAndroid = userAgent.indexOf('Android') > -1 || userAgent.indexOf('Linux') > -1;
33 Core.isFile = location.href.indexOf('file') == 0; //判断当前请求是否为file://协议 33 Core.isFile = location.href.indexOf('file') == 0; //判断当前请求是否为file://协议
34 - Core.isWeixin = userAgent.indexOf('MicroMessenger') != -1; 34 + Core.isWx = userAgent.indexOf('MicroMessenger') != -1;
35 var ratio = window.devicePixelRatio; 35 var ratio = window.devicePixelRatio;
36 Core.ratio = ratio; 36 Core.ratio = ratio;
37 37
...@@ -140,16 +140,16 @@ function initMatching(){ ...@@ -140,16 +140,16 @@ function initMatching(){
140 Core.isIos = userAgent.match(/i[^;]+;( U;)? CPU.+Mac OS X/) != null; 140 Core.isIos = userAgent.match(/i[^;]+;( U;)? CPU.+Mac OS X/) != null;
141 Core.isAndroid = userAgent.indexOf('Android') > -1 || userAgent.indexOf('Linux') > -1; 141 Core.isAndroid = userAgent.indexOf('Android') > -1 || userAgent.indexOf('Linux') > -1;
142 Core.isFile = location.href.indexOf('file') == 0; //判断当前请求是否为file://协议 142 Core.isFile = location.href.indexOf('file') == 0; //判断当前请求是否为file://协议
143 - Core.isWeixin = userAgent.indexOf('MicroMessenger') != -1; 143 + Core.isWx = userAgent.indexOf('MicroMessenger') != -1;
144 var ratio = window.devicePixelRatio; 144 var ratio = window.devicePixelRatio;
145 Core.ratio = ratio; 145 Core.ratio = ratio;
146 146
147 - Core.PLATFORM_NAME = '9133游戏'; 147 + Core.PLATFORM_NAME = '';
148 148
149 if(Core.isIos){ 149 if(Core.isIos){
150 - Core.server = 'https://sdk.i9133.com'; 150 + Core.server = 'https://sdk.9133.com';
151 }else{ 151 }else{
152 - Core.server = 'http://sdk.i9133.com'; 152 + Core.server = 'http://sdk.9133.com';
153 } 153 }
154 154
155 var lastServer = localStorage.getItem('last_server'); 155 var lastServer = localStorage.getItem('last_server');
...@@ -518,8 +518,6 @@ function initMatching(){ ...@@ -518,8 +518,6 @@ function initMatching(){
518 } else { 518 } else {
519 post_url += '?format=json'; 519 post_url += '?format=json';
520 } 520 }
521 -
522 -
523 var options = { 521 var options = {
524 type: action_method, 522 type: action_method,
525 url: post_url, 523 url: post_url,
...@@ -761,26 +759,31 @@ function initMatching(){ ...@@ -761,26 +759,31 @@ function initMatching(){
761 console.log('not wbkit browser!'); 759 console.log('not wbkit browser!');
762 } 760 }
763 } 761 }
764 - core.finishPay = function() { 762 + core.finishZf = function() {
765 - var pay_url = "sdk://exit?action=pay"; 763 + var zf_url = "sdk://exit?action=zf";
766 core.clearFrame() 764 core.clearFrame()
767 if(Core.Data.game_url && Core.Data.game_url != ''){ 765 if(Core.Data.game_url && Core.Data.game_url != ''){
768 if(Core.Data.back_url){ 766 if(Core.Data.back_url){
769 - pay_url = Core.Data.back_url; 767 + zf_url = Core.Data.back_url;
770 }else{ 768 }else{
771 - pay_url = Core.Data.game_url; 769 + zf_url = Core.Data.game_url;
772 } 770 }
773 }else{ 771 }else{
774 if(Core.Data.trade_id && Core.Data.trade_id != ''){ 772 if(Core.Data.trade_id && Core.Data.trade_id != ''){
775 - pay_url = "sdk://pay?order_id=" + Core.Data.trade_id; 773 + zf_url = "sdk://zf?order_id=" + Core.Data.trade_id;
776 - pay_url += Core.Data.current_pay_channel ? '&paytype=' + Core.Data.current_pay_channel.name : '' 774 + zf_url += Core.Data.current_zf_channel ? '&zftype=' + Core.Data.current_zf_channel.name : ''
777 } 775 }
778 } 776 }
779 try{ 777 try{
780 - location.href = pay_url; 778 + location.href = zf_url;
781 }catch(e){} 779 }catch(e){}
782 } 780 }
783 core.finishLogin = function() { 781 core.finishLogin = function() {
782 + if(Core.Data.compellation_name == "" && Core.Data.identity_card == "" && Core.Data.force_auth == 1){
783 + Core.showTips("根据政策规定，通过实名认证才能进入游戏哦！");
784 + Core.updateMod('identityCard');
785 + return false;
786 + }
784 var login_url = 'sdk://exit?action=login'; 787 var login_url = 'sdk://exit?action=login';
785 var login_params = "open_id=" + Core.Data.open_id + "&token=" + Core.Data.token + "&timestamp=" + Core.Data.timestamp ; 788 var login_params = "open_id=" + Core.Data.open_id + "&token=" + Core.Data.token + "&timestamp=" + Core.Data.timestamp ;
786 login_params += Core.Data.login_count ? '&login_count=' + Core.Data.login_count : '' ; 789 login_params += Core.Data.login_count ? '&login_count=' + Core.Data.login_count : '' ;
......
This diff could not be displayed because it is too large.
...@@ -55,7 +55,7 @@ for (i = 0, l = base_js.length; i < l; i++) { ...@@ -55,7 +55,7 @@ for (i = 0, l = base_js.length; i < l; i++) {
55 if (PATH.existsSync(path)) { 55 if (PATH.existsSync(path)) {
56 mtime = formatTime(fs.statSync(path).mtime); 56 mtime = formatTime(fs.statSync(path).mtime);
57 content.push('/static/sdk/' + path + '?' + mtime); 57 content.push('/static/sdk/' + path + '?' + mtime);
58 - //更新login.html, center.html, pay.html的引用信息的版本号 58 + //更新login.html, center.html, zf.html的引用信息的版本号
59 for (var j = 0, k = html_content.length; j < k; j++) { 59 for (var j = 0, k = html_content.length; j < k; j++) {
60 reg = new RegExp(path.replace('/', '\\/') + '\\?\\d+') 60 reg = new RegExp(path.replace('/', '\\/') + '\\?\\d+')
61 html_content[j] = html_content[j].replace(reg, path + '?' + mtime); 61 html_content[j] = html_content[j].replace(reg, path + '?' + mtime);
...@@ -70,7 +70,7 @@ for (i = 0, l = concat_with_mtime.length; i < l; i++) { ...@@ -70,7 +70,7 @@ for (i = 0, l = concat_with_mtime.length; i < l; i++) {
70 if (PATH.existsSync(path)) { 70 if (PATH.existsSync(path)) {
71 mtime = formatTime(fs.statSync(path).mtime); 71 mtime = formatTime(fs.statSync(path).mtime);
72 content.push('/static/sdk/' + path + '?' + mtime); 72 content.push('/static/sdk/' + path + '?' + mtime);
73 - //更新login.html, center.html, pay.html的引用信息的版本号 73 + //更新login.html, center.html, zf.html的引用信息的版本号
74 for (j = 0, k = html_content.length; j < k; j++) { 74 for (j = 0, k = html_content.length; j < k; j++) {
75 reg = new RegExp(path.replace('/', '\\/') + '\\?\\d+') 75 reg = new RegExp(path.replace('/', '\\/') + '\\?\\d+')
76 html_content[j] = html_content[j].replace(reg, path + '?' + mtime); 76 html_content[j] = html_content[j].replace(reg, path + '?' + mtime);
...@@ -107,7 +107,7 @@ for (i = 0, l = target.length; i < l; i++) { ...@@ -107,7 +107,7 @@ for (i = 0, l = target.length; i < l; i++) {
107 /* 107 /*
108 skin_content.push('/static/sdk/' + path + '/skin.css' + '?' + skin_mtime); 108 skin_content.push('/static/sdk/' + path + '/skin.css' + '?' + skin_mtime);
109 */ 109 */
110 - //更新login.html, center.html, pay.html的引用信息的版本号 110 + //更新login.html, center.html, zf.html的引用信息的版本号
111 for (j = 0, k = html_content.length; j < k; j++) { 111 for (j = 0, k = html_content.length; j < k; j++) {
112 reg = new RegExp('data-v="\\d+"'); 112 reg = new RegExp('data-v="\\d+"');
113 html_content[j] = html_content[j].replace(reg, 'data-v="' + skin_mtime + '"'); 113 html_content[j] = html_content[j].replace(reg, 'data-v="' + skin_mtime + '"');
......
...@@ -51,18 +51,18 @@ select{ ...@@ -51,18 +51,18 @@ select{
51 -moz-osx-font-smoothing: grayscale; 51 -moz-osx-font-smoothing: grayscale;
52 } 52 }
53 53
54 -.icon-weixin:before { content: "\e600"; font-size: 1.8em; color: #0bb515;} 54 +.icon-wx:before { content: "\e600"; font-size: 1.8em; color: #0bb515;}
55 .icon-qq:before { content: "\e601"; font-size: 1.8em; color: #00beef;} 55 .icon-qq:before { content: "\e601"; font-size: 1.8em; color: #00beef;}
56 .icon-iconfontcha:before { content: "\e609"; } 56 .icon-iconfontcha:before { content: "\e609"; }
57 .icon-qq1:before { content: "\e602"; font-size: 1.8em; color: #00beef;} 57 .icon-qq1:before { content: "\e602"; font-size: 1.8em; color: #00beef;}
58 -.icon-weixin1:before { content: "\e603"; } 58 +.icon-wx1:before { content: "\e603"; }
59 .icon-qq2:before { content: "\e604"; font-size: 1.8em; color: #00beef;} 59 .icon-qq2:before { content: "\e604"; font-size: 1.8em; color: #00beef;}
60 .icon-iconfontxiangyou:before { content: "\e60a"; color: #fff; font-size: 1.6em;} 60 .icon-iconfontxiangyou:before { content: "\e60a"; color: #fff; font-size: 1.6em;}
61 .icon-iconfontcolor19:before { content: "\e60b"; } 61 .icon-iconfontcolor19:before { content: "\e60b"; }
62 .icon-xuanzhong:before { content: "\e60c"; color: #ff9600; font-size: 1.6em;} 62 .icon-xuanzhong:before { content: "\e60c"; color: #ff9600; font-size: 1.6em;}
63 .icon-triangle-l:before { content: "\e605"; } 63 .icon-triangle-l:before { content: "\e605"; }
64 .icon-shuangyuanquan:before { content: "\e60d"; color: #089b55;} 64 .icon-shuangyuanquan:before { content: "\e60d"; color: #089b55;}
65 -.icon-weixin2:before { content: "\e606"; } 65 +.icon-wx2:before { content: "\e606"; }
66 .icon-xiangyou:before { content: "\e60e"; } 66 .icon-xiangyou:before { content: "\e60e"; }
67 .icon-fuxuankuangyixuanze:before { content: "\e607"; } 67 .icon-fuxuankuangyixuanze:before { content: "\e607"; }
68 .icon-xiangxia:before { content: "\e60f"; color: #ddd; font-size: 30px;} 68 .icon-xiangxia:before { content: "\e60f"; color: #ddd; font-size: 30px;}
...@@ -599,7 +599,7 @@ body{ ...@@ -599,7 +599,7 @@ body{
599 .new-sdk-container .new-sdk-main .other-login p a.qq{ 599 .new-sdk-container .new-sdk-main .other-login p a.qq{
600 background: url(../images/login_icon.png) no-repeat 0 0; 600 background: url(../images/login_icon.png) no-repeat 0 0;
601 } 601 }
602 -.new-sdk-container .new-sdk-main .other-login p a.weixin{ 602 +.new-sdk-container .new-sdk-main .other-login p a.wx{
603 background: url(../images/login_icon.png) no-repeat 0 -45px; 603 background: url(../images/login_icon.png) no-repeat 0 -45px;
604 } 604 }
605 .new-sdk-container .new-sdk-main .other-login label{ 605 .new-sdk-container .new-sdk-main .other-login label{
......
...@@ -3,19 +3,19 @@ CACHE MANIFEST ...@@ -3,19 +3,19 @@ CACHE MANIFEST
3 #version=20151112001 3 #version=20151112001
4 /static/sdk_3/login.html?20151112001 4 /static/sdk_3/login.html?20151112001
5 /static/sdk_3/center.html?20151112001 5 /static/sdk_3/center.html?20151112001
6 -/static/sdk_3/pay.html?20151112001 6 +/static/sdk_3/zf.html?20151112001
7 /static/sdk_3/share.html?20151112001 7 /static/sdk_3/share.html?20151112001
8 /static/sdk_3/js/fastclick.min.1.0.js?20151112001 8 /static/sdk_3/js/fastclick.min.1.0.js?20151112001
9 /static/sdk_3/js/zepto.min.js?20151112001 9 /static/sdk_3/js/zepto.min.js?20151112001
10 /static/sdk_3/js/doT.min.js?20151112001 10 /static/sdk_3/js/doT.min.js?20151112001
11 /static/sdk_3/js/iscroll.min.1.0.js?20151112001 11 /static/sdk_3/js/iscroll.min.1.0.js?20151112001
12 /static/sdk_3/skin/login.css?20151112001 12 /static/sdk_3/skin/login.css?20151112001
13 -/static/sdk_3/skin/pay.css?20151112001 13 +/static/sdk_3/skin/zf.css?20151112001
14 14
15 /static/sdk_3/js/core.min.js?20151112001 15 /static/sdk_3/js/core.min.js?20151112001
16 /static/sdk_3/js/loader.min.js?20151112001 16 /static/sdk_3/js/loader.min.js?20151112001
17 /static/sdk_3/js/center.min.js?20151112001 17 /static/sdk_3/js/center.min.js?20151112001
18 -/static/sdk_3/js/pay.min.js?20151112001 18 +/static/sdk_3/js/zf.min.js?20151112001
19 /static/sdk_3/js/login.min.js?20151112001 19 /static/sdk_3/js/login.min.js?20151112001
20 /static/sdk_3/images/login_icon.png?20151112001 20 /static/sdk_3/images/login_icon.png?20151112001
21 /static/sdk_3/images/new-sdk-logo.png?20151112001 21 /static/sdk_3/images/new-sdk-logo.png?20151112001
......
...@@ -176,7 +176,7 @@ p.text-muted{color: #999999; } ...@@ -176,7 +176,7 @@ p.text-muted{color: #999999; }
176 right: 5px; 176 right: 5px;
177 top: 13px; 177 top: 13px;
178 } 178 }
179 -.badge.pay{ 179 +.badge.zf{
180 position: absolute; 180 position: absolute;
181 right: -8px; 181 right: -8px;
182 top: -6px; 182 top: -6px;
...@@ -265,18 +265,18 @@ label.enter_game{ ...@@ -265,18 +265,18 @@ label.enter_game{
265 -moz-osx-font-smoothing: grayscale; 265 -moz-osx-font-smoothing: grayscale;
266 } 266 }
267 267
268 -.icon-weixin:before { content: "\e600"; font-size: 1.8em; color: #0bb515;} 268 +.icon-wx:before { content: "\e600"; font-size: 1.8em; color: #0bb515;}
269 .icon-qq:before { content: "\e601"; font-size: 1.8em; color: #0f9fcf;} 269 .icon-qq:before { content: "\e601"; font-size: 1.8em; color: #0f9fcf;}
270 .icon-iconfontcha:before { content: "\e609"; } 270 .icon-iconfontcha:before { content: "\e609"; }
271 .icon-qq1:before { content: "\e602"; font-size: 1.8em; color: #0f9fcf;} 271 .icon-qq1:before { content: "\e602"; font-size: 1.8em; color: #0f9fcf;}
272 -.icon-weixin1:before { content: "\e603"; } 272 +.icon-wx1:before { content: "\e603"; }
273 .icon-qq2:before { content: "\e604"; font-size: 1.8em; color: #0f9fcf;} 273 .icon-qq2:before { content: "\e604"; font-size: 1.8em; color: #0f9fcf;}
274 .icon-iconfontxiangyou:before { content: "\e60a"; color: #fff; font-size: 32px;} 274 .icon-iconfontxiangyou:before { content: "\e60a"; color: #fff; font-size: 32px;}
275 .icon-iconfontcolor19:before { content: "\e60b"; } 275 .icon-iconfontcolor19:before { content: "\e60b"; }
276 .icon-xuanzhong:before { content: "\e60c"; color: #ff9600; font-size: 1.6em;} 276 .icon-xuanzhong:before { content: "\e60c"; color: #ff9600; font-size: 1.6em;}
277 .icon-triangle-l:before { content: "\e605"; } 277 .icon-triangle-l:before { content: "\e605"; }
278 .icon-shuangyuanquan:before { content: "\e60d"; color: #089b55;} 278 .icon-shuangyuanquan:before { content: "\e60d"; color: #089b55;}
279 -.icon-weixin2:before { content: "\e606"; } 279 +.icon-wx2:before { content: "\e606"; }
280 .icon-xiangyou:before { content: "\e60e"; } 280 .icon-xiangyou:before { content: "\e60e"; }
281 .icon-fuxuankuangyixuanze:before { content: "\e607"; } 281 .icon-fuxuankuangyixuanze:before { content: "\e607"; }
282 .icon-xiangxia:before { content: "\e60f"; color: #ddd; font-size: 1.8em;} 282 .icon-xiangxia:before { content: "\e60f"; color: #ddd; font-size: 1.8em;}
...@@ -498,22 +498,22 @@ ul.step-tab{ ...@@ -498,22 +498,22 @@ ul.step-tab{
498 /* 支付类型列表 END */ 498 /* 支付类型列表 END */
499 499
500 /* 确认代付 */ 500 /* 确认代付 */
501 -.pay-proxy-info{ 501 +.zf-proxy-info{
502 font-size:14px; 502 font-size:14px;
503 margin:auto; 503 margin:auto;
504 text-align: left; 504 text-align: left;
505 height: 100px; 505 height: 100px;
506 } 506 }
507 -.pay-proxy-info .desc{ 507 +.zf-proxy-info .desc{
508 margin-left:0px; 508 margin-left:0px;
509 } 509 }
510 -.pay-proxy-info .desc p{ 510 +.zf-proxy-info .desc p{
511 font-size: 14px; 511 font-size: 14px;
512 line-height: 16px; 512 line-height: 16px;
513 margin: 5px 0; 513 margin: 5px 0;
514 padding: 0; 514 padding: 0;
515 } 515 }
516 -.pay-proxy-info .btn-group{ 516 +.zf-proxy-info .btn-group{
517 margin-left:10px; 517 margin-left:10px;
518 float:right;} 518 float:right;}
519 /* 确认代付 END */ 519 /* 确认代付 END */
...@@ -884,24 +884,24 @@ div.head span.num{ ...@@ -884,24 +884,24 @@ div.head span.num{
884 div.sec{ 884 div.sec{
885 margin-top: 16px; 885 margin-top: 16px;
886 } 886 }
887 -ol.other-pay{ 887 +ol.other-zf{
888 padding-left: 5px; 888 padding-left: 5px;
889 } 889 }
890 -ol.other-pay li{ 890 +ol.other-zf li{
891 display:inline-block; 891 display:inline-block;
892 } 892 }
893 893
894 -ol.other-pay li a{ 894 +ol.other-zf li a{
895 display:inline-block; 895 display:inline-block;
896 text-align: center; 896 text-align: center;
897 margin:5px 10px 5px 0; 897 margin:5px 10px 5px 0;
898 padding: 0 5px; 898 padding: 0 5px;
899 cursor: pointer; 899 cursor: pointer;
900 } 900 }
901 -ol.other-pay li a:last-of-type{ 901 +ol.other-zf li a:last-of-type{
902 margin: 5px 0px 5px 0; 902 margin: 5px 0px 5px 0;
903 } 903 }
904 -ol.other-pay li a img{ 904 +ol.other-zf li a img{
905 width: 70px; 905 width: 70px;
906 height: 70px; 906 height: 70px;
907 907
...@@ -949,7 +949,7 @@ ol.other-pay li a img{ ...@@ -949,7 +949,7 @@ ol.other-pay li a img{
949 .level{ color:#F60; float:right; font-size:14px;} 949 .level{ color:#F60; float:right; font-size:14px;}
950 .gz-zhanghao{ text-align:left; padding:5px; margin-bottom:10px;} 950 .gz-zhanghao{ text-align:left; padding:5px; margin-bottom:10px;}
951 .gz-zhanghao .qq{ padding:5px 0px 5px 35px;background:url(http://cdn.i9133.com/static/sdk/skin/img/qq.png) left bottom no-repeat; } 951 .gz-zhanghao .qq{ padding:5px 0px 5px 35px;background:url(http://cdn.i9133.com/static/sdk/skin/img/qq.png) left bottom no-repeat; }
952 -.gz-zhanghao .weixin{ background:url(http://cdn.i9133.com/static/sdk/skin/img/weixin.png) left bottom no-repeat; padding:5px 0px 5px 35px} 952 +.gz-zhanghao .wx{ background:url(http://cdn.i9133.com/static/sdk/skin/img/wx.png) left bottom no-repeat; padding:5px 0px 5px 35px}
953 953
954 .fs_box{ text-align:left; font-size:16px; } 954 .fs_box{ text-align:left; font-size:16px; }
955 955
...@@ -1151,19 +1151,19 @@ li.more .btn{ display:block;} ...@@ -1151,19 +1151,19 @@ li.more .btn{ display:block;}
1151 height: auto; 1151 height: auto;
1152 min-height: 73px; 1152 min-height: 73px;
1153 } 1153 }
1154 -.pay-info-cont{ 1154 +.zf-info-cont{
1155 padding: 10px 37px; 1155 padding: 10px 37px;
1156 position: relative; 1156 position: relative;
1157 } 1157 }
1158 -.pay-info-cont .player-info-cont{ 1158 +.zf-info-cont .player-info-cont{
1159 border-right:1px solid black; 1159 border-right:1px solid black;
1160 1160
1161 } 1161 }
1162 -.pay-info-cont .player-info-cont .head-ico{ 1162 +.zf-info-cont .player-info-cont .head-ico{
1163 max-height: 50px; 1163 max-height: 50px;
1164 max-width: 50px; 1164 max-width: 50px;
1165 } 1165 }
1166 -.pay-info-cont .player-info-cont span{ 1166 +.zf-info-cont .player-info-cont span{
1167 display: inline-block; 1167 display: inline-block;
1168 1168
1169 } 1169 }
...@@ -1247,10 +1247,10 @@ position:absolute; left:0; right:0; top:0; bottom:0; width:auto; height:auto; ma ...@@ -1247,10 +1247,10 @@ position:absolute; left:0; right:0; top:0; bottom:0; width:auto; height:auto; ma
1247 .warm-prompt h2 { color: #ff0000; font-size: 20px; font-weight: normal; font-family: "Microsoft YaHei","微软雅黑"; } 1247 .warm-prompt h2 { color: #ff0000; font-size: 20px; font-weight: normal; font-family: "Microsoft YaHei","微软雅黑"; }
1248 .warm-prompt p { color: #535353; font-family: "Microsoft YaHei","微软雅黑"; font-size: 16px; margin: 0;} 1248 .warm-prompt p { color: #535353; font-family: "Microsoft YaHei","微软雅黑"; font-size: 16px; margin: 0;}
1249 .warm-prompt p a { color: #f39700; } 1249 .warm-prompt p a { color: #f39700; }
1250 -.pay-info-cont .user-msg { white-space: nowrap; text-overflow: ellipsis; overflow: hidden; word-break: break-all; margin-left: 15px; width: calc(100% - 100px);} 1250 +.zf-info-cont .user-msg { white-space: nowrap; text-overflow: ellipsis; overflow: hidden; word-break: break-all; margin-left: 15px; width: calc(100% - 100px);}
1251 -.pay-info-cont .user-msg h2 { font-weight: normal; font-size: 24px; margin: 0; color: #949494; } 1251 +.zf-info-cont .user-msg h2 { font-weight: normal; font-size: 24px; margin: 0; color: #949494; }
1252 -.pay-info-cont .user-msg p { font-size: 24px; color: #434343; margin: 0; line-height: normal;} 1252 +.zf-info-cont .user-msg p { font-size: 24px; color: #434343; margin: 0; line-height: normal;}
1253 -.pay-info-cont .user-msg p span { color: #f39700; } 1253 +.zf-info-cont .user-msg p span { color: #f39700; }
1254 1254
1255 /*充值记录*/ 1255 /*充值记录*/
1256 .integral .box{ border-left:2px solid #089b55; margin-left:100px; height:100%; padding:0 10px 20px;;} 1256 .integral .box{ border-left:2px solid #089b55; margin-left:100px; height:100%; padding:0 10px 20px;;}
......
1 +20180925
...\ No newline at end of file ...\ No newline at end of file
This diff is collapsed. Click to expand it.
1 -SERVER_URL=http://sdk.i9133.com
2 -CDN_SERVER_URL=http://cdn.i9133.com
3 -SDK_TYPE=.sys_config_9133
...\ No newline at end of file ...\ No newline at end of file
1 +SERVER_URL=https://sdk.i9133.com
2 +CDN_SERVER_URL=https://cdn.i9133.com
3 +SDK_TYPE=.sys_config_9133_n
...\ No newline at end of file ...\ No newline at end of file
......
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <project version="4"> 2 <project version="4">
3 - <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK"> 3 + <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
4 <output url="file://$PROJECT_DIR$/build/classes" /> 4 <output url="file://$PROJECT_DIR$/build/classes" />
5 </component> 5 </component>
6 <component name="ProjectType"> 6 <component name="ProjectType">
......
...@@ -2,11 +2,11 @@ apply plugin: 'com.android.application' ...@@ -2,11 +2,11 @@ apply plugin: 'com.android.application'
2 2
3 android { 3 android {
4 compileSdkVersion 29 4 compileSdkVersion 29
5 - buildToolsVersion "29.0.2" 5 + buildToolsVersion '29.0.2'
6 defaultConfig { 6 defaultConfig {
7 applicationId "com.youai.demo.poolsdk" 7 applicationId "com.youai.demo.poolsdk"
8 minSdkVersion 19 8 minSdkVersion 19
9 - targetSdkVersion 29 9 + targetSdkVersion 19
10 versionCode 1 10 versionCode 1
11 versionName "1.0" 11 versionName "1.0"
12 } 12 }
......
No preview for this file type
No preview for this file type
...@@ -2,18 +2,19 @@ ...@@ -2,18 +2,19 @@
2 <config> 2 <config>
3 3
4 <sdkconfig 4 <sdkconfig
5 - YA_APPID="58fd78a9834e7246b8dc0eac" 5 + YA_APPID="5b6bf23e665fff5f47475e56"
6 - YA_APPKEY="b06b86b79c25774ec758657a7203bae6" 6 + YA_APPKEY="a6050ea63e9b3c4cfedbe6d8c629240f"
7 + styleName="sdk_11"
7 gamesimplename="fytx_test" 8 gamesimplename="fytx_test"
8 - sdksimplename="youyu" 9 + sdksimplename="i9133"
9 sdkversioncode="V1_0" 10 sdkversioncode="V1_0"
10 channelparameter1="" 11 channelparameter1=""
11 channelparameter2="" 12 channelparameter2=""
12 custom="" 13 custom=""
13 gamechannelid="" 14 gamechannelid=""
14 - logincheckurl="http://183.136.223.85:9010/logincheck/check/" 15 + logincheckurl="http://login.public.sdk.gzyouai.com/logincheck/check"
15 - payorderurl="http://183.136.223.85:9020/paycheck/create" 16 + paycheckurl="http://pay.public.sdk.gzyouai.com/paycheck/confirm"
16 - paycheckurl="http://183.136.223.85:9020/paycheck/confirm" 17 + payorderurl="http://pay.public.sdk.gzyouai.com/paycheck/create"
17 usertype="gssaXIIEiL0=" /> 18 usertype="gssaXIIEiL0=" />
18 19
19 </config> 20 </config>
...\ No newline at end of file ...\ No newline at end of file
......
No preview for this file type
This diff is collapsed. Click to expand it.
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
This diff is collapsed. Click to expand it.
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
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>
40 - <form action="/sdk/login" method="post" class="ajax align-left clearfix"> 40 + <form action="/sdk/login2" method="post" class="ajax align-left clearfix">
41 <div class="new-sdk-logo"><a href="#"><img src="images/new-sdk-logo.png"></a></div> 41 <div class="new-sdk-logo"><a href="#"><img src="images/new-sdk-logo.png"></a></div>
42 <div class="new-sdk-main"> 42 <div class="new-sdk-main">
43 <div class="inputbox clearfix" style="position: relative;"> 43 <div class="inputbox clearfix" style="position: relative;">
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
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_3/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://wxlogin?app_id={app_id}&next=/static/sdk_3/login.html" class="wx hide">
72 </a> 72 </a>
73 </p>--> 73 </p>-->
74 74
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
87 87
88 </li> 88 </li>
89 <li> 89 <li>
90 -<!-- <a class="op-guest" data-replace="href" method="post" href="/sdk/register?type=-1&app_id={app_id}">一键注册</a> --> 90 +<!-- <a class="op-guest" data-replace="href" method="post" href="/sdk/register2?type=-1&app_id={app_id}">一键注册</a> -->
91 91
92 <a class="btn larg btn-orange submit" utocomplete="off" >登录</a> 92 <a class="btn larg btn-orange submit" utocomplete="off" >登录</a>
93 </li> 93 </li>
...@@ -130,7 +130,7 @@ ...@@ -130,7 +130,7 @@
130 <div class="new-sdk-container"> 130 <div class="new-sdk-container">
131 <div class="SDK-titlebox"></div> 131 <div class="SDK-titlebox"></div>
132 <div class="new-sdk-logo"><a href="#"><img src="images/new-sdk-logo.png"></a></div> 132 <div class="new-sdk-logo"><a href="#"><img src="images/new-sdk-logo.png"></a></div>
133 - <form action="/sdk/register" class="ajax clearfix"> 133 + <form action="/sdk/register2" class="ajax clearfix">
134 <div class="new-sdk-main"> 134 <div class="new-sdk-main">
135 <div class="inputbox clearfix"> 135 <div class="inputbox clearfix">
136 <div class="ileft">账号：</div> 136 <div class="ileft">账号：</div>
......
...@@ -13,14 +13,14 @@ var concat_with_mtime = [ ...@@ -13,14 +13,14 @@ var concat_with_mtime = [
13 'js/core.min.js', 13 'js/core.min.js',
14 'js/loader.min.js', 14 'js/loader.min.js',
15 'js/center.min.js', 15 'js/center.min.js',
16 - 'js/pay.min.js', 16 + 'js/zf.min.js',
17 'js/login.min.js' 17 'js/login.min.js'
18 ] 18 ]
19 19
20 var htmls = [ 20 var htmls = [
21 'login.html', 21 'login.html',
22 'center.html', 22 'center.html',
23 - 'pay.html', 23 + 'zf.html',
24 'share.html' 24 'share.html'
25 ] 25 ]
26 26
......
...@@ -31,7 +31,7 @@ function initMatching(){ ...@@ -31,7 +31,7 @@ function initMatching(){
31 Core.isIos = userAgent.match(/i[^;]+;( U;)? CPU.+Mac OS X/) != null; 31 Core.isIos = userAgent.match(/i[^;]+;( U;)? CPU.+Mac OS X/) != null;
32 Core.isAndroid = userAgent.indexOf('Android') > -1 || userAgent.indexOf('Linux') > -1; 32 Core.isAndroid = userAgent.indexOf('Android') > -1 || userAgent.indexOf('Linux') > -1;
33 Core.isFile = location.href.indexOf('file') == 0; //判断当前请求是否为file://协议 33 Core.isFile = location.href.indexOf('file') == 0; //判断当前请求是否为file://协议
34 - Core.isWeixin = userAgent.indexOf('MicroMessenger') != -1; 34 + Core.isWx = userAgent.indexOf('MicroMessenger') != -1;
35 var ratio = window.devicePixelRatio; 35 var ratio = window.devicePixelRatio;
36 Core.ratio = ratio; 36 Core.ratio = ratio;
37 37
...@@ -109,6 +109,7 @@ function initMatching(){ ...@@ -109,6 +109,7 @@ function initMatching(){
109 _w = Core.sdk_w * _scale; 109 _w = Core.sdk_w * _scale;
110 110
111 Core.ios_w = _w; 111 Core.ios_w = _w;
112 +
112 113
113 $('meta[name="viewport"]').attr('content','width=' + _w + ',maximum-scale=' + _scale + ',user-scalable=no'); 114 $('meta[name="viewport"]').attr('content','width=' + _w + ',maximum-scale=' + _scale + ',user-scalable=no');
114 //$('<meta name="viewport" content="maximum-scale=' + _scale + '"/>').appendTo(_head); 115 //$('<meta name="viewport" content="maximum-scale=' + _scale + '"/>').appendTo(_head);
...@@ -139,14 +140,17 @@ function initMatching(){ ...@@ -139,14 +140,17 @@ function initMatching(){
139 Core.isIos = userAgent.match(/i[^;]+;( U;)? CPU.+Mac OS X/) != null; 140 Core.isIos = userAgent.match(/i[^;]+;( U;)? CPU.+Mac OS X/) != null;
140 Core.isAndroid = userAgent.indexOf('Android') > -1 || userAgent.indexOf('Linux') > -1; 141 Core.isAndroid = userAgent.indexOf('Android') > -1 || userAgent.indexOf('Linux') > -1;
141 Core.isFile = location.href.indexOf('file') == 0; //判断当前请求是否为file://协议 142 Core.isFile = location.href.indexOf('file') == 0; //判断当前请求是否为file://协议
142 - Core.isWeixin = userAgent.indexOf('MicroMessenger') != -1; 143 + Core.isWx = userAgent.indexOf('MicroMessenger') != -1;
143 var ratio = window.devicePixelRatio; 144 var ratio = window.devicePixelRatio;
144 Core.ratio = ratio; 145 Core.ratio = ratio;
145 146
146 - Core.PLATFORM_NAME = '游娱'; 147 + Core.PLATFORM_NAME = '';
147 148
148 - 149 + if(Core.isIos){
149 - Core.server = 'https://sdk.uuufish.com'; 150 + Core.server = 'https://sdk.9133.com';
151 + }else{
152 + Core.server = 'http://sdk.9133.com';
153 + }
150 154
151 var lastServer = localStorage.getItem('last_server'); 155 var lastServer = localStorage.getItem('last_server');
152 if(lastServer && lastServer.indexOf('http:')==0){ 156 if(lastServer && lastServer.indexOf('http:')==0){
...@@ -217,6 +221,7 @@ function initMatching(){ ...@@ -217,6 +221,7 @@ function initMatching(){
217 221
218 Core.ios_w = _w; 222 Core.ios_w = _w;
219 223
224 +
220 $('meta[name="viewport"]').attr('content','width=' + _w + ',maximum-scale=' + _scale + ',user-scalable=no'); 225 $('meta[name="viewport"]').attr('content','width=' + _w + ',maximum-scale=' + _scale + ',user-scalable=no');
221 //$('<meta name="viewport" content="maximum-scale=' + _scale + '"/>').appendTo(_head); 226 //$('<meta name="viewport" content="maximum-scale=' + _scale + '"/>').appendTo(_head);
222 //$('<meta name="viewport" content="width=' + _w + '"/>').appendTo(_head); 227 //$('<meta name="viewport" content="width=' + _w + '"/>').appendTo(_head);
...@@ -513,8 +518,6 @@ function initMatching(){ ...@@ -513,8 +518,6 @@ function initMatching(){
513 } else { 518 } else {
514 post_url += '?format=json'; 519 post_url += '?format=json';
515 } 520 }
516 -
517 -
518 var options = { 521 var options = {
519 type: action_method, 522 type: action_method,
520 url: post_url, 523 url: post_url,
...@@ -547,7 +550,8 @@ function initMatching(){ ...@@ -547,7 +550,8 @@ function initMatching(){
547 } 550 }
548 if ($obj[0].tagName == "FORM") { 551 if ($obj[0].tagName == "FORM") {
549 $obj[0].disabled = false; 552 $obj[0].disabled = false;
550 - $obj.find("input, button").attr('disabled', null); 553 + $obj.find("input[type='text'],input[type='password'],input[name='password'], button").attr('disabled', null);
554 +
551 var $but_input = $obj.find('[type=submit]'); 555 var $but_input = $obj.find('[type=submit]');
552 if ($but_input.is('button')) { 556 if ($but_input.is('button')) {
553 $but_input.html(temp); 557 $but_input.html(temp);
...@@ -755,26 +759,31 @@ function initMatching(){ ...@@ -755,26 +759,31 @@ function initMatching(){
755 console.log('not wbkit browser!'); 759 console.log('not wbkit browser!');
756 } 760 }
757 } 761 }
758 - core.finishPay = function() { 762 + core.finishZf = function() {
759 - var pay_url = "sdk://exit?action=pay"; 763 + var zf_url = "sdk://exit?action=zf";
760 core.clearFrame() 764 core.clearFrame()
761 if(Core.Data.game_url && Core.Data.game_url != ''){ 765 if(Core.Data.game_url && Core.Data.game_url != ''){
762 if(Core.Data.back_url){ 766 if(Core.Data.back_url){
763 - pay_url = Core.Data.back_url; 767 + zf_url = Core.Data.back_url;
764 }else{ 768 }else{
765 - pay_url = Core.Data.game_url; 769 + zf_url = Core.Data.game_url;
766 } 770 }
767 }else{ 771 }else{
768 if(Core.Data.trade_id && Core.Data.trade_id != ''){ 772 if(Core.Data.trade_id && Core.Data.trade_id != ''){
769 - pay_url = "sdk://pay?order_id=" + Core.Data.trade_id; 773 + zf_url = "sdk://zf?order_id=" + Core.Data.trade_id;
770 - pay_url += Core.Data.current_pay_channel ? '&paytype=' + Core.Data.current_pay_channel.name : '' 774 + zf_url += Core.Data.current_zf_channel ? '&zftype=' + Core.Data.current_zf_channel.name : ''
771 } 775 }
772 } 776 }
773 try{ 777 try{
774 - location.href = pay_url; 778 + location.href = zf_url;
775 }catch(e){} 779 }catch(e){}
776 } 780 }
777 core.finishLogin = function() { 781 core.finishLogin = function() {
782 + if(Core.Data.compellation_name == "" && Core.Data.identity_card == "" && Core.Data.force_auth == 1){
783 + Core.showTips("根据政策规定，通过实名认证才能进入游戏哦！");
784 + Core.updateMod('identityCard');
785 + return false;
786 + }
778 var login_url = 'sdk://exit?action=login'; 787 var login_url = 'sdk://exit?action=login';
779 var login_params = "open_id=" + Core.Data.open_id + "&token=" + Core.Data.token + "&timestamp=" + Core.Data.timestamp ; 788 var login_params = "open_id=" + Core.Data.open_id + "&token=" + Core.Data.token + "&timestamp=" + Core.Data.timestamp ;
780 login_params += Core.Data.login_count ? '&login_count=' + Core.Data.login_count : '' ; 789 login_params += Core.Data.login_count ? '&login_count=' + Core.Data.login_count : '' ;
......
...@@ -55,7 +55,7 @@ for (i = 0, l = base_js.length; i < l; i++) { ...@@ -55,7 +55,7 @@ for (i = 0, l = base_js.length; i < l; i++) {
55 if (PATH.existsSync(path)) { 55 if (PATH.existsSync(path)) {
56 mtime = formatTime(fs.statSync(path).mtime); 56 mtime = formatTime(fs.statSync(path).mtime);
57 content.push('/static/sdk/' + path + '?' + mtime); 57 content.push('/static/sdk/' + path + '?' + mtime);
58 - //更新login.html, center.html, pay.html的引用信息的版本号 58 + //更新login.html, center.html, zf.html的引用信息的版本号
59 for (var j = 0, k = html_content.length; j < k; j++) { 59 for (var j = 0, k = html_content.length; j < k; j++) {
60 reg = new RegExp(path.replace('/', '\\/') + '\\?\\d+') 60 reg = new RegExp(path.replace('/', '\\/') + '\\?\\d+')
61 html_content[j] = html_content[j].replace(reg, path + '?' + mtime); 61 html_content[j] = html_content[j].replace(reg, path + '?' + mtime);
...@@ -70,7 +70,7 @@ for (i = 0, l = concat_with_mtime.length; i < l; i++) { ...@@ -70,7 +70,7 @@ for (i = 0, l = concat_with_mtime.length; i < l; i++) {
70 if (PATH.existsSync(path)) { 70 if (PATH.existsSync(path)) {
71 mtime = formatTime(fs.statSync(path).mtime); 71 mtime = formatTime(fs.statSync(path).mtime);
72 content.push('/static/sdk/' + path + '?' + mtime); 72 content.push('/static/sdk/' + path + '?' + mtime);
73 - //更新login.html, center.html, pay.html的引用信息的版本号 73 + //更新login.html, center.html, zf.html的引用信息的版本号
74 for (j = 0, k = html_content.length; j < k; j++) { 74 for (j = 0, k = html_content.length; j < k; j++) {
75 reg = new RegExp(path.replace('/', '\\/') + '\\?\\d+') 75 reg = new RegExp(path.replace('/', '\\/') + '\\?\\d+')
76 html_content[j] = html_content[j].replace(reg, path + '?' + mtime); 76 html_content[j] = html_content[j].replace(reg, path + '?' + mtime);
...@@ -107,7 +107,7 @@ for (i = 0, l = target.length; i < l; i++) { ...@@ -107,7 +107,7 @@ for (i = 0, l = target.length; i < l; i++) {
107 /* 107 /*
108 skin_content.push('/static/sdk/' + path + '/skin.css' + '?' + skin_mtime); 108 skin_content.push('/static/sdk/' + path + '/skin.css' + '?' + skin_mtime);
109 */ 109 */
110 - //更新login.html, center.html, pay.html的引用信息的版本号 110 + //更新login.html, center.html, zf.html的引用信息的版本号
111 for (j = 0, k = html_content.length; j < k; j++) { 111 for (j = 0, k = html_content.length; j < k; j++) {
112 reg = new RegExp('data-v="\\d+"'); 112 reg = new RegExp('data-v="\\d+"');
113 html_content[j] = html_content[j].replace(reg, 'data-v="' + skin_mtime + '"'); 113 html_content[j] = html_content[j].replace(reg, 'data-v="' + skin_mtime + '"');
......
...@@ -23,6 +23,7 @@ section{ ...@@ -23,6 +23,7 @@ section{
23 a,input,textarea,select { 23 a,input,textarea,select {
24 outline: 0; 24 outline: 0;
25 } 25 }
26 +input[type=button],input[type=text],input[type=password]{-webkit-appearance:none;outline:none}
26 a:focus { 27 a:focus {
27 outline:thin dotted; /* 处理“outline”在Chrome浏览器中和其它浏览器之间的不一致 */ 28 outline:thin dotted; /* 处理“outline”在Chrome浏览器中和其它浏览器之间的不一致 */
28 } 29 }
...@@ -50,18 +51,18 @@ select{ ...@@ -50,18 +51,18 @@ select{
50 -moz-osx-font-smoothing: grayscale; 51 -moz-osx-font-smoothing: grayscale;
51 } 52 }
52 53
53 -.icon-weixin:before { content: "\e600"; font-size: 1.8em; color: #0bb515;} 54 +.icon-wx:before { content: "\e600"; font-size: 1.8em; color: #0bb515;}
54 .icon-qq:before { content: "\e601"; font-size: 1.8em; color: #00beef;} 55 .icon-qq:before { content: "\e601"; font-size: 1.8em; color: #00beef;}
55 .icon-iconfontcha:before { content: "\e609"; } 56 .icon-iconfontcha:before { content: "\e609"; }
56 .icon-qq1:before { content: "\e602"; font-size: 1.8em; color: #00beef;} 57 .icon-qq1:before { content: "\e602"; font-size: 1.8em; color: #00beef;}
57 -.icon-weixin1:before { content: "\e603"; } 58 +.icon-wx1:before { content: "\e603"; }
58 .icon-qq2:before { content: "\e604"; font-size: 1.8em; color: #00beef;} 59 .icon-qq2:before { content: "\e604"; font-size: 1.8em; color: #00beef;}
59 .icon-iconfontxiangyou:before { content: "\e60a"; color: #fff; font-size: 1.6em;} 60 .icon-iconfontxiangyou:before { content: "\e60a"; color: #fff; font-size: 1.6em;}
60 .icon-iconfontcolor19:before { content: "\e60b"; } 61 .icon-iconfontcolor19:before { content: "\e60b"; }
61 .icon-xuanzhong:before { content: "\e60c"; color: #ff9600; font-size: 1.6em;} 62 .icon-xuanzhong:before { content: "\e60c"; color: #ff9600; font-size: 1.6em;}
62 .icon-triangle-l:before { content: "\e605"; } 63 .icon-triangle-l:before { content: "\e605"; }
63 .icon-shuangyuanquan:before { content: "\e60d"; color: #089b55;} 64 .icon-shuangyuanquan:before { content: "\e60d"; color: #089b55;}
64 -.icon-weixin2:before { content: "\e606"; } 65 +.icon-wx2:before { content: "\e606"; }
65 .icon-xiangyou:before { content: "\e60e"; } 66 .icon-xiangyou:before { content: "\e60e"; }
66 .icon-fuxuankuangyixuanze:before { content: "\e607"; } 67 .icon-fuxuankuangyixuanze:before { content: "\e607"; }
67 .icon-xiangxia:before { content: "\e60f"; color: #ddd; font-size: 30px;} 68 .icon-xiangxia:before { content: "\e60f"; color: #ddd; font-size: 30px;}
...@@ -598,7 +599,7 @@ body{ ...@@ -598,7 +599,7 @@ body{
598 .new-sdk-container .new-sdk-main .other-login p a.qq{ 599 .new-sdk-container .new-sdk-main .other-login p a.qq{
599 background: url(../images/login_icon.png) no-repeat 0 0; 600 background: url(../images/login_icon.png) no-repeat 0 0;
600 } 601 }
601 -.new-sdk-container .new-sdk-main .other-login p a.weixin{ 602 +.new-sdk-container .new-sdk-main .other-login p a.wx{
602 background: url(../images/login_icon.png) no-repeat 0 -45px; 603 background: url(../images/login_icon.png) no-repeat 0 -45px;
603 } 604 }
604 .new-sdk-container .new-sdk-main .other-login label{ 605 .new-sdk-container .new-sdk-main .other-login label{
......
...@@ -3,19 +3,19 @@ CACHE MANIFEST ...@@ -3,19 +3,19 @@ CACHE MANIFEST
3 #version=20151112001 3 #version=20151112001
4 /static/sdk_3/login.html?20151112001 4 /static/sdk_3/login.html?20151112001
5 /static/sdk_3/center.html?20151112001 5 /static/sdk_3/center.html?20151112001
6 -/static/sdk_3/pay.html?20151112001 6 +/static/sdk_3/zf.html?20151112001
7 /static/sdk_3/share.html?20151112001 7 /static/sdk_3/share.html?20151112001
8 /static/sdk_3/js/fastclick.min.1.0.js?20151112001 8 /static/sdk_3/js/fastclick.min.1.0.js?20151112001
9 /static/sdk_3/js/zepto.min.js?20151112001 9 /static/sdk_3/js/zepto.min.js?20151112001
10 /static/sdk_3/js/doT.min.js?20151112001 10 /static/sdk_3/js/doT.min.js?20151112001
11 /static/sdk_3/js/iscroll.min.1.0.js?20151112001 11 /static/sdk_3/js/iscroll.min.1.0.js?20151112001
12 /static/sdk_3/skin/login.css?20151112001 12 /static/sdk_3/skin/login.css?20151112001
13 -/static/sdk_3/skin/pay.css?20151112001 13 +/static/sdk_3/skin/zf.css?20151112001
14 14
15 /static/sdk_3/js/core.min.js?20151112001 15 /static/sdk_3/js/core.min.js?20151112001
16 /static/sdk_3/js/loader.min.js?20151112001 16 /static/sdk_3/js/loader.min.js?20151112001
17 /static/sdk_3/js/center.min.js?20151112001 17 /static/sdk_3/js/center.min.js?20151112001
18 -/static/sdk_3/js/pay.min.js?20151112001 18 +/static/sdk_3/js/zf.min.js?20151112001
19 /static/sdk_3/js/login.min.js?20151112001 19 /static/sdk_3/js/login.min.js?20151112001
20 /static/sdk_3/images/login_icon.png?20151112001 20 /static/sdk_3/images/login_icon.png?20151112001
21 /static/sdk_3/images/new-sdk-logo.png?20151112001 21 /static/sdk_3/images/new-sdk-logo.png?20151112001
......
...@@ -176,7 +176,7 @@ p.text-muted{color: #999999; } ...@@ -176,7 +176,7 @@ p.text-muted{color: #999999; }
176 right: 5px; 176 right: 5px;
177 top: 13px; 177 top: 13px;
178 } 178 }
179 -.badge.pay{ 179 +.badge.zf{
180 position: absolute; 180 position: absolute;
181 right: -8px; 181 right: -8px;
182 top: -6px; 182 top: -6px;
...@@ -265,18 +265,18 @@ label.enter_game{ ...@@ -265,18 +265,18 @@ label.enter_game{
265 -moz-osx-font-smoothing: grayscale; 265 -moz-osx-font-smoothing: grayscale;
266 } 266 }
267 267
268 -.icon-weixin:before { content: "\e600"; font-size: 1.8em; color: #0bb515;} 268 +.icon-wx:before { content: "\e600"; font-size: 1.8em; color: #0bb515;}
269 .icon-qq:before { content: "\e601"; font-size: 1.8em; color: #0f9fcf;} 269 .icon-qq:before { content: "\e601"; font-size: 1.8em; color: #0f9fcf;}
270 .icon-iconfontcha:before { content: "\e609"; } 270 .icon-iconfontcha:before { content: "\e609"; }
271 .icon-qq1:before { content: "\e602"; font-size: 1.8em; color: #0f9fcf;} 271 .icon-qq1:before { content: "\e602"; font-size: 1.8em; color: #0f9fcf;}
272 -.icon-weixin1:before { content: "\e603"; } 272 +.icon-wx1:before { content: "\e603"; }
273 .icon-qq2:before { content: "\e604"; font-size: 1.8em; color: #0f9fcf;} 273 .icon-qq2:before { content: "\e604"; font-size: 1.8em; color: #0f9fcf;}
274 .icon-iconfontxiangyou:before { content: "\e60a"; color: #fff; font-size: 32px;} 274 .icon-iconfontxiangyou:before { content: "\e60a"; color: #fff; font-size: 32px;}
275 .icon-iconfontcolor19:before { content: "\e60b"; } 275 .icon-iconfontcolor19:before { content: "\e60b"; }
276 .icon-xuanzhong:before { content: "\e60c"; color: #ff9600; font-size: 1.6em;} 276 .icon-xuanzhong:before { content: "\e60c"; color: #ff9600; font-size: 1.6em;}
277 .icon-triangle-l:before { content: "\e605"; } 277 .icon-triangle-l:before { content: "\e605"; }
278 .icon-shuangyuanquan:before { content: "\e60d"; color: #089b55;} 278 .icon-shuangyuanquan:before { content: "\e60d"; color: #089b55;}
279 -.icon-weixin2:before { content: "\e606"; } 279 +.icon-wx2:before { content: "\e606"; }
280 .icon-xiangyou:before { content: "\e60e"; } 280 .icon-xiangyou:before { content: "\e60e"; }
281 .icon-fuxuankuangyixuanze:before { content: "\e607"; } 281 .icon-fuxuankuangyixuanze:before { content: "\e607"; }
282 .icon-xiangxia:before { content: "\e60f"; color: #ddd; font-size: 1.8em;} 282 .icon-xiangxia:before { content: "\e60f"; color: #ddd; font-size: 1.8em;}
...@@ -498,22 +498,22 @@ ul.step-tab{ ...@@ -498,22 +498,22 @@ ul.step-tab{
498 /* 支付类型列表 END */ 498 /* 支付类型列表 END */
499 499
500 /* 确认代付 */ 500 /* 确认代付 */
501 -.pay-proxy-info{ 501 +.zf-proxy-info{
502 font-size:14px; 502 font-size:14px;
503 margin:auto; 503 margin:auto;
504 text-align: left; 504 text-align: left;
505 height: 100px; 505 height: 100px;
506 } 506 }
507 -.pay-proxy-info .desc{ 507 +.zf-proxy-info .desc{
508 margin-left:0px; 508 margin-left:0px;
509 } 509 }
510 -.pay-proxy-info .desc p{ 510 +.zf-proxy-info .desc p{
511 font-size: 14px; 511 font-size: 14px;
512 line-height: 16px; 512 line-height: 16px;
513 margin: 5px 0; 513 margin: 5px 0;
514 padding: 0; 514 padding: 0;
515 } 515 }
516 -.pay-proxy-info .btn-group{ 516 +.zf-proxy-info .btn-group{
517 margin-left:10px; 517 margin-left:10px;
518 float:right;} 518 float:right;}
519 /* 确认代付 END */ 519 /* 确认代付 END */
...@@ -884,24 +884,24 @@ div.head span.num{ ...@@ -884,24 +884,24 @@ div.head span.num{
884 div.sec{ 884 div.sec{
885 margin-top: 16px; 885 margin-top: 16px;
886 } 886 }
887 -ol.other-pay{ 887 +ol.other-zf{
888 padding-left: 5px; 888 padding-left: 5px;
889 } 889 }
890 -ol.other-pay li{ 890 +ol.other-zf li{
891 display:inline-block; 891 display:inline-block;
892 } 892 }
893 893
894 -ol.other-pay li a{ 894 +ol.other-zf li a{
895 display:inline-block; 895 display:inline-block;
896 text-align: center; 896 text-align: center;
897 margin:5px 10px 5px 0; 897 margin:5px 10px 5px 0;
898 padding: 0 5px; 898 padding: 0 5px;
899 cursor: pointer; 899 cursor: pointer;
900 } 900 }
901 -ol.other-pay li a:last-of-type{ 901 +ol.other-zf li a:last-of-type{
902 margin: 5px 0px 5px 0; 902 margin: 5px 0px 5px 0;
903 } 903 }
904 -ol.other-pay li a img{ 904 +ol.other-zf li a img{
905 width: 70px; 905 width: 70px;
906 height: 70px; 906 height: 70px;
907 907
...@@ -949,7 +949,7 @@ ol.other-pay li a img{ ...@@ -949,7 +949,7 @@ ol.other-pay li a img{
949 .level{ color:#F60; float:right; font-size:14px;} 949 .level{ color:#F60; float:right; font-size:14px;}
950 .gz-zhanghao{ text-align:left; padding:5px; margin-bottom:10px;} 950 .gz-zhanghao{ text-align:left; padding:5px; margin-bottom:10px;}
951 .gz-zhanghao .qq{ padding:5px 0px 5px 35px;background:url(http://cdn.i9133.com/static/sdk/skin/img/qq.png) left bottom no-repeat; } 951 .gz-zhanghao .qq{ padding:5px 0px 5px 35px;background:url(http://cdn.i9133.com/static/sdk/skin/img/qq.png) left bottom no-repeat; }
952 -.gz-zhanghao .weixin{ background:url(http://cdn.i9133.com/static/sdk/skin/img/weixin.png) left bottom no-repeat; padding:5px 0px 5px 35px} 952 +.gz-zhanghao .wx{ background:url(http://cdn.i9133.com/static/sdk/skin/img/wx.png) left bottom no-repeat; padding:5px 0px 5px 35px}
953 953
954 .fs_box{ text-align:left; font-size:16px; } 954 .fs_box{ text-align:left; font-size:16px; }
955 955
...@@ -1151,19 +1151,19 @@ li.more .btn{ display:block;} ...@@ -1151,19 +1151,19 @@ li.more .btn{ display:block;}
1151 height: auto; 1151 height: auto;
1152 min-height: 73px; 1152 min-height: 73px;
1153 } 1153 }
1154 -.pay-info-cont{ 1154 +.zf-info-cont{
1155 padding: 10px 37px; 1155 padding: 10px 37px;
1156 position: relative; 1156 position: relative;
1157 } 1157 }
1158 -.pay-info-cont .player-info-cont{ 1158 +.zf-info-cont .player-info-cont{
1159 border-right:1px solid black; 1159 border-right:1px solid black;
1160 1160
1161 } 1161 }
1162 -.pay-info-cont .player-info-cont .head-ico{ 1162 +.zf-info-cont .player-info-cont .head-ico{
1163 max-height: 50px; 1163 max-height: 50px;
1164 max-width: 50px; 1164 max-width: 50px;
1165 } 1165 }
1166 -.pay-info-cont .player-info-cont span{ 1166 +.zf-info-cont .player-info-cont span{
1167 display: inline-block; 1167 display: inline-block;
1168 1168
1169 } 1169 }
...@@ -1247,10 +1247,10 @@ position:absolute; left:0; right:0; top:0; bottom:0; width:auto; height:auto; ma ...@@ -1247,10 +1247,10 @@ position:absolute; left:0; right:0; top:0; bottom:0; width:auto; height:auto; ma
1247 .warm-prompt h2 { color: #ff0000; font-size: 20px; font-weight: normal; font-family: "Microsoft YaHei","微软雅黑"; } 1247 .warm-prompt h2 { color: #ff0000; font-size: 20px; font-weight: normal; font-family: "Microsoft YaHei","微软雅黑"; }
1248 .warm-prompt p { color: #535353; font-family: "Microsoft YaHei","微软雅黑"; font-size: 16px; margin: 0;} 1248 .warm-prompt p { color: #535353; font-family: "Microsoft YaHei","微软雅黑"; font-size: 16px; margin: 0;}
1249 .warm-prompt p a { color: #f39700; } 1249 .warm-prompt p a { color: #f39700; }
1250 -.pay-info-cont .user-msg { white-space: nowrap; text-overflow: ellipsis; overflow: hidden; word-break: break-all; margin-left: 15px; width: calc(100% - 100px);} 1250 +.zf-info-cont .user-msg { white-space: nowrap; text-overflow: ellipsis; overflow: hidden; word-break: break-all; margin-left: 15px; width: calc(100% - 100px);}
1251 -.pay-info-cont .user-msg h2 { font-weight: normal; font-size: 24px; margin: 0; color: #949494; } 1251 +.zf-info-cont .user-msg h2 { font-weight: normal; font-size: 24px; margin: 0; color: #949494; }
1252 -.pay-info-cont .user-msg p { font-size: 24px; color: #434343; margin: 0; line-height: normal;} 1252 +.zf-info-cont .user-msg p { font-size: 24px; color: #434343; margin: 0; line-height: normal;}
1253 -.pay-info-cont .user-msg p span { color: #f39700; } 1253 +.zf-info-cont .user-msg p span { color: #f39700; }
1254 1254
1255 /*充值记录*/ 1255 /*充值记录*/
1256 .integral .box{ border-left:2px solid #089b55; margin-left:100px; height:100%; padding:0 10px 20px;;} 1256 .integral .box{ border-left:2px solid #089b55; margin-left:100px; height:100%; padding:0 10px 20px;;}
......
1 +20180925
...\ No newline at end of file ...\ No newline at end of file
1 -SERVER_URL=http://sdk.uuufish.com
2 -CDN_SERVER_URL=http://sdk.uuufish.com
3 -SDK_TYPE=.sys_config_youyu
...\ No newline at end of file ...\ No newline at end of file
1 +SERVER_URL=https://sdk.i9133.com
2 +CDN_SERVER_URL=https://cdn.i9133.com
3 +SDK_TYPE=.sys_config_9133_n
...\ No newline at end of file ...\ No newline at end of file
......
No preview for this file type
No preview for this file type
No preview for this file type