From 17e40841925401fdd2110bd09e922f97902f75ae Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Sat, 21 Dec 2019 17:18:59 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E8=A7=92=E8=89=B2=E6=9D=83=E9=99=90?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/View/AuthManager/category.html | 2 +- Application/Admin/View/AuthManager/dataempower.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Application/Admin/View/AuthManager/category.html b/Application/Admin/View/AuthManager/category.html index 7c0f31a39..2b4fc6769 100644 --- a/Application/Admin/View/AuthManager/category.html +++ b/Application/Admin/View/AuthManager/category.html @@ -40,7 +40,7 @@
- +
diff --git a/Application/Admin/View/AuthManager/dataempower.html b/Application/Admin/View/AuthManager/dataempower.html index e5d0efe8b..2ea3a454c 100644 --- a/Application/Admin/View/AuthManager/dataempower.html +++ b/Application/Admin/View/AuthManager/dataempower.html @@ -73,7 +73,7 @@ - + 返回 From ac6f980d0328021137d92d4b16bc14781f356e89 Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Sat, 21 Dec 2019 17:38:18 +0800 Subject: [PATCH 02/12] =?UTF-8?q?=E8=A7=92=E8=89=B2=E6=9D=83=E9=99=90?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/View/AuthManager/category.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Admin/View/AuthManager/category.html b/Application/Admin/View/AuthManager/category.html index 2b4fc6769..9e976cb56 100644 --- a/Application/Admin/View/AuthManager/category.html +++ b/Application/Admin/View/AuthManager/category.html @@ -40,7 +40,7 @@
- + 返 回
From ab27c53da4700d26c520c5f80d4acc436a97b2e5 Mon Sep 17 00:00:00 2001 From: liuweiwen <“529520975@qq.com> Date: Sat, 21 Dec 2019 17:42:10 +0800 Subject: [PATCH 03/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/View/Spend/lists.html | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Application/Admin/View/Spend/lists.html b/Application/Admin/View/Spend/lists.html index 7bf71f5e8..881fe2728 100644 --- a/Application/Admin/View/Spend/lists.html +++ b/Application/Admin/View/Spend/lists.html @@ -394,7 +394,11 @@ location.reload(); }, 1500); } else { - var tip_msg = e.msg ? e.msg : "补单失败"; + if (e.msg) { + var tip_msg = e.msg; + } else { + var tip_msg = e.info ? e.info : "补单失败"; + } layer.msg(tip_msg, {icon: 2}); } }, From 2e818c04f8ef6640fc07c55e4abee00bb2dd372e Mon Sep 17 00:00:00 2001 From: liuweiwen <“529520975@qq.com> Date: Sat, 21 Dec 2019 18:51:52 +0800 Subject: [PATCH 04/12] =?UTF-8?q?=E7=99=BB=E5=BD=95=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Common/extend.php | 25 ++++++++++++++----- .../Controller/MemberController.class.php | 7 +++--- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/Application/Admin/Common/extend.php b/Application/Admin/Common/extend.php index 2b7118037..75804c516 100644 --- a/Application/Admin/Common/extend.php +++ b/Application/Admin/Common/extend.php @@ -1706,12 +1706,25 @@ function get_admin_listOther() * @param $promote_id * @return mixed */ -function getOffspringByPromoteId($promote_id) { - $promote_ids = M('promote', 'tab_') - ->where(['chain' => ['like', "%/{$promote_id}/%"]]) - ->field('group_concat(id) as promote_ids') - ->find(); - return $promote_ids['promote_ids']; +function getOffspringByPromoteId($promote_id = null) { + if (isset($promote_id)) { + if ($promote_id ==0) {//官方渠道 + $promote_ids = '0'; + } else { + $where['chain'] = ['like', "%/{$promote_id}/%"]; + $where['id'] = $promote_id;//会长本身 + $where['_logic'] = 'or'; + $map['_complex'] = $where; + $promote_ids = M('promote', 'tab_') + ->where($map) + ->field('group_concat(id) as promote_ids') + ->find(); + $promote_ids = $promote_ids['promote_ids']; + } + } else { + $promote_ids = getPowerPromoteIds(); + } + return $promote_ids; } diff --git a/Application/Admin/Controller/MemberController.class.php b/Application/Admin/Controller/MemberController.class.php index fd6c8a73c..8f5695723 100644 --- a/Application/Admin/Controller/MemberController.class.php +++ b/Application/Admin/Controller/MemberController.class.php @@ -1072,16 +1072,15 @@ class MemberController extends ThinkController if (isset($_REQUEST['promote_id'])) { if (I('promote_level') ==1) { $promote_ids = getOffspringByPromoteId($_REQUEST['promote_id']); - if (empty($promote_ids)) { - $promote_ids = -1; - } $map['promote_id'] = ['exp', "in($promote_ids)"]; } else { $map['promote_id'] = $_REQUEST['promote_id']; } unset($_REQUEST['promote_id']); + } elseif (I('promote_level') ==1) { + $promote_ids = getOffspringByPromoteId(); + $map['promote_id'] = ['exp', "in($promote_ids)"]; } - // $map['type'] = 1; // $map['login_time'] = ['exp', 'login_time<>0']; $extend = array(); From 5b1a4db378348d58dc2b8d4d40a7ccc32b60b053 Mon Sep 17 00:00:00 2001 From: liuweiwen <“529520975@qq.com> Date: Sat, 21 Dec 2019 18:54:58 +0800 Subject: [PATCH 05/12] =?UTF-8?q?=E7=99=BB=E5=BD=95=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Controller/MemberController.class.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Application/Admin/Controller/MemberController.class.php b/Application/Admin/Controller/MemberController.class.php index 8f5695723..ec51078c0 100644 --- a/Application/Admin/Controller/MemberController.class.php +++ b/Application/Admin/Controller/MemberController.class.php @@ -1079,7 +1079,9 @@ class MemberController extends ThinkController unset($_REQUEST['promote_id']); } elseif (I('promote_level') ==1) { $promote_ids = getOffspringByPromoteId(); - $map['promote_id'] = ['exp', "in($promote_ids)"]; + if ($promote_ids != 'all') { + $map['promote_id'] = ['exp', "in($promote_ids)"]; + } } // $map['type'] = 1; // $map['login_time'] = ['exp', 'login_time<>0']; From 0d088037dac1ca6ec86ab2fd2eeb2ba63ab11ab8 Mon Sep 17 00:00:00 2001 From: liuweiwen <“529520975@qq.com> Date: Sat, 21 Dec 2019 19:04:24 +0800 Subject: [PATCH 06/12] =?UTF-8?q?=E7=99=BB=E5=BD=95=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=BC=BA=E5=88=B6=E7=B4=A2=E5=BC=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Controller/MemberController.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Admin/Controller/MemberController.class.php b/Application/Admin/Controller/MemberController.class.php index ec51078c0..46220b439 100644 --- a/Application/Admin/Controller/MemberController.class.php +++ b/Application/Admin/Controller/MemberController.class.php @@ -1087,7 +1087,7 @@ class MemberController extends ThinkController // $map['login_time'] = ['exp', 'login_time<>0']; $extend = array(); $extend['map'] = $map; - $count = M('UserLoginRecord','tab_')->field('user_id')->where($extend['map'])->group('user_id')->select(false); + $count = M('UserLoginRecord','tab_')->table('tab_user_login_record FORCE INDEX(user_id_promote_idx)')->field('user_id')->where($extend['map'])->group('user_id')->select(false); $sql = "select count(user_id) as count from ({$count})t"; $count = M('UserLoginRecord','tab_')->query($sql); From 6255d05472ffde64801af420e1417ce5aae32cf0 Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Sat, 21 Dec 2019 19:51:12 +0800 Subject: [PATCH 07/12] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E7=BB=9F=E8=AE=A1?= =?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/Admin/Controller/PlatformController.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Admin/Controller/PlatformController.class.php b/Application/Admin/Controller/PlatformController.class.php index 8c2cc9281..3a2820344 100644 --- a/Application/Admin/Controller/PlatformController.class.php +++ b/Application/Admin/Controller/PlatformController.class.php @@ -405,7 +405,7 @@ class PlatformController extends ThinkController count(IF(register_time ' . $mounth . ',1,null)) as mounth') ->join("tab_promote AS tp2 ON tp2.`chain` LIKE CONCAT('%/', tp1.id, '/%') OR tp2.id = tp1.id", 'left') ->join("tab_user as u on tp2.id = u.promote_id", 'left') - ->join($play_info_map ? "tab_user_play_info as upi on upi.user_id = u.id " . $play_info_map : false) +// ->join($play_info_map ? "tab_user_play_info as upi on upi.user_id = u.id " . $play_info_map : false) ->where($map) ->group('tp1.id') ->order('count desc, register_time') From 32e362ab806ed404ba98d7308636bc233f58c526 Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Sat, 21 Dec 2019 19:53:16 +0800 Subject: [PATCH 08/12] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E7=BB=9F=E8=AE=A1?= =?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/Admin/Controller/PlatformController.class.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Application/Admin/Controller/PlatformController.class.php b/Application/Admin/Controller/PlatformController.class.php index 3a2820344..f28fae475 100644 --- a/Application/Admin/Controller/PlatformController.class.php +++ b/Application/Admin/Controller/PlatformController.class.php @@ -295,10 +295,7 @@ class PlatformController extends ThinkController unset($_REQUEST['pay_way']); } - $promoteRoot = getPowerPromoteIds(); - if ($promoteRoot) { - $map['promote_id'] =array('in',$promoteRoot); - } + setPowerPromoteIds($map); $map['pay_status'] = 1; $today = total(1); From 5417e1751d3bcd356868d40981ab7ffdc26310a2 Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Sat, 21 Dec 2019 19:55:56 +0800 Subject: [PATCH 09/12] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E7=BB=9F=E8=AE=A1?= =?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/Admin/Controller/PlatformController.class.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Application/Admin/Controller/PlatformController.class.php b/Application/Admin/Controller/PlatformController.class.php index f28fae475..f30b0f194 100644 --- a/Application/Admin/Controller/PlatformController.class.php +++ b/Application/Admin/Controller/PlatformController.class.php @@ -211,10 +211,7 @@ class PlatformController extends ThinkController unset($_REQUEST['register_way']); } - $promoteRoot = getPowerPromoteIds(); - if ($promoteRoot) { - $map['promote_id'] =array('in',$promoteRoot); - } + setPowerPromoteIds($map); $today = total(1); $week = total(2); From 7b4cd74a23f11114d0431bf36e6cddaf4bde9ab3 Mon Sep 17 00:00:00 2001 From: liuweiwen <“529520975@qq.com> Date: Mon, 23 Dec 2019 10:53:42 +0800 Subject: [PATCH 10/12] =?UTF-8?q?=E8=90=BD=E5=9C=B0=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 fc4d0eb42..67c448a77 100644 --- a/Application/Home/View/default/Home/landingPage.html +++ b/Application/Home/View/default/Home/landingPage.html @@ -54,7 +54,7 @@
- +