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

Merge branch 'hotfix/landing_page' of wmtx/platform into release

Browse Source 
落地页优化
master
廖金灵 5 years ago committed by Gogs
parent 97f79a9c0f a22ad6c001
commit e2e3874c68
8 changed files with 69 additions and 25 deletions
Show Stats Download Patch File Download Diff File

14
Application/Admin/Common/extend.php
Unescape Escape View File

@ -1884,14 +1884,14 @@ function excelUpStreamTemplate($data, $all_sum_money, $all_pay_amount, $big_all_
//增加甲方信息 //增加甲方信息
$objPHPExcel->getActiveSheet()->setCellValue('D2', $data['first_party_info']['partner']); $objPHPExcel->getActiveSheet()->setCellValue('D2', $data['first_party_info']['partner']);
$objPHPExcel->getActiveSheet()->setCellValue('D3', $data['first_party_info']['link_man']); $objPHPExcel->getActiveSheet()->setCellValue('D3', $data['first_party_info']['link_man']);
$objPHPExcel->getActiveSheet()->setCellValue('D4', $data['first_party_info']['link_phone']); $objPHPExcel->getActiveSheet()->setCellValue('D4', $data['first_party_info']['link_phone']."\t");
$objPHPExcel->getActiveSheet()->setCellValue('D5', $data['first_party_info']['address']); $objPHPExcel->getActiveSheet()->setCellValue('D5', $data['first_party_info']['address']);
$objPHPExcel->getActiveSheet()->setCellValue('D6', $data['first_party_info']['company_tax_no']); $objPHPExcel->getActiveSheet()->setCellValue('D6', $data['first_party_info']['company_tax_no']);
//增加乙方信息 //增加乙方信息
$objPHPExcel->getActiveSheet()->setCellValue('J2', $data['second_party_info']['partner']); $objPHPExcel->getActiveSheet()->setCellValue('J2', $data['second_party_info']['partner']);
$objPHPExcel->getActiveSheet()->setCellValue('J3', $data['second_party_info']['link_man']); $objPHPExcel->getActiveSheet()->setCellValue('J3', $data['second_party_info']['link_man']);
$objPHPExcel->getActiveSheet()->setCellValue('J4', $data['second_party_info']['link_phone']); $objPHPExcel->getActiveSheet()->setCellValue('J4', $data['second_party_info']['link_phone']."\t");
$objPHPExcel->getActiveSheet()->setCellValue('J5', $data['second_party_info']['address']); $objPHPExcel->getActiveSheet()->setCellValue('J5', $data['second_party_info']['address']);
$objPHPExcel->getActiveSheet()->setCellValue('J6', $data['second_party_info']['company_tax_no']); $objPHPExcel->getActiveSheet()->setCellValue('J6', $data['second_party_info']['company_tax_no']);
@ -1946,12 +1946,12 @@ function excelUpStreamTemplate($data, $all_sum_money, $all_pay_amount, $big_all_
//收款方 //收款方
$objPHPExcel->getActiveSheet()->setCellValue("D" . ($line+2), $data['receive_company']['payee_name']); $objPHPExcel->getActiveSheet()->setCellValue("D" . ($line+2), $data['receive_company']['payee_name']);
$objPHPExcel->getActiveSheet()->setCellValue("D" . ($line+3), $data['receive_company']['bank_account']); $objPHPExcel->getActiveSheet()->setCellValue("D" . ($line+3), $data['receive_company']['bank_account']."\t");
$objPHPExcel->getActiveSheet()->setCellValue("D" . ($line+4), $data['receive_company']['opening_bank']); $objPHPExcel->getActiveSheet()->setCellValue("D" . ($line+4), $data['receive_company']['opening_bank']);
//付款方 //付款方
$objPHPExcel->getActiveSheet()->setCellValue("J" . ($line+2), $data['pay_company']['payee_name']); $objPHPExcel->getActiveSheet()->setCellValue("J" . ($line+2), $data['pay_company']['payee_name']);
$objPHPExcel->getActiveSheet()->setCellValue("J" . ($line+3), $data['pay_company']['bank_account']); $objPHPExcel->getActiveSheet()->setCellValue("J" . ($line+3), $data['pay_company']['bank_account']."\t");
$objPHPExcel->getActiveSheet()->setCellValue("J" . ($line+4), $data['pay_company']['opening_bank']); $objPHPExcel->getActiveSheet()->setCellValue("J" . ($line+4), $data['pay_company']['opening_bank']);
$statement_begin_time = date('Y.m.d', $data['statement_begin_time']);//对账开始时间 $statement_begin_time = date('Y.m.d', $data['statement_begin_time']);//对账开始时间
@ -2039,18 +2039,18 @@ function excelDownStreamTemplate($data, $all_sum_money, $all_pay_amount, $big_al
//甲方信息 //甲方信息
$objPHPExcel->getActiveSheet()->setCellValue('B'.($line+3), $data['pay_company']['partner']);//甲方 $objPHPExcel->getActiveSheet()->setCellValue('B'.($line+3), $data['pay_company']['partner']);//甲方
$objPHPExcel->getActiveSheet()->setCellValue('B'.($line+4), $data['pay_company']['link_man']);//联系人 $objPHPExcel->getActiveSheet()->setCellValue('B'.($line+4), $data['pay_company']['link_man']);//联系人
$objPHPExcel->getActiveSheet()->setCellValue('B'.($line+5), $data['pay_company']['link_phone']);//联系电话 $objPHPExcel->getActiveSheet()->setCellValue('B'.($line+5), $data['pay_company']['link_phone']."\t");//联系电话
$objPHPExcel->getActiveSheet()->setCellValue('B'.($line+6), $data['receive_company']['invoice_content']);//开票项目 $objPHPExcel->getActiveSheet()->setCellValue('B'.($line+6), $data['receive_company']['invoice_content']);//开票项目
$objPHPExcel->getActiveSheet()->setCellValue('B'.($line+7), $data['receive_company']['invoice_type']);//发票类型 $objPHPExcel->getActiveSheet()->setCellValue('B'.($line+7), $data['receive_company']['invoice_type']);//发票类型
//乙方信息 //乙方信息
$objPHPExcel->getActiveSheet()->setCellValue('E'.($line+3), $data['receive_company']['partner']);//乙方 $objPHPExcel->getActiveSheet()->setCellValue('E'.($line+3), $data['receive_company']['partner']);//乙方
$objPHPExcel->getActiveSheet()->setCellValue('E'.($line+4), $data['receive_company']['link_man']);//联系人 $objPHPExcel->getActiveSheet()->setCellValue('E'.($line+4), $data['receive_company']['link_man']);//联系人
$objPHPExcel->getActiveSheet()->setCellValue('E'.($line+5), $data['receive_company']['link_phone']);//联系电话 $objPHPExcel->getActiveSheet()->setCellValue('E'.($line+5), $data['receive_company']['link_phone']."\t");//联系电话
$objPHPExcel->getActiveSheet()->setCellValue('E'.($line+6), $data['receive_company']['address']);//邮寄地址 $objPHPExcel->getActiveSheet()->setCellValue('E'.($line+6), $data['receive_company']['address']);//邮寄地址
// $objPHPExcel->getActiveSheet()->setCellValue('E'.($line+8), $value['pay_amount']);//请汇入此账号 // $objPHPExcel->getActiveSheet()->setCellValue('E'.($line+8), $value['pay_amount']);//请汇入此账号
$objPHPExcel->getActiveSheet()->setCellValue('E'.($line+8), $data['receive_company']['payee_name']);//户名 $objPHPExcel->getActiveSheet()->setCellValue('E'.($line+8), $data['receive_company']['payee_name']);//户名
$objPHPExcel->getActiveSheet()->setCellValue('E'.($line+9), $data['receive_company']['bank_account']);//银行账号 $objPHPExcel->getActiveSheet()->setCellValue('E'.($line+9), $data['receive_company']['bank_account']."\t");//银行账号
$objPHPExcel->getActiveSheet()->setCellValue('E'.($line+10), $data['receive_company']['opening_bank']);//开户行 $objPHPExcel->getActiveSheet()->setCellValue('E'.($line+10), $data['receive_company']['opening_bank']);//开户行
$fileName = "{$data['second_party_info']['partner']}&{$data['first_party_info']['partner']}-对账单{$statement_begin_time}-{$statement_end_time}"; $fileName = "{$data['second_party_info']['partner']}&{$data['first_party_info']['partner']}-对账单{$statement_begin_time}-{$statement_end_time}";

8
Application/Admin/Controller/CompanyStatementController.class.php
Unescape Escape View File

@ -616,7 +616,7 @@ class CompanyStatementController extends ThinkController
} }
//创建基础未满基础信息 //创建基础未满基础信息
if($va['pay_amount'] < $no_pool_money){ if($va['platform_amount'] < $no_pool_money){
$lackcompany =[ $lackcompany =[
"company_id"=>$company_info['id'], "company_id"=>$company_info['id'],
"company_type"=>$v['company_type'], "company_type"=>$v['company_type'],
@ -651,16 +651,16 @@ class CompanyStatementController extends ThinkController
array_multisort($last_names,SORT_DESC,SORT_STRING,$va['statement_info']); array_multisort($last_names,SORT_DESC,SORT_STRING,$va['statement_info']);
} }
} }
if($va['pay_amount'] < $no_pool_money){ if($va['platform_amount'] < $no_pool_money){
//依旧小于不结算金额存旧版 //依旧小于不结算金额存旧版
if($lackcompany['pay_amount'] > 0){ if($lackcompany['pay_amount'] != 0){
$lask_id = $LackStatement->add($lackcompany); $lask_id = $LackStatement->add($lackcompany);
$v['create_lack_ids'][] =$lask_id; $v['create_lack_ids'][] =$lask_id;
$v['lack_statement_money'] +=$lackcompany['statement_money']; $v['lack_statement_money'] +=$lackcompany['statement_money'];
$v['lack_platform_amount'] +=$lackcompany['platform_amount']; $v['lack_platform_amount'] +=$lackcompany['platform_amount'];
} }
}else{ }else{
if($va['pay_amount'] > 0){ if($va['pay_amount'] != 0){
//存成功 //存成功
$company =[ $company =[
"pool_id"=>0, "pool_id"=>0,

8
Application/Admin/Controller/CompanyStatementSetController.class.php
Unescape Escape View File

@ -715,7 +715,7 @@ class CompanyStatementSetController extends Controller {
//金额为0不补点 //金额为0不补点
continue; continue;
} }
if($add_data['platform_amount'] <= 0){ if($add_data['platform_amount'] == 0){
return; return;
} }
// dd($add_data); // dd($add_data);
@ -1067,9 +1067,9 @@ class CompanyStatementSetController extends Controller {
if($type == 2 && $v['statement_money'] == 0){ if($type == 2 && $v['statement_money'] == 0){
//补点不存 //补点不存
}else{ }else{
if($v['pay_amount'] < 300){ if($v['platform_amount'] < 300){
//存未满 //存未满
if($lackcompany['pay_amount'] > 0){ if($lackcompany['pay_amount'] != 0){
$lask_id = $LackStatement->add($lackcompany); $lask_id = $LackStatement->add($lackcompany);
$countdata['create_lack_ids'][] =$lask_id; $countdata['create_lack_ids'][] =$lask_id;
$countdata['lack_statement_money'] +=$lackcompany['statement_money']; $countdata['lack_statement_money'] +=$lackcompany['statement_money'];
@ -1077,7 +1077,7 @@ class CompanyStatementSetController extends Controller {
} }
}else{ }else{
if($v['pay_amount'] > 0){ if($v['pay_amount'] != 0){
//存成功配置单号 //存成功配置单号
$company =[ $company =[
"pool_id"=>0, "pool_id"=>0,

11
Application/Admin/Controller/ExportController.class.php
Unescape Escape View File

@ -8281,14 +8281,16 @@ class ExportController extends Controller
$searchGameIds = null; $searchGameIds = null;
$game_ids = array_column(getGameByName(I("game_name"), I("sdk_type")), 'id'); $game_ids = array_column(getGameByName(I("game_name"), I("sdk_type")), 'id');
$gameWhere = [];
if ($game_ids) { if ($game_ids) {
$map['s.game_id'] = ['in', $game_ids]; $map['s.game_id'] = ['in', $game_ids];
$searchGameIds = $game_ids; $gameWhere['id'] = ['in', $game_ids];
} }
if (!empty(I('partner_id'))) { if (!empty(I('partner_id'))) {
$map['g.partner_id'] = I('partner_id'); $map['g.partner_id'] = I('partner_id');
$gameWhere['partner_id'] = I('partner_id');
} }
if (!empty(I('timestart'))) { if (!empty(I('timestart'))) {
@ -8301,13 +8303,15 @@ class ExportController extends Controller
if (!empty($map['_string'])) { if (!empty($map['_string'])) {
$map['_string'] .= " and "; $map['_string'] .= " and ";
} }
$map['_string'] .= " s.payed_time < {$timeend}"; $map['_string'] .= " s.pay_time <= {$timeend}";
} }
if (!empty(I('game_type_id'))) { if (!empty(I('game_type_id'))) {
$map['g.game_type_id'] = I('game_type_id'); $map['g.game_type_id'] = I('game_type_id');
$searchGameIds = M('game', 'tab_')->where(['game_type_id' => I('game_type_id', 0)])->getField('id', true); $gameWhere['game_type_id'] = I('game_type_id', 0);
} }
$searchGameIds = M('game', 'tab_')->where($gameWhere)->getField('id', true);
$xlsData = D("spend")->gameStatistics($map); $xlsData = D("spend")->gameStatistics($map);
@ -8335,6 +8339,7 @@ class ExportController extends Controller
'started_at' => I('timestart', ''), 'started_at' => I('timestart', ''),
'ended_at' => I('timeend', ''), 'ended_at' => I('timeend', ''),
'search_games' => $searchGameCodes, 'search_games' => $searchGameCodes,
'device_type' => I("sdk_type", 0),
]); ]);
$aggData = []; $aggData = [];
$aggTotal = '0.00'; $aggTotal = '0.00';

12
Application/Admin/Controller/FinanceController.class.php
Unescape Escape View File

@ -709,13 +709,15 @@ class FinanceController extends ThinkController
$searchGameIds = null; $searchGameIds = null;
$game_ids = array_column(getGameByName(I("game_name"), I("sdk_type")), 'id'); $game_ids = array_column(getGameByName(I("game_name"), I("sdk_type")), 'id');
$gameWhere = [];
if ($game_ids) { if ($game_ids) {
$map['s.game_id'] = ['in', $game_ids]; $map['s.game_id'] = ['in', $game_ids];
$searchGameIds = $game_ids; $gameWhere['id'] = ['in', $game_ids];
} }
if (!empty(I('partner_id'))) { if (!empty(I('partner_id'))) {
$map['g.partner_id'] = I('partner_id'); $map['g.partner_id'] = I('partner_id');
$gameWhere['partner_id'] = I('partner_id');
} }
if (!empty(I('timestart'))) { if (!empty(I('timestart'))) {
@ -728,14 +730,15 @@ class FinanceController extends ThinkController
if (!empty($map['_string'])) { if (!empty($map['_string'])) {
$map['_string'] .= " and "; $map['_string'] .= " and ";
} }
$map['_string'] .= " s.payed_time < {$timeend}"; $map['_string'] .= " s.payed_time <= {$timeend}";
} }
if (!empty(I('game_type_id'))) { if (!empty(I('game_type_id'))) {
$map['g.game_type_id'] = I('game_type_id'); $map['g.game_type_id'] = I('game_type_id');
$searchGameIds = M('game', 'tab_')->where(['game_type_id' => I('game_type_id', 0)])->getField('id', true); $gameWhere['game_type_id'] = I('game_type_id', 0);
} }
$searchGameIds = M('game', 'tab_')->where($gameWhere)->getField('id', true);
$startTime = time(); $startTime = time();
//游戏统计列表 //游戏统计列表
$data = D("spend")->gameStatistics($map, $row, $p); $data = D("spend")->gameStatistics($map, $row, $p);
@ -763,6 +766,7 @@ class FinanceController extends ThinkController
'started_at' => I('timestart', ''), 'started_at' => I('timestart', ''),
'ended_at' => I('timeend', ''), 'ended_at' => I('timeend', ''),
'search_games' => $searchGameCodes, 'search_games' => $searchGameCodes,
'device_type' => I("sdk_type", 0),
]); ]);
$aggData = []; $aggData = [];
$aggTotal = '0.00'; $aggTotal = '0.00';

41
Application/Home/View/default/Home/landingPage.html
Unescape Escape View File

@ -615,9 +615,10 @@ background:rgba(0,0,0,0.6); z-index: 999;display: none;"></div>
<div class="swiper-slide"> <div class="swiper-slide">
<div class="swiper-slide-box"> <div class="swiper-slide-box">
<div class="slide-img"> <div class="slide-img">
<img src="__IMG__/20191225/1.png" alt="" style=" height: 4.34rem;"> <img src="__IMG__/20191225/1.png" alt="" style=" height: 3.64rem;">
</div> </div>
<div>一、请先安装并打开testflight平台</div> <div style="text-align: left;margin-left: 10px;">一、请先安装并打开testflight平台</div>
<div onclick='$(".mounting").hide();$(".installPop").show();' style="font-size: xx-small;margin-left: 10px;">提示：<a id='install-btn' style="color: cornflowerblue;text-decoration: underline;">由于苹果进行区域限制问题，目前需要用户手动设置dns为114.114.114.114或8.8.8.8</a><img src="__IMG__/next_bg.png" style="width: 25px;margin-left: 8px;"></div>
</div> </div>
</div> </div>
<div class="swiper-slide"> <div class="swiper-slide">
@ -625,7 +626,7 @@ background:rgba(0,0,0,0.6); z-index: 999;display: none;"></div>
<div class="slide-img"> <div class="slide-img">
<img src="__IMG__/20191225/2.png" alt="" style=" height: 4.34rem;"> <img src="__IMG__/20191225/2.png" alt="" style=" height: 4.34rem;">
</div> </div>
<div>二、安装步骤窗口点击按钮，下载游戏</div> <div style="text-align: left;margin-left: 10px;">二、安装步骤窗口点击按钮，下载游戏</div>
</div> </div>
</div> </div>
</div> </div>
@ -639,6 +640,26 @@ background:rgba(0,0,0,0.6); z-index: 999;display: none;"></div>
</div> </div>
</div> </div>
<!-- TestFlight安装提示 -->
<div class="register installPop" style="display: none;">
<div class="register-box" style="height: auto;">
<div class="register-heard">
TestFlight安装提示
</div>
<div class="content" style="font-size: initial;">
<div class="content" style="padding: 30px;">
<div style="font-weight: bolder;">具体操作方式：</div>
<div style="margin-top: 15px;font-size: small;line-height: 25px;"><span style="color: cornflowerblue;">设置--无限局域网--已连接的那个WIFI右边的蓝色i标签点进去--配置DNS--把自动改成手动--添加服务器</span><div><span style="color: cornflowerblue;">114.114.114.114</span>,把原有的服务器删除</div></div>
<div class="mounting-text" style="margin-top: 100px;">
<a href="https://itunes.apple.com/cn/app/testflight/id899247664?mt=8" target="_blank" class="mounting-btn">继续安装TestFlight平台</a>
</div>
</div>
</div>
</div>
</div>
</body> </body>
</html> </html>
<script src="__STATIC__/ios9/js/layer/layer.js?VerNo=20190923" type="text/javascript"></script> <script src="__STATIC__/ios9/js/layer/layer.js?VerNo=20190923" type="text/javascript"></script>
@ -731,6 +752,7 @@ function getCurUserId() {
} }
$(function(){ $(function(){
// 极速下载
$(".stabilization").click(function(){ $(".stabilization").click(function(){
event.stopPropagation(); event.stopPropagation();
if (isLogin()) { if (isLogin()) {
@ -741,6 +763,7 @@ function getCurUserId() {
} }
$(".window").hide(); $(".window").hide();
}); });
$(".login .register-heard>a").click(function(){ $(".login .register-heard>a").click(function(){
$(".login").hide(); $(".login").hide();
$(".window").show(); $(".window").show();
@ -911,10 +934,22 @@ function getCurUserId() {
lazyLoading:true,//图片延迟加载 lazyLoading:true,//图片延迟加载
lazyLoadingInPrevNext:true,//前一个和后一个延迟加载 lazyLoadingInPrevNext:true,//前一个和后一个延迟加载
autoplayDisableOnInteraction : false, autoplayDisableOnInteraction : false,
preventClicksPropagation : false,
pagination: { pagination: {
el: '.swiper-pagination', el: '.swiper-pagination',
clickable: true, clickable: true,
}, },
// on : {
// click : function (e) {
// // var realIdx = this.realIndex
// // //var item = mySwiper.list[realIdx]
// // console.log(realIdx)
// // if (realIdx == 0) {
// // $(".mounting").hide();
// // $(".installPop").show();
// // }
// }
// },
autoplay: { autoplay: {
delay: 2000, delay: 2000,
stopOnLastSlide: false, stopOnLastSlide: false,

BIN
Public/Admin/excel/up_stream.xls
View File

Binary file not shown.

BIN
Public/Home/images/next_bg.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.3 KiB

Write Preview
Loading…
Cancel
Save