master
elf 11 months ago
parent 3924f3ab1d
commit 1437980c72

@ -117,7 +117,7 @@ class PromoteController extends ThinkController
$row = 10; $row = 10;
} }
if (I('oa_associated', -1) != -1) { if (I('oa_associated', -1) != -1 && false) {
$map['oa_associated'] = I('oa_associated'); $map['oa_associated'] = I('oa_associated');
$oa_data = []; $oa_data = [];
for ($i = 1; $i > 0; $i++) { for ($i = 1; $i > 0; $i++) {
@ -170,7 +170,7 @@ class PromoteController extends ThinkController
$list_data = M()->table("(".$list_data.") a")->field("a.*,pr.account top_account")->join("tab_promote pr on a.top_id = pr.id")->select(); $list_data = M()->table("(".$list_data.") a")->field("a.*,pr.account top_account")->join("tab_promote pr on a.top_id = pr.id")->select();
$list_data = D(self::model_name)->parseListData($list_data); $list_data = D(self::model_name)->parseListData($list_data);
$oa_data = []; $oa_data = [];
if (I('oa_associated', -1) == -1) { if (I('oa_associated', -1) == -1 && false) {
foreach ($list_data as $k => $v) { foreach ($list_data as $k => $v) {
// $list_data[$k]['account'] = trim($v['account']); // $list_data[$k]['account'] = trim($v['account']);
// if($v['oa_associated'] != 1) { // if($v['oa_associated'] != 1) {

@ -1283,8 +1283,8 @@ class PromoteService {
$siteConfig = $promoteCompany && $promoteCompany['is_site_custom'] == 1 ? json_decode($promoteCompany['site_config'], true) : null; $siteConfig = $promoteCompany && $promoteCompany['is_site_custom'] == 1 ? json_decode($promoteCompany['site_config'], true) : null;
if (!$siteConfig) { if (!$siteConfig) {
$siteConfig = []; $siteConfig = [];
$siteConfig['logo'] = check_logo_is_exist(C('CH_LOGO_BACKSTAGE'), 'logo_default.png'); $siteConfig['logo'] = check_logo_is_exist(C('CH_LOGO_BACKSTAGE'), 'logo1.jpg');
// $siteConfig['login_logo'] = check_logo_is_exist(C('CH_SET_LOGO'),'logo_default.png'); // $siteConfig['login_logo'] = check_logo_is_exist(C('CH_SET_LOGO'),'logo1.jpg');
$siteConfig['icon'] = get_cover(C('CH_SET_ICO'), 'path'); $siteConfig['icon'] = get_cover(C('CH_SET_ICO'), 'path');
$siteConfig['title'] = seo_replace(C('channel_index.seo_title'),'','channel') . '_' . C('CH_SET_TITLE'); $siteConfig['title'] = seo_replace(C('channel_index.seo_title'),'','channel') . '_' . C('CH_SET_TITLE');
} else { } else {
@ -1310,4 +1310,4 @@ class PromoteService {
} }
return $promote; return $promote;
} }
} }

@ -4429,7 +4429,7 @@ class DownloadController extends BaseController
$field = "$fieldS, $fieldUser, $fieldToday as recharge_cost_today, $fieldLR as user_game_login_count"; $field = "$fieldS, $fieldUser, $fieldToday as recharge_cost_today, $fieldLR as user_game_login_count";
$subQuery = M('spend', 'tab_')->alias('uc') $subQuery = M('spend', 'tab_')->alias('uc')
->field($field) ->field($field)
// ->join('left join tab_user_play_info as ui on ui.user_id = uc.user_id and ui.game_id = uc.game_id and ui.server_id = uc.server_id and ui.role_id = uc.role_id') ->join('left join tab_user_play_info as ui on ui.user_id = uc.user_id and ui.game_id = uc.game_id and ui.server_id = uc.server_id and ui.role_id = uc.game_player_id')
->join('join tab_user as u on u.id = uc.user_id') ->join('join tab_user as u on u.id = uc.user_id')
->where($map) ->where($map)
->group('uc.game_player_id,uc.server_id,uc.game_id,uc.user_id,uc.promote_id') ->group('uc.game_player_id,uc.server_id,uc.game_id,uc.user_id,uc.promote_id')
@ -5296,4 +5296,4 @@ class DownloadController extends BaseController
} }
$this->exportExcel($xlsName, $xlsCell, $data, $id); $this->exportExcel($xlsName, $xlsCell, $data, $id);
} }
} }

