diff --git a/Application/Home/Controller/TestResourceController.class.php b/Application/Home/Controller/TestResourceController.class.php
index fe03d36c2..4f7f381b8 100644
--- a/Application/Home/Controller/TestResourceController.class.php
+++ b/Application/Home/Controller/TestResourceController.class.php
@@ -33,8 +33,8 @@ class TestResourceController extends BaseController
if(!empty(I('user_account'))){
$map['tab_test_resource.user_account']=['like','%'.I('user_account').'%'];
}
- if(!empty(I('promote_name'))){
- $map['tab_test_resource.promote_account']=['like','%'.I('promote_name').'%'];
+ if(!empty(I('promote_id'))){
+ $map['tab_test_resource.promote_id']=I('promote_id');
}
$map['user.promote_id']=session("promote_auth.pid");
@@ -45,7 +45,6 @@ class TestResourceController extends BaseController
->page($page,$row)
->order('tab_test_resource.create_time DESC')
->select();
-// echo M('test_resource','tab_')->_sql();die();
foreach ($data as $key => $value) {
$data[$key]['create_time'] = date('Y-m-d H:m:i',$value['create_time']);
@@ -606,5 +605,15 @@ class TestResourceController extends BaseController
$this->display();
}
+ public function getChildPromoteList()
+ {
+ $promoteId = intval(I('post.promote_id', 0));
+ $promoteId = empty($promoteId) ? PID : $promoteId;
+ $promoteList = getAllPromoteListByType(3, false, $promoteId);
+ $data['status'] = 1;
+ $data['data'] = $promoteList;
+
+ $this->ajaxReturn($data);
+ }
}
\ No newline at end of file
diff --git a/Application/Home/View/default/TestResource/protectLogList.html b/Application/Home/View/default/TestResource/protectLogList.html
index 93c8c63f1..59b3d3dfd 100644
--- a/Application/Home/View/default/TestResource/protectLogList.html
+++ b/Application/Home/View/default/TestResource/protectLogList.html
@@ -48,7 +48,7 @@
diff --git a/Application/Home/View/default/TestResource/supportNumberList.html b/Application/Home/View/default/TestResource/supportNumberList.html
index 1843338e2..7cc17060c 100644
--- a/Application/Home/View/default/TestResource/supportNumberList.html
+++ b/Application/Home/View/default/TestResource/supportNumberList.html
@@ -46,10 +46,13 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -162,6 +192,7 @@
diff --git a/Data/update.sql b/Data/update.sql
index b4e5fac89..ce1797271 100644
--- a/Data/update.sql
+++ b/Data/update.sql
@@ -168,15 +168,6 @@ ADD COLUMN `user_token` char(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT
-- ----------------------------
alter table `tab_giftbag` modify COLUMN `giftbag_version` tinyint(2) COMMENT '运营平台 0双平台 1and 2ios 3超级签'
--- ----------------------------
--- 2019-10-17 zyx
--- ----------------------------
-ALTER TABLE `tab_test_resource`
-MODIFY COLUMN `user_account` varchar(50) BINARY CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '用户帐号' AFTER `user_id`;
-ALTER TABLE `tab_test_resource`
-MODIFY COLUMN `role_name` varchar(50) BINARY CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '角色名' AFTER `phone`,
-MODIFY COLUMN `promote_account` varchar(30) BINARY CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '所属推广员账号' AFTER `promote_id`;
-
-- 2019-10-22 cxj
UPDATE `sys_model` SET list_grid = "id:编号\r\nsort:排序\r\ngame_name:游戏名称\r\ngame_type_name:游戏类型\r\ngame_type_id:游戏类型\r\ngame_appid:游戏appid\r\ngame_status|get_info_status:显示状态\r\npay_status|get_info_status:支付状态\r\nicon:图片id\r\napply_status:审核状态\r\ncategory:开放类型\r\nrecommend_status|get_info_status*1:推荐状态\r\nrelation_game_id:关联游戏id\r\nrelation_game_name:关联游戏名称\r\nsdk_version:运营平台\r\ndevelopers:开发商\r\ndow_num:下载\r\nonline_status:上线状态\r\ncreate_time:创建时间\r\nserver_type:混服管理\r\nid:操作:[EDIT]&id=[id]|编辑,Game/del?ids=[id]|删除" where id = 15;