public_service / public_sdk_android

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

更新目录为sys..

Expand all
Inline Side-by-side
Showing 35 changed files with 287 additions and 217 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() {
......
This diff is collapsed. Click to expand it.
...@@ -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',
......
This diff is collapsed. Click to expand it.
...@@ -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
This diff is collapsed. Click to expand it.
...@@ -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() {
......
This diff is collapsed. Click to expand it.
...@@ -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',
......
This diff is collapsed. Click to expand it.
...@@ -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
This diff is collapsed. Click to expand it.
...@@ -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
......