From 0405ada382beeab24d9551dfe988f88f29ad123d Mon Sep 17 00:00:00 2001 From: ELF <360197197@qq.com> Date: Wed, 25 Dec 2019 17:36:32 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=90=BD=E5=9C=B0?= =?UTF-8?q?=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/View/default/Home/landingPage.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Application/Home/View/default/Home/landingPage.html b/Application/Home/View/default/Home/landingPage.html index 09efaff56..a904f7cb3 100644 --- a/Application/Home/View/default/Home/landingPage.html +++ b/Application/Home/View/default/Home/landingPage.html @@ -379,9 +379,9 @@
- +
- +
登录
From 5c7d69935380cdb020061ea56ee01c92f26c5464 Mon Sep 17 00:00:00 2001 From: ELF <360197197@qq.com> Date: Wed, 25 Dec 2019 17:40:24 +0800 Subject: [PATCH 02/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=90=BD=E5=9C=B0?= =?UTF-8?q?=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/View/default/Home/landingPage.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Application/Home/View/default/Home/landingPage.html b/Application/Home/View/default/Home/landingPage.html index a904f7cb3..367deed8d 100644 --- a/Application/Home/View/default/Home/landingPage.html +++ b/Application/Home/View/default/Home/landingPage.html @@ -620,7 +620,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 +628,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); }); From 6621467b58c073be54faa1b05f4e7377ef0b6c5f Mon Sep 17 00:00:00 2001 From: ELF <360197197@qq.com> Date: Wed, 25 Dec 2019 17:47:01 +0800 Subject: [PATCH 03/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Home/View/default/Home/landingPage.html | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/Application/Home/View/default/Home/landingPage.html b/Application/Home/View/default/Home/landingPage.html index 367deed8d..952608179 100644 --- a/Application/Home/View/default/Home/landingPage.html +++ b/Application/Home/View/default/Home/landingPage.html @@ -381,7 +381,7 @@
- +
登录
@@ -394,7 +394,7 @@
- 联系客服 + 联系客服
@@ -433,7 +433,7 @@
- 联系客服 + 联系客服
@@ -449,7 +449,7 @@
- +
@@ -466,7 +466,7 @@
注册即表示同意
- 《用户协议》 + 《用户协议》
@@ -500,7 +500,7 @@
注册即表示同意
- 《用户协议》 + 《用户协议》
@@ -679,6 +679,9 @@ 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'; + }) function GetVerityCode() { //刷新验证码 From 18e39c5fc7363220cdd827f7e6b8c7b04abbad7e Mon Sep 17 00:00:00 2001 From: ELF <360197197@qq.com> Date: Wed, 25 Dec 2019 18:04:03 +0800 Subject: [PATCH 04/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Home/View/default/Home/landingPage.html | 88 ++++++++++--------- .../Controller/BaseController.class.php | 4 +- .../Controller/CommonController.class.php | 14 +-- 3 files changed, 53 insertions(+), 53 deletions(-) diff --git a/Application/Home/View/default/Home/landingPage.html b/Application/Home/View/default/Home/landingPage.html index 952608179..75d609a86 100644 --- a/Application/Home/View/default/Home/landingPage.html +++ b/Application/Home/View/default/Home/landingPage.html @@ -381,7 +381,7 @@
- +
登录
@@ -423,7 +423,7 @@
获取验证码
-
修改密码
+
修改密码
@@ -462,11 +462,11 @@
获取验证码
-
立即注册
+
立即注册
注册即表示同意
- 《用户协议》 + 《用户协议》
@@ -496,11 +496,11 @@
-
立即注册
+
立即注册
注册即表示同意
- 《用户协议》 + 《用户协议》
@@ -567,42 +567,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; } } @@ -683,12 +683,18 @@ var PhoneObj = { 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() @@ -774,7 +780,7 @@ var PhoneObj = { }) //普通注册 - $("#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() @@ -822,7 +828,7 @@ var PhoneObj = { }) //忘记密码 - $("#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() 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..b67a7c7db 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(); @@ -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('发送失败'); } } From 4536b7771498612b3fb479de5c9522c5240e772b Mon Sep 17 00:00:00 2001 From: ELF <360197197@qq.com> Date: Wed, 25 Dec 2019 18:10:35 +0800 Subject: [PATCH 05/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/View/default/Home/landingPage.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Application/Home/View/default/Home/landingPage.html b/Application/Home/View/default/Home/landingPage.html index 75d609a86..03b508eb2 100644 --- a/Application/Home/View/default/Home/landingPage.html +++ b/Application/Home/View/default/Home/landingPage.html @@ -466,7 +466,7 @@
注册即表示同意
- 《用户协议》 + 《用户协议》
@@ -500,7 +500,7 @@
注册即表示同意
- 《用户协议》 + 《用户协议》
@@ -806,7 +806,7 @@ var PhoneObj = { } $.ajax({ type: 'POST', - url: 'mobile.php?s=/Ssg/userRegister.html', + url: 'mobile.php?s=/Common/userRegister.html', dataType: 'JSON', data:{ account: account, From 4b46cd45633b3fff14ae233a326acaa299ae4382 Mon Sep 17 00:00:00 2001 From: ELF <360197197@qq.com> Date: Wed, 25 Dec 2019 18:20:19 +0800 Subject: [PATCH 06/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/View/default/Home/landingPage.html | 2 +- Application/Mobile/Controller/CommonController.class.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Application/Home/View/default/Home/landingPage.html b/Application/Home/View/default/Home/landingPage.html index 03b508eb2..c5126a27a 100644 --- a/Application/Home/View/default/Home/landingPage.html +++ b/Application/Home/View/default/Home/landingPage.html @@ -810,7 +810,7 @@ var PhoneObj = { dataType: 'JSON', data:{ account: account, - password: regpassword, + password: password, promote_id: promoteId }, success: function (result) { diff --git a/Application/Mobile/Controller/CommonController.class.php b/Application/Mobile/Controller/CommonController.class.php index b67a7c7db..99aba36d5 100644 --- a/Application/Mobile/Controller/CommonController.class.php +++ b/Application/Mobile/Controller/CommonController.class.php @@ -105,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)){ @@ -125,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(); From a1862fd240c1deea9a56e1df615c02a40ef13997 Mon Sep 17 00:00:00 2001 From: ELF <360197197@qq.com> Date: Wed, 25 Dec 2019 19:33:08 +0800 Subject: [PATCH 07/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Home/Controller/HomeController.class.php | 3 ++ .../Home/View/default/Home/landingPage.html | 39 ++++++++----------- 2 files changed, 19 insertions(+), 23 deletions(-) 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 c5126a27a..cade98419 100644 --- a/Application/Home/View/default/Home/landingPage.html +++ b/Application/Home/View/default/Home/landingPage.html @@ -721,12 +721,10 @@ var PhoneObj = { game_id:gameId, }, success: function (result) { - console.log(result) - if (result.return_code == 'fail') { - alert(result.return_msg); + if (result.code == '0000') { + $('.mounting').show(); } else { - $("#alert_box").show(); - setTimeout(hideAndLogin,2500) + alert(result.msg) } } }) @@ -769,11 +767,11 @@ var PhoneObj = { async: false, cache: false, success: function (result) { - if (result.code != 0) { - alert(result.msg); + if (result.code == '0000') { + $('.mounting').show(); GetVerityCode(); } else { - + alert(result.msg); } } }); @@ -814,15 +812,11 @@ var PhoneObj = { 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') { + $('.mounting').show(); + } else { + alert(result.msg) + } } }) @@ -853,13 +847,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) } } }) From eddc5eb7a62a3789d8b902fd09d2a9a0ce974e5f Mon Sep 17 00:00:00 2001 From: ELF <360197197@qq.com> Date: Wed, 25 Dec 2019 19:35:28 +0800 Subject: [PATCH 08/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/View/default/Home/landingPage.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Home/View/default/Home/landingPage.html b/Application/Home/View/default/Home/landingPage.html index cade98419..34ac00d4e 100644 --- a/Application/Home/View/default/Home/landingPage.html +++ b/Application/Home/View/default/Home/landingPage.html @@ -756,7 +756,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, }, From cd6f6e5610ffbcb4eb6eab4d77246cbb68f92c5d Mon Sep 17 00:00:00 2001 From: ELF <360197197@qq.com> Date: Wed, 25 Dec 2019 19:38:24 +0800 Subject: [PATCH 09/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/View/default/Home/landingPage.html | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Application/Home/View/default/Home/landingPage.html b/Application/Home/View/default/Home/landingPage.html index 34ac00d4e..b83fc5959 100644 --- a/Application/Home/View/default/Home/landingPage.html +++ b/Application/Home/View/default/Home/landingPage.html @@ -722,6 +722,7 @@ var PhoneObj = { }, success: function (result) { if (result.code == '0000') { + $(".phone").hide(); $('.mounting').show(); } else { alert(result.msg) @@ -768,11 +769,12 @@ var PhoneObj = { cache: false, success: function (result) { if (result.code == '0000') { + $('.login').hide(); $('.mounting').show(); - GetVerityCode(); } else { alert(result.msg); } + GetVerityCode(); } }); }) @@ -813,6 +815,7 @@ var PhoneObj = { }, success: function (result) { if (result.code == '0000') { + $(".common").hide(); $('.mounting').show(); } else { alert(result.msg) From 727795050c30d6f7ed6a7d0bfec21fc9aa0cd9b8 Mon Sep 17 00:00:00 2001 From: ELF <360197197@qq.com> Date: Wed, 25 Dec 2019 19:46:28 +0800 Subject: [PATCH 10/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/View/default/Home/landingPage.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Home/View/default/Home/landingPage.html b/Application/Home/View/default/Home/landingPage.html index b83fc5959..b848c0b1e 100644 --- a/Application/Home/View/default/Home/landingPage.html +++ b/Application/Home/View/default/Home/landingPage.html @@ -716,7 +716,7 @@ var PhoneObj = { data:{ account: phone, password: password, - code: verifyCode, + verify_code: verifyCode, promote_id: promoteId, game_id:gameId, }, From aa0ec5758adf42976f69002d8cf02b12887ae155 Mon Sep 17 00:00:00 2001 From: ELF <360197197@qq.com> Date: Wed, 25 Dec 2019 19:53:50 +0800 Subject: [PATCH 11/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/View/default/Home/landingPage.html | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Application/Home/View/default/Home/landingPage.html b/Application/Home/View/default/Home/landingPage.html index b848c0b1e..5b863dbf6 100644 --- a/Application/Home/View/default/Home/landingPage.html +++ b/Application/Home/View/default/Home/landingPage.html @@ -33,6 +33,7 @@ + @@ -526,7 +527,7 @@
点击安装TestFlight平台
第二步：点击下方按钮安装游戏
- 点击安装游戏 + 点击安装游戏
@@ -724,6 +725,7 @@ var PhoneObj = { if (result.code == '0000') { $(".phone").hide(); $('.mounting').show(); + $('#beta-url').attr('href', $('[name=betaUrl]').val()) } else { alert(result.msg) } @@ -771,6 +773,7 @@ var PhoneObj = { if (result.code == '0000') { $('.login').hide(); $('.mounting').show(); + $('#beta-url').attr('href', $('[name=betaUrl]').val()) } else { alert(result.msg); } @@ -817,6 +820,7 @@ var PhoneObj = { if (result.code == '0000') { $(".common").hide(); $('.mounting').show(); + $('#beta-url').attr('href', $('[name=betaUrl]').val()) } else { alert(result.msg) } From 7a98ee81cbc6ea2c469ce7c6dc287d11d464e13d Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Wed, 25 Dec 2019 19:55:08 +0800 Subject: [PATCH 12/12] =?UTF-8?q?=E6=94=AF=E4=BB=98=E6=B8=A0=E9=81=93?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1bug=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Controller/PayChannelController.class.php | 1 + 1 file changed, 1 insertion(+) 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,