From 25b32a6036c02128e63620ea68141478390823a7 Mon Sep 17 00:00:00 2001 From: zhengchanglong Date: Tue, 19 Nov 2019 11:41:58 +0800 Subject: [PATCH 01/33] =?UTF-8?q?=E5=AE=98=E7=BD=91=E7=9B=91=E6=8A=A4?= =?UTF-8?q?=E6=8F=90=E9=86=92=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Media/View/default/Article/article/detail1.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Media/View/default/Article/article/detail1.html b/Application/Media/View/default/Article/article/detail1.html index f51533fd8..01d500f9e 100644 --- a/Application/Media/View/default/Article/article/detail1.html +++ b/Application/Media/View/default/Article/article/detail1.html @@ -68,7 +68,7 @@
-
  • 监护工程概述
    • +
  • 监护工程概述
  • 申请服务流程
  • 监护工程概述
  • 健康提示
    • From 0b8f3450c69e34a3341fdc0c7f83a419870c3116 Mon Sep 17 00:00:00 2001 From: sunke <18850253506@163.com> Date: Tue, 19 Nov 2019 11:46:02 +0800 Subject: [PATCH 02/33] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E5=90=8E=E5=8F=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/PromoteController.class.php | 9 ++++++++- Application/Admin/View/Promote/edit.html | 12 +++++++++++ Application/Admin/View/Promote/lists.html | 20 ++++++++++++++----- .../Home/Controller/SafeController.class.php | 2 +- .../View/default/Safe/modifyBaseInfo.html | 8 +++++++- ThinkPHP/ThinkPHP.php | 2 +- 6 files changed, 44 insertions(+), 9 deletions(-) diff --git a/Application/Admin/Controller/PromoteController.class.php b/Application/Admin/Controller/PromoteController.class.php index 948821396..56b360a3e 100644 --- a/Application/Admin/Controller/PromoteController.class.php +++ b/Application/Admin/Controller/PromoteController.class.php @@ -196,7 +196,7 @@ unset($_REQUEST['parent_id']); $idcardpic = $data["idcarpic"]; $businesspic = $data['businesspic']; $agreementpic = $data["agreementpic"]; - + $anothpic = $data["anothpic"]; if(!empty($idcardpic)) { $idcardpicArr = explode(',', $idcardpic); foreach ($idcardpicArr as $key => $value) { @@ -215,9 +215,16 @@ unset($_REQUEST['parent_id']); $agreementpicImg[$key] = get_cover($value2, 'path'); } } + if(!empty($anothpic)) { + $anothpicArr = explode(',', $anothpic); + foreach ($anothpicArr as $key => $value3) { + $anothpicImg[$key] = get_cover($value3, 'path'); + } + } $this->assign("agreementpicimg",$agreementpicImg); $this->assign('businesspicImg',$businesspicImg); $this->assign('idcardimg',$idcardImg); + $this->assign('anothpicimg',$anothpicImg); $this->assign('data',$data); $this->meta_title ='编辑渠道信息'; diff --git a/Application/Admin/View/Promote/edit.html b/Application/Admin/View/Promote/edit.html index 365ca2e56..3c39f46fc 100644 --- a/Application/Admin/View/Promote/edit.html +++ b/Application/Admin/View/Promote/edit.html @@ -130,6 +130,18 @@
    + + 补充认证： + +
    + + $info3):?> + + + +
    + + 邮箱： diff --git a/Application/Admin/View/Promote/lists.html b/Application/Admin/View/Promote/lists.html index 37fd1c090..9735876f8 100644 --- a/Application/Admin/View/Promote/lists.html +++ b/Application/Admin/View/Promote/lists.html @@ -199,11 +199,21 @@ - 成功 - 失败 - 审核中 - 未认证 - + + 成功 + + + 拒绝 + + + 正在审核 + + + 修改审核中 + + + 未认证 + 查看 diff --git a/Application/Home/Controller/SafeController.class.php b/Application/Home/Controller/SafeController.class.php index 1d11552d8..17fde806c 100644 --- a/Application/Home/Controller/SafeController.class.php +++ b/Application/Home/Controller/SafeController.class.php @@ -361,7 +361,7 @@ class SafeController extends BaseController{ $data['email'] = $email; $data['account_type'] = $account_type; $data['bank_card'] = $bank; - $data['ver_status'] = 3; + $data['ver_status'] = 4; // $data['agreementpic'] = $ $data['anothpic'] = $agreementpic; $id = get_pid(); diff --git a/Application/Home/View/default/Safe/modifyBaseInfo.html b/Application/Home/View/default/Safe/modifyBaseInfo.html index d47fbff1f..571937a01 100644 --- a/Application/Home/View/default/Safe/modifyBaseInfo.html +++ b/Application/Home/View/default/Safe/modifyBaseInfo.html @@ -63,7 +63,13 @@
    认证审核失败
    - + + +
    + 修改审核中,请耐心等待~加急,请联系您的平台对接人员 +
    + +
    diff --git a/ThinkPHP/ThinkPHP.php b/ThinkPHP/ThinkPHP.php index 0b967ce99..a75f572e0 100644 --- a/ThinkPHP/ThinkPHP.php +++ b/ThinkPHP/ThinkPHP.php @@ -13,7 +13,7 @@ // ThinkPHP公共入口文件 //---------------------------------- -require 'vendor/autoload.php'; +//require 'vendor/autoload.php'; // 记录开始运行时间 $GLOBALS['_beginTime'] = microtime(TRUE); From 7d080f9d730e89abc6400eaaa57f7523d9fe35d4 Mon Sep 17 00:00:00 2001 From: sunke <18850253506@163.com> Date: Tue, 19 Nov 2019 12:21:17 +0800 Subject: [PATCH 03/33] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Home/Controller/SafeController.class.php | 4 ++++ .../Home/View/default/Safe/modifyBaseInfo.html | 18 +++++++++--------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/Application/Home/Controller/SafeController.class.php b/Application/Home/Controller/SafeController.class.php index 17fde806c..5ba29ead8 100644 --- a/Application/Home/Controller/SafeController.class.php +++ b/Application/Home/Controller/SafeController.class.php @@ -153,6 +153,9 @@ class SafeController extends BaseController{ //修改用户信息 public function modifyBaseInfo() { + $metaTitle = '基础信息'; + $modelList = ['基础信息', $metaTitle]; + $this->verifyPasswordView($modelList); if($_POST) { $id = get_pid(); $ver_status = M('promote','tab_')->where(['id'=>$id])->getField('ver_status',true); @@ -258,6 +261,7 @@ class SafeController extends BaseController{ $data['idcarpic'] = $idcarpic; $data['businesspic'] = $businesspic; $data['agreementpic'] = $agreementpic; + $data['ver_status'] = 3; if($account_type == "公司") { $data['account_type'] = 1; }else { diff --git a/Application/Home/View/default/Safe/modifyBaseInfo.html b/Application/Home/View/default/Safe/modifyBaseInfo.html index 571937a01..1ace1661e 100644 --- a/Application/Home/View/default/Safe/modifyBaseInfo.html +++ b/Application/Home/View/default/Safe/modifyBaseInfo.html @@ -82,7 +82,7 @@ - + - + - + - + - + - + - + - + - + ' +' ' +'' From 1cfa474b83a48bc1ca12dbb72cc97bc03ded1b6f Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Tue, 19 Nov 2019 14:47:24 +0800 Subject: [PATCH 08/33] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=B9=B3=E5=8F=B0->?= =?UTF-8?q?=E7=99=BB=E5=BD=95=E7=BB=9F=E8=AE=A1--=E6=9A=82=E6=97=B6?= =?UTF-8?q?=E5=8E=BB=E9=99=A4=E5=8C=BA=E6=9C=8D=E6=A3=80=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Base/Repository/UserRepository.class.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/Application/Base/Repository/UserRepository.class.php b/Application/Base/Repository/UserRepository.class.php index b1efad03b..2068b5bef 100644 --- a/Application/Base/Repository/UserRepository.class.php +++ b/Application/Base/Repository/UserRepository.class.php @@ -67,9 +67,6 @@ class UserRepository $conditions['promote_id'] = ['in', $ids]; if (!empty($gameIds)) { $conditions['game_id'] = ['in', $gameIds]; - if (!empty($params['server_id'])) { - $conditions['server_id'] = $params['server_id']; - } } $conditions[$params['time_column']] = ['between', [$beginTime, $endTime]]; From 1c79152b5c24d9338dce4f39b650024647958970 Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Tue, 19 Nov 2019 15:04:43 +0800 Subject: [PATCH 09/33] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=B9=B3=E5=8F=B0->?= =?UTF-8?q?=E7=99=BB=E5=BD=95=E7=BB=9F=E8=AE=A1--=E6=9A=82=E6=97=B6?= =?UTF-8?q?=E5=8E=BB=E9=99=A4=E5=8C=BA=E6=9C=8D=E6=A3=80=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Base/Repository/UserRepository.class.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Application/Base/Repository/UserRepository.class.php b/Application/Base/Repository/UserRepository.class.php index 2068b5bef..91f189e5a 100644 --- a/Application/Base/Repository/UserRepository.class.php +++ b/Application/Base/Repository/UserRepository.class.php @@ -39,7 +39,6 @@ class UserRepository $beginTime = $params['begin_time'] ?? 0; $endTime = $params['end_time'] ?? 0; $gameId = $params['game_id'] ?? 0; - $serverId = $params['server_id'] ?? 0; $ids = $params['promote_id'] ?? []; $conditions = []; @@ -48,9 +47,6 @@ class UserRepository if ($gameId > 0) { $conditions['game_id'] = $gameId; } - if ($serverId > 0) { - $conditions['server_id'] = $serverId; - } $conditions['pay_way'] = $isBan ? ['neq', '-10'] : ['neq', '-1']; return $conditions; From b64882554af334422974f8bb77e4e214454a736f Mon Sep 17 00:00:00 2001 From: sunke <18850253506@163.com> Date: Tue, 19 Nov 2019 15:26:26 +0800 Subject: [PATCH 10/33] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=90=8E=E5=8F=B0?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=B5=84=E8=B4=A8=E5=AE=A1=E6=A0=B8=E6=A3=80?= =?UTF-8?q?=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/View/Promote/lists.html | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Application/Admin/View/Promote/lists.html b/Application/Admin/View/Promote/lists.html index 9735876f8..49a901191 100644 --- a/Application/Admin/View/Promote/lists.html +++ b/Application/Admin/View/Promote/lists.html @@ -117,6 +117,16 @@ +
    + +
    - + @@ -98,7 +98,7 @@
    + checked="checked" />
    @@ -235,8 +236,6 @@ setValue('relation_game_id', {$Think.request.relation_game_id |default = '""'}); setValue('sdk_version', {$Think.request.sdk_version |default = '""'}); setValue('server_id', {$Think.request.server_id |default = '""'}); - setValue('team_leader_id', {$Think.request.team_leader_id |default = '""'}); - setValue('promote_id', {$Think.request.promote_id |default = 0}); setValue('row', '{:I("get.row",10)}'); var date = "{$setdate}"; @@ -263,36 +262,6 @@ endDate: date }); - $('#team_leader_id').change(function () { - var promoteId = parseInt($(this).val()); - var promoteValue = $(this).find("option:selected").text(); - var html = ""; - - if (promoteId > 0) { - html += ""; - - $.ajax({ - url: "{:U('getChildPromoteList')}", - type: "post", - data: {promote_id:promoteId}, - dataType: 'json', - success: function (data) { - var promoteData = data.data; - - if (promoteData.length > 0) { - for (var i in promoteData) { - html += ""; - } - } - - showPromoteSelect(html); - } - }); - } else { - showPromoteSelect(html); - } - }); - function showPromoteSelect(html) { $("#promote_id").empty(); @@ -301,21 +270,21 @@ } $('#own').on('click',function () { - var ownId = $('#own_id').val(); + var own = $('#own_id'); var checkBox = $(this).children('i'); - if (ownId > 0) { + if (own.is(':checked')) { checkBox.removeClass('iconfangxingxuanzhongfill'); checkBox.removeClass('selected-color'); checkBox.addClass('iconfangxingweixuanzhong'); - $('#own_id').val(0); + own.prop('checked', false); } else { checkBox.removeClass('iconfangxingweixuanzhong'); checkBox.addClass('iconfangxingxuanzhongfill'); checkBox.addClass('selected-color'); - $('#own_id').val({$pID}); + own.prop('checked', true); } }); diff --git a/Application/Home/View/default/Query/register.html b/Application/Home/View/default/Query/register.html index 3f10c5966..106d0dbe5 100644 --- a/Application/Home/View/default/Query/register.html +++ b/Application/Home/View/default/Query/register.html @@ -79,7 +79,8 @@
    @@ -147,8 +148,6 @@ var promoteUrl = "{:U('Query/getSubPromotes')}" initPromoteSelect(promoteUrl) $().ready(function () { - setValue('team_leader_id', {$Think.request.team_leader_id |default = '""'}); - setValue('promote_id', {$Think.request.promote_id |default = 0}); setValue('row', '{:I("get.row",10)}'); var date = "{$setdate}"; @@ -175,59 +174,22 @@ endDate: date }); - $('#team_leader_id').change(function () { - var promoteId = parseInt($(this).val()); - var promoteValue = $(this).find("option:selected").text(); - var html = ""; - - if (promoteId > 0) { - html += ""; - - $.ajax({ - url: "{:U('getChildPromoteList')}", - type: "post", - data: {promote_id:promoteId}, - dataType: 'json', - success: function (data) { - var promoteData = data.data; - - if (promoteData.length > 0) { - for (var i in promoteData) { - html += ""; - } - } - - showPromoteSelect(html); - } - }); - } else { - showPromoteSelect(html); - } - }); - - function showPromoteSelect(html) - { - $("#promote_id").empty(); - $('#promote_id').html(html); - $("#promote_id").select2(); - } - $('#own').on('click',function () { - var ownId = $('#own_id').val(); + var own = $('#own_id'); var checkBox = $(this).children('i'); - if (ownId > 0) { + if (own.is(':checked')) { checkBox.removeClass('iconfangxingxuanzhongfill'); checkBox.removeClass('selected-color'); checkBox.addClass('iconfangxingweixuanzhong'); - $('#own_id').val(0); + own.prop('checked', false); } else { checkBox.removeClass('iconfangxingweixuanzhong'); checkBox.addClass('iconfangxingxuanzhongfill'); checkBox.addClass('selected-color'); - $('#own_id').val({$pID}); + own.prop('checked', true); } }); From a6f52ccdb8bf0b2bed9899d33af6cb4a809399c6 Mon Sep 17 00:00:00 2001 From: chenzhi <“chenzhi063@qq.com> Date: Tue, 19 Nov 2019 17:44:31 +0800 Subject: [PATCH 20/33] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B3=A8=E5=86=8C?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Controller/UserController.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Admin/Controller/UserController.class.php b/Application/Admin/Controller/UserController.class.php index 381a2bb18..37a895967 100644 --- a/Application/Admin/Controller/UserController.class.php +++ b/Application/Admin/Controller/UserController.class.php @@ -254,7 +254,7 @@ class UserController extends AdminController { if (!empty($usernameUser)) { $this->error('用户名已存在！'); } - $emailUser = M('UcenterMember', 'sys_')->field('username')->where(['username' => $username])->find(); + $emailUser = M('UcenterMember', 'sys_')->field('id')->where(['email' => $email])->find(); if (!empty($emailUser)) { $this->error('邮箱已存在！'); } From d941477d470122b39c54a93032b9bd06e855f83b Mon Sep 17 00:00:00 2001 From: sunke <18850253506@163.com> Date: Tue, 19 Nov 2019 18:09:08 +0800 Subject: [PATCH 21/33] =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=A3=80=E7=B4=A2=20?= =?UTF-8?q?=E8=B5=84=E8=B4=A8=E8=AE=A4=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Home/Controller/QueryController.class.php | 6 ++ .../Home/Controller/SafeController.class.php | 56 ++++++++---- .../Home/View/default/Query/achievement.html | 4 +- .../View/default/Safe/modifyBaseInfo.html | 91 +++++++++---------- Data/update.sql | 7 ++ 5 files changed, 92 insertions(+), 72 deletions(-) diff --git a/Application/Home/Controller/QueryController.class.php b/Application/Home/Controller/QueryController.class.php index 0d006d0ea..840ee9872 100644 --- a/Application/Home/Controller/QueryController.class.php +++ b/Application/Home/Controller/QueryController.class.php @@ -1906,6 +1906,11 @@ class QueryController extends BaseController public function achievement() { $time = I('time', date('Y-m-d')); + if(!empty($time)) { + $defaultTime = $time ; + }else { + $defaultTime = date('Y-m-d',time()); + } $sdkVersion = I('sdk_version', 0); $gameId = I('game_id', 0); $serverId = I('server_id', 0); @@ -2065,6 +2070,7 @@ class QueryController extends BaseController $this->assign('parentid', $parentId); $this->assign('count', $count); $this->assign('timeout', $timeout); + $this->assign('time',$defaultTime); $this->display(); } diff --git a/Application/Home/Controller/SafeController.class.php b/Application/Home/Controller/SafeController.class.php index 2b21a142c..288e53af0 100644 --- a/Application/Home/Controller/SafeController.class.php +++ b/Application/Home/Controller/SafeController.class.php @@ -319,28 +319,8 @@ class SafeController extends BaseController{ $addressArr = explode(',', json_decode($address)[0]); $promoteInfo['addressdata'] = $addressArr; $this->assign('addr',json_decode($address)[1]); - }else { - $this->assign('addr','未填写地址'); } $promoteInfo['address'] = json_decode($address); - if(empty($promoteInfo['bank_card'])) { - $promoteInfo['bank_card'] = " "; - } - if(empty($promoteInfo['email'])) { - $promoteInfo['email'] = " "; - } - if(empty($promoteInfo['real_name'])) { - $promoteInfo['real_name'] = " "; - } - if(empty($promoteInfo['mobile_phone'])) { - $promoteInfo['mobile_phone'] = " "; - } - if(empty($promoteInfo['bank_name'])) { - $promoteInfo['bank_name'] = " "; - } - if(empty($promoteInfo['idcard'])) { - $promoteInfo['idcard'] = " "; - } $this->assign("ver_status",$promoteInfo['ver_status']); $this->assign('promoteinfo', $promoteInfo); @@ -377,6 +357,42 @@ class SafeController extends BaseController{ $account_type = $_REQUEST["account_type"]; $bank = $_REQUEST["bank"]; $agreementpic = $_REQUEST["agreementpic"]; + if(empty($tel)) { + $this->error("手机号码不能为空"); + return false; + } + $pattern = "/^1[3|5|7|8]\\d{9}$/i"; + if(!preg_match($pattern, $tel)) { + $this->error("手机号码格式不合法"); + return false; + } + + if(empty($address1)) { + $this->error("地址不能为空"); + return false; + } + if(empty($email)) { + $this->error("邮箱不能为空"); + return false; + } + $patternemail = "/^([0-9A-Za-z\\-_\\.]+)@([0-9a-z]+\\.[a-z]{2,3}(\\.[a-z]{2})?)$/i"; + if (!preg_match($patternemail, $email)) { + $this->error('邮箱地址错误'); + return false; + } + if(empty($bank)) { + $this->error("卡号不能为空"); + return false; + } + $bank_card_pattern = "/^\d{10,19}$/u"; + if (!preg_match($bank_card_pattern, $bank)) { + $this->error('卡号格式错误'); + return false; + } + if(empty($agreementpic)) { + $this->error("补充协议不能为空"); + return false; + } $Res = M("promote","tab_")->field('address')->where(['id'=>$id])->find(); $address = json_decode($Res['address'],false); $address[1] = $address1; diff --git a/Application/Home/View/default/Query/achievement.html b/Application/Home/View/default/Query/achievement.html index b295ed228..b2c1a9bb4 100644 --- a/Application/Home/View/default/Query/achievement.html +++ b/Application/Home/View/default/Query/achievement.html @@ -61,14 +61,14 @@
    - +
    0):?>
    - 返回上级 + 返回上级
    diff --git a/Application/Home/View/default/Safe/modifyBaseInfo.html b/Application/Home/View/default/Safe/modifyBaseInfo.html index 1ace1661e..e645fd7a8 100644 --- a/Application/Home/View/default/Safe/modifyBaseInfo.html +++ b/Application/Home/View/default/Safe/modifyBaseInfo.html @@ -84,23 +84,21 @@     @@ -200,12 +198,11 @@ @@ -218,12 +215,11 @@       - - - - - - + + + + +
    真实姓名{$ver_status}：*真实姓名： @@ -93,7 +93,7 @@
    身份证号码：*身份证号码： @@ -105,7 +105,7 @@
    身份证证件：*身份证证件：
    @@ -198,7 +198,7 @@
    电话：*电话： @@ -249,7 +249,7 @@
    邮箱：*邮箱： @@ -262,7 +262,7 @@
    账户类型{$promoteinfo['complanystatus']}：*账户类型{$promoteinfo['complanystatus']}： 公司个人 @@ -273,7 +273,7 @@
    开户银行：*开户银行： @@ -286,7 +286,7 @@
    银行账户名：*银行账户名： @@ -299,7 +299,7 @@
    银行账号：*银行账号： From 60d1a4ced8b25385c367a7ad1f8c3663a9a1c613 Mon Sep 17 00:00:00 2001 From: sunke <18850253506@163.com> Date: Tue, 19 Nov 2019 12:28:31 +0800 Subject: [PATCH 04/33] =?UTF-8?q?=E9=98=B2=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Home/Controller/SafeController.class.php | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/Application/Home/Controller/SafeController.class.php b/Application/Home/Controller/SafeController.class.php index 5ba29ead8..1be8fe404 100644 --- a/Application/Home/Controller/SafeController.class.php +++ b/Application/Home/Controller/SafeController.class.php @@ -321,6 +321,24 @@ class SafeController extends BaseController{ $this->assign('addr','未填写地址'); } $promoteInfo['address'] = json_decode($address); + if(empty($promoteInfo['bank_card'])) { + $promoteInfo['bank_card'] = " "; + } + if(empty($promoteInfo['email'])) { + $promoteInfo['email'] = " "; + } + if(empty($promoteInfo['real_name'])) { + $promoteInfo['real_name'] = " "; + } + if(empty($promoteInfo['mobile_phone'])) { + $promoteInfo['mobile_phone'] = " "; + } + if(empty($promoteInfo['bank_name'])) { + $promoteInfo['bank_name'] = " "; + } + if(empty($promoteInfo['idcard'])) { + $promoteInfo['idcard'] = " "; + } $this->assign("ver_status",$promoteInfo['ver_status']); $this->assign('promoteinfo', $promoteInfo); From fe3dc2f378292d273ffda5da781a1ac55251093e Mon Sep 17 00:00:00 2001 From: sunke <18850253506@163.com> Date: Tue, 19 Nov 2019 12:54:22 +0800 Subject: [PATCH 05/33] =?UTF-8?q?=E5=85=85=E5=80=BC=E7=8E=A9=E5=AE=B6?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E9=BB=98=E8=AE=A4=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/Controller/DownloadController.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Home/Controller/DownloadController.class.php b/Application/Home/Controller/DownloadController.class.php index 52a5c56a3..ec28ddc7c 100644 --- a/Application/Home/Controller/DownloadController.class.php +++ b/Application/Home/Controller/DownloadController.class.php @@ -2677,7 +2677,7 @@ class DownloadController extends BaseController { if(!empty($map['promote_id'])) { $spendMap['promote_id'] = $map['promote_id']; } - $map['create_time'] = ['between', [strtotime(date('Y-m-d 00:00:00')) - 31*24*3600, strtotime(date('Y-m-d 23:59:59'))]]; + $map['create_time'] = ['between', [strtotime(date('Y-m-d 00:00:00')) - 6*24*3600, strtotime(date('Y-m-d 23:59:59'))]]; $roles = M('user_play_info','tab_')->where($map)->select(); $roleIds = array_column($roles, 'role_id'); From ed4a184f798accc9e775de11852ba12042867d1d Mon Sep 17 00:00:00 2001 From: tpingzhang <635929049@qq.com> Date: Tue, 19 Nov 2019 14:01:05 +0800 Subject: [PATCH 06/33] =?UTF-8?q?sdk=20=E6=94=AF=E4=BB=98=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Data/update.sql | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Data/update.sql b/Data/update.sql index 63465cfb3..3ca59c02b 100644 --- a/Data/update.sql +++ b/Data/update.sql @@ -428,3 +428,8 @@ CREATE TABLE `tab_notice_read` ( ALTER TABLE `tab_user_play_info` ADD INDEX `search`(`promote_id`, `game_id`, `server_id`, `create_time`); ALTER TABLE `tab_user_login_record` ADD INDEX `search`(`promote_id`, `game_id`, `server_id`, `login_time`); ALTER TABLE `tab_spend` ADD INDEX `search`(`promote_id`, `game_id`, `server_id`, `pay_way`, `pay_status`, `pay_time`); + +--sdk 支付信息 +ALTER TABLE `tab_pay_info` +MODIFY COLUMN `order_id` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '平台订单ID' AFTER `game_id`, +ADD COLUMN `extend` varchar(255) NOT NULL DEFAULT '' COMMENT 'cp订单ID' AFTER `game_id`; From dc3500820132d780e1abb1b3b3625f9a0318e63d Mon Sep 17 00:00:00 2001 From: sunke <18850253506@163.com> Date: Tue, 19 Nov 2019 14:41:23 +0800 Subject: [PATCH 07/33] =?UTF-8?q?=E8=B5=84=E8=B4=A8=E8=AE=A4=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/DownloadController.class.php | 2 ++ .../Home/Controller/SafeController.class.php | 17 ++++++++++------- .../Home/View/default/Safe/editModify.html | 5 +++-- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/Application/Home/Controller/DownloadController.class.php b/Application/Home/Controller/DownloadController.class.php index ec28ddc7c..ea2f579ad 100644 --- a/Application/Home/Controller/DownloadController.class.php +++ b/Application/Home/Controller/DownloadController.class.php @@ -2403,6 +2403,8 @@ class DownloadController extends BaseController { foreach ($data as &$list) { //提现状态 + $list['pay_order_number'] = $this->encryption($list['pay_order_number']); + $list['user_account'] = $this->encryption($list['user_account']); if ($list['pay_status'] == 1) { switch ($list['selle_status']) { case 0: diff --git a/Application/Home/Controller/SafeController.class.php b/Application/Home/Controller/SafeController.class.php index 1be8fe404..2b21a142c 100644 --- a/Application/Home/Controller/SafeController.class.php +++ b/Application/Home/Controller/SafeController.class.php @@ -156,12 +156,14 @@ class SafeController extends BaseController{ $metaTitle = '基础信息'; $modelList = ['基础信息', $metaTitle]; $this->verifyPasswordView($modelList); + $id = get_pid(); + $ver_status = M('promote','tab_')->where(['id'=>$id])->getField('ver_status',true); + if($ver_status[0] == 1) { + //return $this->display('editModify'); + $this->redirect('editModify'); + + } if($_POST) { - $id = get_pid(); - $ver_status = M('promote','tab_')->where(['id'=>$id])->getField('ver_status',true); - if($ver_status[0] == 1) { - $this->success('认证',U('editModify')); - } $username = $_REQUEST['username']; //真实姓名 $id_card = $_REQUEST["id_card"]; //身份证号码 $tel = $_REQUEST['tel']; @@ -389,7 +391,7 @@ class SafeController extends BaseController{ $id = get_pid(); $updateRs = M("promote","tab_")->where(['id'=>$id])->save($data); if($updateRs) { - $this->success("更新信息成功"); + $this->success("更新信息成功",U('modifyBaseInfo')); }else { $this->error("更新信息失败"); } @@ -397,7 +399,7 @@ class SafeController extends BaseController{ public function ajaxEdit() { $id = get_pid(); - $rs = M("promote","tab_")->field('mobile_phone,address,email,account_type,bank_card')->where(['id'=>$id])->find(); + $rs = M("promote","tab_")->field('mobile_phone,address,email,account_type,bank_card,anothpic')->where(['id'=>$id])->find(); $this->assign('tel',$rs['mobile_phone']); $this->assign('address',$rs['address']); $this->assign('email',$rs['email']); @@ -410,6 +412,7 @@ class SafeController extends BaseController{ 'account_type'=> $rs['account_type'], 'bank_card'=> $rs['bank_card'], 'idcarpic' => $rs['idcarpic'], + 'anothpic' => $rs['anothpic'], ]; if($rs['account_type'] == 1) { $res['complanystatus'] = true; diff --git a/Application/Home/View/default/Safe/editModify.html b/Application/Home/View/default/Safe/editModify.html index d767abb7b..e063c954a 100644 --- a/Application/Home/View/default/Safe/editModify.html +++ b/Application/Home/View/default/Safe/editModify.html @@ -175,6 +175,7 @@ success:function(res) { var tel = res.tel var address = res.address + console.log(res) var email = res.email var account_type = res.account_type if(account_type == 1) { @@ -187,7 +188,7 @@ var bank_card = res.bank_card var complanystatus = res.complanystatus var personalstatus = res.personalstatus - + var anothpic = res.anothpic layer.open({ type: 1 ,title: false //不显示标题栏 @@ -211,7 +212,7 @@ +'
    开户银行:' +'
    补充协议：' - +' ' + +' ' +'
    点击上传
    ' +'
    *须补充修改协议(联系平台签署)
    *真实姓名： - - - - - - + + + + +
    *身份证号码： - - - - - - + + + + +
    *电话： - - - - - - + + + + +