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

Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev

Browse Source
master
Your Name 5 years ago
parent f1b5a2257d d2d7dec38a
commit 45ff545256
9 changed files with 20 additions and 23 deletions
Show Stats Download Patch File Download Diff File

2
Application/Common/Common/function.php
Unescape Escape View File

@ -61,7 +61,7 @@ function str2arr($str, $glue = ',')
* @return string
* @author 麦当苗儿 <zuojiazi@vip.qq.com>
*/
function arr2str($arr, $glue = ',')
function arr2str($arr=[], $glue = ',')
{
return implode($glue, $arr);
}

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

@ -270,9 +270,9 @@ class PromoteController extends BaseController
//$count = M("server", "tab_")->where($map)->count();
foreach ($open_server_list as $key => $server) {
$open_server_list[$key]['icon'] = get_cover($server['icon'], 'path');
if ($server['pay_type'] == 1) {
if ($server['server_version'] == 1) {
$open_server_list[$key]['pay_type'] = '安卓';
} elseif ($server['pay_type'] == 1) {
} elseif ($server['server_version'] == 2) {
$open_server_list[$key]['pay_type'] = 'iOS';
} else {
$open_server_list[$key]['pay_type'] = '安卓、iOS';

2
Application/Home/Controller/TestResourceController.class.php
Unescape Escape View File

@ -246,7 +246,7 @@ class TestResourceController extends BaseController
parent::_initialize();
$map['id'] = get_pid();
$pro = M("promote", "tab_")->where($map)->find();
if ($pro['parent_id']!=0) {
if ($pro['parent_id']!=0&&!($pro['parent_id']>0&&$pro['grand_id']==0)) {
$this->error('无权操作！');
}
}

4
Application/Home/View/default/Promote/index.html
Unescape Escape View File

@ -222,7 +222,7 @@
$.each(result.data, function (index, item) {
if(index==0){
show="<tr>" +
"<td><img src='"+item.icon+"'></td>" +
"<td><img src='"+item.icon+"' style='width:80px'></td>" +
"<td>"+item.game_name+"</td>" +
"<td>"+item.pay_type+"</td>" +
"<td>"+item.start_time+"</td>" +
@ -230,7 +230,7 @@
"</tr>"
}else{
show+="<tr>" +
"<td><img src='"+item.icon+"'></td>" +
"<td><img src='"+item.icon+"' style='width:80px'></td>" +
"<td>"+item.game_name+"</td>" +
"<td>"+item.pay_type+"</td>" +
"<td>"+item.start_time+"</td>" +

6
Application/Home/View/default/Public/promote_base.html
Unescape Escape View File

@ -88,8 +88,8 @@
<?php endif;?>
</div>
<?php if($loginer['id'] == 1 || $loginer['parent_id'] == 1 || $loginer['grand_id'] == 1):?>
<eq name="parent_id" value="0">
<?php if($loginer['id'] == 1 || $loginer['parent_id'] == 1 || $loginer['grand_id'] == 1 || ($loginer['parent_id']>0&&$loginer['grand_id']==0) ):?>
<div class="subNav jssubNav"><i class="prev_icon icon_fenbao"></i><span>测试资源</span><i class="arrow_icon"></i></div>
<div class="navContent jsnavContent">
<a href="{:U('TestResource/index')}" class="<if condition='CONTROLLER_NAME eq TestResource and (ACTION_NAME eq index or ACTION_NAME eq add or ACTION_NAME eq apply ) '>active</if> ">测试资源申请</a>
@ -97,7 +97,7 @@
<a href="{:U('TestResource/supportNumberList')}" class="<if condition='CONTROLLER_NAME eq TestResource and (ACTION_NAME eq supportNumberList or ACTION_NAME eq freezeSupport or ACTION_NAME eq unfreezeSupport or ACTION_NAME eq rechangePassward ) '>active</if> ">扶持号管理</a>
<a href="{:U('TestResource/protectLogList')}" class="<if condition='CONTROLLER_NAME eq TestResource and ACTION_NAME eq protectLogList '>active</if> ">日志管理</a>
</div>
</eq>
<?php endif;?>
<!--<eq name="parent_id" value="0">
<div class="subNav jssubNav"><i class="prev_icon icon_fenbao"></i><span>扶持管理</span><i class="arrow_icon"></i></div>

4
Application/Media/View/default/Index/hezuo.html
Unescape Escape View File

@ -6,7 +6,7 @@
<div class="ln_map">
<div style="width:1200px;height:406px;border:#ccc solid 1px;" id="dituContent"></div>
<div class="ln_map_a">
<div>公司地址：福建省福州市仓山区城门镇大浦路2号安德大厦A电梯五楼 <span>联系人： 雷女士</span> <span> 联系电话： 13067391751</span> </div>
<div>公司地址：福建省福州市鼓楼区福大怡山文化创意园11号楼103号 <span>联系人： 雷女士</span> <span> 联系电话： 13067391751</span> </div>
<div>邮政编码：350004</div>
</div>
</div>
@ -23,7 +23,7 @@
//创建地图函数：
function createMap(){
var map = new BMap.Map("dituContent");//在百度地图容器中创建一个地图
var point = new BMap.Point(119.36461610058595,26.002382945493657);//定义一个中心点坐标
var point = new BMap.Point(119.277211920,26.079526844);//定义一个中心点坐标
map.centerAndZoom(point,18);//设定地图的中心点和坐标并将地图显示在地图容器中
window.map = map;//将map变量存储在全局
}

13
Application/Mobile/Controller/SsgController.class.php
Unescape Escape View File

@ -30,11 +30,6 @@ class SsgController extends BaseController {
redirect(U("ssg/index", array('promete_id' => $promoteId)));
}
// /*if (!$promoteId) {
// echo "链接失效，请重新向推广员索取链接。";
// exit();
// $this->error("参数非法");
// }*/
if ($promoteId) {
$exists = M("promote", "tab_")->where(array('id' => $promoteId))->find();
if (!$exists) {
@ -454,8 +449,9 @@ class SsgController extends BaseController {
))->find();
if($payLog && $payLog['pay_status']==1){
$this->assign("error","亲~您已购买过了~请到【订单查询】查看订单信息哟~");
$this->display('blank');
//$this->assign("error","亲~您已购买过了~<br/>请到【订单查询】查看订单信息哟~");
//$this->display('blank');
redirect("/mobile.php/Ssg/install_show/user_id/$userId/game_id/$gameId/order_id/".$payLog['order_id']);
}else{
if (!$gameInfo['supersign_token']) {
//$this->error("超级签token未填写！");
@ -512,7 +508,7 @@ class SsgController extends BaseController {
}else{
redirect("https://".$_SERVER['HTTP_HOST']."/mobile.php/Ssg/install_show/user_id/$userId/game_id/$gameId/order_id/$orderId");
}*/
$this->assign("error","亲~您已购买过了~请到【订单查询】查看订单信息哟~");
$this->assign("error","亲~您已购买过了~<br/>请到【订单查询】查看订单信息哟~");
$this->display('blank');
//$this->error("亲~您已购买过了~请到【订单查询】查看订单信息哟~");
exit();
@ -567,6 +563,7 @@ class SsgController extends BaseController {
$weixn = new Weixin();
$wx_pay = json_decode($weixn->weixin_pay('超级签消费', $orderId, $price, 'MWEB', 4), true);
if($wx_pay['status']==1){
//$redirect_url = $_SERVER['HTTP_HOST']."/mobile.php/Ssg/install_show/user_id/{$userId}/game_id/{$gameId}/order_id/{$orderId}";
redirect($wx_pay['mweb_url']);
}else{
$this->assign("error",$wx_pay['return_msg']);

2
Application/Mobile/View/Ssg/index.html
Unescape Escape View File

@ -6,7 +6,7 @@
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="viewport"
content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no">
<title>超级签购买界面</title>
<title>超级签首页</title>
<link href="__CSS__/ssg/common.css" rel="stylesheet" type="text/css">
<script src="__JS__/ssg/flexible.min.js" type="text/javascript"></script>
<script src="__JS__/ssg/juicer.min.js" type="text/javascript"></script>

6
Application/Sdk/Controller/Ipa365Controller.class.php
Unescape Escape View File

@ -125,7 +125,7 @@ class Ipa365Controller extends BaseController{
))->find();
if($payLog && $payLog['pay_status']==1){
$this->assign("error","亲~您已购买过了~请到【订单查询】查看订单信息哟~");
$this->assign("error","亲~您已购买过了~<br/>请到【订单查询】查看订单信息哟~");
$this->display('blank');
}else{
if (!$gameInfo['supersign_token']) {
@ -182,7 +182,7 @@ class Ipa365Controller extends BaseController{
}else{
redirect("https://".$_SERVER['HTTP_HOST']."/sdk.php/Ipa365/install_show/user_id/$userId/game_id/$gameId/order_id/$orderId");
}*/
$this->assign("error","亲~您已购买过了~请到【订单查询】查看订单信息哟~");
$this->assign("error","亲~您已购买过了~<br/>请到【订单查询】查看订单信息哟~");
$this->display('blank');
//$this->error("亲~您已购买过了~请到【订单查询】查看订单信息哟~");
exit();
@ -279,7 +279,7 @@ class Ipa365Controller extends BaseController{
}else{
redirect("https://".$_SERVER['HTTP_HOST']."/sdk.php/Ipa365/install_show/user_id/$userId/game_id/$gameId/order_id/$orderId");
}
$this->error("亲~您已购买过了~请到【订单查询】查看订单信息哟~");
$this->error("亲~您已购买过了~<br/>请到【订单查询】查看订单信息哟~");
} else {
$orderId = "SS_" . date('Ymd') . date('His') . sp_random_string(4); // 超级签
if (!$gameInfo['supersign_token']) {

Write Preview
Loading…
Cancel
Save