From 0a7096623b0890d5ac83ab65487e111dc037236e Mon Sep 17 00:00:00 2001
From: sunke <18850253506@163.com>
Date: Thu, 28 Nov 2019 11:42:11 +0800
Subject: [PATCH 01/68] =?UTF-8?q?=E9=9A=90=E8=97=8F=E9=9C=80=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Home/Controller/DownloadController.class.php | 2 +-
 Application/Home/Controller/QueryController.class.php    | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/Application/Home/Controller/DownloadController.class.php b/Application/Home/Controller/DownloadController.class.php
index 12e57fead..c3961f507 100644
--- a/Application/Home/Controller/DownloadController.class.php
+++ b/Application/Home/Controller/DownloadController.class.php
@@ -1767,12 +1767,12 @@ class DownloadController extends BaseController {
         $model = M('user','tab_');
         
         $data = $model->field('account,device_number,promote_account,register_time,register_ip,login_time,login_ip')->where($map)->order('tab_user.id desc')->select();
-        //var_dump($data);
         $xlsData = [];
         foreach ($data as $key1 => $value1) {
            $value1['register_time'] = date("Y-m-d H:i:s",$value1['register_time']);
            $value1['login_time'] = date("Y-m-d H:i:s",$value1['login_time']);
            $value1['account'] = $this->encryption($value1['account']); 
+           $value1['device_number'] = $this->encryption($value1['device_number']);
            $xlsData[] = $value1;
         }
         $this->exportExcel($xlsName, $xlsCell, $xlsData,$id);
diff --git a/Application/Home/Controller/QueryController.class.php b/Application/Home/Controller/QueryController.class.php
index bfa3f4c86..d751d4150 100644
--- a/Application/Home/Controller/QueryController.class.php
+++ b/Application/Home/Controller/QueryController.class.php
@@ -20,11 +20,6 @@ class QueryController extends BaseController
         0 => '平台币',
         1 => '支付宝',
         2 => '微信',
-        5 => '聚宝云',
-        6 => '竣付通',
-        7 => '苹果支付',
-        8 => '金猪支付',
-        9 => '双乾支付',
     ];
 
     public function recharge($p = 0)
@@ -258,6 +253,10 @@ class QueryController extends BaseController
                 $list['new_login_time'] = date('Y-m-d H:i:s', $newLoginData['login_time']);
                 $list['new_login_ip'] = $newLoginData['login_ip'];
                 $list['account'] = substr($list['account'], 0, 2) . '******' . substr($list['account'], 8);
+                if(!empty($list['device_number'])) {
+                     $list['device_number'] = encryption($list['device_number']);
+                }
+                
             }
         }
 

From dd22e6d0e98babb739b4aaa3cf8e5dd0e732cb62 Mon Sep 17 00:00:00 2001
From: chenzhi <“chenzhi063@qq.com>
Date: Thu, 28 Nov 2019 14:24:14 +0800
Subject: [PATCH 02/68] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A1=A5=E9=93=BEin/ou?=
 =?UTF-8?q?t?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/Controller/MendController.class.php | 5 ++++-
 Application/Admin/View/Mend/shiftInfo.html            | 6 +++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Application/Admin/Controller/MendController.class.php b/Application/Admin/Controller/MendController.class.php
