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 @@
<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,7 +2,7 @@
<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="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" />
......@@ -10,22 +10,20 @@
<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" />
<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>
......@@ -183,20 +181,6 @@
<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>
<!-- 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
......
......@@ -88,9 +88,14 @@ 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;
......@@ -105,7 +110,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);
......@@ -141,7 +145,8 @@ function initMatching(){
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.
......@@ -160,29 +160,28 @@
<div class="container">
<div class="box_info_center">
<h2 class="align-left">
请选择要充值{{=Core.Data.game_unit_name || ''}}的数量
</h2>
<p class="align-left text-muted">
注：充值 <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 || ''}}
</p>
<div class="amount_level align-left" >
{{~ Core.Data.amount_level :item:index }}
{{? parseInt(item) }}
<input type="button" value="{{=parseInt(item)}}" class="btn" data="{{=item}}" />
{{?}}
{{~}}
</div>
<br>
<p class="align-left text-success tips9133">
{{? Core.Data.pay_only != 1 }}
{{? Core.Data.is_guest == 1}}
亲爱的<span class="text-info">游客</span>玩家,为确保账号资金安全,请先<a href="#modify_pwd">免费升级账号</a>再充值。
{{??}}
{{? Core.Data.vip > 0}}
{{??}}
{{?}}
{{?}}
{{?}}
</p>
<br>
<div class="amount_level align-left" >
<a href="javascript:Core.finishPay()" id="back-btn" class="btn larg conBtn " style="text-align: center;display:none">请返回游戏</a>
<br>
</div>
</div>
</div>
</script>
......@@ -202,7 +201,7 @@
</form>
<p class="text-warning align-left">游客账号是系统临时生成，存在风险，为了您的账号安全建议升级永久账号。</p>
{{??}}
<p class="text-success align-left">您的账号已经成功升级成手游平台永久账号，登录<a href="sdk://open?url=http://m.9133.com">9133.com</a>可以了解更多特权。</p>
<p class="text-success align-left">您的账号已经成功升级成手游平台永久账号。</p>
{{?}}
</div>
</div>
......@@ -234,7 +233,7 @@
<p>
<input class="larg" type="text" name="pay_message" placeholder="给他留言···" />
</p>
<input class="larg btn" type="submit" value="发起代付" />
<p class="align-left small"><span class="error">*</span>注：手游平台登录帐号，不是游戏角色名称</p>
</div>
</div>
......@@ -269,7 +268,7 @@
<input type="number" name="vdcode" id="vdcode" required="" placeholder="输入验证码">
<img id="vdimgck1" src="{{=Core.server}}/validate_code/" onclick="this.src=this.src+'?'+(new Date()).getTime()" style="cursor: pointer;" alt="看不清？点击更换" />
</div>
<input class="larg btn" type="submit" value="确认兑换" />
<hr/>
<div class="clearfix">
<a href="#channel_list&force" class="btn width100" >使用支付宝、银行卡、神州行充值</a>
......@@ -312,7 +311,7 @@
<div class="channel_list align-left" >
{{? Core.Data.youai_star <= Core.Data.total_amount }}
/*<a href="#exchange" class="btn btn-block">游爱星兑换 <span style="float:right;color:#d2d2d2">＞</span></a>*/
<!--<a href="#exchange" class="btn btn-block">游爱星兑换 <span style="float:right;color:#d2d2d2">＞</span></a>-->
{{?}}
{{~Core.Data.game_pay_channel_list :item:index }}
{{?item.name}}
......@@ -383,7 +382,7 @@
<input type="hidden" name="role_name" value="{{=Core.Data.role_name}}" />
{{? Core.Data.current_pay_channel }}
<input type="hidden" name="pay_channel_id" value="{{=Core.Data.current_pay_channel.id}}" />
{{?}}
<input type="hidden" name="game_amount" value="{{? Core.Data.game_amount}}{{=Core.Data.game_amount}}{{?}}" />
<input type="hidden" name="money" value="{{=Core.Data.money}}" />
<div class="require_input ">
......@@ -435,6 +434,7 @@
<input class="larg btn zhifubaoBtn" type="submit" value="前往付款" />
{{?}}
</div>
{{?}}
</form>
</div>
......@@ -516,26 +516,10 @@
</div>
<div class="container align-left">
<div class="box_info_center">
<p id="share" class="clearfix">
<span>分享到：</span>
<a class="s_qzone" href="http://sns.qzone.qq.com/cgi-bin/qzshare/cgi_qzshare_onekey" title="QQ空间"></a>
<a class="s_tqq" data-appkey="0af6f17f08f3ab2b52c6df3a3ed9b60b" href="http://share.v.t.qq.com/index.php" title="腾讯微博"></a>
</p>
<p id="share_weixin" class="clearfix">
<span>分享到微信：</span>
点击右上角按钮，选择“<span class="text-info">发送给朋友</span>”或者“<span class="text-info">分享到朋友圈</span>”即可完成分享;
</p>
<div class="fs_box invite_box">
<h3 class="text-info">奖励说明:</h3>
<p>
1.成功邀请好友一起玩游戏，您可获得<span class="text-info">5{{=Core.Data.game_unit_name}}</span>的奖励。
</p>
<p>
2.好友若充值(限前10笔)，您可获得<span class="text-info">5%</span>充值奖励。
</p>
<p>
3.好友首次充值，因被您邀请可额外获得<span class="text-info">10%</span>充值返利。
</p>
</div>
</div>
</div>
......@@ -564,11 +548,11 @@
</ol>
</div>
<div class="sec sec_invtite">
<p class="title-fs">方式二：邀请好友可获得{{=Core.Data.game_unit_name}}&nbsp;&nbsp;<a href="#invite_friend">立即去邀请</a></p>
</div>
{{??}}
<div class="sec sec_invtite">
<p class="title-fs">方式一：邀请好友可获得{{=Core.Data.game_unit_name}}&nbsp;&nbsp;<a href="#invite_friend">立即去邀请</a></p>
</div>
{{?}}
</div>
......@@ -805,6 +789,11 @@ FastClick.attach(document.body);
(function(){
getData('/sdk/pay/json');
})();
$(function(){
if (Core.isIos) {
$('meta[name="viewport"]').attr('content','width=800,maximum-scale=1,user-scalable=no');
}
});
</script>
</body>
......
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
......@@ -27,6 +27,11 @@ a:focus {
outline:thin dotted; /* 处理“outline”在Chrome浏览器中和其它浏览器之间的不一致 */
}
.red{ color: red;}
select{
-moz-appearance: none;
-webkit-appearance:none;
appearance:none;
}
/*字体图标*/
@font-face {font-family: "iconfont";
src: url('../font/iconfont.eot?t=1468997064'); /* IE9*/
......@@ -287,8 +292,8 @@ body{
}
.new-sdk-container .new-sdk-box .input select{
width: 100%;
height: 38px;
line-height: 38px;
height: 88px;
line-height: 88px;
background: none;
border: none;
color: #434343;
......@@ -678,7 +683,8 @@ body{
display: none;
font-family: 宋体;
max-height: 11em;
overflow-y: scroll;
/*overflow-y: scroll;*/
height: 150px;
}
.new-sdk-container .pull-box ul{
margin-left: 65px;
......@@ -914,11 +920,11 @@ button.close {
}
.user-center a{
position: absolute;
right: 37px;
bottom:17px;
right: 27px;
bottom:7px;
color: #ff9600;
font-size: 24px;
padding:10px;
}
.user-center a.lefticon{
right: auto;
......@@ -1168,6 +1174,7 @@ input::-webkit-input-placeholder, textarea::-webkit-input-placeholder {
font-size: 24px;
font-family: "Microsoft YaHei","微软雅黑";
vertical-align: -webkit-baseline-middle;
padding: 10px;
}
.pwd_box .step-box .question-input-box{
background: #fff;
......
#!/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
SDK_TYPE=.sys_config_xingwan
\ No newline at end of file
......
......@@ -2,7 +2,7 @@
<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="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" />
......@@ -10,22 +10,20 @@
<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" />
<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>
......@@ -183,20 +181,6 @@
<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>
<!-- 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
......
......@@ -88,9 +88,14 @@ 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;
......@@ -105,7 +110,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);
......@@ -141,7 +145,8 @@ function initMatching(){
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.
......@@ -160,29 +160,28 @@
<div class="container">
<div class="box_info_center">
<h2 class="align-left">
请选择要充值{{=Core.Data.game_unit_name || ''}}的数量
</h2>
<p class="align-left text-muted">
注：充值 <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 || ''}}
</p>
<div class="amount_level align-left" >
{{~ Core.Data.amount_level :item:index }}
{{? parseInt(item) }}
<input type="button" value="{{=parseInt(item)}}" class="btn" data="{{=item}}" />
{{?}}
{{~}}
</div>
<br>
<p class="align-left text-success tips9133">
{{? Core.Data.pay_only != 1 }}
{{? Core.Data.is_guest == 1}}
亲爱的<span class="text-info">游客</span>玩家,为确保账号资金安全,请先<a href="#modify_pwd">免费升级账号</a>再充值。
{{??}}
{{? Core.Data.vip > 0}}
{{??}}
{{?}}
{{?}}
{{?}}
</p>
<br>
<div class="amount_level align-left" >
<a href="javascript:Core.finishPay()" id="back-btn" class="btn larg conBtn " style="text-align: center;display:none">请返回游戏</a>
<br>
</div>
</div>
</div>
</script>
......@@ -202,7 +201,7 @@
</form>
<p class="text-warning align-left">游客账号是系统临时生成，存在风险，为了您的账号安全建议升级永久账号。</p>
{{??}}
<p class="text-success align-left">您的账号已经成功升级成手游平台永久账号，登录<a href="sdk://open?url=http://m.9133.com">9133.com</a>可以了解更多特权。</p>
<p class="text-success align-left">您的账号已经成功升级成手游平台永久账号。</p>
{{?}}
</div>
</div>
......@@ -234,7 +233,7 @@
<p>
<input class="larg" type="text" name="pay_message" placeholder="给他留言···" />
</p>
<input class="larg btn" type="submit" value="发起代付" />
<p class="align-left small"><span class="error">*</span>注：手游平台登录帐号，不是游戏角色名称</p>
</div>
</div>
......@@ -269,7 +268,7 @@
<input type="number" name="vdcode" id="vdcode" required="" placeholder="输入验证码">
<img id="vdimgck1" src="{{=Core.server}}/validate_code/" onclick="this.src=this.src+'?'+(new Date()).getTime()" style="cursor: pointer;" alt="看不清？点击更换" />
</div>
<input class="larg btn" type="submit" value="确认兑换" />
<hr/>
<div class="clearfix">
<a href="#channel_list&force" class="btn width100" >使用支付宝、银行卡、神州行充值</a>
......@@ -312,7 +311,7 @@
<div class="channel_list align-left" >
{{? Core.Data.youai_star <= Core.Data.total_amount }}
/*<a href="#exchange" class="btn btn-block">游爱星兑换 <span style="float:right;color:#d2d2d2">＞</span></a>*/
<!--<a href="#exchange" class="btn btn-block">游爱星兑换 <span style="float:right;color:#d2d2d2">＞</span></a>-->
{{?}}
{{~Core.Data.game_pay_channel_list :item:index }}
{{?item.name}}
......@@ -383,7 +382,7 @@
<input type="hidden" name="role_name" value="{{=Core.Data.role_name}}" />
{{? Core.Data.current_pay_channel }}
<input type="hidden" name="pay_channel_id" value="{{=Core.Data.current_pay_channel.id}}" />
{{?}}
<input type="hidden" name="game_amount" value="{{? Core.Data.game_amount}}{{=Core.Data.game_amount}}{{?}}" />
<input type="hidden" name="money" value="{{=Core.Data.money}}" />
<div class="require_input ">
......@@ -435,6 +434,7 @@
<input class="larg btn zhifubaoBtn" type="submit" value="前往付款" />
{{?}}
</div>
{{?}}
</form>
</div>
......@@ -516,26 +516,10 @@
</div>
<div class="container align-left">
<div class="box_info_center">
<p id="share" class="clearfix">
<span>分享到：</span>
<a class="s_qzone" href="http://sns.qzone.qq.com/cgi-bin/qzshare/cgi_qzshare_onekey" title="QQ空间"></a>
<a class="s_tqq" data-appkey="0af6f17f08f3ab2b52c6df3a3ed9b60b" href="http://share.v.t.qq.com/index.php" title="腾讯微博"></a>
</p>
<p id="share_weixin" class="clearfix">
<span>分享到微信：</span>
点击右上角按钮，选择“<span class="text-info">发送给朋友</span>”或者“<span class="text-info">分享到朋友圈</span>”即可完成分享;
</p>
<div class="fs_box invite_box">
<h3 class="text-info">奖励说明:</h3>
<p>
1.成功邀请好友一起玩游戏，您可获得<span class="text-info">5{{=Core.Data.game_unit_name}}</span>的奖励。
</p>
<p>
2.好友若充值(限前10笔)，您可获得<span class="text-info">5%</span>充值奖励。
</p>
<p>
3.好友首次充值，因被您邀请可额外获得<span class="text-info">10%</span>充值返利。
</p>
</div>
</div>
</div>
......@@ -564,11 +548,11 @@
</ol>
</div>
<div class="sec sec_invtite">
<p class="title-fs">方式二：邀请好友可获得{{=Core.Data.game_unit_name}}&nbsp;&nbsp;<a href="#invite_friend">立即去邀请</a></p>
</div>
{{??}}
<div class="sec sec_invtite">
<p class="title-fs">方式一：邀请好友可获得{{=Core.Data.game_unit_name}}&nbsp;&nbsp;<a href="#invite_friend">立即去邀请</a></p>
</div>
{{?}}
</div>
......@@ -805,6 +789,11 @@ FastClick.attach(document.body);
(function(){
getData('/sdk/pay/json');
})();
$(function(){
if (Core.isIos) {
$('meta[name="viewport"]').attr('content','width=800,maximum-scale=1,user-scalable=no');
}
});
</script>
</body>
......
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
......@@ -27,6 +27,11 @@ a:focus {
outline:thin dotted; /* 处理“outline”在Chrome浏览器中和其它浏览器之间的不一致 */
}
.red{ color: red;}
select{
-moz-appearance: none;
-webkit-appearance:none;
appearance:none;
}
/*字体图标*/
@font-face {font-family: "iconfont";
src: url('../font/iconfont.eot?t=1468997064'); /* IE9*/
......@@ -287,8 +292,8 @@ body{
}
.new-sdk-container .new-sdk-box .input select{
width: 100%;
height: 38px;
line-height: 38px;
height: 88px;
line-height: 88px;
background: none;
border: none;
color: #434343;
......@@ -678,7 +683,8 @@ body{
display: none;
font-family: 宋体;
max-height: 11em;
overflow-y: scroll;
/*overflow-y: scroll;*/
height: 150px;
}
.new-sdk-container .pull-box ul{
margin-left: 65px;
......@@ -914,11 +920,11 @@ button.close {
}
.user-center a{
position: absolute;
right: 37px;
bottom:17px;
right: 27px;
bottom:7px;
color: #ff9600;
font-size: 24px;
padding:10px;
}
.user-center a.lefticon{
right: auto;
......@@ -1168,6 +1174,7 @@ input::-webkit-input-placeholder, textarea::-webkit-input-placeholder {
font-size: 24px;
font-family: "Microsoft YaHei","微软雅黑";
vertical-align: -webkit-baseline-middle;
padding: 10px;
}
.pwd_box .step-box .question-input-box{
background: #fff;
......
#!/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
SDK_TYPE=.sys_config_xingwan
\ No newline at end of file
......