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

Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev

Browse Source
master
chenzhi 5 years ago
parent 82afa60d12 d172b0ec8b
commit 2433844bf2
10 changed files with 65 additions and 29 deletions
Show Stats Download Patch File Download Diff File

5
Application/Admin/Controller/GameController.class.php
Unescape Escape View File

@ -298,6 +298,9 @@ class GameController extends ThinkController
$this->error('一句话简介不能超过30个字！');
exit;
}
if (!preg_match("/^((https|http|ftp|rtsp|mms)?:\/\/)[^\s]+/i", $_POST['beta_url'])) {
return $this->error("请填写正确的Bata链接");
}
/*if($_POST['apply_status']==0&&$_POST['game_status']==1){
$this->error('游戏未审核不允许显示');//游戏添加完成
}*/
@ -349,6 +352,8 @@ class GameController extends ThinkController
$phone['flooring_page_video'] = $sibling['flooring_page_video'];
$phone['flooring_page_video_cover'] = $sibling['flooring_page_video_cover'];
$phone['supersign_status'] = $sibling['supersign_status'];
$phone['beta_url'] = $_POST['beta_url'];
$phone['beta_status'] = $_POST['beta_status'];
M('Game', 'tab_')->data($phone)->where(array('id' => $another['id']))->save();
//同时修改代充游戏折扣
$set_fidel['status'] = 1;

7
Application/Admin/Controller/PromoteController.class.php
Unescape Escape View File

@ -227,7 +227,9 @@ class PromoteController extends ThinkController
if (preg_match('/^[a-zA-Z0-9]{6,15}$/', $account)==false) {
$this->error('账号只能是6-15位字母或数字');
}
if (empty($company_id)) {
$this->error('请选择推广公司');
}
$promoteService = new PromoteService();
$status = $promoteService->addPromote($data);
if ($status) {
@ -278,7 +280,8 @@ class PromoteController extends ThinkController
$data['account'] = I('post.account');
$map1['id'] = array('neq',$_POST['id']);
$map1['account'] = $data['account'];
if ($this->accountExist($data['account'])) {
if ($this->accountExist($data['account'], $_POST['id'])) {
$this->error('该账号已存在');
}
$pdata = D('Promote')->where($map1)->find();

22
Application/Admin/View/Game/edit.html
Unescape Escape View File

@ -429,6 +429,28 @@
</if>
</tr>
<tr>
<td class="l" >Bata版本链接：</td>
<td class="r" colspan="3">
<input type="text" class="txt " name="beta_url" value="{$data['beta_url']}" placeholder="请输入Bata版本下载链接">
</td>
</tr>
<tr>
<td class="l">Bata版本是否开启</td>
<td class="r" >
<span class="form_radio table_btn">
<label>
<input type="radio" class="inp_radio" value="0" name="beta_status" <?php if ($data['beta_status'] == 0):?>checked='checked'<?php endif;?> > 关闭
</label>
<label>
<input type="radio" class="inp_radio" value="1" name="beta_status" <?php if ($data['beta_status'] == 1):?>checked='checked'<?php endif;?> > 开启
</label>
</span>
</td>
</tr>
<notempty name="data.accredit_img">

26
Application/Admin/View/Promote/add.html
Unescape Escape View File

@ -38,6 +38,19 @@
<span class="notice-text">密码长度必须大于6位</span>
</td>
</tr>
<tr>
<td class="l"><i class="mustmark" style="margin-left:-7px">*</i>所属推广公司</td>
<td class="r">
<select name="company_id" id="company_id">
<option value="0">请选择推广公司</option>
<volist name="companys" id="vo">
<option value="{$vo.id}">{$vo.company_name}</option>
</volist>
</select>
<!-- <span class="notice-text">设置该推广员所属的推广公司</span>-->
</td>
</tr>
<tr>
<td class="l">账号状态：</td>
<td class="r table_radio">
@ -83,19 +96,6 @@
</tr>
<tr>
<td class="l">所属推广公司</td>
<td class="r">
<select name="company_id" id="company_id">
<option value="0">请选择推广公司</option>
<volist name="companys" id="vo">
<option value="{$vo.id}">{$vo.company_name}</option>
</volist>
</select>
<!-- <span class="notice-text">设置该推广员所属的推广公司</span>-->
</td>
</tr>
</tbody>
</table>
</div>

6
Application/Admin/View/SuperStatistical/index.html
Unescape Escape View File

@ -157,7 +157,7 @@
shadeClose: true,
shade: 0.8,
area: ['70%', '80%'],
content: ['admin.php?s=/SuperStatistical/lists' + params , 'no']
content: 'admin.php?s=/SuperStatistical/lists' + params
});
});
$("#role1").click(function () {
@ -167,7 +167,7 @@
shadeClose: true,
shade: 0.8,
area: ['70%', '80%'],
content: ['admin.php?s=/SuperStatistical/lists' + params , 'no']
content: 'admin.php?s=/SuperStatistical/lists' + params
});
});
$("#superDetail").click(function () {
@ -177,7 +177,7 @@
shadeClose: true,
shade: 0.8,
area: ['70%', '80%'],
content: ['admin.php?s=/SuperStatistical/superDetail' + params , 'no']
content: 'admin.php?s=/SuperStatistical/superDetail' + params
});
});
//搜索功能

