diff --git a/Application/Admin/Conf/config.php b/Application/Admin/Conf/config.php
index f0c3cb657..62f5a797c 100644
--- a/Application/Admin/Conf/config.php
+++ b/Application/Admin/Conf/config.php
@@ -17,6 +17,8 @@ return array(
'DATA_CACHE_TYPE' => 'File', // 数据缓存类型
'URL_MODEL' => 3, //URL模式
+ 'GET_INFO_KEY' => 'wmkjtx_kj213',
+
/* 文件上传相关配置 */
'DOWNLOAD_UPLOAD' => array(
'mimes' => '', //允许上传的文件MiMe类型
diff --git a/Application/Admin/Controller/AjaxController.class.php b/Application/Admin/Controller/AjaxController.class.php
index e5819d404..a66743da3 100644
--- a/Application/Admin/Controller/AjaxController.class.php
+++ b/Application/Admin/Controller/AjaxController.class.php
@@ -151,8 +151,12 @@ class AjaxController extends ThinkController{
}
}
- public function getPromotersByLevel($level=1)
+ public function getPromotersByLevel()
{
+ $level = I('level');
+ if (!$level) {
+ return $this->ajaxReturn(['code'=>1, 'msg'=>'获取成功', 'data'=>[]]);
+ }
$this->ajaxReturn(['code'=>1, 'msg'=>'获取成功', 'data'=>(new PromoteModel)->getPromotersByLevel($level)]);
}
diff --git a/Application/Admin/Controller/ConsoleController.class.php b/Application/Admin/Controller/ConsoleController.class.php
index cd6fd82a8..53113ade2 100644
--- a/Application/Admin/Controller/ConsoleController.class.php
+++ b/Application/Admin/Controller/ConsoleController.class.php
@@ -5,23 +5,55 @@
namespace Admin\Controller;
use Admin\Model\SpendModel;
use Think\Think;
-use Org\RedisSDK\Redis;
-class AutoController extends Think {
+class ConsoleController extends Think {
protected function _initialize()
{
C(api('Config/lists'));
}
- public function modifyUserRole()
- {
- M('user_play_info', 'tab_')->select(['game_id', 'server_id', 'role_id'])->group('game_id, server_id, role_id')->having('count(*)>1')->select();
-
- }
-
- public function modifyRecharge()
+ public function modifyPromote()
{
+ $promotes = M('promote', 'tab_')->where(['parent_id' => 0])->select();
+ foreach ($promotes as $promote) {
+ $promote['chain'] = '/';
+ $promote['level'] = 1;
+
+ M('promote', 'tab_')->where(['id' => $promote['id']])->save(['chain' => '/', 'level' => 1]);
+ $subPromote = $promote;
+ unset($subPromote['id']);
+ $subPromote['parent_id'] = $promote['id'];
+ $subPromote['parent_name'] = $promote['account'];
+ $subPromote['chain'] = $promote['chain'] . $promote['id'] . '/';
+ $subPromote['level'] = $promote['level'] + 1;
+ $subPromote['account'] = 'second_' . $promote['account'];
+ $subPromote['nickname'] = '二级_' . $promote['nickname'];
+ $subPromote['mobile_phone'] = '';
+ $subPromote['email'] = '';
+ $subPromote['real_name'] = '';
+ $subPromote['money'] = 0;
+ $subPromote['total_money'] = 0;
+ $subPromote['balance_coin'] = 0;
+ $subPromote['create_time'] = time();
+ $subPromote['last_login_time'] = 0;
+ $subPromote['idcard'] = '';
+ M('promote', 'tab_')->add($subPromote);
+ $subId = M()->getLastInsID();
+ $subChain = $subPromote['chain'] . $subId . '/';
+ M('promote', 'tab_')->where(['parent_id' => $promote['id'], 'id' => ['neq', $subId]])->save([
+ 'parent_id' => $subId,
+ 'parent_name' => $subPromote['account'],
+ 'chain' => $subChain,
+ 'level' => 3,
+ ]);
+ // echo M()->getLastSql() . "\n";
+ M('promote', 'tab_')->where(['grand_id' => $promote['id']])->save([
+ 'chain' => ['exp', 'concat("' . $subChain. '",parent_id,"/")'],
+ 'level' => 4,
+ ]);
+ // echo M()->getLastSql() . "\n";
+ }
}
}
diff --git a/Application/Admin/Controller/MemberController.class.php b/Application/Admin/Controller/MemberController.class.php
index 41f3b410b..0dd00f39e 100644
--- a/Application/Admin/Controller/MemberController.class.php
+++ b/Application/Admin/Controller/MemberController.class.php
@@ -68,6 +68,12 @@ class MemberController extends ThinkController
$maps['tab_user.account'] = ['like',"%".I('account')."%"];
unset($_REQUEST['account']);
}
+ if (isset($_REQUEST['device_number'])) {
+ empty($hav) || $hav .= ' AND ';
+ $hav .= "tab_user.device_number = '{$_REQUEST['device_number']}'";
+ $maps['tab_user.device_number'] = $_REQUEST['device_number'];
+ unset($_REQUEST['device_number']);
+ }
if (isset($_REQUEST['age_status'])) {
empty($hav) || $hav .= ' AND ';
$hav .= 'tab_user.age_status =' . I('age_status');
@@ -1151,7 +1157,7 @@ class MemberController extends ThinkController
M('device_bans', 'tab_')->add(['type'=>$type, 'tag'=>$tag, 'create_time'=>time(), 'operator_id'=>is_login()]);
}
- return $this->success("新增成功");
+ return $this->success("新增成功", U('Member/device_bans_list'));
} else {
M('device_bans', 'tab_')->where(['id'=>$id])->delete();
return $this->success("解除成功");
diff --git a/Application/Admin/Model/UserModel.class.php b/Application/Admin/Model/UserModel.class.php
index 1dc8c4bdf..e5529b227 100644
--- a/Application/Admin/Model/UserModel.class.php
+++ b/Application/Admin/Model/UserModel.class.php
@@ -1102,6 +1102,22 @@ class UserModel extends Model{
$data['fgame_id']=$game_id;
$data['fgame_name']=$game_name;
$model->save($data);
+ $device_type = M('User','tab_')->where(['id' => $user['id']])->getField('device_type');
+ if(empty($device_type)){
+ $gameServer = substr($game_name, -10, 9);
+ if($gameServer == '安卓版'){
+ $arr['device_type'] = 'Android';
+ } elseif($gameServer == '苹果版') {
+ $arr['device_type'] = 'IOS';
+ }
+ $arr['time'] = time();
+ $arr['account'] = $account;
+ ksort($arr);
+ reset($arr);
+ $sign = md5(http_build_query($arr) . C('GET_INFO_KEY'));
+ $arr['sign'] = $sign;
+ $reData = curl_post('http://oa.76ba.com/api/wanmeng/deviceTypeUpdate',$arr);
+ }
}
return $data["token"];
}
diff --git a/Application/Admin/View/Member/device_bans_list.html b/Application/Admin/View/Member/device_bans_list.html
index 3279cdd11..81ccea278 100644
--- a/Application/Admin/View/Member/device_bans_list.html
+++ b/Application/Admin/View/Member/device_bans_list.html
@@ -100,7 +100,7 @@
| {:get_admin_nickname($data['operator_id'])} |
{$data.create_time|date='Y-m-d H:i:s',###} |
- 解除
+ 解除
|
diff --git a/Application/Admin/View/Member/edit.html b/Application/Admin/View/Member/edit.html
index 5041ccaa3..a23921597 100644
--- a/Application/Admin/View/Member/edit.html
+++ b/Application/Admin/View/Member/edit.html
@@ -307,7 +307,7 @@
$("#role").click(function () {
layer.open({
type: 2,
- title: "【游戏付费记录】列表",
+ title: "【游戏角色】列表",
shadeClose: true,
shade: 0.8,
area: ['70%', '80%'],
diff --git a/Application/Admin/View/Member/user_info.html b/Application/Admin/View/Member/user_info.html
index a0842a56e..e7bab57aa 100644
--- a/Application/Admin/View/Member/user_info.html
+++ b/Application/Admin/View/Member/user_info.html
@@ -150,6 +150,9 @@
+
+
+
diff --git a/Application/Admin/View/Query/withdraw.html b/Application/Admin/View/Query/withdraw.html
index d9f71f886..e4d233f10 100644
--- a/Application/Admin/View/Query/withdraw.html
+++ b/Application/Admin/View/Query/withdraw.html
@@ -376,6 +376,11 @@ function details(id){
},
// dnd: false,
paste: document.body,
+ accept: {
+ title: '文件',
+ extensions: 'png,gif,jpg,jpeg,bmp,txt,doc*,xlsx,asp,pdf',
+ mimeTypes: '.png,.gif,.jpg,.jpeg,.bmp,.txt,.doc*,.xlsx,.asp,.pdf',
+ },
// 不压缩image, 默认如果是jpeg，文件上传前会压缩一把再上传！
resize: false,
disableGlobalDnd: true,
diff --git a/Application/Admin/View/TestResource/index.html b/Application/Admin/View/TestResource/index.html
index 72d2a6bec..cfa496488 100644
--- a/Application/Admin/View/TestResource/index.html
+++ b/Application/Admin/View/TestResource/index.html
@@ -180,6 +180,11 @@
+
+ if(C('COLOR_STYLE')=='blue_color') echo '';
+
+
+
+