From 2ca1009b326656975306166982ddbfffe7292238 Mon Sep 17 00:00:00 2001
From: chenxiaojun <956334972@qq.com>
Date: Thu, 10 Oct 2019 09:44:13 +0800
Subject: [PATCH 07/25] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E5=90=8E?=
=?UTF-8?q?=E5=8F=B0=20=E6=B8=B8=E6=88=8F=E6=B7=BB=E5=8A=A0=E6=B7=B7?=
=?UTF-8?q?=E6=9C=8D=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Application/Admin/View/Game/add.html | 14 ++++++++++++++
Application/Admin/View/Game/edit.html | 15 +++++++++++++++
2 files changed, 29 insertions(+)
diff --git a/Application/Admin/View/Game/add.html b/Application/Admin/View/Game/add.html
index 27196ce88..7e8ad8c7a 100644
--- a/Application/Admin/View/Game/add.html
+++ b/Application/Admin/View/Game/add.html
@@ -75,6 +75,20 @@
+
| 开放类型 |
From 622264a82061ee07b32e147064c168721fa7063a Mon Sep 17 00:00:00 2001
From: chenxiaojun <956334972@qq.com>
Date: Thu, 10 Oct 2019 10:25:05 +0800
Subject: [PATCH 08/25] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=9F=A5=E8=AF=A2?=
=?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Home/Controller/QueryController.class.php | 13 +++++++++++--
.../Home/View/default/Public/promote_base.html | 2 +-
Application/Home/View/default/Query/recharge.html | 10 +++++-----
3 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/Application/Home/Controller/QueryController.class.php b/Application/Home/Controller/QueryController.class.php
index 3382bdd5b..5b06ee2a3 100644
--- a/Application/Home/Controller/QueryController.class.php
+++ b/Application/Home/Controller/QueryController.class.php
@@ -99,7 +99,7 @@ class QueryController extends BaseController
$map['tab_spend.is_check'] = ['neq', 2];
$data = M('Spend', 'tab_')
- ->field('tab_spend.*,tab_promote.account as pro_account,tab_promote.real_name as pro_real_name,tab_promote.grand_id as pro_grand_id')
+ ->field('tab_spend.*,tab_promote.account as pro_account,tab_promote.real_name as pro_real_name,tab_promote.grand_id as pro_grand_id,tab_promote.parent_id as pro_parent_id')
->join('tab_game on tab_spend.game_id = tab_game.id')
->join('left join tab_promote on tab_spend.promote_id = tab_promote.id')
->where($map)
@@ -114,6 +114,14 @@ class QueryController extends BaseController
if (!empty($data)) {
foreach ($data as &$list) {
+ if ($list['pro_grand_id'] > 0) {
+ $thisPromoteData = D('Promote')
+ ->field('account,real_name')
+ ->where(array('id' => $list['pro_parent_id']))
+ ->find();
+ $list['p_pro_account'] = $thisPromoteData['account'];
+ $list['p_pro_real_name'] = $thisPromoteData['real_name'];
+ }
$list['user_account'] = substr($list['user_account'], 0, 2) . '******' . substr($list['user_account'], 8);
}
}
@@ -148,7 +156,7 @@ class QueryController extends BaseController
$this->assign('pID', PID);
$this->assign('ownId', I('own_id'));
$this->assign('payWayData', QueryController::$payWay);
- $this->meta_title = "充值明细";
+ $this->meta_title = "订单查询";
$this->display();
}
@@ -1880,6 +1888,7 @@ class QueryController extends BaseController
}
$this->assign('list_data', $spendData);
+ $this->meta_title = "订单详情";
$this->display('view_spend_detailed');
}
}
diff --git a/Application/Home/View/default/Public/promote_base.html b/Application/Home/View/default/Public/promote_base.html
index 73b31b407..fb122b97d 100644
--- a/Application/Home/View/default/Public/promote_base.html
+++ b/Application/Home/View/default/Public/promote_base.html
@@ -51,7 +51,7 @@
每日概况
数据汇总
- 充值明细
+ 订单查询
注册明细
diff --git a/Application/Home/View/default/Query/recharge.html b/Application/Home/View/default/Query/recharge.html
index 71370e406..3a1a1d508 100644
--- a/Application/Home/View/default/Query/recharge.html
+++ b/Application/Home/View/default/Query/recharge.html
@@ -55,11 +55,11 @@
- 当前位置：数据管理>充值明细
+ 当前位置：数据管理>订单查询
- 充值明细
- 对所有渠道用户玩家产生的充值信息，进行记录的功能
+ 订单数据
+ 对所有渠道用户玩家产生的订单信息，进行记录的功能
@@ -207,9 +207,9 @@
| {$vo.pro_account}({$vo.pro_real_name}) |
- |
+ {$vo.pro_account}({$vo.pro_real_name}) |
- |
+ {$vo.p_pro_account}({$vo.p_pro_real_name}) |
{$vo.pro_account}({$vo.pro_real_name}) |
From e95b78aa0363dc83102b35084865bafe22c963e3 Mon Sep 17 00:00:00 2001
From: chenxiaojun <956334972@qq.com>
Date: Thu, 10 Oct 2019 10:26:01 +0800
Subject: [PATCH 09/25] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=9F=A5=E8=AF=A2?=
=?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Application/Home/View/default/Query/view_spend_detailed.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Application/Home/View/default/Query/view_spend_detailed.html b/Application/Home/View/default/Query/view_spend_detailed.html
index b44dd28bc..4cb678fc7 100644
--- a/Application/Home/View/default/Query/view_spend_detailed.html
+++ b/Application/Home/View/default/Query/view_spend_detailed.html
@@ -33,7 +33,7 @@
- 当前位置：数据管理>充值明细>查看详细
+ 当前位置：数据管理>订单查询>查看详细
From 906f3fd87076d09ed3999092e4e198ac967e9349 Mon Sep 17 00:00:00 2001
From: chenxiaojun <956334972@qq.com>
Date: Thu, 10 Oct 2019 10:27:59 +0800
Subject: [PATCH 10/25] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=9F=A5=E8=AF=A2?=
=?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Application/Home/View/default/Query/recharge.html | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Application/Home/View/default/Query/recharge.html b/Application/Home/View/default/Query/recharge.html
index 3a1a1d508..d9911f061 100644
--- a/Application/Home/View/default/Query/recharge.html
+++ b/Application/Home/View/default/Query/recharge.html
@@ -175,8 +175,8 @@
| 玩家账号 |
游戏订单 |
- 订单金额 |
支付方式 |
+ 订单金额 |
游戏名称 |
区服 |
角色名 |
@@ -199,8 +199,8 @@
| {$vo.user_account} |
{$vo.order_number} |
- {$vo.pay_amount} |
{:get_pay_way($vo['pay_way'])} |
+ {$vo.pay_amount} |
{$vo.game_name} |
{$vo.server_name} |
{$vo.game_player_name} |
From 4a96cf7871d716191e2fb283adeeb24058fadaab Mon Sep 17 00:00:00 2001
From: "18850253506@163.com" <18850253506@163.com>
Date: Thu, 10 Oct 2019 10:58:24 +0800
Subject: [PATCH 11/25] =?UTF-8?q?=E8=B5=84=E6=96=99=E4=B8=93=E5=8C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Admin/Controller/GameController.class.php | 11 +-
Application/Admin/View/Game/add.html | 14 +-
Application/Admin/View/Game/edit.html | 8 +
.../Home/Controller/ApplyController.class.php | 120 +++
.../Home/View/default/Apply/feature.html | 748 ++++++++++++++++++
Data/update.sql | 3 +-
6 files changed, 901 insertions(+), 3 deletions(-)
create mode 100644 Application/Home/View/default/Apply/feature.html
diff --git a/Application/Admin/Controller/GameController.class.php b/Application/Admin/Controller/GameController.class.php
index cf7174101..b45cdcb4e 100644
--- a/Application/Admin/Controller/GameController.class.php
+++ b/Application/Admin/Controller/GameController.class.php
@@ -180,6 +180,14 @@ class GameController extends ThinkController
} else {
$_POST['display_site'] = '';
}
+
+ $content = $_POST['content'];
+ if(!empty($content)) {
+ $_POST['detail_content'] = $content;
+ } else {
+ $_POST['detail_content'] = '';
+ }
+
$pinyin = new \Think\Pinyin();
$num = mb_strlen($_POST['game_name'], 'UTF8');
@@ -288,9 +296,10 @@ class GameController extends ThinkController
} else {
$_POST['display_site'] = '';
}
-
+ $content = $_POST['content'];
$game = D(self::model_name);//M('$this->$model_name','tab_');
$_POST['discount'] == '' ? $_POST['discount'] = 10 : $_POST['discount'];
+ $_POST['detail_content'] = $content;
$res = $game->update();
$id = $res["id"];
$sibling = D("Game")->find($id);
diff --git a/Application/Admin/View/Game/add.html b/Application/Admin/View/Game/add.html
index 7e8ad8c7a..a967b6986 100644
--- a/Application/Admin/View/Game/add.html
+++ b/Application/Admin/View/Game/add.html
@@ -191,7 +191,19 @@
| 游戏详细介绍： |
-
+
+ |
+
+
+ | 游戏资料中心： |
+
+
+
+
+ {:hook('adminArticleEdit', array('name'=>'content','value'=>$field['value']))}
+
+
|
diff --git a/Application/Admin/View/Game/edit.html b/Application/Admin/View/Game/edit.html
index 32d70678b..b97ee5d7e 100644
--- a/Application/Admin/View/Game/edit.html
+++ b/Application/Admin/View/Game/edit.html
@@ -202,6 +202,14 @@
+
+
+ | 游戏资料中心： |
+
+
+ {:hook('adminArticleEdit', array('name'=>'content','value'=>$field['value']))}
+ |
+
| 游戏ICON |
diff --git a/Application/Home/Controller/ApplyController.class.php b/Application/Home/Controller/ApplyController.class.php
index ac8cacea8..a7e554662 100644
--- a/Application/Home/Controller/ApplyController.class.php
+++ b/Application/Home/Controller/ApplyController.class.php
@@ -198,6 +198,105 @@ class ApplyController extends BaseController
$this->meta_title = "申请游戏";
$this->display('index');
}
+
+ //查看游戏资料专区
+ public function feature($p = 0, $type = 0)
+ {
+ $promoteId = empty(I('promote_id')) ? PID : I('promote_id');//搜索的渠道ID
+ $promoteRole = empty(I('promote_role')) ? 1 : I('promote_role');//渠道角色
+ //$parentPromoteId = getParentPromoteId($promoteId);//上级渠道ID
+ $thisParentPromoteId = getParentPromoteId(PID);//本账号上级渠道ID
+
+// $addPermission = 1;//是否有添加游戏权限
+// if ($thisParentPromoteId == 0 && $promoteRole == 3) {
+// $addPermission = 0;
+// }
+
+ $map['tab_game.online_status'] = 1;//开发者游戏上线状态
+ $map['tab_game.down_port'] = 1;//游戏端口 第三方接口不能申请
+ $map['tab_game.game_status'] = 1;//游戏状态
+ $map['tab_game.developers'] = 0; //平台游戏(官网游戏，非开发者游戏)
+
+ $applyPromote = M('apply','tab_')->field('game_id')->where(['promote_id' => $promoteId])->select();
+ $noDeveloperGameArr = array();
+
+ foreach ($applyPromote as $key => $value) {
+ $applyPromoteGameId = $value['game_id'];
+ $gameInfo = M('Game','tab_')
+ ->field('id,icon,game_name,features,sdk_version,game_size,game_type_name,relation_game_name,developers')
+ ->where(['id' => $applyPromoteGameId])->select();
+ if($gameInfo[0]['developers'] > 0){
+ unset($gameInfo[0]['developers']);
+ $noDeveloperGameArr[] = $gameInfo[0]['id'] ; //非开发者游戏
+ }
+ }
+
+
+ $page = intval($p);
+ $page = $page ? $page : 1; //默认显示第一页数据
+
+ if (isset($_REQUEST['row'])) {
+ $row = $_REQUEST['row'];
+ } else {
+ $row = 10;
+ }
+ $map['_logic'] = 'and';
+ if (!empty(I('game_id'))) {
+ $thisRelationGameName = M('Game', 'tab_')->where(array('id' => I('game_id')))->getField('relation_game_name');
+
+ $map['tab_game.relation_game_name'] = ['like', $thisRelationGameName];
+ $where['_complex'] = $map;
+ // $where['tab_game.id'] = ['in',$noDeveloperGameArr];
+ // $where['_logic']='or';
+ }else {
+ $where['_complex'] = $map;
+ $where['tab_game.id'] = ['in',$noDeveloperGameArr];
+ $where['_logic']='or';
+ }
+
+ $data = M('Game', 'tab_')
+ ->field('tab_game.id,tab_game.icon,tab_game.game_name,tab_game.features,tab_game.sdk_version,tab_game.game_size,tab_game.game_type_name,tab_game.relation_game_name,ta_1.id as apply_id_1')
+ ->join('left join tab_apply as ta_1 on tab_game.id = ta_1.game_id and ta_1.offline_status = 0 and ta_1.promote_id = ' . $promoteId)//查询是否拥有该游戏
+ ->where($where)
+ ->order('tab_game.developers desc,tab_game.sort desc,tab_game.id desc')
+ ->page($page, $row)
+ ->select();
+ //$AllData = array_merge($noDeveloperGameArr,$data);
+
+ /* 查询记录总数 */
+ $count = M("Game", "tab_")
+ ->field('tab_game.id')
+ ->where($map)
+ ->select();
+ $count = count($count);
+
+ //分页
+ $parameter['p'] = I('get.p', 1);
+ $parameter['row'] = I('get.row');
+ $parameter['type'] = $type;
+ $parameter['promote_role'] = $promoteRole;
+ empty(I('promote_id')) || $parameter['promote_id'] = I('promote_id');
+
+ $page = set_pagination($count, $row, $parameter);
+ if ($page) {
+ $this->assign('_page', $page);
+ }
+
+ $this->assign('list_data', $data);
+ $this->assign("count", $count);
+ $this->assign("promoteId", $promoteId);
+ // $this->assign('parentPromoteId', $parentPromoteId);
+ $this->assign('thisParentPromoteId', $thisParentPromoteId);
+ // $this->assign('promoteRole', $promoteRole);
+ $this->assign('pID', PID);
+ //$this->assign('promoteData', getAllPromoteListByType($promoteRole));
+// $this->assign('addPermission', $addPermission);
+ // $this->assign('type', $type);
+
+ $this->meta_title = "申请游戏";
+
+ $this->display();
+ }
//查看游戏详情
public function viewGameDetailed()
@@ -1597,4 +1696,25 @@ class ApplyController extends BaseController
$this->ajaxReturn(['status' => 1, 'data' => $enableStatus]);
}
+
+ public function backDetailData() { //返回详情数据
+ $result = ['code' => 10001,'msg' => "该游戏信息不存在，请确认！",'error' => 1,'info' => ''];
+ $id = $_POST['id'];
+ if(empty($id)) {
+ $this->ajaxReturn($result);
+ }
+ $gameInfo = M('Game','tab_')->where(['id' => $id])->getField('detail_content');
+ if(!$gameInfo) {
+ $this->ajaxReturn($result);
+ }else {
+ $result['code'] = 10000;
+ $result['msg'] = "获取信息成功";
+ $result['error'] = -1;
+ $result['info'] = $gameInfo;
+ $this->ajaxReturn($result);
+
+ }
+
+
+ }
}
diff --git a/Application/Home/View/default/Apply/feature.html b/Application/Home/View/default/Apply/feature.html
new file mode 100644
index 000000000..0211843b3
--- /dev/null
+++ b/Application/Home/View/default/Apply/feature.html
@@ -0,0 +1,748 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  资料专区
+
+
+
+
+
+
+
+
+ -
+
+ 暂无数据
+
+
+
+
+ -
+
+
+
+
+
+
+
+ {$_page}
+
+
+
+ | |