elf
/
qy-platform
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branches 'dev' and 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx

Browse Source 
 Conflicts:
	Data/update.sql
master
zhengyongxing 5 years ago
parent c1b446ba9a a389f9a245
commit f225cff461
3 changed files with 42 additions and 2 deletions
Show Stats Download Patch File Download Diff File

11
Application/Base/Service/PromoteService.class.php
Unescape Escape View File

@ -330,12 +330,20 @@ class PromoteService {
$map = []; $map = [];
$map['promote_id'] = $fromPromote['id']; $map['promote_id'] = $fromPromote['id'];
$spendMap = $map;
if (count($shiftIds) > 0) { if (count($shiftIds) > 0) {
$map['id'] = ['in', $shiftIds]; $spendMap['user_id'] = $map['id'] = ['in', $shiftIds];
} }
$users = M('user', 'tab_')->field(['id', 'account', 'nickname'])->where($map)->select(); $users = M('user', 'tab_')->field(['id', 'account', 'nickname'])->where($map)->select();
$spendMap['pay_time'] = ['egt', $orderTime];
$payAmountRows = M('spend', 'tab_')
->field(['user_id', 'sum(pay_amount) payAmount'])
->where($spendMap)
->select();
$payAmountRows = index_by_column('user_id', $payAmountRows);
$mends = []; $mends = [];
foreach ($users as $item) { foreach ($users as $item) {
$mends[] = [ $mends[] = [
@ -349,6 +357,7 @@ class PromoteService {
'remark' => $remark == '' ? ($task['creator_type'] == 0 ? '后台补链' : '玩家迁移') : $remark, 'remark' => $remark == '' ? ($task['creator_type'] == 0 ? '后台补链' : '玩家迁移') : $remark,
'order_time' => $orderTime, 'order_time' => $orderTime,
'create_time' => time(), 'create_time' => time(),
'pay_amount' => isset($payAmountRows[$item['id']]) ? $payAmountRows[$item['id']]['payAmount'] : 0,
'op_id' => $creator ? $creator['id'] : 0, 'op_id' => $creator ? $creator['id'] : 0,
'op_account' => $opAccount, 'op_account' => $opAccount,
'op_type' => $task['creator_type'], 'op_type' => $task['creator_type'],

32
Application/Home/View/default/Home/landingPage2.html
Unescape Escape View File

@ -17,6 +17,27 @@
<link rel="stylesheet" href="__CSS__/landing_page.css"> <link rel="stylesheet" href="__CSS__/landing_page.css">
</head> </head>
<body class="main_bg" style="background-color: #0a0a0a;height: auto;"> <body class="main_bg" style="background-color: #0a0a0a;height: auto;">
<style>
.home-video {
position: absolute;
text-align: center;
top: 23.28%;
}
.home-video video {
margin-left: 0.45%;
width: 84.75%;
}
@media(min-width:580px){
.home-video {
max-width:580px;
}
}
@media(min-height:580px){
.home-video {
max-width:580px;
}
}
</style>
<input type="hidden" name="title" value="{$game['relation_game_name']}"> <input type="hidden" name="title" value="{$game['relation_game_name']}">
<input type="hidden" name="icon" value="{$game['icon']}"> <input type="hidden" name="icon" value="{$game['icon']}">
<input type="hidden" name="desc" value="{$game['features']}"> <input type="hidden" name="desc" value="{$game['features']}">
@ -33,12 +54,21 @@
<div class="h_wrap"> <div class="h_wrap">
<div id="data-2"> <div id="data-2">
<volist name="game['flooring_page_imgs']" id="item"> <volist name="game['flooring_page_imgs']" id="item" key="k">
<div style="position: relative;">
<?php if ($k == 1) :?>
<?php if (!empty($game['flooring_page_video'])):?>
<div class="home-video">
<video id="shakeVideo" src="{$game['flooring_page_video']}" controls muted webkit-playsinline="true" playsinline="true"></video>
</div>
<?php endif;?>
<?php endif ;?>
<?php if ($downloadUrl == 'https://'.$_SERVER['HTTP_HOST']) :?> <?php if ($downloadUrl == 'https://'.$_SERVER['HTTP_HOST']) :?>
<a href="#" class="no-package"><img src="{$item}" style="width: 100%;"/></a> <a href="#" class="no-package"><img src="{$item}" style="width: 100%;"/></a>
<?php else :?> <?php else :?>
<a href="javascript:;" class="down-link" down-link="{$downloadUrl}"><img src="{$item}" style="width: 100%;"/></a> <a href="javascript:;" class="down-link" down-link="{$downloadUrl}"><img src="{$item}" style="width: 100%;"/></a>
<?php endif ;?> <?php endif ;?>
</div>
</volist> </volist>
</div> </div>
</div> </div>

1
Data/update.sql
Unescape Escape View File

@ -657,6 +657,7 @@ ALTER TABLE tab_game ADD `ios_video_top` tinyint(1) DEFAULT '1' COMMENT 'ios落
-- 新旧IOS打包标识 -- 新旧IOS打包标识
ALTER TABLE `tab_game_source` add COLUMN `is_new_sdk` tinyint(2) DEFAULT '0' COMMENT '是否新SDK(IOS)'; ALTER TABLE `tab_game_source` add COLUMN `is_new_sdk` tinyint(2) DEFAULT '0' COMMENT '是否新SDK(IOS)';
ALTER TABLE `tab_mend` ADD COLUMN `pay_amount` decimal(10,2) NOT NULL DEFAULT '0.00' COMMENT '换绑时归属前推广员的充值金额' AFTER `promote_account_to`;
-- 合服游戏区服表 tping -- 合服游戏区服表 tping
CREATE TABLE `tab_server_union` ( CREATE TABLE `tab_server_union` (

Write Preview
Loading…
Cancel
Save