diff --git a/Application/Admin/Controller/PayChannelController.class.php b/Application/Admin/Controller/PayChannelController.class.php
index 1675b0c4f..b18953b7e 100644
--- a/Application/Admin/Controller/PayChannelController.class.php
+++ b/Application/Admin/Controller/PayChannelController.class.php
@@ -460,6 +460,7 @@ class PayChannelController extends ThinkController
->select(false);
// var_dump($spendData);die();
$coinMap['pay_status'] = 1;
+ $coinMap['pay_source'] = 2;
$coinData = M('pay_info','tab_')
->join("inner join tab_deposit on tab_pay_info.order_id=tab_deposit.pay_order_number")
->field("pay_order_number,tab_deposit.create_time as pay_time,tab_deposit.user_account,tab_pay_info.game_name,tab_deposit.promote_account,
diff --git a/Application/Home/Controller/HomeController.class.php b/Application/Home/Controller/HomeController.class.php
index 04f863e2c..adc53ef6a 100644
--- a/Application/Home/Controller/HomeController.class.php
+++ b/Application/Home/Controller/HomeController.class.php
@@ -237,6 +237,9 @@ class HomeController extends Controller
$downloadUrl = $applyService->getDownloadUrl($apply);
}
+ $serviceQQ = M("config", "sys_")->field('value')->where("name='APP_QQ'")->find()['value'];
+ $this->assign("serviceQQ", $serviceQQ);
+
$this->assign('isNewIos', $isNewIos);
$this->assign('downloadUrl', $downloadUrl);
$this->assign('isIOS13', $isIOS13);
diff --git a/Application/Home/View/default/Home/landingPage.html b/Application/Home/View/default/Home/landingPage.html
index 09efaff56..5b863dbf6 100644
--- a/Application/Home/View/default/Home/landingPage.html
+++ b/Application/Home/View/default/Home/landingPage.html
@@ -33,6 +33,7 @@
+
@@ -379,9 +380,9 @@
-
联系客服
+
联系客服
@@ -423,7 +424,7 @@
获取验证码
- 修改密码
+ 修改密码
@@ -433,7 +434,7 @@
-
联系客服
+
联系客服
@@ -449,7 +450,7 @@
- 立即注册
+ 立即注册
@@ -567,42 +568,42 @@ var PhoneObj = {
},
//获取验证码
sendPhoneCode:function(phone, fun){
- if(PhoneObj.codeflag){
- if(PhoneObj.checkPhone(phone)){
- //无需等待网络响应直接倒计时
- fun()
- //获取验证码
- $.ajax({
- type: 'GET',
- url: 'mobile.php?s=/Common/sendPhoneCode.html&phone='+phone,
- dataType: 'JSON',
- success: function (result) {
- if (result.status != '0000') {
- alert(result.msg);
- }
- }
- })
+ if(PhoneObj.codeflag){
+ if(PhoneObj.checkPhone(phone)){
+ //无需等待网络响应直接倒计时
+ fun()
+ //获取验证码
+ $.ajax({
+ type: 'GET',
+ url: 'mobile.php?s=/Common/sendPhoneCode.html&phone='+phone,
+ dataType: 'JSON',
+ success: function (result) {
+ if (result.status != '0000') {
+ alert(result.msg);
+ }
}
- }else{
- // alert("发送验证码频率过高，请等待"+PhoneObj.i+"秒后再试")
+ })
}
+ }else{
+ // alert("发送验证码频率过高，请等待"+PhoneObj.i+"秒后再试")
+ }
},
checkPassword(password){
- if(password.length < 6 || password.length > 12){
- alert('密码长度6-12个字符');
- return false;
- }
- // var pwdRegex = new RegExp('(?=.*[0-9])(?=.*[a-zA-Z])');
- // if (!pwdRegex.test(password)) {
- // alert("您的密码复杂度太低（密码中必须包含字母、数字）！");
- // return false;
- // }
- var chinaRex = new RegExp("[\\u4E00-\\u9FFF]+","g");;
- if (chinaRex.test(password)) {
- alert("密码不允许含有中文字符！");
- return false;
- }
- return true;
+ if(password.length < 6 || password.length > 12){
+ alert('密码长度6-12个字符');
+ return false;
+ }
+ // var pwdRegex = new RegExp('(?=.*[0-9])(?=.*[a-zA-Z])');
+ // if (!pwdRegex.test(password)) {
+ // alert("您的密码复杂度太低（密码中必须包含字母、数字）！");
+ // return false;
+ // }
+ var chinaRex = new RegExp("[\\u4E00-\\u9FFF]+","g");;
+ if (chinaRex.test(password)) {
+ alert("密码不允许含有中文字符！");
+ return false;
+ }
+ return true;
}
}
@@ -620,7 +621,7 @@ var PhoneObj = {
$("#getPhoneCode").on("click",function(){
//获取手机
var dom = $(this);
- var phone = $('#phoneval').val();
+ var phone = $('#phone-register-box').find('[name=mobile]').val();
PhoneObj.sendPhoneCode(phone,function(){
PhoneObj.countDown(dom);
});
@@ -628,7 +629,7 @@ var PhoneObj = {
$("#forgetGetPhoneCode").on("click",function(){
//获取手机
var dom = $(this);
- var phone = $('#forgetPhoneval').val();
+ var phone = $('#forget-box').find('[name=mobile]').val();
PhoneObj.sendPhoneCode(phone,function(){
PhoneObj.countDown(dom);
});
@@ -679,13 +680,22 @@ var PhoneObj = {
$("input").click(function(){
event.stopPropagation();
})
+ $(".service_qq").on("click",function(){
+ window.location.href = 'mqqwpa://im/chat?chat_type=wpa&uin={$serviceQQ}&version=1&src_type=web&web_src=oicqzone.com';
+ })
+
+ $('#verifyCode').on({
+ click: function () {
+ GetVerityCode()
+ }
+ })
function GetVerityCode() {
//刷新验证码
$("#verifyCode").attr("src", "/mobile.php?s=/Common/verify.html&id=" + Math.random());
}
- $("#phonereg").on("click",function(){
+ $("#mobile-reg").on("click",function(){
var box = $('#phone-register-box')
var phone = box.find('[name=mobile]').val()
var password = box.find('[name=password]').val()
@@ -707,17 +717,17 @@ var PhoneObj = {
data:{
account: phone,
password: password,
- code: verifyCode,
+ verify_code: verifyCode,
promote_id: promoteId,
game_id:gameId,
},
success: function (result) {
- console.log(result)
- if (result.return_code == 'fail') {
- alert(result.return_msg);
+ if (result.code == '0000') {
+ $(".phone").hide();
+ $('.mounting').show();
+ $('#beta-url').attr('href', $('[name=betaUrl]').val())
} else {
- $("#alert_box").show();
- setTimeout(hideAndLogin,2500)
+ alert(result.msg)
}
}
})
@@ -749,7 +759,7 @@ var PhoneObj = {
url: 'mobile.php?s=/Common/login.html',
data: {
'account': account,
- 'password': window.btoa(password),
+ 'password': password,
'verify_code': verifyCode,
'promote_id': promoteId,
},
@@ -760,18 +770,20 @@ var PhoneObj = {
async: false,
cache: false,
success: function (result) {
- if (result.code != 0) {
- alert(result.msg);
- GetVerityCode();
+ if (result.code == '0000') {
+ $('.login').hide();
+ $('.mounting').show();
+ $('#beta-url').attr('href', $('[name=betaUrl]').val())
} else {
-
+ alert(result.msg);
}
+ GetVerityCode();
}
});
})
//普通注册
- $("#userreg").on("click", function(){
+ $("#normal-reg").on("click", function(){
var box = $('#register-box')
var account = box.find('[name=account]').val()
var password = box.find('[name=password]').val()
@@ -797,29 +809,27 @@ var PhoneObj = {
}
$.ajax({
type: 'POST',
- url: 'mobile.php?s=/Ssg/userRegister.html',
+ url: 'mobile.php?s=/Common/userRegister.html',
dataType: 'JSON',
data:{
account: account,
- password: regpassword,
+ password: password,
promote_id: promoteId
},
success: function (result) {
- if (result.return_code == 'fail') {
- alert(result.return_msg);
- } else {
- //成功
- $("#alert_box").show();
- setTimeout(hideAndLogin,2500)
- // alert("注册并登陆成功");
- // window.location.href = "mobile.php?s=/Ssg/index.html"
- }
+ if (result.code == '0000') {
+ $(".common").hide();
+ $('.mounting').show();
+ $('#beta-url').attr('href', $('[name=betaUrl]').val())
+ } else {
+ alert(result.msg)
+ }
}
})
})
//忘记密码
- $("#forgetBtn").on("click",function(){
+ $("#modify-password").on("click",function(){
var box = $('#forget-box')
var phone = box.find('[name=mobile]').val()
var password = box.find('[name=password]').val()
@@ -844,13 +854,12 @@ var PhoneObj = {
verify_code: verifyCode
},
success: function (result) {
- console.log(result)
- if (result.return_code == 'fail') {
- alert(result.return_msg);
+ if (result.code == '0000') {
+ alert('修改成功，请用新密码登录！')
+ $(".login").show();
+ $(".forgetPass").hide();
} else {
- $("#alert_content").html("密码修改成功，系统将在三秒后自动登录");
- $("#alert_box").show();
- setTimeout(hideAndLogin,2500)
+ alert(result.msg)
}
}
})
diff --git a/Application/Mobile/Controller/BaseController.class.php b/Application/Mobile/Controller/BaseController.class.php
index 0b58f5446..9663c309f 100644
--- a/Application/Mobile/Controller/BaseController.class.php
+++ b/Application/Mobile/Controller/BaseController.class.php
@@ -385,12 +385,12 @@ class BaseController extends Controller {
return M("bind_recharge","tab_")->add($data);
}
- protected function respondSuccess($message, $code = '0000')
+ protected function respondSuccess($message = '成功', $code = '0000')
{
$this->respond($message, $code);
}
- protected function respondError($message, $code = '1000')
+ protected function respondError($message = '失败', $code = '1000')
{
$this->respond($message, $code);
}
diff --git a/Application/Mobile/Controller/CommonController.class.php b/Application/Mobile/Controller/CommonController.class.php
index ed92a328e..99aba36d5 100644
--- a/Application/Mobile/Controller/CommonController.class.php
+++ b/Application/Mobile/Controller/CommonController.class.php
@@ -26,15 +26,10 @@ class CommonController extends BaseController {
{
$account = I('account');
$password = I('password');
- $code = I('code', '');
$verifyCode = I('verify_code', '');
- if (!$code) {
- $this->respondError('参数非法');
- }
+ $promoteId = I('promote_id', 0);
- $applyService = new ApplyService();
- $result = $applyService->decodeApplyCode($code);
- if (!$result) {
+ if (!$promoteId) {
$this->respondError('参数非法');
}
@@ -42,7 +37,6 @@ class CommonController extends BaseController {
if (!$verify->check($verifyCode)) {
$this->respondError('验证码错误');
}
- $promoteId = $result['promote_id'];
$promote = M('promote', 'tab_')->where(['id' => $promoteId])->find();
$userApi = new MemberApi();
@@ -111,7 +105,7 @@ class CommonController extends BaseController {
$gameId = $params['game_id'] ?? 0;
#验证短信验证码
- $this->smsVerify($params['account'], $params['code']);
+ $this->smsVerify($params['account'], $params['verify_code']);
$res = $this->doRegister($params['account'], $params['password'], $params['account'], $promoteId, 4, 2, $gameId);
if(empty($res)){
@@ -131,7 +125,7 @@ class CommonController extends BaseController {
if (empty($params)) {
$this->respondError('基础信息不能为空');
}
- $this->smsVerify($params['account'], $params['code']);
+ $this->smsVerify($params['account'], $params['verify_code']);
//更新密码
$userApi = new MemberApi();
$userInfo = M("user", "tab_")->where("account = '".$params['account']."'")->find();
@@ -221,9 +215,9 @@ class CommonController extends BaseController {
$result = R('Common/Sms/send_sms_code', [$phone, 10, false]);
if ($result['code'] == 200) {
- $this->setData($result['data'])->respondSuccess();
+ $this->setData($result['data'])->respondSuccess('发送成功');
} else {
- $this->respondError();
+ $this->respondError('发送失败');
}
}
-
+
-
+
@@ -462,7 +463,7 @@