@ -48,7 +48,7 @@
<if condition="CONTROLLER_NAME eq 'Cline' "> <if condition="CONTROLLER_NAME eq 'Cline' ">
<a href="https://www.vlcms.com/" target="_blank"> <a href="https://www.vlcms.com/" target="_blank">
<span class="placeholder-graphic placeholder-graphic_logo" style="background:transparent;"> <span class="placeholder-graphic placeholder-graphic_logo" style="background:transparent;">
<img src="{:check_logo_is_exist(C('CH_SET_LOGO'),'logo_default.png')}" alt="logo"> <img src="{:check_logo_is_exist(C('CH_SET_LOGO'),'logo1.jpg')}" alt="logo">
</span> </span>
</a> </a>
<else/> <else/>
@ -107,4 +107,4 @@
<script src="__JS__/20170913/common.js"></script> <script src="__JS__/20170913/common.js"></script>
<block name="script"></block> <block name="script"></block>
</body> </body>
</html> </html>

@ -48,7 +48,7 @@
<if condition="CONTROLLER_NAME eq 'Cline' "> <if condition="CONTROLLER_NAME eq 'Cline' ">
<a href="https://www.vlcms.com/" target="_blank"> <a href="https://www.vlcms.com/" target="_blank">
<span class="placeholder-graphic placeholder-graphic_logo" style="background:transparent;"> <span class="placeholder-graphic placeholder-graphic_logo" style="background:transparent;">
<img src="{:check_logo_is_exist(C('CH_SET_LOGO'),'logo_default.png')}" alt="logo"> <img src="{:check_logo_is_exist(C('CH_SET_LOGO'),'logo1.jpg')}" alt="logo">
</span> </span>
</a> </a>
<else/> <else/>
@ -107,4 +107,4 @@
<script src="__JS__/20170913/common.js"></script> <script src="__JS__/20170913/common.js"></script>
<block name="script"></block> <block name="script"></block>
</body> </body>
</html> </html>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 434 KiB

After

Width:  |  Height:  |  Size: 683 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.6 KiB

@ -6,3 +6,35 @@
[GIN-debug] POST /upload --> main.setupRouter.func1 (3 handlers) [GIN-debug] POST /upload --> main.setupRouter.func1 (3 handlers)
[GIN-debug] Listening and serving HTTP on :8080 [GIN-debug] Listening and serving HTTP on :8080
[GIN-debug] [WARNING] Creating an Engine instance with the Logger and Recovery middleware already attached.
[GIN-debug] [WARNING] Running in "debug" mode. Switch to "release" mode in production.
- using env: export GIN_MODE=release
- using code: gin.SetMode(gin.ReleaseMode)
[GIN-debug] POST /upload --> main.setupRouter.func1 (3 handlers)
[GIN-debug] Listening and serving HTTP on :8080
[GIN-debug] [WARNING] Creating an Engine instance with the Logger and Recovery middleware already attached.
[GIN-debug] [WARNING] Running in "debug" mode. Switch to "release" mode in production.
- using env: export GIN_MODE=release
- using code: gin.SetMode(gin.ReleaseMode)
[GIN-debug] POST /upload --> main.setupRouter.func1 (3 handlers)
[GIN-debug] Listening and serving HTTP on :8080
[GIN-debug] [WARNING] Creating an Engine instance with the Logger and Recovery middleware already attached.
[GIN-debug] [WARNING] Running in "debug" mode. Switch to "release" mode in production.
- using env: export GIN_MODE=release
- using code: gin.SetMode(gin.ReleaseMode)
[GIN-debug] POST /upload --> main.setupRouter.func1 (3 handlers)
[GIN-debug] Listening and serving HTTP on :8080
[GIN-debug] [WARNING] Creating an Engine instance with the Logger and Recovery middleware already attached.
[GIN-debug] [WARNING] Running in "debug" mode. Switch to "release" mode in production.
- using env: export GIN_MODE=release
- using code: gin.SetMode(gin.ReleaseMode)
[GIN-debug] POST /upload --> main.setupRouter.func1 (3 handlers)
[GIN-debug] Listening and serving HTTP on :8080

File diff suppressed because it is too large Load Diff
Loading…
Cancel
Save