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 237 additions and 159 deletions
......@@ -2,13 +2,13 @@
<config>
<sdkconfig
YA_APPID="58abba4954c21d1275766755"
YA_APPKEY="28ed3cfdcd40d081a5e8dd761f7e344b"
YA_APPID="58db653e0184553d610527d6"
YA_APPKEY="28e614d62b8d4e74757cbf3e15ce5596"
channelparameter1=""
channelparameter2=""
custom=""
gamechannelid=""
gamesimplename="fytx_test"
gamesimplename="qyj1"
logincheckurl="http://login.public.sdk.gzyouai.com/logincheck/check"
paycheckurl="http://pay.public.sdk.gzyouai.com/paycheck/confirm"
payorderurl="http://pay.public.sdk.gzyouai.com/paycheck/create"
......
......@@ -2,30 +2,28 @@
<html>
<head>
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no">
<meta name="apple-mobile-web-app-capable" content="yes" />
<meta name="apple-mobile-web-app-status-bar-style" content="black" />
<meta http-equiv="Content-type" content="text/html; charset=utf-8" />
<meta name="format-detection" content="telephone=no">
<meta name="screen-orientation" content="portrait">
<meta name="full-screen" content="yes">
<meta http-equiv="x-ua-compatible" content="IE=edge" />
<link href="skin/login.css?v=20150923001" type="text/css" rel="stylesheet" />
<meta name="viewport" content="width=device-width, user-scalable=no" />
<meta name="apple-mobile-web-app-capable" content="yes" />
<meta name="apple-mobile-web-app-status-bar-style" content="black" />
<meta http-equiv="Content-type" content="text/html; charset=utf-8" />
<meta name="format-detection" content="telephone=no">
<meta name="screen-orientation" content="portrait">
<meta name="full-screen" content="yes">
<meta http-equiv="x-ua-compatible" content="IE=edge" />
<title>
手游平台支付
</title>
<style>
h4,p{font-size: 24px;
font-weight: normal;
padding: 0 20px;font-family: "微软雅黑"; width: 100%;}
p{ text-indent: 2em;}
</style>
</head>
<body>
<!-- 协议模块 -->
<section id="agreement">
<div class="new-sdk-container">
<div class="SDK-titlebox"></div>
<div class="new-sdk-logo"><a href="#"><img src="images/new-sdk-logo.png"></a></div>
<div class="new-sdk-content">
<h3>网络服务协议</h3>
<div class="content-main">
<div class="mask"></div>
<div class="horizontal" style="height: 220px;">
<h4>1. 账号服务条款的接受</h4>
<p>1.1 账号由上海星玩网络科技（以下简称“星玩”）及其关联公司所有并合法运营，星玩及其关联公司并在本用户服务协议的条款和要求下提供服务。</p>
<p>1.2 当用户访问、浏览及使用账号提供的各项服务、业务时，用户便表明其接受了本服务协议的条款，并同意受本服务协议的约束，用户并保证其提交的信息真实、准确、及时和完整；若用户不同意本协议条款的，请停止注册程序。</p>
......@@ -182,21 +180,7 @@
<p>本服务条款的生效、履行、解释及争议的解决均适用中华人民共和国法律，发生的争议提交广州仲裁委员会裁决。如果本服务协议中某项条款因与中华人民共和国现行法律相抵触而导致无效，将不影响其他部分的效力。</p>
<h4>21. 生效条件</h4>
<p>本协议自用户访问、浏览及使用账号之时开始生效。</p>
</div>
</div>
<div class="only-btn inline-btn">
<a href="login.html#register" class="submit btn-orange">确定</a>
<div class="agreement l" style="margin-right: 0;">
<div class="checkbox checkbox-2 l" >
<i class="iconfont icon-xuanzhong"></i>
</div>
<p class="l">已阅读</p>
</div>
</div>
</div>
</section>
</div>
<!-- end -->
<script type="text/javascript" src="js/fastclick.min.1.0.js?20150923001"></script>
<script type="text/javascript" src="js/zepto.min.js?20150923001"></script>
......@@ -208,6 +192,10 @@
});
</script>
<script type="text/javascript" src="js/core.min.js?20150923001" ></script>
<script type="text/javascript" src="js/simpScroller-min.js"></script>
<script>
simpScroller(document.querySelector(".horizontal"), {});
</script>
</body>
</html>
\ No newline at end of file
......
This diff is collapsed. Click to expand it.
......@@ -88,24 +88,28 @@ function initMatching(){
if (!Core.sdk_w) Core.sdk_w = 600;
_scale = 1;
if (ratio > 1.5){
_scale = 2.3 / ratio;
} else if (ratio < 1) {
if(ratio == 2){//5、6、6s(2.4)
_scale = 2.4 / ratio;
if(userAgent.indexOf('iPad') != -1){
_scale = 2 / ratio;
}
}else if(ratio >2.5){//6s plus
_scale = 2.7 / ratio;
}else if (ratio < 1) {
_scale = 1.5 / ratio;
} else {
_scale = 1;
}
if(userAgent.indexOf('iPad') != -1 && Core.sdk_w > 768){
Core.sdk_w = Core.sdk_w / 2;
Core.sdk_h = Core.sdk_h / 2 / _scale;
Core.sdk_h = Core.sdk_h / 2 / _scale;
}else{
Core.sdk_h = Core.sdk_h * _scale;
}
_w = Core.sdk_w * _scale;
Core.ios_w = _w;
$('meta[name="viewport"]').attr('content','width=' + _w + ',maximum-scale=' + _scale + ',user-scalable=no');
//$('<meta name="viewport" content="maximum-scale=' + _scale + '"/>').appendTo(_head);
//$('<meta name="viewport" content="width=' + _w + '"/>').appendTo(_head);
......@@ -138,10 +142,11 @@ function initMatching(){
Core.isWeixin = userAgent.indexOf('MicroMessenger') != -1;
var ratio = window.devicePixelRatio;
Core.ratio = ratio;
Core.PLATFORM_NAME = '星玩';
Core.PLATFORM_NAME = '星玩';
Core.server = 'http://sdk.shxingwan.com';
Core.server = 'https://sdk.shxingwan.com';
var lastServer = localStorage.getItem('last_server');
if(lastServer && lastServer.indexOf('http:')==0){
if(Core.isFile){
......@@ -191,11 +196,10 @@ function initMatching(){
var _w = null;
if (Core.isIos) {
$('html').attr('data-useragent', 'ios');
if (!Core.sdk_w) Core.sdk_w = 600;
_scale = 1;
if (ratio > 1.5){
_scale = 2 / ratio;
if (ratio > 1.5){//6s plus,
_scale = 2.8 / ratio;
} else if (ratio < 1) {
_scale = 1.5 / ratio;
} else {
......@@ -211,7 +215,6 @@ function initMatching(){
Core.ios_w = _w;
$('meta[name="viewport"]').attr('content','width=' + _w + ',maximum-scale=' + _scale + ',user-scalable=no');
//$('<meta name="viewport" content="maximum-scale=' + _scale + '"/>').appendTo(_head);
//$('<meta name="viewport" content="width=' + _w + '"/>').appendTo(_head);
......@@ -328,7 +331,8 @@ function initMatching(){
core.updateMod = function(modId) {
if (!modId in modules) {
console.error('没有对应的模块id的section:' + modId);
return;
modId = 'home'
//return;
}
location.hash = "#" + modId + '&force';
}
......@@ -511,7 +515,7 @@ function initMatching(){
var options = {
type: action_method,
url: Core.get_url(post_url),
url: post_url,
dataType: 'json',
contentType: "application/x-www-form-urlencoded; charset=utf-8",
data: param,
......@@ -600,7 +604,7 @@ function initMatching(){
$obj[0].disabled = true;
}
Core.showTips('加载中...', true, 5000);
$.ajax(options);
Core.ajax(options);
return false;
}
......@@ -610,9 +614,7 @@ function initMatching(){
Core.showTips('请求已提交，请稍候。');
return;
}
if(Core.isFile){
path = core.server + path;
}
var options = {
type: "get",
url: path,
......@@ -632,7 +634,7 @@ function initMatching(){
}
$obj.data('disabled', true);
Core.showTips('加载中...', true, 5000);
$.ajax(options);
Core.ajax(options);
return false;
}
......@@ -662,9 +664,7 @@ function initMatching(){
dataType = 'json';
}
var data_result = '';
if(Core.isFile){
data_url = core.server + data_url;
}
var options = {
type: "get",
url: data_url,
......@@ -710,7 +710,7 @@ function initMatching(){
}
}
Core.showTips('加载中...', true, 5000);
$.ajax(options);
Core.ajax(options);
}
// 判断用户是否登录,使用两个
core.isAuths = function() {
......
This diff is collapsed. Click to expand it.
......@@ -69,12 +69,9 @@
//如果不尝试自动登录，直接初始化界面
if (!tryAutoLogin)
goInit();
//请求数据
if (Core.isFile) {
url = Core.server + url;
}
$.ajax({
Core.ajax({
type: 'GET',
url: url + '?' + params,
dataType: 'json',
......
This diff is collapsed. Click to expand it.
......@@ -17,6 +17,7 @@
}
Core.inherit(Home, Module);
Home.prototype.bind = function() {
$('#loading').click(function(){$(this).hide()})
var that = this;
that.$c.on('click', 'input[type=button]', function(e) {
// 更新要兑换的元宝
......@@ -30,6 +31,7 @@
Core.Data.money = Core.Data.youai_star / Core.Data.rate;
Core.updateMod('exchange');
} else {
// 用户游爱星不足够兑换，进入充值渠道列表
Core.Data.money = youai_star_need / Core.Data.rate;
Core.Data.youai_star = youai_star_need;
......@@ -38,7 +40,12 @@
return false;
});
}
Home.prototype.show_after = function(){
setTimeout(function(){
$('#back-btn').show();
},3000)
}
Core.registerMod('home', Home);
/**
......@@ -143,7 +150,7 @@
var reload = false;
var list = Core.Data.game_pay_channel_list;
var $c = $(e.target);
var id = $c.attr('data-id');
var id = $(this).attr('data-id');
for ( var index in list) {
var item = list[index];
if (id == item.id) {
......@@ -908,22 +915,23 @@
Core.Data.enter_amount = Core.Data.enter_game_amount / Core.Data.exchange_rate;
Core.Data.pay_again = 0;
}
if (Core.Data.enter_game_amount > 0
&& Core.Data.enter_amount <= Core.Data.total_amount) {
// 需要进入兑换页面
Core.start_page = "exchange";
Core.Data.game_amount = Core.Data.enter_game_amount;
Core.Data.youai_star = Core.Data.enter_amount;
Core.Data.money = Core.Data.youai_star / Core.Data.rate;
} else if (Core.Data.enter_game_amount > 0) {
//if (Core.Data.enter_game_amount > 0
// && Core.Data.enter_amount <= Core.Data.total_amount) {
// // 需要进入兑换页面
// Core.start_page = "exchange";
// Core.Data.game_amount = Core.Data.enter_game_amount;
// Core.Data.youai_star = Core.Data.enter_amount;
// Core.Data.money = Core.Data.youai_star / Core.Data.rate;
//} else
//if (Core.Data.enter_game_amount > 0) {
// 需要进入渠道充值页面
Core.start_page = "channel_list";
Core.Data.game_amount = Core.Data.enter_game_amount;
Core.Data.youai_star = Core.Data.enter_amount;
Core.Data.money = Core.Data.youai_star / Core.Data.rate;
} else {
// 没有输入充值数量，进入选择数量的界面
}
//} else {
// // 没有输入充值数量，进入选择数量的界面
//}
}
function onBridgeReady() {
......
/*!
** create by zhangxinxu(.com) 2013-07-15
** a simple method for custom scrolling
** it can be used on both mobile and parts desktop browser IE9+/FF/Chrome/...
*/
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
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
date:2017-4-11
author
:lizenghua
instructions
:与星玩SDK同步
date:2017-4-12
author:lizenghua
instructions:修复当账户及密码为空时（本地存储的账号密码数据为空），通过密保找回密码时一直处于加载中无法跳转的问题
date:2017-4-21
author:lizenghua
instructions:
1、当用户是正式用户并绑定了手机后进行实名认证；身份证校验js：identity_id.js
改动的文件有：login.html、login.js（同步在sdk_xingwan、sdk_6）
2、改动注释了pay.js里面的911行到918行：进入sdk要购买的游戏币>0时强制进入渠道充值页面（已同步在sdk_xingwan、sdk_6）
date:2017-4-24
author:lizenghua
instructions:
1、处理绑定手机的手机验证规则（176），
2、手机找回密码中重置密码残留旧密码问题
date:2017-5-3
author:lizenghua
instructions:
1、注释掉pay.html中的“游爱星”兑换入口
2、处理支付方式切换中出现 input_item 为undefind 的bug （将383行的{{?}}移至435行）
3、去掉设置密保中select默认的下拉图标（login.css）
4、如果没有第三方登录则隐藏掉“第三方登录”字眼
date:2017-5-8
author:lizenghua
instructions:处理支付方式点击支付图标出现 input_item 为undefind 的bug（将150行$c改成$(this)）
date:2017-5-12
author:lizenghua
instructions:与游娱同步
\ No newline at end of file
This diff is collapsed. Click to expand it.
#!/bin/sh
#js css压缩,生成更新包打包
CDN_SERVER='http://youyu.9133.com/static'
CDN_SERVER='http://cdn.9133.com/static'
DIR_PATH="$( cd "$( dirname "$0" )" && pwd )"
......
20161117
\ No newline at end of file
20170111
......
SERVER_URL=http://sdk.shxingwan.com
CDN_SERVER_URL=http://sdk.shxingwan.com
\ No newline at end of file
CDN_SERVER_URL=http://sdk.shxingwan.com
SDK_TYPE=.sys_config_xingwan
\ No newline at end of file
......
......@@ -2,30 +2,28 @@
<html>
<head>
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no">
<meta name="apple-mobile-web-app-capable" content="yes" />
<meta name="apple-mobile-web-app-status-bar-style" content="black" />
<meta http-equiv="Content-type" content="text/html; charset=utf-8" />
<meta name="format-detection" content="telephone=no">
<meta name="screen-orientation" content="portrait">
<meta name="full-screen" content="yes">
<meta http-equiv="x-ua-compatible" content="IE=edge" />
<link href="skin/login.css?v=20150923001" type="text/css" rel="stylesheet" />
<meta name="viewport" content="width=device-width, user-scalable=no" />
<meta name="apple-mobile-web-app-capable" content="yes" />
<meta name="apple-mobile-web-app-status-bar-style" content="black" />
<meta http-equiv="Content-type" content="text/html; charset=utf-8" />
<meta name="format-detection" content="telephone=no">
<meta name="screen-orientation" content="portrait">
<meta name="full-screen" content="yes">
<meta http-equiv="x-ua-compatible" content="IE=edge" />
<title>
手游平台支付
</title>
<style>
h4,p{font-size: 24px;
font-weight: normal;
padding: 0 20px;font-family: "微软雅黑"; width: 100%;}
p{ text-indent: 2em;}
</style>
</head>
<body>
<!-- 协议模块 -->
<section id="agreement">
<div class="new-sdk-container">
<div class="SDK-titlebox"></div>
<div class="new-sdk-logo"><a href="#"><img src="images/new-sdk-logo.png"></a></div>
<div class="new-sdk-content">
<h3>网络服务协议</h3>
<div class="content-main">
<div class="mask"></div>
<div class="horizontal" style="height: 220px;">
<h4>1. 账号服务条款的接受</h4>
<p>1.1 账号由上海星玩网络科技（以下简称“星玩”）及其关联公司所有并合法运营，星玩及其关联公司并在本用户服务协议的条款和要求下提供服务。</p>
<p>1.2 当用户访问、浏览及使用账号提供的各项服务、业务时，用户便表明其接受了本服务协议的条款，并同意受本服务协议的约束，用户并保证其提交的信息真实、准确、及时和完整；若用户不同意本协议条款的，请停止注册程序。</p>
......@@ -182,21 +180,7 @@
<p>本服务条款的生效、履行、解释及争议的解决均适用中华人民共和国法律，发生的争议提交广州仲裁委员会裁决。如果本服务协议中某项条款因与中华人民共和国现行法律相抵触而导致无效，将不影响其他部分的效力。</p>
<h4>21. 生效条件</h4>
<p>本协议自用户访问、浏览及使用账号之时开始生效。</p>
</div>
</div>
<div class="only-btn inline-btn">
<a href="login.html#register" class="submit btn-orange">确定</a>
<div class="agreement l" style="margin-right: 0;">
<div class="checkbox checkbox-2 l" >
<i class="iconfont icon-xuanzhong"></i>
</div>
<p class="l">已阅读</p>
</div>
</div>
</div>
</section>
</div>
<!-- end -->
<script type="text/javascript" src="js/fastclick.min.1.0.js?20150923001"></script>
<script type="text/javascript" src="js/zepto.min.js?20150923001"></script>
......@@ -208,6 +192,10 @@
});
</script>
<script type="text/javascript" src="js/core.min.js?20150923001" ></script>
<script type="text/javascript" src="js/simpScroller-min.js"></script>
<script>
simpScroller(document.querySelector(".horizontal"), {});
</script>
</body>
</html>
\ No newline at end of file
......
This diff is collapsed. Click to expand it.
......@@ -88,24 +88,28 @@ function initMatching(){
if (!Core.sdk_w) Core.sdk_w = 600;
_scale = 1;
if (ratio > 1.5){
_scale = 2.3 / ratio;
} else if (ratio < 1) {
if(ratio == 2){//5、6、6s(2.4)
_scale = 2.4 / ratio;
if(userAgent.indexOf('iPad') != -1){
_scale = 2 / ratio;
}
}else if(ratio >2.5){//6s plus
_scale = 2.7 / ratio;
}else if (ratio < 1) {
_scale = 1.5 / ratio;
} else {
_scale = 1;
}
if(userAgent.indexOf('iPad') != -1 && Core.sdk_w > 768){
Core.sdk_w = Core.sdk_w / 2;
Core.sdk_h = Core.sdk_h / 2 / _scale;
Core.sdk_h = Core.sdk_h / 2 / _scale;
}else{
Core.sdk_h = Core.sdk_h * _scale;
}
_w = Core.sdk_w * _scale;
Core.ios_w = _w;
$('meta[name="viewport"]').attr('content','width=' + _w + ',maximum-scale=' + _scale + ',user-scalable=no');
//$('<meta name="viewport" content="maximum-scale=' + _scale + '"/>').appendTo(_head);
//$('<meta name="viewport" content="width=' + _w + '"/>').appendTo(_head);
......@@ -138,10 +142,11 @@ function initMatching(){
Core.isWeixin = userAgent.indexOf('MicroMessenger') != -1;
var ratio = window.devicePixelRatio;
Core.ratio = ratio;
Core.PLATFORM_NAME = '星玩';
Core.PLATFORM_NAME = '星玩';
Core.server = 'http://sdk.shxingwan.com';
Core.server = 'https://sdk.shxingwan.com';
var lastServer = localStorage.getItem('last_server');
if(lastServer && lastServer.indexOf('http:')==0){
if(Core.isFile){
......@@ -191,11 +196,10 @@ function initMatching(){
var _w = null;
if (Core.isIos) {
$('html').attr('data-useragent', 'ios');
if (!Core.sdk_w) Core.sdk_w = 600;
_scale = 1;
if (ratio > 1.5){
_scale = 2 / ratio;
if (ratio > 1.5){//6s plus,
_scale = 2.8 / ratio;
} else if (ratio < 1) {
_scale = 1.5 / ratio;
} else {
......@@ -211,7 +215,6 @@ function initMatching(){
Core.ios_w = _w;
$('meta[name="viewport"]').attr('content','width=' + _w + ',maximum-scale=' + _scale + ',user-scalable=no');
//$('<meta name="viewport" content="maximum-scale=' + _scale + '"/>').appendTo(_head);
//$('<meta name="viewport" content="width=' + _w + '"/>').appendTo(_head);
......@@ -328,7 +331,8 @@ function initMatching(){
core.updateMod = function(modId) {
if (!modId in modules) {
console.error('没有对应的模块id的section:' + modId);
return;
modId = 'home'
//return;
}
location.hash = "#" + modId + '&force';
}
......@@ -511,7 +515,7 @@ function initMatching(){
var options = {
type: action_method,
url: Core.get_url(post_url),
url: post_url,
dataType: 'json',
contentType: "application/x-www-form-urlencoded; charset=utf-8",
data: param,
......@@ -600,7 +604,7 @@ function initMatching(){
$obj[0].disabled = true;
}
Core.showTips('加载中...', true, 5000);
$.ajax(options);
Core.ajax(options);
return false;
}
......@@ -610,9 +614,7 @@ function initMatching(){
Core.showTips('请求已提交，请稍候。');
return;
}
if(Core.isFile){
path = core.server + path;
}
var options = {
type: "get",
url: path,
......@@ -632,7 +634,7 @@ function initMatching(){
}
$obj.data('disabled', true);
Core.showTips('加载中...', true, 5000);
$.ajax(options);
Core.ajax(options);
return false;
}
......@@ -662,9 +664,7 @@ function initMatching(){
dataType = 'json';
}
var data_result = '';
if(Core.isFile){
data_url = core.server + data_url;
}
var options = {
type: "get",
url: data_url,
......@@ -710,7 +710,7 @@ function initMatching(){
}
}
Core.showTips('加载中...', true, 5000);
$.ajax(options);
Core.ajax(options);
}
// 判断用户是否登录,使用两个
core.isAuths = function() {
......
This diff is collapsed. Click to expand it.
......@@ -69,12 +69,9 @@
//如果不尝试自动登录，直接初始化界面
if (!tryAutoLogin)
goInit();
//请求数据
if (Core.isFile) {
url = Core.server + url;
}
$.ajax({
Core.ajax({
type: 'GET',
url: url + '?' + params,
dataType: 'json',
......
This diff is collapsed. Click to expand it.
......@@ -17,6 +17,7 @@
}
Core.inherit(Home, Module);
Home.prototype.bind = function() {
$('#loading').click(function(){$(this).hide()})
var that = this;
that.$c.on('click', 'input[type=button]', function(e) {
// 更新要兑换的元宝
......@@ -30,6 +31,7 @@
Core.Data.money = Core.Data.youai_star / Core.Data.rate;
Core.updateMod('exchange');
} else {
// 用户游爱星不足够兑换，进入充值渠道列表
Core.Data.money = youai_star_need / Core.Data.rate;
Core.Data.youai_star = youai_star_need;
......@@ -38,7 +40,12 @@
return false;
});
}
Home.prototype.show_after = function(){
setTimeout(function(){
$('#back-btn').show();
},3000)
}
Core.registerMod('home', Home);
/**
......@@ -143,7 +150,7 @@
var reload = false;
var list = Core.Data.game_pay_channel_list;
var $c = $(e.target);
var id = $c.attr('data-id');
var id = $(this).attr('data-id');
for ( var index in list) {
var item = list[index];
if (id == item.id) {
......@@ -908,22 +915,23 @@
Core.Data.enter_amount = Core.Data.enter_game_amount / Core.Data.exchange_rate;
Core.Data.pay_again = 0;
}
if (Core.Data.enter_game_amount > 0
&& Core.Data.enter_amount <= Core.Data.total_amount) {
// 需要进入兑换页面
Core.start_page = "exchange";
Core.Data.game_amount = Core.Data.enter_game_amount;
Core.Data.youai_star = Core.Data.enter_amount;
Core.Data.money = Core.Data.youai_star / Core.Data.rate;
} else if (Core.Data.enter_game_amount > 0) {
//if (Core.Data.enter_game_amount > 0
// && Core.Data.enter_amount <= Core.Data.total_amount) {
// // 需要进入兑换页面
// Core.start_page = "exchange";
// Core.Data.game_amount = Core.Data.enter_game_amount;
// Core.Data.youai_star = Core.Data.enter_amount;
// Core.Data.money = Core.Data.youai_star / Core.Data.rate;
//} else
//if (Core.Data.enter_game_amount > 0) {
// 需要进入渠道充值页面
Core.start_page = "channel_list";
Core.Data.game_amount = Core.Data.enter_game_amount;
Core.Data.youai_star = Core.Data.enter_amount;
Core.Data.money = Core.Data.youai_star / Core.Data.rate;
} else {
// 没有输入充值数量，进入选择数量的界面
}
//} else {
// // 没有输入充值数量，进入选择数量的界面
//}
}
function onBridgeReady() {
......
/*!
** create by zhangxinxu(.com) 2013-07-15
** a simple method for custom scrolling
** it can be used on both mobile and parts desktop browser IE9+/FF/Chrome/...
*/
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
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
date:2017-4-11
author
:lizenghua
instructions
:与星玩SDK同步
date:2017-4-12
author:lizenghua
instructions:修复当账户及密码为空时（本地存储的账号密码数据为空），通过密保找回密码时一直处于加载中无法跳转的问题
date:2017-4-21
author:lizenghua
instructions:
1、当用户是正式用户并绑定了手机后进行实名认证；身份证校验js：identity_id.js
改动的文件有：login.html、login.js（同步在sdk_xingwan、sdk_6）
2、改动注释了pay.js里面的911行到918行：进入sdk要购买的游戏币>0时强制进入渠道充值页面（已同步在sdk_xingwan、sdk_6）
date:2017-4-24
author:lizenghua
instructions:
1、处理绑定手机的手机验证规则（176），
2、手机找回密码中重置密码残留旧密码问题
date:2017-5-3
author:lizenghua
instructions:
1、注释掉pay.html中的“游爱星”兑换入口
2、处理支付方式切换中出现 input_item 为undefind 的bug （将383行的{{?}}移至435行）
3、去掉设置密保中select默认的下拉图标（login.css）
4、如果没有第三方登录则隐藏掉“第三方登录”字眼
date:2017-5-8
author:lizenghua
instructions:处理支付方式点击支付图标出现 input_item 为undefind 的bug（将150行$c改成$(this)）
date:2017-5-12
author:lizenghua
instructions:与游娱同步
\ No newline at end of file
This diff is collapsed. Click to expand it.
#!/bin/sh
#js css压缩,生成更新包打包
CDN_SERVER='http://youyu.9133.com/static'
CDN_SERVER='http://cdn.9133.com/static'
DIR_PATH="$( cd "$( dirname "$0" )" && pwd )"
......
20161117
\ No newline at end of file
20170111
......
SERVER_URL=http://sdk.shxingwan.com
CDN_SERVER_URL=http://sdk.shxingwan.com
\ No newline at end of file
CDN_SERVER_URL=http://sdk.shxingwan.com
SDK_TYPE=.sys_config_xingwan
\ No newline at end of file
......