5
Application/Admin/View/SuperStatistical/lists.html
Unescape Escape View File

@ -17,6 +17,9 @@
<script type="text/javascript" src="__JS__/select2.min.js"></script>
</head>
<style>
html {
min-width:100%;
}
body {
padding: 0px;
}
@ -42,7 +45,7 @@
.select2-results__option[aria-selected] {font-size:12px;}
</style>
<body>
<div id="main" class="main" style="min-height: 342px;width: 92.5%;">
<div id="main" class="main" style="min-height: 342px;width: 97%;">
<script src="__STATIC__/layer/layer.js" type="text/javascript"></script>
<link rel="stylesheet" type="text/css" href="__CSS__/admin_table.css" media="all">

5
Application/Admin/View/SuperStatistical/superDetail.html
Unescape Escape View File

@ -17,6 +17,9 @@
<script type="text/javascript" src="__JS__/select2.min.js"></script>
</head>
<style>
html {
min-width:100%;
}
body {
padding: 0px;
}
@ -42,7 +45,7 @@
.select2-results__option[aria-selected] {font-size:12px;}
</style>
<body>
<div id="main" class="main" style="min-height: 342px;width: 92.5%;">
<div id="main" class="main" style="min-height: 342px;width: 96%;">
<script src="__STATIC__/layer/layer.js" type="text/javascript"></script>
<link rel="stylesheet" type="text/css" href="__CSS__/admin_table.css" media="all">

4
Application/Home/Controller/HomeController.class.php
Unescape Escape View File

@ -181,7 +181,9 @@ class HomeController extends Controller
'flooring_page_video',
'flooring_page_video_cover',
'supersign_status',
'ios_video_top'
'ios_video_top',
'stable_status',
'stable_url',
];
$map = ['id' => intval($gameId)];
$game = M('game', 'tab_')->field($columns)->where($map)->find();

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

@ -261,13 +261,6 @@
<div class="text">• 至尊下载：永不闪退、不丢数据稳定有保障</div>
<div class="text"> • 同一设备安装一次可在一年内无限次下载重装</div>
<!-- <div class="blue-btn">￥10至尊下载</div>-->
<!-- <div class="blue-btn stabilization">稳定版下载</div>-->
<!-- <div class="gray-btn">普通下载</div>-->
<?php if ($game['dow_status'] ==1):?>
<?php if ($game['supersign_status'] ==1):?>

5
Data/update.sql
Unescape Escape View File

@ -907,3 +907,8 @@ CREATE TABLE `tab_repair_pay` (
`type` int(11) DEFAULT '0' COMMENT '0通知到账 1补单记录',
PRIMARY KEY (`id`)
) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=utf8 COMMENT='通知到账补单';
ALTER TABLE `tab_game`
ADD COLUMN `stable_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '稳定版状态';
ALTER TABLE `tab_game`
ADD COLUMN `stable_url` varchar(150) NOT NULL DEFAULT '' COMMENT '稳定版链接';
Write Preview
Loading…
Cancel
Save