index a1d9bc50f..fdadcef2e 100644
--- a/Application/Admin/Controller/MendController.class.php
+++ b/Application/Admin/Controller/MendController.class.php
@@ -111,13 +111,16 @@ class MendController extends ThinkController {
     {
         $id  = I('id');
         $info = M("shift_task")->where("id = {$id} and status = 0")->find();
+        
         if(empty($info)){
             $this->error("补链不存在或已处理");
         }
         
 
         $info['user_id'] = json_decode($info['shift_ids'])[0]; 
-        $info['order_time'] = date("Y-m-d",$info['order_time']); 
+        $info['order_time'] = date("Y-m-d",$info['order_time']);
+        $userid = $info['user_id'];
+        $info['account'] = M("User","tab_")->field("account")->where("id = '{$userid}'")->find()['account'];
         $this->assign('data',$info);
         $this->display();
     }
diff --git a/Application/Admin/View/Mend/shiftInfo.html b/Application/Admin/View/Mend/shiftInfo.html
index dd6f0f9a8..768d1bd5c 100644
--- a/Application/Admin/View/Mend/shiftInfo.html
+++ b/Application/Admin/View/Mend/shiftInfo.html
@@ -57,7 +57,7 @@
             <tr>
                 <td class="l noticeinfo">用户账号</td>
                 <td class="r table_radio">
-                    <input name="account" value="{:get_promote_name($data['promote_id'])}" disabled readonly type="text" class="">
+                    <input name="account" value="{$data['account']}" disabled readonly type="text" class="">
                 </td>
             </tr>
             <tr>
@@ -82,13 +82,13 @@
                 </td>
             </tr>
 
-            <tr>
+            <!-- <tr>
                 <td class="l noticeinfo">换绑类型</td>
                 <td class="r table_radio">
                     <input name="bind_type" value="1" type="radio">In
                     <input name="bind_type" value="2" type="radio">Out
                 </td>
-            </tr>
+            </tr> -->
 
             <tr>
                 <td class="l noticeinfo">备注</td>

From 25fa79ea5557b01ef77b7fea96bd8a954a3e001a Mon Sep 17 00:00:00 2001
From: ELF <360197197@qq.com>
Date: Thu, 28 Nov 2019 15:19:02 +0800
Subject: [PATCH 03/68] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=8E=A9=E5=AE=B6?=
 =?UTF-8?q?=E8=BF=81=E7=A7=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Base/Service/PromoteService.class.php     | 34 ++++++++++++++-----
 1 file changed, 25 insertions(+), 9 deletions(-)

diff --git a/Application/Base/Service/PromoteService.class.php b/Application/Base/Service/PromoteService.class.php
index 41c60fb55..59ecd333a 100644
--- a/Application/Base/Service/PromoteService.class.php
+++ b/Application/Base/Service/PromoteService.class.php
@@ -92,7 +92,8 @@ class PromoteService {
         $balanceCoinMode = isset($params['balance_coin_mode']) ? $params['balance_coin_mode'] : 0;
         $type = isset($params['type']) ? $params['type'] : 0;
         $shiftIds = isset($params['shift_ids']) && $params['shift_ids'] ? $params['shift_ids'] : [];
-        $createPromoteId = empty(session('promote_auth.pid')) ? 0 : session('promote_auth.pid');
+        $creatorId = isset($params['creator_id']) ? $params['creator_id'] : 0;
+        $creatorType = isset($params['creator_type']) ? $params['creator_type'] : 0;
 
         if ($fromPromoteId == $toPromoteId) {
             return [
@@ -140,7 +141,8 @@ class PromoteService {
             'order_time' => strtotime($orderTime),
             'balance_coin_mode' => $balanceCoinMode,
             'create_time' => time(),
-            'create_promote_id' => $createPromoteId,
+            'creator_id' => $creatorId,
+            'creator_type' => $creatorType,
             'status' => 0,
             'type' => $type,
             'shift_ids' => json_encode($shiftIds)
@@ -299,9 +301,18 @@ class PromoteService {
     {
         $toPromoteId = $task['to_promote_id'];
         $fromPromoteId = $task['from_promote_id'];
+        $orderTime = $task['order_time'];
         $shiftIds = json_decode($task['shift_ids'], true) ?? [];
 
-        $createPromote = M('promote', 'tab_')->where(['create_promote_id' => $task['create_promote_id']])->find();
+        $creator = null;
+        $opAccount = '';
+        if ($task['creator_type'] == 1) {
+            $creator = M('promote', 'tab_')->where(['id' => $task['creator_id']])->find();
+            $opAccount = $creator ? $creator['account'] : '';
+        } else {
+            $creator = M('ucenter_member', 'sys_')->where(['id' => $task['creator_id']])->find();
+            $opAccount = $creator ? $creator['username'] : '';
+        }
 
         $toPromote = M('promote', 'tab_')->where(['id' => $toPromoteId])->find();
         $fromPromote = M('promote', 'tab_')->where(['id' => $fromPromoteId])->find();
@@ -334,9 +345,9 @@ class PromoteService {
                 'promote_account_to' => $toPromote['account'],
                 'remark' => '玩家迁移',
                 'create_time' => time(),
-                'op_id' => $createPromote ? $createPromote['id'] : 0,
-                'op_account' => $createPromote ? $createPromote['account'] : '',
-                'op_type' => 1,
+                'op_id' => $creator ? $creator['id'] : 0,
+                'op_account' => $opAccount,
+                'op_type' => $task['creator_type'],
                 'bind_type' => 1,
             ];
         }
@@ -370,9 +381,14 @@ class PromoteService {
         M('user_play', 'tab_')->where($otherMap)->save($updateData);
         M('user_play_info', 'tab_')->where($otherMap)->save($updateData);
         
-        M('spend', 'tab_')->where($otherMap)->where(['is_check' => ['in','1,2']])->save($updateData); // 只改未对账的数据
-        M('deposit', 'tab_')->where($otherMap)->save($updateData);
-        M('bind_spend', 'tab_')->where($otherMap)->save($updateData);
+        $orderMap1 = $otherMap;
+        $orderMap1['pay_time'] = ['egt', $orderTime];
+        M('spend', 'tab_')->where($orderMap1)->where(['is_check' => ['in','1,2']])->save($updateData); // 只改未对账的数据
+        M('bind_spend', 'tab_')->where($orderMap1)->save($updateData);
+
+        $orderMap2 = $otherMap;
+        $orderMap2['create_time'] = ['egt', $orderTime];
+        M('deposit', 'tab_')->where($orderMap2)->save($updateData);
 
         $status = M('shift_task', 'sys_')->where('id=' . $task['id'])->save(['status' => 1, 'handle_time' => time()]);
         if (!$status) {

From bdd4e8ed813fcd16f86df70daaae4ec411355085 Mon Sep 17 00:00:00 2001
From: ELF <360197197@qq.com>
Date: Thu, 28 Nov 2019 15:20:13 +0800
Subject: [PATCH 04/68] =?UTF-8?q?=E4=BF=AE=E6=94=B9sql?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Data/update.sql | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/Data/update.sql b/Data/update.sql
index 14be61b6d..f29b78f3e 100644
--- a/Data/update.sql
+++ b/Data/update.sql
@@ -585,4 +585,12 @@ VALUES
   ('contact_cs', '联系客服', '[{\"name\":\"support\",\"title\":\"\\u8054\\u7cfb\\u5ba2\\u670d\",\"menu_version\":\"0\",\"url\":\"\",\"type\":\"2\",\"act\":\"3007567814\",\"ios_url\":\"3007567814\",\"sort\":\"1\",\"id\":1,\"icon\":\"\",\"cover\":\"\"}]', '', 5, 1, 1571723212 );
 INSERT INTO `tab_tool` (`name`, `title`, `config`, `template`, `type`, `status`, `create_time` )
 VALUES
-  ('sdk_menu', 'SDK用户菜单', '[{\"name\":\"mine\",\"title\":\"\\u6211\\u7684\",\"menu_version\":\"0\",\"url\":\"\",\"type\":\"1\",\"act\":\"my\",\"ios_url\":\"\",\"sort\":\"1\",\"id\":\"1\",\"icon\":\"\\/Uploads\\/Picture\\/2019-11-20\\/5dd524dfd76fa.png\",\"cover\":\"1980\"},{\"name\":\"gift\",\"title\":\"\\u793c\\u5305\",\"menu_version\":\"0\",\"url\":\"\\/sdk.php\\/GameGiftPage\\/gift_list\",\"type\":\"0\",\"act\":\"gift\",\"ios_url\":\"?action=gift\",\"sort\":\"2\",\"id\":2,\"icon\":\"\\/Uploads\\/Picture\\/2019-11-20\\/5dd52509f3767.png\",\"cover\":\"1981\"},{\"name\":\"support\",\"title\":\"\\u5ba2\\u670d\",\"menu_version\":\"0\",\"url\":\"\",\"type\":\"1\",\"act\":\"support\",\"ios_url\":\"\",\"sort\":\"3\",\"id\":3,\"icon\":\"\\/Uploads\\/Picture\\/2019-11-20\\/5dd5251e0aee3.png\",\"cover\":\"1982\"},{\"name\":\"message\",\"title\":\"\\u6d88\\u606f\",\"menu_version\":\"0\",\"url\":\"\",\"type\":\"1\",\"act\":\"msg\",\"ios_url\":\"\",\"sort\":\"4\",\"id\":4,\"icon\":\"\\/Uploads\\/Picture\\/2019-11-20\\/5dd525606ff53.png\",\"cover\":\"1983\"},{\"name\":\"logout\",\"title\":\"\\u9000\\u51fa\",\"menu_version\":\"0\",\"url\":\"\",\"type\":\"1\",\"act\":\"logout\",\"ios_url\":\"\",\"sort\":\"5\",\"id\":5,\"icon\":\"\\/Uploads\\/Picture\\/2019-11-20\\/5dd525d99ed99.png\",\"cover\":\"1984\"},{\"name\":\"suppersign\",\"title\":\"\\u8d85\\u7ea7\\u7b7e\",\"menu_version\":\"2\",\"url\":\"\\/mobile.php\\/ssg\\/home\",\"type\":\"2\",\"act\":\"suppersign\",\"ios_url\":\"http:\\/\\/m.wmtxkj.cn\\/mobile.php\\/ssg\\/home\",\"sort\":\"6\",\"id\":6,\"icon\":\"\\/Uploads\\/Picture\\/2019-11-20\\/5dd525f388843.png\",\"cover\":\"1985\"}]', '', 5, 1, 1571723212 );
\ No newline at end of file
+  ('sdk_menu', 'SDK用户菜单', '[{\"name\":\"mine\",\"title\":\"\\u6211\\u7684\",\"menu_version\":\"0\",\"url\":\"\",\"type\":\"1\",\"act\":\"my\",\"ios_url\":\"\",\"sort\":\"1\",\"id\":\"1\",\"icon\":\"\\/Uploads\\/Picture\\/2019-11-20\\/5dd524dfd76fa.png\",\"cover\":\"1980\"},{\"name\":\"gift\",\"title\":\"\\u793c\\u5305\",\"menu_version\":\"0\",\"url\":\"\\/sdk.php\\/GameGiftPage\\/gift_list\",\"type\":\"0\",\"act\":\"gift\",\"ios_url\":\"?action=gift\",\"sort\":\"2\",\"id\":2,\"icon\":\"\\/Uploads\\/Picture\\/2019-11-20\\/5dd52509f3767.png\",\"cover\":\"1981\"},{\"name\":\"support\",\"title\":\"\\u5ba2\\u670d\",\"menu_version\":\"0\",\"url\":\"\",\"type\":\"1\",\"act\":\"support\",\"ios_url\":\"\",\"sort\":\"3\",\"id\":3,\"icon\":\"\\/Uploads\\/Picture\\/2019-11-20\\/5dd5251e0aee3.png\",\"cover\":\"1982\"},{\"name\":\"message\",\"title\":\"\\u6d88\\u606f\",\"menu_version\":\"0\",\"url\":\"\",\"type\":\"1\",\"act\":\"msg\",\"ios_url\":\"\",\"sort\":\"4\",\"id\":4,\"icon\":\"\\/Uploads\\/Picture\\/2019-11-20\\/5dd525606ff53.png\",\"cover\":\"1983\"},{\"name\":\"logout\",\"title\":\"\\u9000\\u51fa\",\"menu_version\":\"0\",\"url\":\"\",\"type\":\"1\",\"act\":\"logout\",\"ios_url\":\"\",\"sort\":\"5\",\"id\":5,\"icon\":\"\\/Uploads\\/Picture\\/2019-11-20\\/5dd525d99ed99.png\",\"cover\":\"1984\"},{\"name\":\"suppersign\",\"title\":\"\\u8d85\\u7ea7\\u7b7e\",\"menu_version\":\"2\",\"url\":\"\\/mobile.php\\/ssg\\/home\",\"type\":\"2\",\"act\":\"suppersign\",\"ios_url\":\"http:\\/\\/m.wmtxkj.cn\\/mobile.php\\/ssg\\/home\",\"sort\":\"6\",\"id\":6,\"icon\":\"\\/Uploads\\/Picture\\/2019-11-20\\/5dd525f388843.png\",\"cover\":\"1985\"}]', '', 5, 1, 1571723212 );
+
+-- 修改迁移
+ALTER TABLE `sys_shift_task` 
+CHANGE COLUMN `create_promote_id` `creator_id` int(11) NOT NULL DEFAULT 0 COMMENT '创建渠道ID' AFTER `status`;
+ALTER TABLE `sys_shift_task` 
+ADD COLUMN `creator_type` tinyint(1) NOT NULL DEFAULT 0 COMMENT '创建者类型 0 后台管理员 1 推广员' AFTER `creator_id`;
+ALTER TABLE `platform`.`tab_mend` 
+ADD COLUMN `op_type` tinyint(0) NOT NULL DEFAULT 0 COMMENT '0 管理员 1 推广员' AFTER `op_account`;
\ No newline at end of file

From f09ee9495261e1242b0949b645692c4f23dcccb4 Mon Sep 17 00:00:00 2001
From: chenzhi <“chenzhi063@qq.com>
Date: Thu, 28 Nov 2019 15:30:39 +0800
Subject: [PATCH 05/68] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=A1=A5=E9=93=BE?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/Controller/MendController.class.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Application/Admin/Controller/MendController.class.php b/Application/Admin/Controller/MendController.class.php
index fdadcef2e..16625e9d8 100644
--- a/Application/Admin/Controller/MendController.class.php
+++ b/Application/Admin/Controller/MendController.class.php
@@ -81,6 +81,8 @@ class MendController extends ThinkController {
                 "order_time"=>$create['order_time'],
                 "type"=>2,
                 "shift_ids"=>[$create['user_id']],
+                "creator_type"=>0,
+                "creator_id"=>$_SESSION["onethink_admin"]["user_auth"]["uid"]
             );
             if(!empty($create['remark'])){
                 $params['remark'] = $create['remark'];

From 895cd1e861d9b5cd88b8bb8a0c057c56f8ff5bab Mon Sep 17 00:00:00 2001
From: ELF <360197197@qq.com>
Date: Thu, 28 Nov 2019 15:32:38 +0800
Subject: [PATCH 06/68] =?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/Controller/PromoteController.class.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Application/Home/Controller/PromoteController.class.php b/Application/Home/Controller/PromoteController.class.php
index 0335835b6..f505a8857 100644
--- a/Application/Home/Controller/PromoteController.class.php
+++ b/Application/Home/Controller/PromoteController.class.php
@@ -1935,8 +1935,12 @@ class PromoteController extends BaseController
 
     public function shift()
     {
+        $loginPromote = $this->getLoginPromote();
+        $params = $_POST;
+        $params['creator_id'] = $loginPromote['id'];
+        $params['creator_type'] = 1;
         $promoteService = new PromoteService();
-        $result = $promoteService->addShiftTask($_POST);
+        $result = $promoteService->addShiftTask($params);
         $this->ajaxReturn($result);
     }
 

From 375c9904afad24fa5bcf505c8d1b7ee158291d25 Mon Sep 17 00:00:00 2001
From: chenxiaojun <956334972@qq.com>
Date: Thu, 28 Nov 2019 15:32:46 +0800
Subject: [PATCH 07/68] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=B9=B3=E5=8F=B0->?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=AE=A1=E7=90=86->=E5=85=85=E5=80=BC?=
 =?UTF-8?q?=E7=8E=A9=E5=AE=B6--=E6=B7=BB=E5=8A=A0=E8=AF=B4=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Home/View/default/Query/userRecharges.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Application/Home/View/default/Query/userRecharges.html b/Application/Home/View/default/Query/userRecharges.html
index 9e7f9172f..abc69c383 100644
--- a/Application/Home/View/default/Query/userRecharges.html
+++ b/Application/Home/View/default/Query/userRecharges.html
@@ -31,6 +31,7 @@
       </div>
       <img src="__IMG__/20180207/icon_normal_game.png">
       <span class="title_main">玩家充值</span>
+      <span class="details">说明：充值数据不包含当日</span>
     </div>
     <div class="trunk-content article">
         <div class="trunk-search clearfix jssearch">

From 2515ee98eb037880effd665171d68cf49ee65685 Mon Sep 17 00:00:00 2001
From: chenxiaojun <956334972@qq.com>
Date: Thu, 28 Nov 2019 15:36:30 +0800
Subject: [PATCH 08/68] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=B9=B3=E5=8F=B0->?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=AE=A1=E7=90=86->=E5=85=85=E5=80=BC?=
 =?UTF-8?q?=E7=8E=A9=E5=AE=B6--=E6=97=B6=E9=97=B4=E6=A3=80=E7=B4=A2?=
 =?UTF-8?q?=E8=8C=83=E5=9B=B4=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Home/Controller/QueryController.class.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Application/Home/Controller/QueryController.class.php b/Application/Home/Controller/QueryController.class.php
index bfa3f4c86..519383587 100644
--- a/Application/Home/Controller/QueryController.class.php
+++ b/Application/Home/Controller/QueryController.class.php
@@ -1843,6 +1843,7 @@ class QueryController extends BaseController
         $this->assign('initBegTime', $initBegTime);
         $this->assign('initEndTime', $initEndTime);
         $this->assign('sort', $sort);
+        $this->assign('setdate', date("Y-m-d", time() - 3600 * 24));
         $this->display('userRecharges');
     }
 

From b989f746050e701cf7a761cb345e955bf84235e1 Mon Sep 17 00:00:00 2001
From: chenxiaojun <956334972@qq.com>
Date: Thu, 28 Nov 2019 15:41:13 +0800
Subject: [PATCH 09/68] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=B9=B3=E5=8F=B0->?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=AE=A1=E7=90=86->=E5=85=85=E5=80=BC?=
 =?UTF-8?q?=E7=8E=A9=E5=AE=B6--=E6=97=B6=E9=97=B4=E6=A3=80=E7=B4=A2?=
 =?UTF-8?q?=E8=8C=83=E5=9B=B4=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Home/Controller/QueryController.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Application/Home/Controller/QueryController.class.php b/Application/Home/Controller/QueryController.class.php
index 519383587..75979e442 100644
--- a/Application/Home/Controller/QueryController.class.php
+++ b/Application/Home/Controller/QueryController.class.php
@@ -1720,7 +1720,7 @@ class QueryController extends BaseController
         $sortName = trim(I('sort_name', ''));
         $sort = intval(I('sort', 1));
         $sortNameData = ['recharge_cost', 'recharge_count', 'recharge_cost_today', 'unlogin_day'];
-        $nowTime = date('Y-m-d');
+        $nowTime = date('Y-m-d', time() - 3600 * 24);
         $initBegTime = date('Y-m-d', strtotime('-6 day', strtotime($nowTime)));
         $initBegTime = empty(I('begtime')) ? $initBegTime : I('begtime');
         $initEndTime = $nowTime;
@@ -1843,7 +1843,7 @@ class QueryController extends BaseController
         $this->assign('initBegTime', $initBegTime);
         $this->assign('initEndTime', $initEndTime);
         $this->assign('sort', $sort);
-        $this->assign('setdate', date("Y-m-d", time() - 3600 * 24));
+        $this->assign('setdate', $nowTime);
         $this->display('userRecharges');
     }
 

From 128c11f5b84baf75ee84aa878089ee58f1edfe32 Mon Sep 17 00:00:00 2001
From: ELF <360197197@qq.com>
Date: Thu, 28 Nov 2019 15:48:47 +0800
Subject: [PATCH 10/68] =?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/Base/Service/PromoteService.class.php | 3 ++-
 Data/update.sql                                   | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Application/Base/Service/PromoteService.class.php b/Application/Base/Service/PromoteService.class.php
index 59ecd333a..403ef5db5 100644
--- a/Application/Base/Service/PromoteService.class.php
+++ b/Application/Base/Service/PromoteService.class.php
@@ -343,7 +343,8 @@ class PromoteService {
                 'promote_account' => $fromPromote['account'],
                 'promote_id_to' => $toPromote['id'],
                 'promote_account_to' => $toPromote['account'],
-                'remark' => '玩家迁移',
+                'remark' => $task['creator_type'] == 0 ? '后台补链' : '玩家迁移',
+                'order_time' => $orderTime,
                 'create_time' => time(),
                 'op_id' => $creator ? $creator['id'] : 0,
                 'op_account' => $opAccount,
diff --git a/Data/update.sql b/Data/update.sql
index f29b78f3e..9fe8233fb 100644
--- a/Data/update.sql
+++ b/Data/update.sql
@@ -588,9 +588,11 @@ VALUES
   ('sdk_menu', 'SDK用户菜单', '[{\"name\":\"mine\",\"title\":\"\\u6211\\u7684\",\"menu_version\":\"0\",\"url\":\"\",\"type\":\"1\",\"act\":\"my\",\"ios_url\":\"\",\"sort\":\"1\",\"id\":\"1\",\"icon\":\"\\/Uploads\\/Picture\\/2019-11-20\\/5dd524dfd76fa.png\",\"cover\":\"1980\"},{\"name\":\"gift\",\"title\":\"\\u793c\\u5305\",\"menu_version\":\"0\",\"url\":\"\\/sdk.php\\/GameGiftPage\\/gift_list\",\"type\":\"0\",\"act\":\"gift\",\"ios_url\":\"?action=gift\",\"sort\":\"2\",\"id\":2,\"icon\":\"\\/Uploads\\/Picture\\/2019-11-20\\/5dd52509f3767.png\",\"cover\":\"1981\"},{\"name\":\"support\",\"title\":\"\\u5ba2\\u670d\",\"menu_version\":\"0\",\"url\":\"\",\"type\":\"1\",\"act\":\"support\",\"ios_url\":\"\",\"sort\":\"3\",\"id\":3,\"icon\":\"\\/Uploads\\/Picture\\/2019-11-20\\/5dd5251e0aee3.png\",\"cover\":\"1982\"},{\"name\":\"message\",\"title\":\"\\u6d88\\u606f\",\"menu_version\":\"0\",\"url\":\"\",\"type\":\"1\",\"act\":\"msg\",\"ios_url\":\"\",\"sort\":\"4\",\"id\":4,\"icon\":\"\\/Uploads\\/Picture\\/2019-11-20\\/5dd525606ff53.png\",\"cover\":\"1983\"},{\"name\":\"logout\",\"title\":\"\\u9000\\u51fa\",\"menu_version\":\"0\",\"url\":\"\",\"type\":\"1\",\"act\":\"logout\",\"ios_url\":\"\",\"sort\":\"5\",\"id\":5,\"icon\":\"\\/Uploads\\/Picture\\/2019-11-20\\/5dd525d99ed99.png\",\"cover\":\"1984\"},{\"name\":\"suppersign\",\"title\":\"\\u8d85\\u7ea7\\u7b7e\",\"menu_version\":\"2\",\"url\":\"\\/mobile.php\\/ssg\\/home\",\"type\":\"2\",\"act\":\"suppersign\",\"ios_url\":\"http:\\/\\/m.wmtxkj.cn\\/mobile.php\\/ssg\\/home\",\"sort\":\"6\",\"id\":6,\"icon\":\"\\/Uploads\\/Picture\\/2019-11-20\\/5dd525f388843.png\",\"cover\":\"1985\"}]', '', 5, 1, 1571723212 );
 
 -- 修改迁移
+ALTER TABLE `tab_mend` 
+ADD COLUMN `order_time` int(11) NOT NULL DEFAULT 0 COMMENT '订单时间' AFTER `remark`;
 ALTER TABLE `sys_shift_task` 
 CHANGE COLUMN `create_promote_id` `creator_id` int(11) NOT NULL DEFAULT 0 COMMENT '创建渠道ID' AFTER `status`;
 ALTER TABLE `sys_shift_task` 
 ADD COLUMN `creator_type` tinyint(1) NOT NULL DEFAULT 0 COMMENT '创建者类型 0 后台管理员 1 推广员' AFTER `creator_id`;
-ALTER TABLE `platform`.`tab_mend` 
+ALTER TABLE `tab_mend` 
 ADD COLUMN `op_type` tinyint(0) NOT NULL DEFAULT 0 COMMENT '0 管理员 1 推广员' AFTER `op_account`;
\ No newline at end of file

From ef250272132ebcc51a24705f52867152291cfd78 Mon Sep 17 00:00:00 2001
From: chenzhi <“chenzhi063@qq.com>
Date: Thu, 28 Nov 2019 15:51:33 +0800
Subject: [PATCH 11/68] =?UTF-8?q?=E8=A1=A5=E9=93=BE=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=88=87=E5=88=86=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/View/Mend/lists.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Application/Admin/View/Mend/lists.html b/Application/Admin/View/Mend/lists.html
index 2e87bce63..8cb0c4723 100644
--- a/Application/Admin/View/Mend/lists.html
+++ b/Application/Admin/View/Mend/lists.html
@@ -107,6 +107,7 @@
                         <th>补链前渠道</th>
                         <th>补链后渠道</th>
                         <th style="width: 450px;">备注</th>
+                        <th>切分时间</th>
                         <th>补链时间</th>
                         <th>操作人员</th>
                     </tr>
@@ -126,6 +127,7 @@
                             <td class="js-pop" >
                                 <a href="javascript:" title="点击查看" class="remarkView" info="{$data['remark']}">{:get_title($data['remark'])}</a>
                             </td>
+                            <td>{$data.order_time|date='Y-m-d H:i:s',###}</td>
                             <td>{$data.create_time|date='Y-m-d H:i:s',###}</td>
                             <td>{$data.op_account}</td>
                         </tr>

From e962786e0713300de2be544f93665aec335e4156 Mon Sep 17 00:00:00 2001
From: liuweiwen <“529520975@qq.com>
Date: Thu, 28 Nov 2019 15:58:42 +0800
Subject: [PATCH 12/68] =?UTF-8?q?=E5=90=8E=E5=8F=B0-=E3=80=90=E5=85=85?=
 =?UTF-8?q?=E5=80=BC=E3=80=91-=E3=80=90=E5=B9=B3=E5=8F=B0=E5=B8=81?=
 =?UTF-8?q?=E5=85=85=E5=80=BC=E3=80=91=E5=AF=BC=E5=87=BA=E5=85=85=E5=80=BC?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=87=BA=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/Controller/ExportController.class.php      | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php
index dc9e97c15..e6e6fb766 100644
--- a/Application/Admin/Controller/ExportController.class.php
+++ b/Application/Admin/Controller/ExportController.class.php
@@ -49,10 +49,9 @@ class ExportController extends Controller
     //导出Excel
     function expUser($id)
     {
-                $xlsName = $_REQUEST['xlsname'];
+        $xlsName = $_REQUEST['xlsname'];
         switch ($id) {
             case 1:
-
                 $xlsCell = array(
                     array('user_account', "玩家账号"),
                     array('game_name', "游戏名称"),
@@ -861,10 +860,11 @@ class ExportController extends Controller
                     $map['spend_ip'] = array('like', '%' . trim($_REQUEST['spend_ip']) . '%');
                     unset($_REQUEST['spend_ip']);
                 }
-                if (isset($_REQUEST['time-start']) && isset($_REQUEST['time-end'])) {
-                    $map['pay_time'] = array('BETWEEN', array(strtotime($_REQUEST['time-start']), strtotime($_REQUEST['time-end']) + 24 * 60 * 60 - 1));
-                    unset($_REQUEST['time-start']);
-                    unset($_REQUEST['time-end']);
+
+                if (isset($_REQUEST['timestart']) && isset($_REQUEST['timeend'])) {
+                    $map['pay_time'] = array('BETWEEN', array(strtotime($_REQUEST['timestart']), strtotime($_REQUEST['timeend']) + 24 * 60 * 60 - 1));
+                    unset($_REQUEST['timestart']);
+                    unset($_REQUEST['timeend']);
                 }
                 if (isset($_REQUEST['start']) && isset($_REQUEST['end'])) {
                     $map['pay_time'] = array('BETWEEN', array(strtotime($_REQUEST['start']), strtotime($_REQUEST['end']) + 24 * 60 * 60 - 1));

From a91a5d57594a6b01e07a59b584b400e962f55a1f Mon Sep 17 00:00:00 2001
From: ELF <360197197@qq.com>
Date: Thu, 28 Nov 2019 16:01:54 +0800
Subject: [PATCH 13/68] =?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/Base/Service/PromoteService.class.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Application/Base/Service/PromoteService.class.php b/Application/Base/Service/PromoteService.class.php
index 403ef5db5..b42047a94 100644
--- a/Application/Base/Service/PromoteService.class.php
+++ b/Application/Base/Service/PromoteService.class.php
@@ -390,6 +390,7 @@ class PromoteService {
         $orderMap2 = $otherMap;
         $orderMap2['create_time'] = ['egt', $orderTime];
         M('deposit', 'tab_')->where($orderMap2)->save($updateData);
+        M('user_play_data_count', 'tab_')->where($orderMap2)->save(['promote_id' => $toPromote['id']]);
 
         $status = M('shift_task', 'sys_')->where('id=' . $task['id'])->save(['status' => 1, 'handle_time' => time()]);
         if (!$status) {

From a71b46eb6f5591d232a7623a0d92e352cc1c02d3 Mon Sep 17 00:00:00 2001
From: liuweiwen <“529520975@qq.com>
Date: Thu, 28 Nov 2019 16:20:38 +0800
Subject: [PATCH 14/68] =?UTF-8?q?pc=E5=AE=98=E7=BD=91=E5=85=85=E5=80=BC?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98=E6=96=B9=E5=BC=8F=E5=86=99=E6=AD=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controller/RechargeController.class.php     |  8 ++++----
 .../Media/View/default/Recharge/pay.html        | 17 +++++++++++------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/Application/Media/Controller/RechargeController.class.php b/Application/Media/Controller/RechargeController.class.php
index d293f70e2..98392f8e6 100644
--- a/Application/Media/Controller/RechargeController.class.php
+++ b/Application/Media/Controller/RechargeController.class.php
@@ -98,15 +98,15 @@ class RechargeController extends BaseController
             case 'alipay':
                 //判断是否开启支付宝充值
                 if (pay_set_status('alipay') == 0) {
-                    $this->error("网站未启用支付宝充值", '', 1);
-                    exit();
+//                    $this->error("网站未启用支付宝充值", '', 1);
+//                    exit();
                 }
                 echo $pay->buildRequestForm($vo);
                 break;
             case 'weixin':
                 if (pay_set_status('wei_xin') == 0 && pay_set_status('weixin') == 0&&pay_set_status('weixin_gf')==0 ) {
-                    $this->error("网站未启用微信充值", '', 1);
-                    exit();
+//                    $this->error("网站未启用微信充值", '', 1);
+//                    exit();
                 }
                 if (get_wx_type() == 0) {//微信官方
                     $data['pay_order_number'] = $data['order_no'];
diff --git a/Application/Media/View/default/Recharge/pay.html b/Application/Media/View/default/Recharge/pay.html
index 0f5b0c2d4..392e70c07 100644
--- a/Application/Media/View/default/Recharge/pay.html
+++ b/Application/Media/View/default/Recharge/pay.html
@@ -136,20 +136,25 @@
         <div class="way-box">
           <div class="way-select">
 
-            <if condition="get_tool_status('alipay') eq 1">
+<!--            <if condition="get_tool_status('alipay') eq 1">-->
+<!--            <div class="wayBg" data-type="alipay">-->
+<!--              <img src="__IMG__/zhifubaozhifu.png" alt="">-->
+<!--              <span>支付宝</span>-->
+<!--            </div>-->
+
+<!--            </if>-->
+
+<!--            <if condition="get_tool_status('weixin') eq 1 or get_tool_status('wei_xin') eq 1 or get_tool_status('weixin_gf') eq 1">-->
             <div class="wayBg" data-type="alipay">
               <img src="__IMG__/zhifubaozhifu.png" alt="">
               <span>支付宝</span>
-
             </div>
-            </if>
-
-            <if condition="get_tool_status('weixin') eq 1 or get_tool_status('wei_xin') eq 1 or get_tool_status('weixin_gf') eq 1">
             <div class="" data-type="weixin">
               <img src="__IMG__/weixin.png" alt="">
               <span>微信支付</span>
             </div>
-            </if>
+
+<!--            </if>-->
 
             <if condition="get_tool_status('jft') eq 1">
               <div class="" data-type="jft"><span class="p1_1 g" id="p1">竣付通</span></div>

From d64b6278836691c24705f6fabe32979d360980d6 Mon Sep 17 00:00:00 2001
From: chenzhi <“chenzhi063@qq.com>
Date: Thu, 28 Nov 2019 16:20:52 +0800
Subject: [PATCH 15/68] =?UTF-8?q?=E6=B8=B8=E6=88=8F=E5=85=85=E5=80=BC?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=96=87=E5=AD=97=E8=AF=B4=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/View/Spend/lists.html | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Application/Admin/View/Spend/lists.html b/Application/Admin/View/Spend/lists.html
index aad5158b0..4c52357aa 100644
--- a/Application/Admin/View/Spend/lists.html
+++ b/Application/Admin/View/Spend/lists.html
@@ -230,13 +230,16 @@
 
 
                     <td>汇总</td>
-                    <td colspan="99">
+                    <td colspan="6">
                         当页充值：{:null_to_0(array_sum(array_column(array_status2value('pay_status','',$list_data),'pay_amount')))}
                         今日充值：{$ttotal}
                         昨日充值：{$ytotal}
                         累计充值：{$total}（此处只汇总充值成功的订单）
                     </td>
-                    <td></td>
+                    <td colspan="99" style="color: #a9a9a9;">
+                        今日充值：今日平台所有推广员的累计充值（包括官方渠道）/
+                        昨日充值：昨日平台所有推广员的累计充值（包括官方渠道）
+                    </td>
                 </tr>
                 </tbody>
             </table>

From b61fdf2e97a15514389817c8ec1442283fbaa6dd Mon Sep 17 00:00:00 2001
From: liuweiwen <“529520975@qq.com>
Date: Thu, 28 Nov 2019 16:21:45 +0800
Subject: [PATCH 16/68] =?UTF-8?q?=E6=89=8B=E6=9C=BA=E5=AE=98=E7=BD=91?=
 =?UTF-8?q?=E7=BB=91=E5=AE=9A=E6=89=8B=E6=9C=BA=E9=A1=B5=E9=9D=A2=E5=8F=91?=
 =?UTF-8?q?=E9=80=81=E9=AA=8C=E8=AF=81=E7=A0=81=E6=A0=B7=E5=BC=8F=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Mobile/View/User/userphone.html | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/Application/Mobile/View/User/userphone.html b/Application/Mobile/View/User/userphone.html
index a2a6babdf..e71abec7a 100644
--- a/Application/Mobile/View/User/userphone.html
+++ b/Application/Mobile/View/User/userphone.html
@@ -100,8 +100,12 @@
             $(e).removeClass('g-btn').addClass('g-btntn');
             var a = setInterval(function() {
               r--;
-              $(e).text('成功'+r + '秒后重发'),
-              0 == r && ($(e).removeClass('g-btntn').addClass('g-btn'), $(e).text('获取短信验证码'), clearInterval(a))
+              $(e).text(r + '秒'),
+              $(e).css("background", "rgba(169,169,169)");
+              0 == r && ($(e).removeClass('g-btntn').addClass('g-btn'),
+                      $(e).text('获取短信验证码'),
+                      $(e).css("background", "rgba(33,177,235,1)"),
+                      clearInterval(a))
             },1e3)
           }
         };

From bdc5d99f6ef98645ba422dc1d1233b365f4779ea Mon Sep 17 00:00:00 2001
From: liuweiwen <“529520975@qq.com>
Date: Thu, 28 Nov 2019 16:26:01 +0800
Subject: [PATCH 17/68] =?UTF-8?q?pc=E5=AE=98=E7=BD=91=20=E5=AE=A2=E6=9C=8D?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83=EF=BC=8C=E6=90=9C=E7=B4=A2=E6=A1=86=EF=BC=8C?=
 =?UTF-8?q?=E5=AD=97=E4=BD=93=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Media/View/default/Service/detail.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Application/Media/View/default/Service/detail.html b/Application/Media/View/default/Service/detail.html
index 170e43ce9..428fa6459 100644
--- a/Application/Media/View/default/Service/detail.html
+++ b/Application/Media/View/default/Service/detail.html
@@ -19,7 +19,6 @@
       height: 30px;
       padding-left: 12px;
       padding-right: 30px;
-      font-size: 1rem;
     }
 
     .search-icon {

From a21f2c218c0af25d8eeedee3b0acd417283daf8c Mon Sep 17 00:00:00 2001
From: liuweiwen <“529520975@qq.com>
Date: Thu, 28 Nov 2019 16:27:34 +0800
Subject: [PATCH 18/68] =?UTF-8?q?pc=E5=AE=98=E7=BD=91=20=E5=AE=98=E7=BD=91?=
 =?UTF-8?q?=E3=80=91----=E3=80=90=E8=B4=A6=E6=88=B7=E5=85=85=E5=80=BC?=
 =?UTF-8?q?=E3=80=91=E7=82=B9=E5=87=BB=E5=AE=B6=E9=95=BF=E7=9B=91=E6=8A=A4?=
 =?UTF-8?q?/=E5=AE=A2=E6=9C=8D=E5=B8=AE=E5=8A=A9=EF=BC=8C=E6=97=A0?=
 =?UTF-8?q?=E5=8F=8D=E9=A6=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Media/View/default/Recharge/pay.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Application/Media/View/default/Recharge/pay.html b/Application/Media/View/default/Recharge/pay.html
index 392e70c07..06610c336 100644
--- a/Application/Media/View/default/Recharge/pay.html
+++ b/Application/Media/View/default/Recharge/pay.html
@@ -185,8 +185,8 @@
         <img src="__IMG__/foot_logo.png" alt="">
         <div class="foot_top_ri">
           <div class="foot_link">
-            <a>家长监护</a>
-            <a>客服帮助</a>
+            <a href="/media.php?s=/Article/news1/type/supervise.html">家长监护</a>
+            <a href="/media.php?s=/Service/index.html">客服帮助</a>
 <!--            <a href="#">国浩律所</a>-->
           </div>
           <div class="foot_serial">

From a150015972b940b0eb4e07e7fe1c07c0bf54ddcf Mon Sep 17 00:00:00 2001
From: liuweiwen <“529520975@qq.com>
Date: Thu, 28 Nov 2019 16:34:34 +0800
Subject: [PATCH 19/68] =?UTF-8?q?pc=E5=AE=98=E7=BD=91=20=E7=83=AD=E9=97=A8?=
 =?UTF-8?q?=E6=B8=B8=E6=88=8F=EF=BC=8C=E5=A4=9A=E6=AC=BE=E6=B8=B8=E6=88=8F?=
 =?UTF-8?q?=E5=85=A8=E9=83=A8=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Media/View/default/Index/business.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Application/Media/View/default/Index/business.html b/Application/Media/View/default/Index/business.html
index db35bcb12..abf06a821 100644
--- a/Application/Media/View/default/Index/business.html
+++ b/Application/Media/View/default/Index/business.html
@@ -32,7 +32,7 @@
             </div>
             <div class="have_product">
                 <ul >
-                    <volist name="recommend" id="rec" offset="0" length="1">
+                    <volist name="recommend" id="rec">
                     <li>
                         <img src="{:get_cover($rec['cover'],'path')}" onerror="this.src='__IMG__/empty.jpg';this.onerror=null"/>
                         <div class="have_product_box">
@@ -42,6 +42,7 @@
                         </div>
                     </li>
                     </volist>
+
                 </ul>
             </div>
         </div>

From ef60ca85cfff474aa571b105a51dffc344582fc1 Mon Sep 17 00:00:00 2001
From: ELF <360197197@qq.com>
Date: Thu, 28 Nov 2019 16:35:26 +0800
Subject: [PATCH 20/68] =?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/Base/Service/PromoteService.class.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Application/Base/Service/PromoteService.class.php b/Application/Base/Service/PromoteService.class.php
index b42047a94..a8d5e1e7c 100644
--- a/Application/Base/Service/PromoteService.class.php
+++ b/Application/Base/Service/PromoteService.class.php
@@ -94,6 +94,7 @@ class PromoteService {
         $shiftIds = isset($params['shift_ids']) && $params['shift_ids'] ? $params['shift_ids'] : [];
         $creatorId = isset($params['creator_id']) ? $params['creator_id'] : 0;
         $creatorType = isset($params['creator_type']) ? $params['creator_type'] : 0;
+        $remark = isset($params['remark']) ? $params['remark'] : '';
 
         if ($fromPromoteId == $toPromoteId) {
             return [
@@ -145,6 +146,7 @@ class PromoteService {
             'creator_type' => $creatorType,
             'status' => 0,
             'type' => $type,
+            'remark' => $remark,
             'shift_ids' => json_encode($shiftIds)
         ];
 
@@ -303,6 +305,7 @@ class PromoteService {
         $fromPromoteId = $task['from_promote_id'];
         $orderTime = $task['order_time'];
         $shiftIds = json_decode($task['shift_ids'], true) ?? [];
+        $remark = $task['remark'] ?? '';
 
         $creator = null;
         $opAccount = '';
@@ -343,7 +346,7 @@ class PromoteService {
                 'promote_account' => $fromPromote['account'],
                 'promote_id_to' => $toPromote['id'],
                 'promote_account_to' => $toPromote['account'],
-                'remark' => $task['creator_type'] == 0 ? '后台补链' : '玩家迁移',
+                'remark' => $remark == '' ? ($task['creator_type'] == 0 ? '后台补链' : '玩家迁移') : $remark,
                 'order_time' => $orderTime,
                 'create_time' => time(),
                 'op_id' => $creator ? $creator['id'] : 0,

From 14f69c408ed2852f686a5a60db719e39a581db38 Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Thu, 28 Nov 2019 16:42:12 +0800
Subject: [PATCH 21/68] =?UTF-8?q?=E7=99=BB=E5=BD=95=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controller/ExportController.class.php     | 157 ++++++++++++------
 1 file changed, 102 insertions(+), 55 deletions(-)

diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php
index dc9e97c15..232938b73 100644
--- a/Application/Admin/Controller/ExportController.class.php
+++ b/Application/Admin/Controller/ExportController.class.php
@@ -3419,80 +3419,127 @@ if ($key == 'model'){
 		 * 登录记录
 		 * @author 鹿文学
 		 */
-		public function login_record() {
+    public function login_record() {
 
-			$xlsName = $_REQUEST['xlsname'];
+        $xlsName = $_REQUEST['xlsname'];
 
-			$xlsCell = array(
-				array('user_account','玩家账号'),
-				array('game_name','游戏名称'),
-				array('server_name','游戏区服'),
-				array('user_nickname','角色名'),
-				array('login_time','登录时间'),
-				array('login_ip','最后登录ip'),
-			);
+//			$xlsCell = array(
+//				array('user_account','玩家账号'),
+//				array('game_name','游戏名称'),
+//				array('server_name','游戏区服'),
+//				array('user_nickname','角色名'),
+//				array('login_time','登录时间'),
+//				array('login_ip','最后登录ip'),
+//			);
 
+        $xlsCell = array(
+            '玩家账号',
+            '游戏名称',
+            '游戏区服',
+            '角色名',
+            '登录时间',
+            '最后登录ip',
+        );
 
 
-			if (isset($_REQUEST['login_ip'])) {
-					$map['login_ip'] = $_REQUEST['login_ip'];
-			}
-			if (isset($_REQUEST['game_id'])) {
-					$map['game_id'] = $_REQUEST['game_id'];
-            }
-            if (isset($_REQUEST['game_name'])) {
-                $map['game_name'] = ['like', $_REQUEST['game_name']."%"];
-                unset($_REQUEST['game_name']);
-            }
-            if (isset($_REQUEST['game_type'])) {
-                $map['sdk_version'] = $_REQUEST['game_type'];
-                unset($_REQUEST['game_type']);
-            }
-            if (isset($_REQUEST['server_name'])) {
-                $map['server_name'] = $_REQUEST['server_name'];
-                unset($_REQUEST['server_name']);
-            }
-			if (isset($_REQUEST['timestart']) && isset($_REQUEST['timeend'])) {
-					$map['login_time'] = array('BETWEEN', array(strtotime($_REQUEST['timestart']), strtotime($_REQUEST['timeend']) + 24 * 60 * 60 - 1));
-			}elseif(isset($_REQUEST['timestart'])){
-					$map['login_time'] = array('GT',strtotime($_REQUEST['timestart']));
-			}elseif(isset($_REQUEST['timeend'])){
-					$map['login_time'] = array('lt',(strtotime($_REQUEST['timeend'])+ 24 * 60 * 60 - 1));
-			}
-			if (isset($_REQUEST['account'])) {
-					$map['user_account'] = array('like', '%' . trim($_REQUEST['account']) . '%');
-            }
-            
-            $map['login_time'] = array('neq', 0);
 
-			$page = intval($_REQUEST['p']);
+        if (isset($_REQUEST['login_ip'])) {
+            $map['login_ip'] = $_REQUEST['login_ip'];
+        }
+        if (isset($_REQUEST['game_id'])) {
+            $map['game_id'] = $_REQUEST['game_id'];
+        }
+        if (isset($_REQUEST['game_name'])) {
+            $map['game_name'] = ['like', $_REQUEST['game_name']."%"];
+            unset($_REQUEST['game_name']);
+        }
+        if (isset($_REQUEST['game_type'])) {
+            $map['sdk_version'] = $_REQUEST['game_type'];
+            unset($_REQUEST['game_type']);
+        }
+        if (isset($_REQUEST['server_name'])) {
+            $map['server_name'] = $_REQUEST['server_name'];
+            unset($_REQUEST['server_name']);
+        }
+        if (isset($_REQUEST['timestart']) && isset($_REQUEST['timeend'])) {
+            $map['login_time'] = array('BETWEEN', array(strtotime($_REQUEST['timestart']), strtotime($_REQUEST['timeend']) + 24 * 60 * 60 - 1));
+        }elseif(isset($_REQUEST['timestart'])){
+            $map['login_time'] = array('GT',strtotime($_REQUEST['timestart']));
+        }elseif(isset($_REQUEST['timeend'])){
+            $map['login_time'] = array('lt',(strtotime($_REQUEST['timeend'])+ 24 * 60 * 60 - 1));
+        }
+        if (isset($_REQUEST['account'])) {
+            $map['user_account'] = array('like', '%' . trim($_REQUEST['account']) . '%');
+        }
 
-			$page = $page?$page:1;
+//            $map['login_time'] = array('neq', 0);
 
-			$row = $_REQUEST['row']?$_REQUEST['row']:10;
+        $page = intval($_REQUEST['p']);
 
-			$data = M('UserLoginRecord','tab_')
-                        ->where($map)->order('id desc')->select();
+        $page = $page?$page:1;
 
-			$xlsData = [];
+        $row = $_REQUEST['row']?$_REQUEST['row']:10;
 
-			foreach($data as $k => $v) {
 
-				$v['login_time'] = date('Y-m-d H:i:s',$v['login_time']);
-				$v['server_name'] = empty($v['server_name'])?'空':$v['server_name'];
+        //查询数量
+        $accessNum = M('UserLoginRecord','tab_')
+            ->where($map)->order('id desc')->count();
 
-				$gamename=trim(get_game_name($v['game_id'],'id'));
+        if ($accessNum > 1000000) {
+            echo "数据量过大，大于100万";die();
+        }
 
-				$v['game_name'] = empty($gamename)?($v['type']==2?'APP登录':'平台登录'):$gamename;
+        $csvFileName = $xlsName.'.csv';
+        //设置好告诉浏览器要下载excel文件的headers
+        header('Content-Description: File Transfer');
+        header('Content-Type: application/vnd.ms-excel');
+        header('Content-Disposition: attachment; filename="'. $csvFileName .'"');
+        header('Expires: 0');
+        header('Cache-Control: must-revalidate');
+        header('Pragma: public');
+        $fp = fopen('php://output', 'a');//打开output流
+        mb_convert_variables('GBK', 'UTF-8', $xlsCell);
+        fputcsv($fp, $xlsCell);//将数据格式化为CSV格式并写入到output流中
 
-				$xlsData[] = $v;
+        $perSize = 50000;//每次查询的条数
+        $pages   = ceil($accessNum / $perSize);
+        for($i = 1; $i <= $pages; $i++) {
 
-			}
+            $data = M('UserLoginRecord','tab_')
+                ->field("user_account,game_name,server_name,user_nickname,login_time,login_ip")
+                ->where($map)
+                ->limit(($i-1)*$perSize  ,$perSize)
+                ->order('id desc')
+                ->select();
 
+            foreach($data as $k => $v) {
 
-			$this->exportExcel($xlsName, $xlsCell, $xlsData);
+                $v['login_time'] = date('Y-m-d H:i:s',$v['login_time']);
+                $v['server_name'] = empty($v['server_name'])?'空':$v['server_name'];
 
-		}
+//                    $gamename=trim(get_game_name($v['game_id'],'id'));
+
+//                    $v['game_name'] = empty($gamename)?($v['type']==2?'APP登录':'平台登录'):$gamename;
+
+                $xlsData[] = $v;
+
+                mb_convert_variables('GBK', 'UTF-8', $v);
+                fputcsv($fp, $v);
+            }
+
+            unset($xlsData);//释放变量的内存
+            //刷新输出缓冲到浏览器
+            ob_flush();
+            flush();//必须同时使用 ob_flush() 和flush() 函数来刷新输出缓冲。
+        }
+//			$xlsData = [];
+
+        exit();
+
+
+//			$this->exportExcel($xlsName, $xlsCell, $xlsData);
+
+    }
 
 
 		/**

From ce86f56cc59c80dac5dd03729a7b3d1bd78fa503 Mon Sep 17 00:00:00 2001
From: chenxiaojun <956334972@qq.com>
Date: Thu, 28 Nov 2019 16:57:11 +0800
Subject: [PATCH 22/68] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=B9=B3=E5=8F=B0->?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=AE=A1=E7=90=86->=E5=85=85=E5=80=BC?=
 =?UTF-8?q?=E7=8E=A9=E5=AE=B6--=E6=97=B6=E9=97=B4=E6=A3=80=E7=B4=A2?=
 =?UTF-8?q?=E8=8C=83=E5=9B=B4=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Home/Controller/QueryController.class.php  | 4 ++--
 Application/Home/View/default/Query/userRecharges.html | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Application/Home/Controller/QueryController.class.php b/Application/Home/Controller/QueryController.class.php
index 75979e442..75b7bc1c5 100644
--- a/Application/Home/Controller/QueryController.class.php
+++ b/Application/Home/Controller/QueryController.class.php
@@ -1728,7 +1728,7 @@ class QueryController extends BaseController
         $begTime = strtotime($initBegTime);
         $endTime = strtotime($initEndTime);
         $endTime += 3600 * 24;
-        $nowTime = strtotime(date('Y-m-d 00:00:00', time()));
+        $nowTime = strtotime($nowTime);
 
         $promote = $this->getLoginPromote();
         $levelPromote = $this->getLevelPromote();
@@ -1843,7 +1843,7 @@ class QueryController extends BaseController
         $this->assign('initBegTime', $initBegTime);
         $this->assign('initEndTime', $initEndTime);
         $this->assign('sort', $sort);
-        $this->assign('setdate', $nowTime);
+        $this->assign('setdate', date('Y-m-d', $nowTime));
         $this->display('userRecharges');
     }
 
diff --git a/Application/Home/View/default/Query/userRecharges.html b/Application/Home/View/default/Query/userRecharges.html
index abc69c383..98b80d789 100644
--- a/Application/Home/View/default/Query/userRecharges.html
+++ b/Application/Home/View/default/Query/userRecharges.html
@@ -123,7 +123,7 @@
                     <i class="iconfont iconsort"></i>
                   </if>
                 </th>
-                <th class="sort" sort-name="recharge_cost_today">今日充值
+                <th class="sort" sort-name="recharge_cost_today">昨日充值
                   <if condition="'recharge_cost_today' == I('sort_name', '')">
                     <if condition="1 == $sort">
                       <i class="iconfont iconsort-down"></i>
@@ -201,6 +201,7 @@ $(function(){
     $(".select_gallery").select2();
 
     var date = "{$setdate}";
+    console.log(date);
     $('#sdate').datetimepicker({
         format: 'yyyy-mm-dd',
         language: "zh-CN",

From 9e9cff0ba37a29f9b57bcddc57c0e39a92d29b7f Mon Sep 17 00:00:00 2001
From: chenzhi <“chenzhi063@qq.com>
Date: Thu, 28 Nov 2019 16:58:33 +0800
Subject: [PATCH 23/68] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=88=87=E5=88=86?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Data/update.sql | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/Data/update.sql b/Data/update.sql
index 9fe8233fb..924ff99c5 100644
--- a/Data/update.sql
+++ b/Data/update.sql
@@ -595,4 +595,17 @@ CHANGE COLUMN `create_promote_id` `creator_id` int(11) NOT NULL DEFAULT 0 COMMEN
 ALTER TABLE `sys_shift_task` 
 ADD COLUMN `creator_type` tinyint(1) NOT NULL DEFAULT 0 COMMENT '创建者类型 0 后台管理员 1 推广员' AFTER `creator_id`;
 ALTER TABLE `tab_mend` 
-ADD COLUMN `op_type` tinyint(0) NOT NULL DEFAULT 0 COMMENT '0 管理员 1 推广员' AFTER `op_account`;
\ No newline at end of file
+ADD COLUMN `op_type` tinyint(0) NOT NULL DEFAULT 0 COMMENT '0 管理员 1 推广员' AFTER `op_account`;
+
+--补链新增切分时间 chenzhi
+UPDATE `sys_model` SET `list_grid` = 'id:编号
+user_account:账号
+user_nickname:昵称
+promote_id:推广员编号
+promote_account:推广员账号
+promote_id_to:修改后编号
+promote_account_to:修改后账号
+remark:备注
+create_time:时间
+op_account:操作人账号
+order_time:切分时间' WHERE `id` = 29;
\ No newline at end of file

From 81e56063c7bfbe524ec119e3d7e8b280bf8f00a9 Mon Sep 17 00:00:00 2001
From: chenzhi <“chenzhi063@qq.com>
Date: Thu, 28 Nov 2019 17:11:21 +0800
Subject: [PATCH 24/68] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8F=96=E6=B6=88?=
 =?UTF-8?q?=E8=A1=A5=E9=93=BE=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/Controller/MendController.class.php |  4 ++--
 Application/Admin/View/Mend/shiftInfo.html    | 22 +++++++++++++++++--
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/Application/Admin/Controller/MendController.class.php b/Application/Admin/Controller/MendController.class.php
index 16625e9d8..b4a22e062 100644
--- a/Application/Admin/Controller/MendController.class.php
+++ b/Application/Admin/Controller/MendController.class.php
@@ -132,9 +132,9 @@ class MendController extends ThinkController {
         $id  = I('id');
         $status = M('ShiftTask')->where(['id' => $id,'status' => 0])->save(['status' => 2]);
         if ($status) {
-            $this->success('取消补链成功', U('lists'), 2);
+            $this->ajaxReturn(array("status"=>1,"url"=> U('lists')));
         } else {
-            $this->error("取消失败，或补链已生效",U('lists'));
+            $this->ajaxReturn(array("status"=>0,"url"=> U('lists')));
         }
     }
 }
diff --git a/Application/Admin/View/Mend/shiftInfo.html b/Application/Admin/View/Mend/shiftInfo.html
index 768d1bd5c..050614e98 100644
--- a/Application/Admin/View/Mend/shiftInfo.html
+++ b/Application/Admin/View/Mend/shiftInfo.html
@@ -130,6 +130,7 @@
 <link href="__STATIC__/datetimepicker/css/dropdown.css" rel="stylesheet" type="text/css">
 <script type="text/javascript" src="__STATIC__/datetimepicker/js/bootstrap-datetimepicker.min.js"></script>
 <script type="text/javascript" src="__STATIC__/datetimepicker/js/locales/bootstrap-datetimepicker.zh-CN.js" charset="UTF-8"></script>
+<script src="__STATIC__/layer/layer.js" type="text/javascript"></script>
 <script type="text/javascript">
 
     var start = $("#bind_time").val();
@@ -151,8 +152,25 @@ Think.setValue("prmoote_id_to", {$data.promote_id|default = "''"});
 $('#submit').click(function(){
     //获取id
     var taskid = $(this).data("id");
-   
-    window.location.href = "{:U('Mend/cancelShift')}"+"&id="+taskid;
+    $.ajax({
+        type:"get",
+        dataType:"json",
+        url:"{:U('Mend/cancelShift')}"+"&id="+taskid,
+        success:function(data){
+            if(data.status == 1){
+                layer.msg('取消补链成功',function(){
+                    window.location.href = data.url;
+                });
+            }else{
+                layer.msg('取消补链失败，或补链已经生效无法取消') 
+            }
+        },
+        error:function(){
+            layer.msg('网络错误');
+        }
+    })
+    
+    // window.location.href = "{:U('Mend/cancelShift')}"+"&id="+taskid;
 });
 $(function(){
 	$('.time').datetimepicker({

From 192ad848977d9e0d18fe5bd899e8c8ef728ff62f Mon Sep 17 00:00:00 2001
From: liuweiwen <“529520975@qq.com>
Date: Thu, 28 Nov 2019 17:53:19 +0800
Subject: [PATCH 25/68] =?UTF-8?q?=E5=90=8E=E5=8F=B0-=E3=80=8B=E5=B9=B3?=
 =?UTF-8?q?=E5=8F=B0=E5=B8=81=E5=85=85=E5=80=BC=E5=AF=BC=E5=87=BA=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/Controller/ExportController.class.php | 7 ++++++-
 Application/Media/Controller/IndexController.class.php  | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php
index e6e6fb766..6e46c418f 100644
--- a/Application/Admin/Controller/ExportController.class.php
+++ b/Application/Admin/Controller/ExportController.class.php
@@ -1004,7 +1004,7 @@ class ExportController extends Controller
                     array('pay_amount', "充值平台币"),
                     array('pay_way', "充值方式", 'get_pay_way', '*'),
                     array('pay_ip', "充值ip"),
-                    array('create_time', "充值时间", 'time_format'),
+                    array('create_time', "充值时间"),
                     array('pay_status', L('Order_status'), 'get_info_status', '*', '9'),
                     array('', "共计充值{$total}"),
                 );
@@ -1012,6 +1012,10 @@ class ExportController extends Controller
                     ->where($map)
                     ->order('id DESC')
                     ->select();
+                foreach ($xlsData as $key => $value) {
+                    $xlsData[$key]['create_time'] = date('Y-m-d H:i:s', $value['create_time']);
+                }
+//                dd($xlsData);
                 break;
             case 9:
                 $xlsName = $xlsName?$xlsName:"平台币发放";
@@ -1542,6 +1546,7 @@ class ExportController extends Controller
             $xlsName = $xlsCell = $xlsData = [];
 
         }
+
         //数据处理
         foreach ($xlsData as $key => $val) {
             foreach ($xlsCell as $k => $v) {
diff --git a/Application/Media/Controller/IndexController.class.php b/Application/Media/Controller/IndexController.class.php
index 6c62afa6f..598b9a936 100644
--- a/Application/Media/Controller/IndexController.class.php
+++ b/Application/Media/Controller/IndexController.class.php
@@ -375,7 +375,7 @@ class IndexController extends BaseController {
                 S('index_reco',$reco);
             }
         }
-        $reco=game_merge($reco,$model['map']);
+        $reco = game_merge($reco,$model['map']);
         $this->assign('recommend',$reco);
 
 

From b764260647fa675d08d1a6d0653b5b41078c2dd8 Mon Sep 17 00:00:00 2001
From: liuweiwen <“529520975@qq.com>
Date: Thu, 28 Nov 2019 18:07:01 +0800
Subject: [PATCH 26/68] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E5=AE=98=E7=BD=91=E9=99=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/Controller/FileController.class.php | 2 --
 Application/Admin/View/Site/media.html                | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/Application/Admin/Controller/FileController.class.php b/Application/Admin/Controller/FileController.class.php
index 864003999..44f7c7a50 100644
--- a/Application/Admin/Controller/FileController.class.php
+++ b/Application/Admin/Controller/FileController.class.php
@@ -249,8 +249,6 @@ class FileController extends AdminController
             C("UPLOAD_{$file_driver}_CONFIG"),
             $_REQUEST['flag']
         ); //TODO:上传到远程服务器
-
-
         /* 记录图片信息 */
         if ($info) {
             $return['status'] = 1;
diff --git a/Application/Admin/View/Site/media.html b/Application/Admin/View/Site/media.html
index d65972025..6fcd1322c 100644
--- a/Application/Admin/View/Site/media.html
+++ b/Application/Admin/View/Site/media.html
@@ -171,7 +171,7 @@
 
 									"swf"             : "__STATIC__/uploadify/uploadify.swf",                      
 									
-									"fileObjName"     : "download",                      
+									"fileObjName"     : "download",
 									
 									"buttonText"      : "上传文档",                      
 									
@@ -181,7 +181,7 @@
 									
 									'removeTimeout'	  : 1,                      
 									
-									'fileTypeExts'	  : '*.doc; *.docx;',                      
+									'fileTypeExts'	  : '*',
 									
 									"onUploadSuccess" : uploadPicture{$field.name},                              
 									

From 95d55a37d7db117dbbd98a95dcb6cab99a4a06b5 Mon Sep 17 00:00:00 2001
From: liuweiwen <“529520975@qq.com>
Date: Thu, 28 Nov 2019 18:14:45 +0800
Subject: [PATCH 27/68] =?UTF-8?q?pc=E7=83=AD=E9=97=A8=E6=B8=B8=E6=88=8F?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=BB=8E=E6=8E=A8=E8=8D=90=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E7=83=AD=E9=97=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Media/Controller/IndexController.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Application/Media/Controller/IndexController.class.php b/Application/Media/Controller/IndexController.class.php
index 598b9a936..ddf4dd26a 100644
--- a/Application/Media/Controller/IndexController.class.php
+++ b/Application/Media/Controller/IndexController.class.php
@@ -361,7 +361,7 @@ class IndexController extends BaseController {
         $model = array(
             'm_name'=>'Game',
             'prefix'=>'tab_',
-            'map'   =>array('game_status'=>1,'recommend_status'=>1,'display_site'=>['like','%' . DISPLAY_SITE . '%']),
+            'map'   =>array('game_status'=>1,'recommend_status'=>2,'display_site'=>['like','%' . DISPLAY_SITE . '%']),
             'field' =>'*,min(id) as id',
             'order' =>'sort desc,id desc',
             'group' =>'relation_game_id',

From 3dddaf247dc34140ca4a62b1a7d43d805a0e899f Mon Sep 17 00:00:00 2001
From: liuweiwen <“529520975@qq.com>
Date: Thu, 28 Nov 2019 18:32:15 +0800
Subject: [PATCH 28/68] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E8=BF=98=E5=8E=9F?=
 =?UTF-8?q?=E6=B8=B8=E6=88=8F=E5=85=85=E5=80=BC=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/Controller/ExportController.class.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php
index b795cbbc9..16de07418 100644
--- a/Application/Admin/Controller/ExportController.class.php
+++ b/Application/Admin/Controller/ExportController.class.php
@@ -860,7 +860,11 @@ class ExportController extends Controller
                     $map['spend_ip'] = array('like', '%' . trim($_REQUEST['spend_ip']) . '%');
                     unset($_REQUEST['spend_ip']);
                 }
-
+                if (isset($_REQUEST['time-start']) && isset($_REQUEST['time-end'])) {
+                    $map['pay_time'] = array('BETWEEN', array(strtotime($_REQUEST['time-start']), strtotime($_REQUEST['time-end']) + 24 * 60 * 60 - 1));
+                    unset($_REQUEST['time-start']);
+                    unset($_REQUEST['time-end']);
+                }
                 if (isset($_REQUEST['timestart']) && isset($_REQUEST['timeend'])) {
                     $map['pay_time'] = array('BETWEEN', array(strtotime($_REQUEST['timestart']), strtotime($_REQUEST['timeend']) + 24 * 60 * 60 - 1));
                     unset($_REQUEST['timestart']);

From b012ec2bafb698bed2a1abd1b5cb5bc98dd924ad Mon Sep 17 00:00:00 2001
From: sunke <18850253506@163.com>
Date: Fri, 29 Nov 2019 10:23:08 +0800
Subject: [PATCH 29/68] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=90=88=E8=AE=A1?=
 =?UTF-8?q?=E4=B8=8B=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controller/DownloadController.class.php   | 34 +++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)

diff --git a/Application/Home/Controller/DownloadController.class.php b/Application/Home/Controller/DownloadController.class.php
index c3961f507..d9104acdd 100644
--- a/Application/Home/Controller/DownloadController.class.php
+++ b/Application/Home/Controller/DownloadController.class.php
@@ -1854,7 +1854,13 @@ class DownloadController extends BaseController {
             ->group('tab_apply.game_id')
             ->order('g.sort desc,g.id desc')
             ->select();
-
+        $allGameIs = M('Apply', 'tab_')
+            ->field('distinct tab_apply.game_id')
+            ->join('tab_game as g on g.id = tab_apply.game_id')
+            ->join($serverJoin)
+            ->where($map)
+            ->select();
+        $allGameIs = array_column($allGameIs, 'game_id');
         $records = [];
          if (!empty($data)) {  
             if (intval($endTime - $begTime) / (24 * 3600) <= 30) {
@@ -1902,6 +1908,30 @@ class DownloadController extends BaseController {
                         'spend_voucher' => 0,
                     ];
                 }
+                $params['all_data'] = 1;
+                $params['game_ids'] = $allGameIs;
+                $allData['game_name'] = "合计";
+                $allData['sdk_version'] = '--';
+                $allData['role_num'] = $userRepository->getCreateRoleCountByGame($params);//创角数
+                $allData['user_num'] = $userRepository->getCreateRoleUserCountByGame($params);//创角用户
+                $allData['new_user_num'] = $userRepository->getNewCreateRoleUserCountByGame($params);//新创角用户
+                $allData['new_device_num'] = $userRepository->getNewCreateRoleDeviceCountByGame($params);//新创角设备
+                $allData['new_ip_num'] = $userRepository->getNewCreateRoleIpCountByGame($params);//新创角IP
+                $allData['login_user_num'] = $userRepository->getLoginCountGroupByGame($params);//登录用户数
+                $allData['spend_user_num'] = $spendRepository->getPayUserCountByGame($params);//充值人数
+                $allData['spend_num'] = $spendRepository->getPayCountByGame($params);//充值次数
+                unset($params['pay_way']);
+                $allData['spend_all_amount'] = null_to_0($spendRepository->getPayAmountByGameAndType($params));//充值总额
+                $params['pay_way'] = ['in', '1,2,3,4,5,6'];
+                $allData['spend_cash'] = null_to_0($spendRepository->getPayAmountByGameAndType($params));//现金充值
+                $params['pay_way'] = 0;
+                $allData['spend_generic'] = null_to_0($spendRepository->getPayAmountByGameAndType($params));//通用币充值
+                $params['pay_way'] = -1;
+                $allData['spend_binding'] = null_to_0($spendRepository->getPayAmountByGameAndType($params));//绑定币充值
+                $allData['spend_discount'] = '0.00';
+                $allData['spend_voucher'] = '0.00';
+                $records[] = $allData;  
+                
             }
         }
 
@@ -2797,7 +2827,7 @@ class DownloadController extends BaseController {
 		array('role_level','等级'),
         array('recharge_cost','充值总额'),          
         array('recharge_count','充值次数'),
-        array('recharge_cost_today','今日充值'),
+        array('recharge_cost_today','昨日充值'),
         array('unlogin_day','未登录天数'),
         array('play_time','最后登录时间'),
         array('promote_account','推广员账号'),

From e8477373ff380e53405c72fa7e6d0b7eaac8a0db Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Fri, 29 Nov 2019 10:47:32 +0800
Subject: [PATCH 30/68] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E8=84=9A=E6=9C=ACbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/Controller/TimingController.class.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/Application/Admin/Controller/TimingController.class.php b/Application/Admin/Controller/TimingController.class.php
index 5cd2b799a..2a089ff0e 100644
--- a/Application/Admin/Controller/TimingController.class.php
+++ b/Application/Admin/Controller/TimingController.class.php
@@ -141,9 +141,15 @@ class TimingController extends AdminController {
             //当日新增设备
             $newSql = M('device_record','tab_')->field('min(create_time) as create_time,model,unique_code,id')->where(['version'=>1])->group('unique_code')->select(false);
             $data['new_device'] = M('device_record','tab_')->table('(' . $newSql . ') as a')->where(['create_time'=>array('between',[$startTime,$startTime+86399])])->order('create_time')->count();
+            $data['time'] = $startTime;
 
             echo $data['new_device'].' ';
 
+            $duration = $this->duration(['create_time'=>array('between',[$startTime-86400*7,$startTime-1])]);
+            $newSqls = M('device_record','tab_')->field('min(create_time) as create_time,model,unique_code,id')->group('unique_code')->select(false);
+            $data['duration7'] = ($duration/M('device_record','tab_')->table('(' . $newSqls . ') as a')->where(['create_time'=>array('between',[$startTime-86400*7,$startTime-1])])->order('create_time')->count())/7;
+            $data['version'] = 1;
+
             $getStatistics = M('device_statistics','tab_')->where(['time'=>$startTime,'version'=>1])->find();
             echo "\n";
             if (!$getStatistics) {
@@ -151,13 +157,14 @@ class TimingController extends AdminController {
             } else {
                 M('device_statistics','tab_')->where(['time'=>$startTime,'version'=>1])->save($data);
             }
-
+            $data['duration7'] = 0;
             echo date("Y-m-d",$startTime).' 苹果 ';
             //当日新增设备
             $newSql = M('device_record','tab_')->field('min(create_time) as create_time,model,unique_code,id')->where(['version'=>2])->group('unique_code')->select(false);
             $data['new_device'] = M('device_record','tab_')->table('(' . $newSql . ') as a')->where(['create_time'=>array('between',[$startTime,$startTime+86399])])->order('create_time')->count();
 
             echo $data['new_device'].' ';
+            $data['version'] = 2;
 
             $getStatistics = M('device_statistics','tab_')->where(['time'=>$startTime,'version'=>2])->find();
             echo "\n";

From 9e26a06ed295a99fd49dcace96a6783db7309f15 Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Fri, 29 Nov 2019 10:55:52 +0800
Subject: [PATCH 31/68] =?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/StatController.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Application/Admin/Controller/StatController.class.php b/Application/Admin/Controller/StatController.class.php
index 3f3ee2da9..a9c341bec 100644
--- a/Application/Admin/Controller/StatController.class.php
+++ b/Application/Admin/Controller/StatController.class.php
@@ -1375,7 +1375,7 @@ class StatController extends ThinkController
             $model = M('device_statistics','tab_');
 
 		    if ($type == 0) {
-		        $return = $model->sum('new_device');
+		        $return = $model->where(['time'=>['neq',0]])->sum('new_device');
 //                $return = $device->all_device();
             } else if($type == 1) {
                 $return = $model->where(['time'=>array('between',[$todaystart,$todaystart+86399])])->sum('new_device');

From 9568f390baf8f19b9b1343dc8fdf4b31ca4e921e Mon Sep 17 00:00:00 2001
From: liuweiwen <“529520975@qq.com>
Date: Fri, 29 Nov 2019 11:25:58 +0800
Subject: [PATCH 32/68] =?UTF-8?q?=E6=96=B0=E7=89=88=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

---
 .../Home/View/default/Home/landingPage.html   | 333 +++++++++++++++---
 1 file changed, 285 insertions(+), 48 deletions(-)

diff --git a/Application/Home/View/default/Home/landingPage.html b/Application/Home/View/default/Home/landingPage.html
index 2a31f76fb..78b2e994e 100644
--- a/Application/Home/View/default/Home/landingPage.html
+++ b/Application/Home/View/default/Home/landingPage.html
@@ -4,19 +4,19 @@
   <meta itemprop="name" content="{$game['relation_game_name']}"/>
   <meta itemprop="image" content="{$game['icon']}"/>
   <meta name="description" itemprop="description" content="{$game['features']}"/>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1">
-  <script type="text/javascript" src="__JS__/jquery-1.11.1.min.js"></script>
-  <script type="text/javascript" src="https://res2.wx.qq.com/open/js/jweixin-1.4.0.js"></script>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <meta http-equiv="X-UA-Compatible" content="ie=edge">
   <link href="{:get_cover(C('CH_SET_ICO'),'path')}" type="image/x-icon" rel="shortcut icon">
+  <script src="__JS__/jquery-1.11.3.min.js"></script>
+  <script type="text/javascript" src="__JS__/getRem.js"></script>
+  <script type="text/javascript" src="__JS__/swiper.min.js"></script>
+  <link rel="stylesheet" type="text/css" href="__CSS__/swiper.min.css">
+  <link rel="stylesheet" type="text/css" href="__CSS__/reset.css">
+  <link rel="stylesheet" type="text/css" href="__CSS__/index2.css">
   <title>{$game['relation_game_name']}</title>
-  <link rel="stylesheet" href="__CSS__/20180207/promition.css">
-  <link rel="stylesheet" href="__CSS__/20180207/game.css">
-  <link href="__STATIC__/ios9/css/common.css" rel="stylesheet" type="text/css">
-  <link rel="stylesheet" href="__CSS__/landing_page.css">
 </head>
-<body class="main_bg" style="background-color: #0a0a0a;height: auto;">
+<body>
 <input type="hidden" name="title" value="{$game['relation_game_name']}">
 <input type="hidden" name="icon" value="{$game['icon']}">
 <input type="hidden" name="desc" value="{$game['features']}">
@@ -30,47 +30,286 @@
 <?php endif;?>
 <?php endif;?>
 
-<div class="h_wrap">
-  <div id="data-2">
-    <volist name="game['flooring_page_imgs']" id="item">
-      <?php if ($downloadUrl == 'https://'.$_SERVER['HTTP_HOST']) :?>
-      <a href="#" class="no-package"><img src="{$item}" style="width: 100%;"/></a>
-      <?php else :?>
-      <a href="javascript:;" class="down-link" down-link="{$downloadUrl}"><img src="{$item}" style="width: 100%;"/></a>
-      <?php endif ;?>
-    </volist>
+
+<div class="home">
+  <div class="home-box">
+    <div class="heard">
+      <img src="{$game['icon']}" alt="">
+      <div class="right">
+        <div>{$game['relation_game_name']}</div>
+        <div>{$game['features']}</div>
+        <div>
+          <?php if ($downloadUrl == 'https://'.$_SERVER['HTTP_HOST']) :?>
+          <div class="download">免费安装</div>
+          <?php else :?>
+          <div class="download">免费安装</div>
+          <?php endif ;?>
+          <img src="__IMG__/wenhao.png" class="doubt" alt="">
+        </div>
+      </div>
+    </div>
+    <div class="evaluate">
+      <div class="evaluate-box">
+        <div class="number">
+          <span>{$game['game_score']}</span>
+          <div class="start">
+            <img src="__IMG__/start1.png" alt="">
+            <img src="__IMG__/start1.png" alt="">
+            <img src="__IMG__/start1.png" alt="">
+            <img src="__IMG__/start1.png" alt="">
+            <img src="__IMG__/start.png" alt="">
+          </div>
+        </div>
+        <div class="grade">14.48K个评分</div>
+      </div>
+      <div class="evaluate-box">
+        <span>#{$game['recommend_level']}</span>
+        <div class="grade">网络游戏</div>
+      </div>
+      <div class="evaluate-box">
+        <span>16+</span>
+        <div class="grade">年龄</div>
+      </div>
+    </div>
+    <div class="slide_list">
+      <ul class="slide-box">
+        <volist name="game['flooring_page_imgs']" id="item">
+          <li class="slide-item">
+            <img src="{$item}" alt="">
+          </li>
+        </volist>
+      </ul>
+    </div>
+    <div class="synopsis">
+      <div>简介</div>
+      <div id="brief_introduction">{$game['features']}</div>
+      <div id="look_more">
+        <div class="bg-blur"></div>
+        <div class="more">查看更多</div>
+      </div>
+    </div>
+    <div class="appraisal">
+      <div class="title">评分及评论</div>
+      <div class="appraisal-box">
+        <div class="left">
+          <span>{$game['game_score']}</span>
+          <span>满分5分</span>
+        </div>
+        <div class="right">
+          <div class="start-number">
+            <div class="start">
+              <img src="__IMG__/start1.png" alt="">
+              <img src="__IMG__/start1.png" alt="">
+              <img src="__IMG__/start1.png" alt="">
+              <img src="__IMG__/start1.png" alt="">
+              <img src="__IMG__/start1.png" alt="">
+            </div>
+            <div class="strip">
+              <div style="width: 2.77rem;"></div>
+            </div>
+          </div>
+          <div class="start-number">
+            <div class="start">
+              <img src="__IMG__/start1.png" alt="">
+              <img src="__IMG__/start1.png" alt="">
+              <img src="__IMG__/start1.png" alt="">
+              <img src="__IMG__/start1.png" alt="">
+            </div>
+            <div class="strip">
+              <div style="width: 0.24rem;"></div>
+            </div>
+          </div>
+          <div class="start-number">
+            <div class="start">
+              <img src="__IMG__/start1.png" alt="">
+              <img src="__IMG__/start1.png" alt="">
+              <img src="__IMG__/start1.png" alt="">
+            </div>
+            <div class="strip">
+              <div style="width: 0.06rem;"></div>
+            </div>
+          </div>
+          <div class="start-number">
+            <div class="start">
+              <img src="__IMG__/start1.png" alt="">
+              <img src="__IMG__/start1.png" alt="">
+            </div>
+            <div class="strip">
+              <div style="width: 0.04rem;"></div>
+            </div>
+          </div>
+          <div class="start-number">
+            <div class="start">
+              <img src="__IMG__/start1.png" alt="">
+            </div>
+            <div class="strip">
+              <div style="width: 0;"></div>
+            </div>
+          </div>
+          <div class="mark">14.48K个评分</div>
+        </div>
+      </div>
+    </div>
+    <div class="device">
+      <div class="title">新功能</div>
+      <div class="soon-title">更新说明：</div>
+      <div class="del">1、优化用户体验</div>
+    </div>
+    <div class="information">
+      <div class="title">信息</div>
+      <div class="data-box">
+        <span>大小</span>
+        <div>{$game['game_size']}MB</div>
+      </div>
+      <div class="data-box">
+        <span>类别</span>
+        <div>游戏</div>
+      </div>
+      <div class="data-box">
+        <span>语言</span>
+        <div>英语，简体中文</div>
+      </div>
+      <div class="data-box">
+        <span>年龄分级</span>
+        <div>限16岁以上</div>
+      </div>
+      <div class="data-box">
+        <span>价格</span>
+        <div>免费</div>
+      </div>
+      <div class="privacy">隐私政策</div>
+    </div>
+  </div>
+  <div class="foot">
+    <div>
+      <div>闽ICP备19000000号-0</div>
+      <div>闽网文{2019}1554-099号</div>
+    </div>
+    <div>抵制不良游戏，拒绝盗版游戏。注意自我保护，谨防受骗上当。</div>
+    <div>适度游戏益脑，沉迷游戏伤身。合理安排时间，享受健康生活。</div>
   </div>
 </div>
-<script src="__STATIC__/layer/layer.js"></script>
-<script src="__STATIC__/ios9/js/layer/layer.js?VerNo=20190923" type="text/javascript"></script>
-<script type="text/javascript">
-  $('.down-link').on('click', function () {
-    if ($('.bn-rule').length > 0) {
-      $('.bn-rule').css('display','block')
-      $('.bn-rule').css('z-index','12')
-      return
-    }
-    if ($('input[name=isNewIos]').val() == 0 && $('input[name=isIOS13]').val() == 1) {
-      if (parseInt("{:I('get.status', 0)}") > 0) {
-        location.href = "{:U('iosDown',array('gid'=>$apply['game_id'],'pid'=>$apply['promote_id'],'status'=>1))}"
-        return
-      } else {
-        layer.confirm('请先到官网注册', {title: '提示'}, function () {
-          location.href = "/mobile.php?s=/User/login/pid/" + "{$apply.promote_id}" + "/gid/" + "{$apply.game_id}" + ".html"
-        })
-        return
-      }
+
+<div class="window" style="display: none;">
+  <div class="containner">
+    <div class="containner-box">
+      <div class="text"> 购买至尊下载，赠送限量至尊超级礼包（价值100元）</div>
+      <div class="text">• 至尊下载：永不闪退、不丢数据稳定有保障</div>
+      <div class="text"> • 同一设备安装一次可在一年内无限次下载重装</div>
+      <div class="blue-btn" onclick="location.href='mobile.php/Ssg/pay/game_id/{$game[\'id\']}/promote_id/{$promoteId}'">￥10至尊下载</div>
+      <div class="gray-btn" onclick="location.href='{$downloadUrl}'">普通下载</div>
+    </div>
+  </div>
+</div>
+<div class="second" style="display: none;">
+  <div class="second-box">
+    <div class="title">升级IOS9后，游戏打不开怎么办</div>
+    <div class="carousel">
+      <div class="swiper-container">
+        <div class="swiper-wrapper">
+          <div class="swiper-slide">
+            <div class="swiper-slide-box">
+              <div>一、游戏安装完毕，点击游戏图标弹出如下提示：</div>
+              <div class="slide-img">
+                <img src="__IMG__/1.png" alt="" style=" height: 2.86rem;">
+                <img src="__IMG__/box-scroll.png" alt="" class="case">
+              </div>
+            </div>
+          </div>
+          <div class="swiper-slide">
+            <div class="swiper-slide-box">
+              <div>二、进入[设置] - [通用] - [描述文件]：找到对应证书名称</div>
+              <div class="slide-img">
+                <img src="__IMG__/2.png" alt="" style="height: 2.75rem;">
+                <img src="__IMG__/box-scroll.png" alt="" class="case">
+              </div>
+            </div>
+          </div>
+          <div class="swiper-slide">
+            <div class="swiper-slide-box">
+              <div>三、信任当前证书</div>
+              <div class="slide-img">
+                <img src="__IMG__/3.png" alt="" style="height: 2.06rem;">
+                <img src="__IMG__/box-scroll.png" alt="" class="case">
+              </div>
+            </div>
+          </div>
+          <div class="swiper-slide">
+            <div class="swiper-slide-box">
+              <div>四、下载过程中若出现以下情况，请检查网络和内存再次尝试下载</div>
+              <div class="slide-img">
+                <img src="__IMG__/4.png" alt="" style="height: 2.88rem;">
+                <img src="__IMG__/box-scroll.png" alt="" class="case">
+              </div>
+            </div>
+          </div>
+          <div class="swiper-slide">
+            <div class="swiper-slide-box">
+              <div>五、如果您已验证并正常体验游戏，一段时间后，点击游戏图标再次出现信任提示且无法信任时，请卸载游戏包，重新安装游戏验证</div>
+            </div>
+          </div>
+        </div>
+        <!-- Add Pagination -->
+        <div class="swiper-pagination"></div>
+      </div>
+    </div>
+    <div class="blue-btn">点我去信任</div>
+  </div>
+</div>
+</body>
+</html>
+<script>
+  $(function(){
+    if ($("#brief_introduction").length<80) {
+      $("#look_more").hide();
     }
-    var downLink = $(this).attr('down-link')
-    location.href = downLink
-  });
+    $(".more").click(function(){
+      $("#look_more").hide();
+      $("#brief_introduction").css("overflow", "visible");
+    });
 
-  $('.no-package').click(function() {
-    layer.msg('暂无下载', {
-      icon: 7,
-      time: 2000
+    function swiperGet(){
+      var swiper = new Swiper('.swiper-container', {
+        loop: true,
+        // autoplay: img > 1,
+        pagination: {
+          el: '.swiper-pagination',
+          clickable: true,
+        },
+        autoplay: {
+          delay: 3000,
+          stopOnLastSlide: false,
+          disableOnInteraction: false,
+        },
+      });
+    };
+    swiperGet();
+    $(".download").click(function(){
+      $(".window").show();
+      document.body.style.overflow = 'hidden';
+    });
+    $(".window").click(function(){
+      $(".window").hide();
+      document.body.style.overflow = 'auto';
+    });
+    $(".gray-btn").click(function(){
+      event.stopPropagation();
+      $(".second").show();
+      swiperGet();
+      document.body.style.overflow = 'hidden';
+      $(".window").hide();
     })
-  })
+    $(".second").click(function(){
+      $(".second").hide();
+      document.body.style.overflow = 'auto';
+    })
+    $(".doubt").click(function(){
+      $(".second").show();
+      document.body.style.overflow = 'hidden';
+      swiperGet();
+    })
+  });
+
   $.ajax({
     url: "{:U('Home/generateWechatSign')}",
     dataType: 'json',
@@ -130,5 +369,3 @@
     });
   }
 </script>
-</body>
-</html>
\ No newline at end of file

From 8fd70a94e7f82106b6334a8506ee513bb35c022b Mon Sep 17 00:00:00 2001
From: liuweiwen <“529520975@qq.com>
Date: Fri, 29 Nov 2019 11:47:13 +0800
Subject: [PATCH 33/68] =?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 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Application/Home/View/default/Home/landingPage.html b/Application/Home/View/default/Home/landingPage.html
index 78b2e994e..34372a598 100644
--- a/Application/Home/View/default/Home/landingPage.html
+++ b/Application/Home/View/default/Home/landingPage.html
@@ -9,6 +9,7 @@
   <meta http-equiv="X-UA-Compatible" content="ie=edge">
   <link href="{:get_cover(C('CH_SET_ICO'),'path')}" type="image/x-icon" rel="shortcut icon">
   <script src="__JS__/jquery-1.11.3.min.js"></script>
+  <script type="text/javascript" src="https://res2.wx.qq.com/open/js/jweixin-1.4.0.js"></script>
   <script type="text/javascript" src="__JS__/getRem.js"></script>
   <script type="text/javascript" src="__JS__/swiper.min.js"></script>
   <link rel="stylesheet" type="text/css" href="__CSS__/swiper.min.css">

From 1bd90da91417b97bd7a3d18cdbcac771e7575dcb Mon Sep 17 00:00:00 2001
From: liuweiwen <“529520975@qq.com>
Date: Fri, 29 Nov 2019 12:12:35 +0800
Subject: [PATCH 34/68] =?UTF-8?q?=E3=80=90=E7=BB=9F=E8=AE=A1=E3=80=91-?=
 =?UTF-8?q?=E3=80=90=E6=95=B0=E6=8D=AE=E5=88=86=E6=9E=90=E3=80=91-?=
 =?UTF-8?q?=E3=80=90ARPU=E5=88=86=E6=9E=90=E3=80=91=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/Controller/StatController.class.php | 56 +++++++++++++++----
 1 file changed, 44 insertions(+), 12 deletions(-)

diff --git a/Application/Admin/Controller/StatController.class.php b/Application/Admin/Controller/StatController.class.php
index a9c341bec..325a530f8 100644
--- a/Application/Admin/Controller/StatController.class.php
+++ b/Application/Admin/Controller/StatController.class.php
@@ -604,7 +604,11 @@ class StatController extends ThinkController
                     ->where($map)
                     ->group('user_id')
                     ->find();
-                $data[$key]['keep_num'] = round($num['num']/$data[$key]['register_num'],4)*100;
+                if (!empty($data[$key]['register_num'])) {
+                    $data[$key]['keep_num'] = round($num['num']/$data[$key]['register_num'],4)*100;
+                } else {
+                    $data[$key]['keep_num'] = 0;
+                }
                 //充值
                 $map = $map_list;
                 empty($game_name ) || $map['game_name'] = array('like','%'.$game_name.'%');
@@ -638,12 +642,24 @@ class StatController extends ThinkController
 
                 $data[$key]['new_pop'] = $query[0]['num'];
                 //付费率
-                $data[$key]['spend_rate'] = round($data[$key]['spend_people']/$data[$key]['act_user'],4)*100;
+                if (!empty($data[$key]['act_user'])) {
+                    $data[$key]['spend_rate'] = round($data[$key]['spend_people']/$data[$key]['act_user'],4)*100;
+                } else {
+                    $data[$key]['spend_rate'] = 0;
+                }
                 //ARPU
-                $data[$key]['ARPU'] = round($data[$key]['spend']/$data[$key]['act_user'],2);
-                //ARPPU
-                $data[$key]['ARPPU'] = round($data[$key]['spend']/$data[$key]['spend_people'],2);
+                if (!empty($data[$key]['act_user'])) {
+                    $data[$key]['ARPU'] = round($data[$key]['spend']/$data[$key]['act_user'],2);
+                } else {
+                    $data[$key]['ARPU'] = 0;
+                }
 
+                //ARPPU
+                if (!empty($data[$key]['spend_people'])) {
+                    $data[$key]['ARPPU'] = round($data[$key]['spend']/$data[$key]['spend_people'],2);
+                } else {
+                    $data[$key]['ARPPU'] = 0;
+                }
                 //累计付费玩家
                 $map = $map_list;
 								empty($hasbindcoins) || $map['pay_way'] = $hasbindcoins['pay_way'];
@@ -1144,7 +1160,11 @@ class StatController extends ThinkController
                 ->join("right join tab_user_login_record as ur on ur.user_id = tab_user.id and FROM_UNIXTIME(ur.login_time,'%Y-%m-%d') = '{$login_time}'")
                 ->where($mapl)
                 ->find();
-            $data[$key]['keep_num'] = round($num['num']/$data[$key]['register_num'],4)*100;
+            if (!empty($data[$key]['register_num'])) {
+                $data[$key]['keep_num'] = round($num['num']/$data[$key]['register_num'],4)*100;
+            } else {
+                $data[$key]['keep_num'] = 0;
+            }
             //充值
             $mapl = $map_list;
             empty($game_name ) || $mapl['game_name'] = array('like','%'.$game_name.'%');
@@ -1157,15 +1177,26 @@ class StatController extends ThinkController
             //付费玩家数
             $data[$key]['spend_people'] = $spend['people'];
             //付费率
-            $data[$key]['spend_rate'] = round($data[$key]['spend_people']/$data[$key]['act_user'],4)*100;
+            if (!empty($data[$key]['act_user'])) {
+                $data[$key]['spend_rate'] = round($data[$key]['spend_people']/$data[$key]['act_user'],4)*100;
+            } else {
+                $data[$key]['spend_rate'] = 0;
+            }
             //ARPU
-            $data[$key]['ARPU'] = round($data[$key]['spend']/$data[$key]['act_user'],2);
+            if (!empty($data[$key]['act_user'])) {
+                $data[$key]['ARPU'] = round($data[$key]['spend']/$data[$key]['act_user'],2);
+            } else {
+                $data[$key]['ARPU'] = 0;
+            }
             //ARPPU
-            $data[$key]['ARPPU'] = round($data[$key]['spend']/$data[$key]['spend_people'],2);
-            if($data[$key]['register_num']==0&&$data[$key]['act_user']==0&&$data[$key]['keep_num']==0&&$data[$key]['spend']==0&&$data[$key]['spend_people']==0){
-                unset($data[$key]);
+            if (!empty($data[$key]['spend_people'])) {
+                $data[$key]['ARPPU'] = round($data[$key]['spend']/$data[$key]['spend_people'],2);
+            } else {
+                $data[$key]['ARPPU'] = 0;
             }
-
+//            if($data[$key]['register_num']==0&&$data[$key]['act_user']==0&&$data[$key]['keep_num']==0&&$data[$key]['spend']==0&&$data[$key]['spend_people']==0){
+//                unset($data[$key]);
+//            }
         }
         $count=count($data);
         if($count > $row){
@@ -1180,6 +1211,7 @@ class StatController extends ThinkController
         $this->assign('list_data',$data);
         $this->display();
     }
+
     function game_analysis(){
         if($_REQUEST['time-start']!=''&&$_REQUEST['time-end']!=''){
             $start=$_REQUEST['time-start'];

From b61587868bcd13232b4c5da0dcdb0a72ac5d3211 Mon Sep 17 00:00:00 2001
From: liuweiwen <“529520975@qq.com>
Date: Fri, 29 Nov 2019 12:22:21 +0800
Subject: [PATCH 35/68] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=B9=BF=E5=91=8A?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/Controller/FileController.class.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Application/Admin/Controller/FileController.class.php b/Application/Admin/Controller/FileController.class.php
index 44f7c7a50..0e1304463 100644
--- a/Application/Admin/Controller/FileController.class.php
+++ b/Application/Admin/Controller/FileController.class.php
@@ -209,9 +209,9 @@ class FileController extends AdminController
         ); //TODO:上传到远程服务器
 
         // 添加水印
-        if ($_REQUEST['flag']) {
-            $this->addWatermarkOnPic($info['download']);
-        }
+//        if ($_REQUEST['flag']) {
+//            $this->addWatermarkOnPic($info['download']);
+//        }
 
         /* 记录图片信息 */
         if ($info) {

From 56d3718c14b6b67d802b237029e2d3ebace37ba6 Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Fri, 29 Nov 2019 14:15:42 +0800
Subject: [PATCH 36/68] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controller/MemberController.class.php     |  9 +++-
 .../Admin/View/Member/login_record.html       | 42 +++++++++++++++++++
 2 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/Application/Admin/Controller/MemberController.class.php b/Application/Admin/Controller/MemberController.class.php
index afde5599c..8f064b6a8 100644
--- a/Application/Admin/Controller/MemberController.class.php
+++ b/Application/Admin/Controller/MemberController.class.php
@@ -788,13 +788,20 @@ class MemberController extends ThinkController
             $map['server_name'] = $_REQUEST['server_name'];
             unset($_REQUEST['server_name']);
         }
+        if (isset($_REQUEST['promote_id'])) {
+            $map['promote_id'] = $_REQUEST['promote_id'];
+            unset($_REQUEST['promote_id']);
+        }
         // $map['type'] = 1;
         // $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);
+        $sql = "select count(user_id) as count from ({$count})t";
+        $count = M('UserLoginRecord','tab_')->query($sql);
 
         $this->m_title = '登录记录';
+        $this->assign('user_count',$count[0]['count']);
         $this->assign('commonset', M('Kuaijieicon')->where(['url' => 'Member/login_record', 'status' => 1])->find());
 
         parent::lists("UserLoginRecord", $p, $extend['map']);
diff --git a/Application/Admin/View/Member/login_record.html b/Application/Admin/View/Member/login_record.html
index 93fd046e7..8de70f9e1 100644
--- a/Application/Admin/View/Member/login_record.html
+++ b/Application/Admin/View/Member/login_record.html
@@ -90,6 +90,21 @@
             <div class="input-list">
                 <input type="text" name="login_ip" class="" placeholder="登录IP" value="{:I('login_ip')}">
             </div>
+            <div class="input-list search_item input-list-gamenoticestatus">
+                <select name="promote_level" style="color:#444" class="select_gallery" id="promote_level">
+                    <option value="">请选择推广员等级</option>
+                    <option value="1" <?php if ($_POST['promote_level'] == 1):?>selected<?php endif;?>>会长</option>
+                    <option value="2" <?php if ($_POST['promote_level'] == 2):?>selected<?php endif;?>>部门长</option>
+                    <option value="3" <?php if ($_POST['promote_level'] == 3):?>selected<?php endif;?>>组长</option>
+                    <option value="4" <?php if ($_POST['promote_level'] == 4):?>selected<?php endif;?>>组员</option>
+                </select>
+                -
+            </div>
+            <div class="input-list search_item input-list-gamenoticestatus">
+                <select name="promote_id" style="color:#444" class="select_gallery" id="promote_id">
+                    <option value="">请选择推广员</option>
+                </select>
+            </div>
             <div class="input-list">
                 <a class="sch-btn" href="javascript:;" id="search"
                    url="{:U('Member/login_record','model='.$model['name'] . '&row=' . I('row'),false)}">
@@ -139,6 +154,10 @@
                             </td>
                         </tr>
                     </volist>
+                    <tr>
+                        <td colspan="2">合计</td>
+                        <td colspan="4">&#12288;&#12288;登录玩家：{$user_count}人 </td>
+                    </tr>
                 </empty>
                 </tbody>
             </table>
@@ -178,6 +197,7 @@
         highlight_subnav("{:U('Member/login_record')}");
 
         $(function () {
+
             <volist name = ":I('get.')" id = "vo" > Think.setValue('{$key}', "{$vo}");
             </volist >
             $(".select_gallery").select2();
@@ -276,6 +296,28 @@
                 $("#game_type").change();
             });
             $("#game_name").change();
+
+            var promote_id = "{:I('promote_id')}";
+            $("#promote_level").change(function(){
+                $.ajax({
+                    url:"{:U('Ajax/getPromotersByLevel')}",
+                    type:"get",
+                    data:{level:$("#promote_level option:selected").val()},
+                    dataType:'json',
+                    success:function(response){
+                        str = '<option value="">请选择推广员</option><option value="0"'+(promote_id && 0 == promote_id?'selected':'')+'>官方渠道</option>';
+                        data = response.data;
+                        for (var i in data){
+                            str += "<option value='"+data[i].id+"' "+(promote_id && data[i].id == promote_id?'selected':'')+">"+data[i].nickname+"</option>"
+                        }
+                        $("#promote_id").empty();
+                        $("#promote_id").append(str);
+                        $("#promote_id").select2();
+                    }
+                })
+            });
+            $("#promote_level").change();
+
         })
     </script>
 </block>

From 324e880056bf592b3e5a4bbe5a4a19719f57cafb Mon Sep 17 00:00:00 2001
From: chenxiaojun <956334972@qq.com>
Date: Fri, 29 Nov 2019 15:03:56 +0800
Subject: [PATCH 37/68] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=B9=B3=E5=8F=B0->?=
 =?UTF-8?q?=E6=B8=B8=E6=88=8F=E7=AE=A1=E7=90=86--=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=A4=8D=E5=88=B6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Home/View/default/Apply/my_game.html      | 24 ++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/Application/Home/View/default/Apply/my_game.html b/Application/Home/View/default/Apply/my_game.html
index 33dff8572..993edaaef 100644
--- a/Application/Home/View/default/Apply/my_game.html
+++ b/Application/Home/View/default/Apply/my_game.html
@@ -11,6 +11,14 @@
     .btn-role-border {
       border-left: 0;
     }
+    .clipboard-btn {
+      width: 60px;
+      height: 28px;
+      border: 0;
+      border-radius: 3px;
+      color: #fff;
+      background-color: #3A97FF;
+    }
   </style>
 </block>
 
@@ -260,13 +268,13 @@
         <div class="game-window-content-eveyone" style="display: block;color: #3A97FF;font-size: 1.1rem;">
           <label style="margin-right: 20px;">下载地址:</label>
           <span id="game_link_address" style="word-wrap: break-word;white-space: normal;"></span>
-          <button id="clipboard-btn" style="display: none;" data-text="">复制</button>
         </div>
       </div>
 
       <div class="game-window-content" style="text-align: center;width: auto;padding-top: 5px;">
         <div class="game-window-content-eveyone" style="display: block;color: #999;font-size: 1.1rem;">
-          <span>复制成功,ctrl+v粘贴即可</span>
+          <span id="copy_msg">复制成功,ctrl+v粘贴即可</span>
+          <button class="clipboard-btn" id="clipboard-btn" style="display: none;" data-text="">复制</button>
         </div>
       </div>
 
@@ -887,12 +895,22 @@
         });
       });
 
-      new ClipboardJS('#clipboard-btn', {
+      var clipboard = new ClipboardJS('#clipboard-btn', {
         text: function(trigger) {
           return trigger.getAttribute('data-text');
         }
       })
 
+      clipboard.on('success', function (e) {
+          $('#copy_msg').text('复制成功,ctrl+v粘贴即可');
+          $('#clipboard-btn').hide();
+      });
+
+      clipboard.on('error', function (e) {
+          $('#copy_msg').text('自动复制失败，请点击复制按钮');
+          $('#clipboard-btn').show();
+      });
+
       $('#submit').click(function () {
           var url = $(this).attr('url');
           var query = $('.jssearch').find('input').serialize();

From 43c1f7832a3af4231cd04a2e5c1ca47b62d011c8 Mon Sep 17 00:00:00 2001
From: liuweiwen <“529520975@qq.com>
Date: Fri, 29 Nov 2019 16:42:33 +0800
Subject: [PATCH 38/68] =?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

---
 .../Home/Controller/HomeController.class.php  |  1 +
 .../Home/View/default/Home/landingPage.html   | 33 ++++++++++++++++++-
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/Application/Home/Controller/HomeController.class.php b/Application/Home/Controller/HomeController.class.php
index 97d6a27b6..b6666d374 100644
--- a/Application/Home/Controller/HomeController.class.php
+++ b/Application/Home/Controller/HomeController.class.php
@@ -227,6 +227,7 @@ class HomeController extends Controller
         $this->assign('apply', $apply);
         $this->assign('game', $game);
         $this->assign('promoteId', $promoteId);
+        $this->assign('cur_url', "http://" . $_SERVER['HTTP_HOST'] . __SELF__);
         $this->display('landingPage');
     }
 
diff --git a/Application/Home/View/default/Home/landingPage.html b/Application/Home/View/default/Home/landingPage.html
index 34372a598..fbb757adf 100644
--- a/Application/Home/View/default/Home/landingPage.html
+++ b/Application/Home/View/default/Home/landingPage.html
@@ -198,7 +198,7 @@
       <div class="text">• 至尊下载：永不闪退、不丢数据稳定有保障</div>
       <div class="text"> • 同一设备安装一次可在一年内无限次下载重装</div>
       <div class="blue-btn" onclick="location.href='mobile.php/Ssg/pay/game_id/{$game[\'id\']}/promote_id/{$promoteId}'">￥10至尊下载</div>
-      <div class="gray-btn" onclick="location.href='{$downloadUrl}'">普通下载</div>
+      <div class="gray-btn down-link"  down-link="{$downloadUrl}">普通下载</div>
     </div>
   </div>
 </div>
@@ -261,6 +261,37 @@
 </html>
 <script>
   $(function(){
+    var cur_url = window.location.href;
+    $('.down-link').on('click', function () {
+      // if ($('.bn-rule').length > 0) {
+      //   $('.bn-rule').css('display','block')
+      //   $('.bn-rule').css('z-index','12')
+      //   return
+      // }
+
+      if ($('input[name=isNewIos]').val() == 0 && $('input[name=isIOS13]').val() == 1) {
+        if (parseInt("{:I('get.status', 0)}") > 0) {
+          location.href = "{:U('iosDown',array('gid'=>$apply['game_id'],'pid'=>$apply['promote_id'],'status'=>1))}"
+          return
+        } else {
+          layer.confirm('请先到官网注册', {title: '提示'}, function () {
+            location.href = "/mobile.php?s=/User/login/pid/" + "{$apply.promote_id}" + "/gid/" + "{$apply.game_id}" + "/url/{base64_encode(base64_encode($cur_url))}" + ".html"
+          });
+          return
+        }
+      }
+      var downLink = $(this).attr('down-link');
+      console.log(downLink);
+      location.href = downLink
+    });
+
+    $('.no-package').click(function() {
+      layer.msg('暂无下载', {
+        icon: 7,
+        time: 2000
+      })
+    });
+
     if ($("#brief_introduction").length<80) {
       $("#look_more").hide();
     }

From 15ce00396f91f80db97f7f083f09b0ab43034295 Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Fri, 29 Nov 2019 17:11:21 +0800
Subject: [PATCH 39/68] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AE=98=E7=BD=91?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Mobile/View/User/recharge.html |  45 ++++++++++++---------
 Public/Mobile/images/juxing3.png           | Bin 9562 -> 9159 bytes
 2 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/Application/Mobile/View/User/recharge.html b/Application/Mobile/View/User/recharge.html
index a43db68b1..1d12c93b2 100644
--- a/Application/Mobile/View/User/recharge.html
+++ b/Application/Mobile/View/User/recharge.html
@@ -19,14 +19,14 @@
             <a href="{:U('/User/index')}" class="arrows"></a>
         </div>
         <div class="recharge-tabbar">
-            <li class="selected" name="currency">平台币充值</li>
-            <li name="iscurrency">折扣充值</li>
+            <li class="selected" name="currency" style="margin-left:0;">平台币充值</li>
+            <!-- <li name="iscurrency">折扣充值</li> -->
         </div>
     </div>
 
     <div class="content">
 
-        <div class="recharge-flat" >
+        <div class="recharge-flat" style="width: 6.9rem;height: 2.9rem;">
             <form class="" id="form1" action="{:U('User/recharge')}" method="post">
             <div class="flat-box">
                 <div class="flat-info">
@@ -38,13 +38,13 @@
             <div class="flat-box">
                 <div class="flat-info">
                     <div>充值金额</div>
-                    <input type="text" class="rcmoney1" name="pay_amount"  placeholder="请输入金额，最低金额1元" style="text-align:right;width: 2.88rem">
+                    <input type="text" class="rcmoney1" name="pay_amount"  placeholder="请输入金额，最低金额1元" style="text-align:right;width: 2.88rem" oninput="this.value=this.value.replace(/[^0-9]+|^0|\d{9}/,'');">
                 </div>
             </div>
             <div class="flat-box">
                 <div class="flat-info">
                     <div>获得平台币</div>
-                    <input type="text" class="rcplatform" name="balance" readonly placeholder="" value="" style="text-align:right;">
+                    <input type="text" class="rcplatform rcmoney1ptb" name="balance" readonly placeholder="" value="" style="text-align:right;">
                 </div>
             </div>
                 <div class="recharge-payment">
@@ -85,12 +85,12 @@
                 </div>
             </form>
         </div>
-        <div class="recharge-discount" style="display: none;">
+        <!-- <div class="recharge-discount" style="display: none;">
             <form class="" id="form2" action="{:U('User/recharge')}" method="post">
             <div class="flat-box">
                 <div class="flat-info">
                     <div>充值账户</div>
-                    <input type="hidden" class="txt" name="account" value="{:session('suser_auth.account')}" readonly="readonly" placeholder="请输入充值账户">
+                    <input type="hidden" class="txt" name="account" value="{:session('suser_auth.account')}" readonly="readonly" placeholder="请输入充值账户" >
                     <span>{:session('suser_auth.account')}</span>
                 </div>
             </div>
@@ -108,7 +108,7 @@
             <div class="flat-box">
                 <div class="flat-info">
                     <div>充值金额</div>
-                    <input type="text" class="txt rcmoney" id="pay_amount" name="pay_amount" placeholder="请输入金额，最低金额1元" style="width:2.88rem;text-align:right;">
+                    <input type="text" class="txt rcmoney" id="pay_amount" name="pay_amount" placeholder="请输入金额，最低金额1元" style="width:2.88rem;text-align:right;" oninput="this.value=this.value.replace(/[^0-9]+|^0|\d{9}/,'');">
                 </div>
             </div>
             <div class="flat-box">
@@ -122,7 +122,7 @@
             <div class="flat-box">
                 <div class="flat-info">
                     <div>实付金额</div>
-                    <input type="text" class="txt realmoney" name="realmoney" readonly style="text-align:right;">
+                    <input type="text" class="txt rcmoney2bb realmoney" name="realmoney" readonly style="text-align:right;">
                 </div>
             </div>
             <div class="flat-box">
@@ -133,7 +133,7 @@
             </div>
                 <div class="recharge-payment">
                     <div class="title">请选择支付方式</div>
-                    <div class="alipay">
+                    <div class="alipay bindway">
                         <div class="alipay_img">
                             <img src="__IMG__/zhifubaozhifu.png" alt="">
                             <div class="img_text">
@@ -143,12 +143,12 @@
                         </div>
 
                         <div class="radio_select">
-                            <input id="zhifubao1" name="way" type="radio" value="1" checked>
+                            <input id="zhifubao1" name="way1" type="radio" value="1" checked>
                             <label for="zhifubao1" class="radio-label"></label>
                         </div>
 
                     </div>
-                    <div class="alipay" id="ch_weixin1">
+                    <div class="alipay bindway" id="ch_weixin1">
                         <div class="alipay_img">
                             <img src="__IMG__/weixin.png" alt="">
                             <div class="img_text">
@@ -157,7 +157,7 @@
                             </div>
                         </div>
                         <div class="radio_select">
-                            <input id="weixin1" name="way" type="radio" value="2" >
+                            <input id="weixin1" name="way1" type="radio" value="2" >
                             <label for="weixin1" class="radio-label"></label>
                         </div>
                     </div>
@@ -169,7 +169,7 @@
                 </div>
             </form>
         </div>
-    </div>
+    </div> -->
 
 
 
@@ -197,6 +197,14 @@
             sib.find('.t-tabpan').eq(index).addClass('active').siblings().removeClass('active');
             return false;
         });
+         //点击父标签切换radio
+        $(".alipay").click(function(){
+            $(this).children(".radio_select").children("input").prop("checked", true);
+        })
+        //阻止事件冒泡
+        $(".radio_select").click(function(){
+        event.stopPropagation();
+        })
         $('.jssbtn').click(function() {
             var that = $(this);
             if (that.hasClass('on')) {
@@ -237,7 +245,7 @@
         $('.rcmoney').keyup(function() {
             var that = $(this),val = $.trim(that.val()),parent=that.closest('.recharge-discount'),pf=parent.find('.rcplatform');
             var rm = parent.find('.realmoney');
-            if(val == ""){return true;}
+            if(val == ""){$(".rcmoney2bb").val(0);$(".rcplatform").val(0);return true;}
             if (val) {
                 if (val>0 && /^(0|[1-9][0-9]*)$/.test(val)) {
                     pf.val(val);
@@ -255,10 +263,10 @@
                 pf.val('');if(rm) {rm.val('');}
             }
         });
-        $('.rcmoney1').keyup(function() {
+        $('.rcmoney1').keyup(function() {            
             var that = $(this),val = $.trim(that.val()),parent=that.closest('.recharge-flat'),pf=parent.find('.rcplatform');
             var rm = parent.find('.realmoney');
-            if(val == ""){return true;}
+            if(val == ""){$(".rcmoney1ptb").val(0);return true;}
             if (val) {
                 if (val>0 && /^(0|[1-9][0-9]*)$/.test(val)) {
                     pf.val(val);
@@ -360,7 +368,8 @@
                             popmsg.msg(result.info);
                         }
                     },
-                    error:function(){
+                    error:function(res){
+                        console.log(res)
                         alert("服务端异常");
                     }
                 })
diff --git a/Public/Mobile/images/juxing3.png b/Public/Mobile/images/juxing3.png
index e19b24a60c8e7aea02309efa2b5dcbd71e20a8b5..031a52fd5aa5db449911c0af43cf6eb83b90dd61 100644
GIT binary patch
literal 9159
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
UZ%HP2K}X`qL7M|PmL5_62f14LJOBUy

literal 9562
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
NX76;k)YkX<{{WX+-}e9j


From b9ab5330c00dcdfd974205127d6670b6692b1fa6 Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Fri, 29 Nov 2019 17:17:50 +0800
Subject: [PATCH 40/68] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AE=98=E7=BD=91?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98=E7=BC=A9=E6=94=BE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Mobile/View/User/recharge.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Application/Mobile/View/User/recharge.html b/Application/Mobile/View/User/recharge.html
index 1d12c93b2..7681102d5 100644
--- a/Application/Mobile/View/User/recharge.html
+++ b/Application/Mobile/View/User/recharge.html
@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
     <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
     <title>充值中心</title>
     <script src="__JS__/jquery-1.11.3.min.js"></script>

From 5d178571cc1aa0e314cd54edc1a9304f12fd8107 Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Fri, 29 Nov 2019 17:20:22 +0800
Subject: [PATCH 41/68] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AE=98=E7=BD=91?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Mobile/View/User/recharge.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Application/Mobile/View/User/recharge.html b/Application/Mobile/View/User/recharge.html
index 7681102d5..8ec31e0d6 100644
--- a/Application/Mobile/View/User/recharge.html
+++ b/Application/Mobile/View/User/recharge.html
@@ -26,7 +26,7 @@
 
     <div class="content">
 
-        <div class="recharge-flat" style="width: 6.9rem;height: 2.9rem;">
+        <div class="recharge-flat" style="">
             <form class="" id="form1" action="{:U('User/recharge')}" method="post">
             <div class="flat-box">
                 <div class="flat-info">

From ffadabf078fcdef7fdb9c4ca309b963229d4ee7a Mon Sep 17 00:00:00 2001
From: liuweiwen <“529520975@qq.com>
Date: Fri, 29 Nov 2019 17:22:05 +0800
Subject: [PATCH 42/68] =?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

---
 .../Home/Controller/HomeController.class.php       |  3 ++-
 .../Home/View/default/Home/landingPage.html        | 14 +++++++++++---
 .../Mobile/Controller/UserController.class.php     |  3 +--
 Application/Mobile/View/User/login.html            |  2 +-
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/Application/Home/Controller/HomeController.class.php b/Application/Home/Controller/HomeController.class.php
index b6666d374..cc9ea7007 100644
--- a/Application/Home/Controller/HomeController.class.php
+++ b/Application/Home/Controller/HomeController.class.php
@@ -227,7 +227,8 @@ class HomeController extends Controller
         $this->assign('apply', $apply);
         $this->assign('game', $game);
         $this->assign('promoteId', $promoteId);
-        $this->assign('cur_url', "http://" . $_SERVER['HTTP_HOST'] . __SELF__);
+        $cur_url = base64_encode(base64_encode("http://" . $_SERVER['HTTP_HOST'] . __SELF__));
+        $this->assign('cur_url', $cur_url);
         $this->display('landingPage');
     }
 
diff --git a/Application/Home/View/default/Home/landingPage.html b/Application/Home/View/default/Home/landingPage.html
index fbb757adf..e11ad0e7f 100644
--- a/Application/Home/View/default/Home/landingPage.html
+++ b/Application/Home/View/default/Home/landingPage.html
@@ -257,13 +257,20 @@
     <div class="blue-btn">点我去信任</div>
   </div>
 </div>
+<?php
+
+?>
+<input type="hidden" id="cur_url" name="cur_url" value="{$cur_url}">
 </body>
 </html>
 <script>
   $(function(){
-    var cur_url = window.location.href;
+    var cur_url = $("#cur_url").val();
+    location.href = "/mobile.php?s=/User/login/pid/" + "{$apply.promote_id}" + "/gid/" + "{$apply.game_id}" + "/url/"+ cur_url + ".html"
+    return;
     $('.down-link').on('click', function () {
-      // if ($('.bn-rule').length > 0) {
+
+        // if ($('.bn-rule').length > 0) {
       //   $('.bn-rule').css('display','block')
       //   $('.bn-rule').css('z-index','12')
       //   return
@@ -275,7 +282,8 @@
           return
         } else {
           layer.confirm('请先到官网注册', {title: '提示'}, function () {
-            location.href = "/mobile.php?s=/User/login/pid/" + "{$apply.promote_id}" + "/gid/" + "{$apply.game_id}" + "/url/{base64_encode(base64_encode($cur_url))}" + ".html"
+            // location.href = '{:U("User/login",array("url"=>base64_encode(base64_encode(U("Game/detail",array("id"=>$_GET["id"], "pid" => $apply.promote_id, "gid" => $apply.game_id))))))}';
+            location.href = "/mobile.php?s=/User/login/pid/" + "{$apply.promote_id}" + "/gid/" + "{$apply.game_id}" + "/url/"+ cur_url + ".html"
           });
           return
         }
diff --git a/Application/Mobile/Controller/UserController.class.php b/Application/Mobile/Controller/UserController.class.php
index e967dbe33..fe9d28fdd 100644
--- a/Application/Mobile/Controller/UserController.class.php
+++ b/Application/Mobile/Controller/UserController.class.php
@@ -203,16 +203,15 @@ class UserController extends BaseController
         } else {
             $pid = I('get.pid', 0);
             $gid = I('get.gid', 0);
+            $from = I('get.from', "");
             if ($pid > 0 || $gid > 0) {
                 cookie('pgInfo', json_encode(['pid' => $pid, 'gid' => $gid]), 3600 * 24);
             }
-
             if ($_REQUEST['url']) {
                 $this->assign('url', base64_decode(base64_decode($_REQUEST['url'])));
             } else {
                 $this->assign('url', U('User/index'));
             }
-
             $this->display();
         }
     }
diff --git a/Application/Mobile/View/User/login.html b/Application/Mobile/View/User/login.html
index d25a26c11..26a9b2d4c 100644
--- a/Application/Mobile/View/User/login.html
+++ b/Application/Mobile/View/User/login.html
@@ -40,7 +40,7 @@
         <div class="pop-wrap"></div>
       </div>
     </div>
-    
+  <input type="hidden" id="from" name="from" value="{$from}">
     <div class="popmsg pop-dialog" style="font-size: .28rem"></div>
   </body>
     <script src="__JS__/pop.lwx.min.js"></script>

From e834c37cb305519407e3e2d2ac7c9e23c7203bb9 Mon Sep 17 00:00:00 2001
From: liuweiwen <“529520975@qq.com>
Date: Fri, 29 Nov 2019 17:23:05 +0800
Subject: [PATCH 43/68] =?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 | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/Application/Home/View/default/Home/landingPage.html b/Application/Home/View/default/Home/landingPage.html
index e11ad0e7f..a5432bb6f 100644
--- a/Application/Home/View/default/Home/landingPage.html
+++ b/Application/Home/View/default/Home/landingPage.html
@@ -265,9 +265,6 @@
 </html>
 <script>
   $(function(){
-    var cur_url = $("#cur_url").val();
-    location.href = "/mobile.php?s=/User/login/pid/" + "{$apply.promote_id}" + "/gid/" + "{$apply.game_id}" + "/url/"+ cur_url + ".html"
-    return;
     $('.down-link').on('click', function () {
 
         // if ($('.bn-rule').length > 0) {

From 8d5297bd994b2a3a08153a5c77c765ff79bf4bdf Mon Sep 17 00:00:00 2001
From: liuweiwen <“529520975@qq.com>
Date: Fri, 29 Nov 2019 17:26:33 +0800
Subject: [PATCH 44/68] =?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 | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/Application/Home/View/default/Home/landingPage.html b/Application/Home/View/default/Home/landingPage.html
index a5432bb6f..e71bd2348 100644
--- a/Application/Home/View/default/Home/landingPage.html
+++ b/Application/Home/View/default/Home/landingPage.html
@@ -308,13 +308,17 @@
     function swiperGet(){
       var swiper = new Swiper('.swiper-container', {
         loop: true,
-        // autoplay: img > 1,
+        observer: true,//修改swiper自己或子元素时，自动初始化swiper
+        observeParents: true,//修改swiper的父元素时，自动初始化swiper
+        // autoplayDisableOnInteraction:false,//
+        lazyLoading:true,//图片延迟加载
+        lazyLoadingInPrevNext:true,//前一个和后一个延迟加载
         pagination: {
           el: '.swiper-pagination',
           clickable: true,
         },
         autoplay: {
-          delay: 3000,
+          delay: 2000,
           stopOnLastSlide: false,
           disableOnInteraction: false,
         },
@@ -405,4 +409,6 @@
       });
     });
   }
+
+
 </script>

From 57ca1269d68cda3e842cdab128c4207659ff6ec7 Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Fri, 29 Nov 2019 17:26:57 +0800
Subject: [PATCH 45/68] =?UTF-8?q?=E7=99=BB=E5=BD=95=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/Controller/ExportController.class.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php
index 16de07418..80f10074a 100644
--- a/Application/Admin/Controller/ExportController.class.php
+++ b/Application/Admin/Controller/ExportController.class.php
@@ -3481,6 +3481,10 @@ if ($key == 'model'){
             $map['user_account'] = array('like', '%' . trim($_REQUEST['account']) . '%');
         }
 
+        if (isset($_REQUEST['promote_id'])) {
+            $map['promote_id'] = $_REQUEST['promote_id'];
+        }
+
 //            $map['login_time'] = array('neq', 0);
 
         $page = intval($_REQUEST['p']);

From 98249f462ae20dd2ae4a7f2d7771926c69a61a73 Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Fri, 29 Nov 2019 17:52:20 +0800
Subject: [PATCH 46/68] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AE=98=E7=BD=91?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controller/UserController.class.php       |  8 ++---
 Application/Mobile/View/User/login.html       | 32 ++++++++++++++++---
 Application/Mobile/View/User/userset.html     | 29 +----------------
 .../Sdk/View/default/Spend/pay_success.html   |  5 ++-
 4 files changed, 35 insertions(+), 39 deletions(-)

diff --git a/Application/Mobile/Controller/UserController.class.php b/Application/Mobile/Controller/UserController.class.php
index fe9d28fdd..334fef288 100644
--- a/Application/Mobile/Controller/UserController.class.php
+++ b/Application/Mobile/Controller/UserController.class.php
@@ -1007,10 +1007,10 @@ class UserController extends BaseController
                 if (!$invidcard) {
                     $this->ajaxReturn(array('status' => -1, 'info' => '身份证号码填写不正确', 'url' => U('User/userauth')));
                 }
-                $cardd = M('User', 'tab_')->where(array('idcard' => $_POST['idcard']))->find();
-                if ($cardd) {
-                    $this->ajaxReturn(array('status' => -1, 'info' => '身份证号码已被使用', 'url' => U('User/userauth')));
-                }
+                // $cardd = M('User', 'tab_')->where(array('idcard' => $_POST['idcard']))->find();
+                // if ($cardd) {
+                //     $this->ajaxReturn(array('status' => -1, 'info' => '身份证号码已被使用', 'url' => U('User/userauth')));
+                // }
             }
 
             if (C('tool_age.status') == 0) {
diff --git a/Application/Mobile/View/User/login.html b/Application/Mobile/View/User/login.html
index 26a9b2d4c..7ba63d50c 100644
--- a/Application/Mobile/View/User/login.html
+++ b/Application/Mobile/View/User/login.html
@@ -42,15 +42,39 @@
     </div>
   <input type="hidden" id="from" name="from" value="{$from}">
     <div class="popmsg pop-dialog" style="font-size: .28rem"></div>
+    <!-- 底部导航 -->
+  <div class="foot_tabbar">
+    <div class="foot_tabbar_box">
+      <div class="foot_info ">
+        <a href="{:U('Index/index')}" class="<if condition='CONTROLLER_NAME eq Index and ACTION_NAME eq index'>active</if>">
+          <img src="__IMG__/new/shouye<if condition='CONTROLLER_NAME eq Index and ACTION_NAME eq index'>1</if>.png" alt="">
+          <span>首页</span>
+        </a>
+      </div>
+      <div class="foot_info ">
+        <a href="{:U('Index/introduce')}" class="<if condition='ACTION_NAME eq introduce'>active</if>">
+          <img src="__IMG__/new/qiyechaxun<if condition='ACTION_NAME eq introduce'>1</if>.png" alt="">
+          <span>企业简介</span></a>
+      </div>
+      <div class="foot_info ">
+        <a href="{:U('Index/business')}" class="<if condition='ACTION_NAME eq business'>active</if>">
+          <img src="__IMG__/new/hezuo<if condition='ACTION_NAME eq business'>1</if>.png" alt="">
+          <span>招商合作</span>
+        </a>
+      </div>
+      <div class="foot_info ">
+        <a href="{:U('User/index')}" class="<if condition='CONTROLLER_NAME eq User'>active</if>">
+          <img src="__IMG__/new/geren<if condition='CONTROLLER_NAME eq User'>1</if>.png" alt="">
+          <span>我的</span>
+        </a>
+      </div>
+    </div>
+  </div>
   </body>
     <script src="__JS__/pop.lwx.min.js"></script>
     <script src="__JS__/lwx.js"></script>
     <script src="__JS__/common.js"></script>
     <script>
-
-        $(document).ready(function(){
-          $('.foot_tabbar').hide()
-        });
       $(document).keyup(function(event){
         if(event.keyCode == 13){ 
           $('.submit').click(); 
diff --git a/Application/Mobile/View/User/userset.html b/Application/Mobile/View/User/userset.html
index a423563cf..fb9891378 100644
--- a/Application/Mobile/View/User/userset.html
+++ b/Application/Mobile/View/User/userset.html
@@ -138,34 +138,7 @@
       </div>
     </div>
   </div>
-  <!-- 底部导航 -->
-  <div class="foot_tabbar">
-    <div class="foot_tabbar_box">
-      <div class="foot_info ">
-        <a href="{:U('Index/index')}" class="<if condition='CONTROLLER_NAME eq Index and ACTION_NAME eq index'>active</if>">
-          <img src="__IMG__/new/shouye<if condition='CONTROLLER_NAME eq Index and ACTION_NAME eq index'>1</if>.png" alt="">
-          <span>首页</span>
-        </a>
-      </div>
-      <div class="foot_info ">
-        <a href="{:U('Index/introduce')}" class="<if condition='ACTION_NAME eq introduce'>active</if>">
-          <img src="__IMG__/new/qiyechaxun<if condition='ACTION_NAME eq introduce'>1</if>.png" alt="">
-          <span>企业简介</span></a>
-      </div>
-      <div class="foot_info ">
-        <a href="{:U('Index/business')}" class="<if condition='ACTION_NAME eq business'>active</if>">
-          <img src="__IMG__/new/hezuo<if condition='ACTION_NAME eq business'>1</if>.png" alt="">
-          <span>招商合作</span>
-        </a>
-      </div>
-      <div class="foot_info ">
-        <a href="{:U('User/index')}" class="<if condition='CONTROLLER_NAME eq User'>active</if>">
-          <img src="__IMG__/new/geren<if condition='CONTROLLER_NAME eq User'>1</if>.png" alt="">
-          <span>我的</span>
-        </a>
-      </div>
-    </div>
-  </div>
+  
 
 
   <div class="popmsg pop-dialog" style="font-size: .28rem;"></div>
diff --git a/Application/Sdk/View/default/Spend/pay_success.html b/Application/Sdk/View/default/Spend/pay_success.html
index 2e07525ba..ff5dcfbab 100644
--- a/Application/Sdk/View/default/Spend/pay_success.html
+++ b/Application/Sdk/View/default/Spend/pay_success.html
@@ -146,12 +146,11 @@ $("#back_success").click(function() {
     }else{
           <if condition="get_wx_type() neq 1">
          
-          window.location.href = Scheme+"://1&back";
-          
+          window.location.href = '/mobile.php?s=/User/index.html';
           
           <else/>
 
-          window.location.href = "mengchuang://showWapPayResult_btnType_?1&back";
+        //   window.location.href  = '/mobile.php?s=/User/index.html';
         </if>
        
     }

From 777a7c8344a2edd034efd3b70bbfd28987722231 Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Fri, 29 Nov 2019 17:58:06 +0800
Subject: [PATCH 47/68] =?UTF-8?q?=E5=AE=98=E7=BD=91=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=E7=BB=93=E6=9E=9C=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Sdk/Controller/SpendController.class.php  | 48 +++++++--------
 .../Sdk/View/default/Spend/pay_success.html   | 60 ++++++++-----------
 2 files changed, 50 insertions(+), 58 deletions(-)

diff --git a/Application/Sdk/Controller/SpendController.class.php b/Application/Sdk/Controller/SpendController.class.php
index 3ab04ae10..0f6515951 100644
--- a/Application/Sdk/Controller/SpendController.class.php
+++ b/Application/Sdk/Controller/SpendController.class.php
@@ -81,32 +81,32 @@ class SpendController extends Controller {
 	}
 	public function pay_success() {
 		
-		$orderno = $_GET ['orderno'] == "" ? $_GET ['out_trade_no'] : $_GET ['orderno'];
-		if (! empty ( $_GET ['jinzhue'] )) {
-			sleep ( 3 );
-			$orderno = $_GET ['jinzhue'];
-		}
-		$pay_where = substr ( $orderno, 0, 2 );
-		$Scheme = file_get_contents ( "./Application/Sdk/Scheme/" . $_GET ['game_id'] . ".txt" );
-		$map ['pay_order_number'] = $orderno;
-		switch ($pay_where) {
-			case 'SP' :
-				$result = M ( 'Spend', 'tab_' )->field ( "pay_status" )->where ( $map )->find ();
-				break;
-			case 'PF' :
-				$result = M ( 'deposit', 'tab_' )->field ( 'pay_status' )->where ( $map )->find ();
-				break;
+		// $orderno = $_GET ['orderno'] == "" ? $_GET ['out_trade_no'] : $_GET ['orderno'];
+		// if (! empty ( $_GET ['jinzhue'] )) {
+		// 	sleep ( 3 );
+		// 	$orderno = $_GET ['jinzhue'];
+		// }
+		// $pay_where = substr ( $orderno, 0, 2 );
+		// $Scheme = file_get_contents ( "./Application/Sdk/Scheme/" . $_GET ['game_id'] . ".txt" );
+		// $map ['pay_order_number'] = $orderno;
+		// switch ($pay_where) {
+		// 	case 'SP' :
+		// 		$result = M ( 'Spend', 'tab_' )->field ( "pay_status" )->where ( $map )->find ();
+		// 		break;
+		// 	case 'PF' :
+		// 		$result = M ( 'deposit', 'tab_' )->field ( 'pay_status' )->where ( $map )->find ();
+		// 		break;
 			
-			case 'TB' :
-				$result = M ( 'balance', 'tab_' )->field ( 'pay_status' )->where ( $map )->find ();
-				break;
+		// 	case 'TB' :
+		// 		$result = M ( 'balance', 'tab_' )->field ( 'pay_status' )->where ( $map )->find ();
+		// 		break;
 			
-			case 'BR' :
-				$result = M ( 'bind_recharge', 'tab_' )->field ( 'pay_status' )->where ( $map )->find ();
-				break;
-		}
-		$this->assign ( 'Scheme', $Scheme );
-		$this->assign ( 'paystatus', $result ['pay_status'] );
+		// 	case 'BR' :
+		// 		$result = M ( 'bind_recharge', 'tab_' )->field ( 'pay_status' )->where ( $map )->find ();
+		// 		break;
+		// }
+		// $this->assign ( 'Scheme', $Scheme );
+		// $this->assign ( 'paystatus', $result ['pay_status'] );
 		$this->display ();
 	}
 	public function pay_success2() {
diff --git a/Application/Sdk/View/default/Spend/pay_success.html b/Application/Sdk/View/default/Spend/pay_success.html
index ff5dcfbab..22c772766 100644
--- a/Application/Sdk/View/default/Spend/pay_success.html
+++ b/Application/Sdk/View/default/Spend/pay_success.html
@@ -137,27 +137,19 @@ $("#back_success").click(function() {
     }catch(err){
     
     } */
-	var Scheme=$('.Scheme').val();
-    var orderno=$('.orderno').val();
-    var u = navigator.userAgent;
-    var isAndroid = u.indexOf('Android') > -1 || u.indexOf('Adr') > -1; //android终端
-    if(isAndroid){
-        window.mengchuang.getPayResult('succeed');
-    }else{
-          <if condition="get_wx_type() neq 1">
-         
-          window.location.href = '/mobile.php?s=/User/index.html';
-          
-          <else/>
-
-        //   window.location.href  = '/mobile.php?s=/User/index.html';
-        </if>
-       
-    }
+	// var Scheme=$('.Scheme').val();
+    // var orderno=$('.orderno').val();
+    // var u = navigator.userAgent;
+    // var isAndroid = u.indexOf('Android') > -1 || u.indexOf('Adr') > -1; //android终端
+    // if(isAndroid){
+    //     window.mengchuang.getPayResult('succeed');
+    // }else{
+        window.location.href = '/mobile.php?s=/User/index.html';
+    // }
     
 });
 $("#back_error").click(function() {
-	
+	window.location.href = '/mobile.php?s=/User/index.html';
 	/* var orderno=$('.orderno').val();
 	var u = navigator.userAgent;
 	var isAndroid = u.indexOf('Android') > -1 || u.indexOf('Adr') > -1; //android终端
@@ -170,22 +162,22 @@ $("#back_error").click(function() {
 	}catch(err){
     
     } */
-	var Scheme=$('.Scheme').val();
-	var orderno=$('.orderno').val();
-	var u = navigator.userAgent;
-	var isAndroid = u.indexOf('Android') > -1 || u.indexOf('Adr') > -1; //android终端
-	if(isAndroid){
-	    window.mengchuang.getPayResult('fail');
-	}else{
-	     <if condition="get_wx_type() neq 1">
-	     	if (!Scheme) 
-	     		;
-	     	else 
-	     		window.location.href = Scheme+"://0&back";
-	     <else/>
-	            window. location.href = "mengchuang://showWapPayResult_btnType_?0&back";
-	    </if>
-	}
+	// var Scheme=$('.Scheme').val();
+	// var orderno=$('.orderno').val();
+	// var u = navigator.userAgent;
+	// var isAndroid = u.indexOf('Android') > -1 || u.indexOf('Adr') > -1; //android终端
+	// if(isAndroid){
+	//     window.mengchuang.getPayResult('fail');
+	// }else{
+	//      <if condition="get_wx_type() neq 1">
+	//      	if (!Scheme) 
+	//      		;
+	//      	else 
+	//      		window.location.href = Scheme+"://0&back";
+	//      <else/>
+	//             window. location.href = "mengchuang://showWapPayResult_btnType_?0&back";
+	//     </if>
+	// }
 });
 </script>
 

From 5413551650cda6efe976b11ef1da03351b982ec4 Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Fri, 29 Nov 2019 18:01:29 +0800
Subject: [PATCH 48/68] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AE=98=E7=BD=91?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Sdk/Controller/SpendController.class.php  | 48 +++++++++----------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/Application/Sdk/Controller/SpendController.class.php b/Application/Sdk/Controller/SpendController.class.php
index 0f6515951..3ab04ae10 100644
--- a/Application/Sdk/Controller/SpendController.class.php
+++ b/Application/Sdk/Controller/SpendController.class.php
@@ -81,32 +81,32 @@ class SpendController extends Controller {
 	}
 	public function pay_success() {
 		
-		// $orderno = $_GET ['orderno'] == "" ? $_GET ['out_trade_no'] : $_GET ['orderno'];
-		// if (! empty ( $_GET ['jinzhue'] )) {
-		// 	sleep ( 3 );
-		// 	$orderno = $_GET ['jinzhue'];
-		// }
-		// $pay_where = substr ( $orderno, 0, 2 );
-		// $Scheme = file_get_contents ( "./Application/Sdk/Scheme/" . $_GET ['game_id'] . ".txt" );
-		// $map ['pay_order_number'] = $orderno;
-		// switch ($pay_where) {
-		// 	case 'SP' :
-		// 		$result = M ( 'Spend', 'tab_' )->field ( "pay_status" )->where ( $map )->find ();
-		// 		break;
-		// 	case 'PF' :
-		// 		$result = M ( 'deposit', 'tab_' )->field ( 'pay_status' )->where ( $map )->find ();
-		// 		break;
+		$orderno = $_GET ['orderno'] == "" ? $_GET ['out_trade_no'] : $_GET ['orderno'];
+		if (! empty ( $_GET ['jinzhue'] )) {
+			sleep ( 3 );
+			$orderno = $_GET ['jinzhue'];
+		}
+		$pay_where = substr ( $orderno, 0, 2 );
+		$Scheme = file_get_contents ( "./Application/Sdk/Scheme/" . $_GET ['game_id'] . ".txt" );
+		$map ['pay_order_number'] = $orderno;
+		switch ($pay_where) {
+			case 'SP' :
+				$result = M ( 'Spend', 'tab_' )->field ( "pay_status" )->where ( $map )->find ();
+				break;
+			case 'PF' :
+				$result = M ( 'deposit', 'tab_' )->field ( 'pay_status' )->where ( $map )->find ();
+				break;
 			
-		// 	case 'TB' :
-		// 		$result = M ( 'balance', 'tab_' )->field ( 'pay_status' )->where ( $map )->find ();
-		// 		break;
+			case 'TB' :
+				$result = M ( 'balance', 'tab_' )->field ( 'pay_status' )->where ( $map )->find ();
+				break;
 			
-		// 	case 'BR' :
-		// 		$result = M ( 'bind_recharge', 'tab_' )->field ( 'pay_status' )->where ( $map )->find ();
-		// 		break;
-		// }
-		// $this->assign ( 'Scheme', $Scheme );
-		// $this->assign ( 'paystatus', $result ['pay_status'] );
+			case 'BR' :
+				$result = M ( 'bind_recharge', 'tab_' )->field ( 'pay_status' )->where ( $map )->find ();
+				break;
+		}
+		$this->assign ( 'Scheme', $Scheme );
+		$this->assign ( 'paystatus', $result ['pay_status'] );
 		$this->display ();
 	}
 	public function pay_success2() {

From 85a74c3aca51b02c0fb257e4ded874a3970915b3 Mon Sep 17 00:00:00 2001
From: liuweiwen <“529520975@qq.com>
Date: Fri, 29 Nov 2019 18:16:49 +0800
Subject: [PATCH 49/68] =?UTF-8?q?=E6=89=8B=E6=9C=BA=E5=AE=98=E7=BD=91?=
 =?UTF-8?q?=E5=8F=91=E9=80=81=E9=AA=8C=E8=AF=81=E7=A0=81=E5=AD=97=E4=BD=93?=
 =?UTF-8?q?=E5=A4=A7=E5=B0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Public/Mobile/css/remove.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Public/Mobile/css/remove.css b/Public/Mobile/css/remove.css
index 08e5de8c5..127d48c3d 100644
--- a/Public/Mobile/css/remove.css
+++ b/Public/Mobile/css/remove.css
@@ -37,7 +37,7 @@
     height:0.6rem;
     background:rgba(33,177,235,1);
     border-radius:0.3rem;
-    font-size:0.15rem;
+    font-size:0.28rem;
     font-family:PingFang SC;
     font-weight:400;
     color:rgba(255,255,255,1);

From d838b6fc224a3fdd22e999ee120ad7d181d4a936 Mon Sep 17 00:00:00 2001
From: liuweiwen <“529520975@qq.com>
Date: Fri, 29 Nov 2019 18:18:14 +0800
Subject: [PATCH 50/68] =?UTF-8?q?=E6=89=8B=E6=9C=BA=E5=AE=98=E7=BD=91-?=
 =?UTF-8?q?=E5=8F=91=E9=80=81=E9=AA=8C=E8=AF=81=E7=A0=81=E5=AD=97=E4=BD=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Public/Mobile/css/remove.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Public/Mobile/css/remove.css b/Public/Mobile/css/remove.css
index 08e5de8c5..127d48c3d 100644
--- a/Public/Mobile/css/remove.css
+++ b/Public/Mobile/css/remove.css
@@ -37,7 +37,7 @@
     height:0.6rem;
     background:rgba(33,177,235,1);
     border-radius:0.3rem;
-    font-size:0.15rem;
+    font-size:0.28rem;
     font-family:PingFang SC;
     font-weight:400;
     color:rgba(255,255,255,1);

From 3754e5504a1e48ffecd9b96dd932b3f5e7b7c385 Mon Sep 17 00:00:00 2001
From: chenxiaojun <956334972@qq.com>
Date: Fri, 29 Nov 2019 18:18:33 +0800
Subject: [PATCH 51/68] =?UTF-8?q?=E6=89=8B=E6=9C=BA=E6=B3=A8=E5=86=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Mobile/View/User/login.html    |  2 +-
 Application/Mobile/View/User/register.html | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/Application/Mobile/View/User/login.html b/Application/Mobile/View/User/login.html
index d25a26c11..f92c2dc7d 100644
--- a/Application/Mobile/View/User/login.html
+++ b/Application/Mobile/View/User/login.html
@@ -29,7 +29,7 @@
           <div class="forget"><a href="{:U('User/forget')}">忘记密码？</a></div>
           <button class="enter submit">登录</button>
      <if condition="I('get.pid') gt 0">
-         <div class="promptly">还没有账号？<a style="margin-left: 10px;"  href="<?='mobile.php?s=/User/step1/pid/'.I('get.pid').'/gid/'.I('get.gid').'.html'?>"> 账号注册 </a>|<a href="<?='mobile.php?s=/User/step/pid/'.I('get.pid').'/gid/'.I('get.gid').'.html'?>"> 手机注册 </a></div>
+         <div class="promptly">还没有账号？<a style="margin-left: 10px;"  href="<?='mobile.php?s=/User/step1/pid/'.I('get.pid').'/gid/'.I('get.gid').'.html'?>"> 账号注册 </a>|<a href="{:U('User/register',array('pid'=>I('get.pid',0),'gid'=>I('get.gid',0)))}"> 手机注册 </a></div>
       <else/>
         <div class="promptly">还没有账号？<a style="margin-left: 10px;" href="{:U('User/step1')}"> 账号注册 </a>|<a href="{:U('User/register')}"> 手机注册 </a></div>
      </if>
diff --git a/Application/Mobile/View/User/register.html b/Application/Mobile/View/User/register.html
index 87ca0f859..70db4d9d5 100644
--- a/Application/Mobile/View/User/register.html
+++ b/Application/Mobile/View/User/register.html
@@ -59,12 +59,20 @@
           var tis = this,that = $(tis);
           if (that.hasClass('disabled')) {return false;}  
           var mobile = $.trim($('#mobile').val());
+          var promoteId = parseInt("{:I('get.pid',0)}");
+          var gameId = parseInt("{:I('get.gid',0)}");
+          var data = {};
+          if (promoteId > 0 && gameId > 0) {
+              data = {'phone':mobile,'promote_id':promoteId,'game_id':gameId};
+          } else {
+              data = {'phone':mobile};
+          }
           if (mobile) {
             if (/^1[0-9]{10}$/.test(mobile)) {
                 $.ajax({
                   type:'POST',
                   url:'{:U("sendsafecode")}',
-                  data:{'phone':mobile},
+                  data:data,
                   async: false,
                   dataType:"Json",
                   success:function(data){

From c384a88c484e889a149d29a9881700da27c2f4c5 Mon Sep 17 00:00:00 2001
From: chenxiaojun <956334972@qq.com>
Date: Fri, 29 Nov 2019 18:27:19 +0800
Subject: [PATCH 52/68] =?UTF-8?q?=E6=89=8B=E6=9C=BA=E6=B3=A8=E5=86=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Mobile/View/User/login.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Application/Mobile/View/User/login.html b/Application/Mobile/View/User/login.html
index f92c2dc7d..4248344a8 100644
--- a/Application/Mobile/View/User/login.html
+++ b/Application/Mobile/View/User/login.html
@@ -77,8 +77,8 @@
       $('.submit').click(function(event) {
           var mobile = $.trim($('#mobile').val());
           var password = $.trim($('#password').val());
-          var promoteId = parseInt("{:I('get.pid')}") ? parseInt("{:I('get.pid')}") : 0;
-          var gameId = parseInt("{:I('get.gid')}") ? parseInt("{:I('get.gid')}") : 0;
+          var promoteId = parseInt("{:I('request.pid')}") ? parseInt("{:I('request.pid')}") : 0;
+          var gameId = parseInt("{:I('request.gid')}") ? parseInt("{:I('request.gid')}") : 0;
           if (mobile) {
             if (password) {
               $.ajax({

From 676ab5dcd2d045622f48a5dca7f4a18ef8c3dbaa Mon Sep 17 00:00:00 2001
From: chenxiaojun <956334972@qq.com>
Date: Fri, 29 Nov 2019 18:57:37 +0800
Subject: [PATCH 53/68] =?UTF-8?q?=E6=89=8B=E6=9C=BA=E6=B3=A8=E5=86=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Mobile/View/User/login.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Application/Mobile/View/User/login.html b/Application/Mobile/View/User/login.html
index 4248344a8..02f345fb3 100644
--- a/Application/Mobile/View/User/login.html
+++ b/Application/Mobile/View/User/login.html
@@ -71,9 +71,9 @@
               $(this).siblings("input").attr('type','password');
           }   
       });
-			
-			
-      var pmsg = $('.popmsg').pop();  
+
+
+      var pmsg = $('.popmsg').pop();
       $('.submit').click(function(event) {
           var mobile = $.trim($('#mobile').val());
           var password = $.trim($('#password').val());

From 28cd4aeeda8ac83d3f9b1389862527578f939a97 Mon Sep 17 00:00:00 2001
From: chenxiaojun <956334972@qq.com>
Date: Fri, 29 Nov 2019 18:58:04 +0800
Subject: [PATCH 54/68] =?UTF-8?q?=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Mobile/Controller/UserController.class.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Application/Mobile/Controller/UserController.class.php b/Application/Mobile/Controller/UserController.class.php
index e967dbe33..3d2064129 100644
--- a/Application/Mobile/Controller/UserController.class.php
+++ b/Application/Mobile/Controller/UserController.class.php
@@ -219,6 +219,7 @@ class UserController extends BaseController
 
     public function bindingPromote($promoteId, $account)
     {
+        Log::write('cxj_login:' . date('Y-m-d H:i:s') . ' ---- ' . $promoteId.'INFO');
         if ($promoteId > 0) {
             $wherePromote['id'] = $promoteId;
             $promoteData = M('Promote', 'tab_')->field('id,account')->where($wherePromote)->find();

From f9b9694a4a5f2d5f549318ef5ad8cab332aa77c3 Mon Sep 17 00:00:00 2001
From: chenxiaojun <956334972@qq.com>
Date: Fri, 29 Nov 2019 19:07:09 +0800
Subject: [PATCH 55/68] =?UTF-8?q?=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Mobile/Controller/UserController.class.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Application/Mobile/Controller/UserController.class.php b/Application/Mobile/Controller/UserController.class.php
index 3d2064129..d685b2ba5 100644
--- a/Application/Mobile/Controller/UserController.class.php
+++ b/Application/Mobile/Controller/UserController.class.php
@@ -230,6 +230,7 @@ class UserController extends BaseController
                 $whereUser['mobile_phone'] = $account;
                 $userData = M('User', 'tab_')->where($whereUser)->find();
 
+                Log::write('cxj_login:' . date('Y-m-d H:i:s') . ' ---- userData' . json($userData) .'INFO');
                 if (!empty($userData)) {
                     if (empty($userData['promote_id'])) {
                         $saveData['promote_id'] = $promoteId;

From ce01823c6bbf3f8ad2a8dd378b00d98147c882b7 Mon Sep 17 00:00:00 2001
From: chenxiaojun <956334972@qq.com>
Date: Fri, 29 Nov 2019 19:10:26 +0800
Subject: [PATCH 56/68] =?UTF-8?q?=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Mobile/Controller/UserController.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Application/Mobile/Controller/UserController.class.php b/Application/Mobile/Controller/UserController.class.php
index d685b2ba5..abc338ad7 100644
--- a/Application/Mobile/Controller/UserController.class.php
+++ b/Application/Mobile/Controller/UserController.class.php
@@ -230,7 +230,7 @@ class UserController extends BaseController
                 $whereUser['mobile_phone'] = $account;
                 $userData = M('User', 'tab_')->where($whereUser)->find();
 
-                Log::write('cxj_login:' . date('Y-m-d H:i:s') . ' ---- userData' . json($userData) .'INFO');
+                Log::write('cxj_login:' . date('Y-m-d H:i:s') . ' ---- userData' . json_encode($userData) .'INFO');
                 if (!empty($userData)) {
                     if (empty($userData['promote_id'])) {
                         $saveData['promote_id'] = $promoteId;

From fe6dd1ddff20283fcc0dc6e6fbf5be4aae788e88 Mon Sep 17 00:00:00 2001
From: liaojinling <360197197@qq.com>
Date: Sat, 30 Nov 2019 09:37:48 +0800
Subject: [PATCH 57/68] =?UTF-8?q?=E6=94=B9=E6=88=90=E6=97=A7=E7=9A=84?=
 =?UTF-8?q?=E6=89=93=E5=8C=85=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Base/Service/GameSourceService.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Application/Base/Service/GameSourceService.class.php b/Application/Base/Service/GameSourceService.class.php
index 86aa33018..137d68e82 100644
--- a/Application/Base/Service/GameSourceService.class.php
+++ b/Application/Base/Service/GameSourceService.class.php
@@ -9,7 +9,7 @@ use GuzzleHttp\Client;
 
 class GameSourceService {
 
-    const IS_FIXED_IOS13 = true;
+    const IS_FIXED_IOS13 = false;
     const DEBUG = true;
 
     public function __construct()

From 9a25fd0a04f8c94c258b0070063f8fad4932c7fa Mon Sep 17 00:00:00 2001
From: liaojinling <360197197@qq.com>
Date: Sat, 30 Nov 2019 10:28:17 +0800
Subject: [PATCH 58/68] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Home/Controller/ApplyController.class.php        | 12 ++++++++++--
 Application/Home/View/default/Apply/my_game.html     |  3 ++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/Application/Home/Controller/ApplyController.class.php b/Application/Home/Controller/ApplyController.class.php
index 374ae8d03..18b02e1b3 100644
--- a/Application/Home/Controller/ApplyController.class.php
+++ b/Application/Home/Controller/ApplyController.class.php
@@ -1756,8 +1756,12 @@ class ApplyController extends BaseController
     public function getDownloadUrl()
     {
         $gameId = I('game_id', 0);
+        $promoteId = I('promote_id', 0);
         $promote = $this->getLoginPromote();
-        $apply = M('apply', 'tab_')->where(['promote_id' => $promote['id'], 'game_id' => $gameId])->find();
+        if ($promoteId == 0) {
+            $promoteId = $promote['id'];
+        }
+        $apply = M('apply', 'tab_')->where(['promote_id' => $promoteId, 'game_id' => $gameId])->find();
         $game = M('game', 'tab_')->field(['icon'])->where(['id' => $gameId])->find();
         if ($apply == null) {
             $this->ajaxReturn([
@@ -1793,8 +1797,12 @@ class ApplyController extends BaseController
     public function getLandingPageUrl()
     {
         $gameId = I('game_id', 0);
+        $promoteId = I('promote_id', 0);
         $promote = $this->getLoginPromote();
-        $apply = M('apply', 'tab_')->where(['promote_id' => $promote['id'], 'game_id' => $gameId])->find();
+        if ($promoteId == 0) {
+            $promoteId = $promote['id'];
+        }
+        $apply = M('apply', 'tab_')->where(['promote_id' => $promoteId, 'game_id' => $gameId])->find();
         $game = M('game', 'tab_')->field(['icon'])->where(['id' => $gameId])->find();
         if ($apply == null) {
             $this->ajaxReturn([
diff --git a/Application/Home/View/default/Apply/my_game.html b/Application/Home/View/default/Apply/my_game.html
index 33dff8572..36764e55b 100644
--- a/Application/Home/View/default/Apply/my_game.html
+++ b/Application/Home/View/default/Apply/my_game.html
@@ -837,6 +837,7 @@
         var linkTag = this
         var gameId = parseInt($(this).attr('data-game-id'))
         var type = $(this).attr('data-type')
+        var promoteId = "{:I('promote_id', 0)}";
         var url = ''
         if (type == 'download') {
           url = "__URL__/getDownloadUrl"
@@ -847,7 +848,7 @@
           url: url,
           type: 'post',
           dataType: "json",
-          data: {game_id: gameId},
+          data: {game_id: gameId, promote_id: promoteId},
           success: function (response) {
             if (response.status == 1) {
               var qrcodeWidth = 200

From 5b743b545519297e0258de4cd92291a8bfb9633e Mon Sep 17 00:00:00 2001
From: liaojinling <360197197@qq.com>
Date: Sat, 30 Nov 2019 10:58:17 +0800
Subject: [PATCH 59/68] =?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/Controller/HomeController.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Application/Home/Controller/HomeController.class.php b/Application/Home/Controller/HomeController.class.php
index 97d6a27b6..dc41372b5 100644
--- a/Application/Home/Controller/HomeController.class.php
+++ b/Application/Home/Controller/HomeController.class.php
@@ -206,9 +206,9 @@ class HomeController extends Controller
         $game['flooring_page_imgs'] = $imageUrls;
 
         $isNewIos = false;
-        if ($gameSource['create_time'] > strtotime(date('2019-11-27 00:00:00'))) {
+        /* if ($gameSource['create_time'] > strtotime(date('2019-11-27 00:00:00'))) {
             $isNewIos = true;
-        }
+        } */
 
         $downloadUrl = '';
         if (!$isNewIos && $isIOS13) {

From 3cfce8675e3d2ad9b3794596adc1a9a0c80ca1ba Mon Sep 17 00:00:00 2001
From: liaojinling <360197197@qq.com>
Date: Sat, 30 Nov 2019 11:07:41 +0800
Subject: [PATCH 60/68] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=AF=8F=E5=88=86?=
 =?UTF-8?q?=E9=92=9F=E6=89=93=E5=8C=85=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/Controller/AutoPackController.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Application/Admin/Controller/AutoPackController.class.php b/Application/Admin/Controller/AutoPackController.class.php
index 713f67a4f..622619e61 100644
--- a/Application/Admin/Controller/AutoPackController.class.php
+++ b/Application/Admin/Controller/AutoPackController.class.php
@@ -301,7 +301,7 @@ class AutoPackController extends Think
         $applys = M('apply', 'tab_')->field('id,game_id,game_name,promote_id,promote_account,sdk_version')
             ->where($map)
             ->order('bale_sort desc,id desc')
-            ->limit(12)
+            ->limit(15)
             ->select();
 
         if (count($applys) == 0) {

From 1204b1a0e89928254ffbe100bdaa39f26b57d913 Mon Sep 17 00:00:00 2001
From: liaojinling <360197197@qq.com>
Date: Sat, 30 Nov 2019 12:25:24 +0800
Subject: [PATCH 61/68] =?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/Base/Service/GameSourceService.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Application/Base/Service/GameSourceService.class.php b/Application/Base/Service/GameSourceService.class.php
index 137d68e82..86aa33018 100644
--- a/Application/Base/Service/GameSourceService.class.php
+++ b/Application/Base/Service/GameSourceService.class.php
@@ -9,7 +9,7 @@ use GuzzleHttp\Client;
 
 class GameSourceService {
 
-    const IS_FIXED_IOS13 = false;
+    const IS_FIXED_IOS13 = true;
     const DEBUG = true;
 
     public function __construct()

From ca4f1954e47f778775391307a4ac31e944d47253 Mon Sep 17 00:00:00 2001
From: liaojinling <360197197@qq.com>
Date: Sat, 30 Nov 2019 14:55:17 +0800
Subject: [PATCH 62/68] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Base/Service/GameSourceService.class.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Application/Base/Service/GameSourceService.class.php b/Application/Base/Service/GameSourceService.class.php
index 86aa33018..4b29cf111 100644
--- a/Application/Base/Service/GameSourceService.class.php
+++ b/Application/Base/Service/GameSourceService.class.php
@@ -194,6 +194,7 @@ class GameSourceService {
                 ];
             }
 
+            $params['packageUrl'] = C('DOMAIN_DOWNLOAD') . ltrim($originalUrl, '.');
             $params['type'] = 'org';
             $result = $this->createPlist($params);
             if ($result['status']) {

From d5dc2396f235d41cf9a4af01c1a7445dba7dfa31 Mon Sep 17 00:00:00 2001
From: liaojinling <360197197@qq.com>
Date: Sat, 30 Nov 2019 23:54:14 +0800
Subject: [PATCH 63/68] =?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/Base/Tool/Request.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Application/Base/Tool/Request.class.php b/Application/Base/Tool/Request.class.php
index c7fe8b38e..283a670ee 100644
--- a/Application/Base/Tool/Request.class.php
+++ b/Application/Base/Tool/Request.class.php
@@ -33,7 +33,7 @@ class Request {
     {
         $isMobile = false;
         $userAgent = $this->getUserAgent();
-        $mobileAgents = ['Android', 'iPhone', 'SymbianOS', 'Windows Phone', 'iPad','iPod'];
+        $mobileAgents = ['Android', 'iPhone', 'SymbianOS', 'Windows Phone', 'iPad', 'iPod'];
         foreach ($mobileAgents as $mobileAgent) {
             if (stripos($userAgent, $mobileAgent) !== false) {
                 $isMobile = true;
@@ -45,7 +45,7 @@ class Request {
     public function isIOS()
     {
         $userAgent = $this->getUserAgent();
-        if(stripos($userAgent, 'iphone') !== false || strpos($userAgent, 'ipad') !== false) {
+        if(stripos($userAgent, 'iphone') !== false || stripos($userAgent, 'ipad') !== false || stripos($userAgent, 'ipod') !== false) {
             return true;
         }
         return false;

From acf2ff131016f1f7e68a6a0cd46d2a9b96077324 Mon Sep 17 00:00:00 2001
From: chenxiaojun <956334972@qq.com>
Date: Mon, 2 Dec 2019 10:47:52 +0800
Subject: [PATCH 64/68] ios13.1

---
 Application/Mobile/Controller/UserController.class.php | 8 +++++---
 Application/Mobile/View/User/register.html             | 9 +--------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/Application/Mobile/Controller/UserController.class.php b/Application/Mobile/Controller/UserController.class.php
index abc338ad7..4a9c24b41 100644
--- a/Application/Mobile/Controller/UserController.class.php
+++ b/Application/Mobile/Controller/UserController.class.php
@@ -219,7 +219,6 @@ class UserController extends BaseController
 
     public function bindingPromote($promoteId, $account)
     {
-        Log::write('cxj_login:' . date('Y-m-d H:i:s') . ' ---- ' . $promoteId.'INFO');
         if ($promoteId > 0) {
             $wherePromote['id'] = $promoteId;
             $promoteData = M('Promote', 'tab_')->field('id,account')->where($wherePromote)->find();
@@ -230,7 +229,6 @@ class UserController extends BaseController
                 $whereUser['mobile_phone'] = $account;
                 $userData = M('User', 'tab_')->where($whereUser)->find();
 
-                Log::write('cxj_login:' . date('Y-m-d H:i:s') . ' ---- userData' . json_encode($userData) .'INFO');
                 if (!empty($userData)) {
                     if (empty($userData['promote_id'])) {
                         $saveData['promote_id'] = $promoteId;
@@ -405,7 +403,11 @@ class UserController extends BaseController
                 $pgInfo = strval(cookie('pgInfo'));
                 Log::write('register:' . date('Y-m-d H:i:s') . ' ---- ' . json_encode($_POST) . ' --- ' . $pgInfo, 'INFO');
                 if (isset($_POST['promote_id']) && !empty($_POST['promote_id'])) {
-                    $pid = $this->suser->register($phone, $password, $phone, $register_way, $register_type, $_POST['promote_id'], $_POST['promote_account'], $sex, $nickname, $head_img);
+                    Log::write('cxj_register:' . date('Y-m-d H:i:s') . ' ---- post' . json_encode($_POST) .' --- INFO');
+                    $thisPromoteAccount = M('promote', 'tab_')->where(array('id' => $_POST['promote_id']))->getField('account');
+                    $thisPromoteAccount = !empty($thisPromoteAccount) ? $thisPromoteAccount : '自然注册';
+                    $promoteAccount = isset($_POST['promote_account']) ? $_POST['promote_account'] : $thisPromoteAccount;
+                    $pid = $this->suser->register($phone, $password, $phone, $register_way, $register_type, $_POST['promote_id'], $promoteAccount, $sex, $nickname, $head_img);
                 } else {
                     $pid = $this->suser->register($phone, $password, $phone, $register_way, $register_type, '', '', $sex, $nickname, $head_img);
                 }
diff --git a/Application/Mobile/View/User/register.html b/Application/Mobile/View/User/register.html
index 70db4d9d5..3dab79e91 100644
--- a/Application/Mobile/View/User/register.html
+++ b/Application/Mobile/View/User/register.html
@@ -59,14 +59,7 @@
           var tis = this,that = $(tis);
           if (that.hasClass('disabled')) {return false;}  
           var mobile = $.trim($('#mobile').val());
-          var promoteId = parseInt("{:I('get.pid',0)}");
-          var gameId = parseInt("{:I('get.gid',0)}");
-          var data = {};
-          if (promoteId > 0 && gameId > 0) {
-              data = {'phone':mobile,'promote_id':promoteId,'game_id':gameId};
-          } else {
-              data = {'phone':mobile};
-          }
+          var data = {'phone':mobile};
           if (mobile) {
             if (/^1[0-9]{10}$/.test(mobile)) {
                 $.ajax({

From ac4d3b36c71af6a9ec8c1659b0893d47e8b37b42 Mon Sep 17 00:00:00 2001
From: chenxiaojun <956334972@qq.com>
Date: Mon, 2 Dec 2019 10:54:02 +0800
Subject: [PATCH 65/68] ios13.1

---
 Application/Mobile/View/User/login.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Application/Mobile/View/User/login.html b/Application/Mobile/View/User/login.html
index 7ba63d50c..c105dc3d9 100644
--- a/Application/Mobile/View/User/login.html
+++ b/Application/Mobile/View/User/login.html
@@ -29,7 +29,7 @@
           <div class="forget"><a href="{:U('User/forget')}">忘记密码？</a></div>
           <button class="enter submit">登录</button>
      <if condition="I('get.pid') gt 0">
-         <div class="promptly">还没有账号？<a style="margin-left: 10px;"  href="<?='mobile.php?s=/User/step1/pid/'.I('get.pid').'/gid/'.I('get.gid').'.html'?>"> 账号注册 </a>|<a href="<?='mobile.php?s=/User/step/pid/'.I('get.pid').'/gid/'.I('get.gid').'.html'?>"> 手机注册 </a></div>
+       <div class="promptly">还没有账号？<a style="margin-left: 10px;"  href="<?='mobile.php?s=/User/step1/pid/'.I('get.pid').'/gid/'.I('get.gid').'.html'?>"> 账号注册 </a>|<a href="{:U('User/register',array('pid'=>I('get.pid',0),'gid'=>I('get.gid',0)))}"> 手机注册 </a></div>
       <else/>
         <div class="promptly">还没有账号？<a style="margin-left: 10px;" href="{:U('User/step1')}"> 账号注册 </a>|<a href="{:U('User/register')}"> 手机注册 </a></div>
      </if>

From 1707d4d1627768a248fe59ed79ff4ec68d035e2e Mon Sep 17 00:00:00 2001
From: chenxiaojun <956334972@qq.com>
Date: Mon, 2 Dec 2019 10:56:02 +0800
Subject: [PATCH 66/68] ios13.1

---
 Application/Mobile/Controller/UserController.class.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Application/Mobile/Controller/UserController.class.php b/Application/Mobile/Controller/UserController.class.php
index 334fef288..48373ab45 100644
--- a/Application/Mobile/Controller/UserController.class.php
+++ b/Application/Mobile/Controller/UserController.class.php
@@ -402,7 +402,11 @@ class UserController extends BaseController
                 $pgInfo = strval(cookie('pgInfo'));
                 Log::write('register:' . date('Y-m-d H:i:s') . ' ---- ' . json_encode($_POST) . ' --- ' . $pgInfo, 'INFO');
                 if (isset($_POST['promote_id']) && !empty($_POST['promote_id'])) {
-                    $pid = $this->suser->register($phone, $password, $phone, $register_way, $register_type, $_POST['promote_id'], $_POST['promote_account'], $sex, $nickname, $head_img);
+                    Log::write('cxj_register:' . date('Y-m-d H:i:s') . ' ---- post' . json_encode($_POST) .' --- INFO');
+                    $thisPromoteAccount = M('promote', 'tab_')->where(array('id' => $_POST['promote_id']))->getField('account');
+                    $thisPromoteAccount = !empty($thisPromoteAccount) ? $thisPromoteAccount : '自然注册';
+                    $promoteAccount = isset($_POST['promote_account']) ? $_POST['promote_account'] : $thisPromoteAccount;
+                    $pid = $this->suser->register($phone, $password, $phone, $register_way, $register_type, $_POST['promote_id'], $promoteAccount, $sex, $nickname, $head_img);
                 } else {
                     $pid = $this->suser->register($phone, $password, $phone, $register_way, $register_type, '', '', $sex, $nickname, $head_img);
                 }

From fa9d40f87acbb0ee30cacc04d4b2235cdf6fa006 Mon Sep 17 00:00:00 2001
From: yulingwei <2436953959@qq.com>
Date: Mon, 2 Dec 2019 11:26:45 +0800
Subject: [PATCH 67/68] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=A3=8E=E6=8E=A7?=
 =?UTF-8?q?=E6=A0=87=E8=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controller/MemberController.class.php     | 24 +++++++++++++++++++
 .../Admin/View/Member/device_bans_edit.html   |  5 +++-
 .../Admin/View/Member/device_bans_list.html   |  4 +++-
 Data/update.sql                               |  6 ++++-
 4 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/Application/Admin/Controller/MemberController.class.php b/Application/Admin/Controller/MemberController.class.php
index afde5599c..c57b0849f 100644
--- a/Application/Admin/Controller/MemberController.class.php
+++ b/Application/Admin/Controller/MemberController.class.php
@@ -1231,6 +1231,24 @@ class MemberController extends ThinkController
         }
         $list = M('device_bans', 'tab_')->where($map)->page($p, $row)->select();
         $count = M('device_bans', 'tab_')->where($map)->count();
+        if (!empty($list)) {
+            foreach ($list as &$item) {
+                switch ($item['type']) {
+                    case '1':
+                        $item['type_name'] = '设备号';
+                        break;
+                    case '2':
+                        $item['type_name'] = 'IP';
+                        break;
+                    case '3':
+                        $item['type_name'] = '落地页链接';
+                        break;
+                    case '4':
+                        $item['type_name'] = '下载链接';
+                        break;
+                }
+            }
+        }
         $page = set_pagination($count, $row);
         if ($page) {
             $this->assign('_page', $page);
@@ -1249,9 +1267,15 @@ class MemberController extends ThinkController
                 if (empty($type) || empty($tag)) {
                     return $this->error("请填写完整信息");
                 }
+                if (\in_array($type, [3,4]) && !preg_match("/^((https|http|ftp|rtsp|mms)?:\/\/)[^\s]+/i", $tag)) {
+                    return $this->error("请填写正确的url地址");
+                }
                 if ($type == 2 && !preg_match("/(\.((2(5[0-5]|[0-4]\d))|[0-1]?\d{1,2})){3}/i", $tag)) {
                     return $this->error("请填写正确的ip信息，如127.0.0.1");
                 }
+                if ($type == 1 && (preg_match("/(\.((2(5[0-5]|[0-4]\d))|[0-1]?\d{1,2})){3}/i", $tag) || preg_match("/^((https|http|ftp|rtsp|mms)?:\/\/)[^\s]+/i", $tag))) {
+                    return $this->error("请填写正确的设备信息");
+                }
                 $map['type'] = $type;
                 $map['tag'] = $tag;
                 $item = M('device_bans', 'tab_')->where($map)->find();
diff --git a/Application/Admin/View/Member/device_bans_edit.html b/Application/Admin/View/Member/device_bans_edit.html
index 275ac0adc..5d1ba903d 100644
--- a/Application/Admin/View/Member/device_bans_edit.html
+++ b/Application/Admin/View/Member/device_bans_edit.html
@@ -11,10 +11,13 @@
                 <select id="type" name="type" class="select_gallery">
                     <option value="1">设备号</option>
                     <option value="2">IP</option>
+                    <option value="3">落地页链接</option>
+                    <option value="4">下载链接</option>
                 </select>
             </li>
             <li>
-                <label>详情</label><input type="text" name="tag" class="" placeholder="风控标识" value="{:I('tag')}">
+                <label>详情</label>
+                <textarea name="tag" class="" placeholder="风控标识" >{:I('tag')}</textarea>
             </li>
             <li>
                 <label>&nbsp;</label><input type="submit" id="submit" value="确认保存" target-form="form-horizontal" class="form_btn ajax-post">
diff --git a/Application/Admin/View/Member/device_bans_list.html b/Application/Admin/View/Member/device_bans_list.html
index e3549e2bf..9eb370005 100644
--- a/Application/Admin/View/Member/device_bans_list.html
+++ b/Application/Admin/View/Member/device_bans_list.html
@@ -48,6 +48,8 @@
                     <option value="">类型</option>
                     <option value="1" <?php echo I('type') == 1 ? "selected" : "" ?> >设备号</option>
                     <option value="2" <?php echo I('type') == 2 ? "selected" : "" ?> >IP</option>
+                    <option value="3" <?php echo I('type') == 3 ? "selected" : "" ?>>落地页链接</option>
+                    <option value="4" <?php echo I('type') == 4 ? "selected" : "" ?>>下载链接</option>
                 </select>
             </div>
             <div class="input-list">
@@ -95,7 +97,7 @@
                         <tr>
                             <!-- <td><input class="ids" type="checkbox" value="{$data['id']}" name="ids"></td> -->
                             <td>{$data.id}</td>
-                            <td><?php echo $data['type'] == 1 ? "设备号" : "IP";?></td>
+                            <td>{$data.type_name}</td>
                             <td>{$data.tag}</td>
                             <td>{:get_admin_nickname($data['operator_id'])}</td>
                             <td>{$data.create_time|date='Y-m-d H:i:s',###}</td>
diff --git a/Data/update.sql b/Data/update.sql
index 924ff99c5..1490c7dbf 100644
--- a/Data/update.sql
+++ b/Data/update.sql
@@ -608,4 +608,8 @@ promote_account_to:修改后账号
 remark:备注
 create_time:时间
 op_account:操作人账号
-order_time:切分时间' WHERE `id` = 29;
\ No newline at end of file
+order_time:切分时间' WHERE `id` = 29;
+
+--新增风控类型
+ALTER TABLE `tab_device_bans`
+MODIFY COLUMN `type`  tinyint(1) UNSIGNED NOT NULL DEFAULT 0 COMMENT '类型 0未知 1设备号 2IP 3落地页链接 4下载链接' AFTER `tag`;

From bd46fd325b146cf31fa81242c59a3efc6100522b Mon Sep 17 00:00:00 2001
From: ELF <360197197@qq.com>
Date: Mon, 2 Dec 2019 11:42:26 +0800
Subject: [PATCH 68/68] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E7=A6=81=E7=94=A8=E8=90=BD=E5=9C=B0=E9=A1=B5=E4=B8=8B=E8=BD=BD?=
 =?UTF-8?q?=E9=A1=B5=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Home/Controller/HomeController.class.php    | 3 ++-
 Application/Home/Controller/PackageController.class.php | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Application/Home/Controller/HomeController.class.php b/Application/Home/Controller/HomeController.class.php
index dc41372b5..9254e4332 100644
--- a/Application/Home/Controller/HomeController.class.php
+++ b/Application/Home/Controller/HomeController.class.php
@@ -141,7 +141,8 @@ class HomeController extends Controller
         if ($code == '' && ($gameId == 0 || $promoteId == 0)) {
             $this->error('访问错误');
         }
-        $blackList = [];
+
+        $blackList = M('device_bans', 'tab_')->where(['type' => 3])->getField('tag', true);
         if (in_array($code, $blackList) || in_array('gid/' . $gameId . '/pid/' . $promoteId, $blackList)) {
             $this->error('该链接已被禁');
         }
diff --git a/Application/Home/Controller/PackageController.class.php b/Application/Home/Controller/PackageController.class.php
index ebd8279c8..580cc849d 100644
--- a/Application/Home/Controller/PackageController.class.php
+++ b/Application/Home/Controller/PackageController.class.php
@@ -30,12 +30,12 @@ class PackageController extends Controller
         $code = I('code', '');
         $gameId = I('game_id', 0);
         $promoteId = I('promote_id', 0);
-// var_dump($gameId, $promoteId);die();
+        
         if ($code == '' && ($gameId == 0 || $promoteId == 0)) {
             $this->redirect("package/downloadError", ['message' => '访问错误']);
         }
 
-        $blackList = [];
+        $blackList = M('device_bans', 'tab_')->where(['type' => 4])->getField('tag', true);
         if (in_array($code, $blackList) || in_array('game_id/' . $gameId . '/promote_id/' . $promoteId, $blackList)) {
             $this->redirect("package/downloadError", ['message' => '该链接已被禁']);
         }