Merge branch 'fix/admin_second_optimization' of wmtx/platform into release

bug修复及cp合作方获取接口添加
master
廖金灵 5 years ago committed by Gogs
commit e39ab6806e

@ -272,23 +272,29 @@ class AuthManagerController extends AdminController{
$this->error('请选择要操作的数据!');
}
// 1正常为0禁用,-1为删除'
switch ( strtolower($method) ){
case 'forbidgroup':
$status = 0;
$op_name = "禁用";
$msg = array('success'=>'操作成功,状态禁用成功!', 'error'=>'状态禁用失败!', 'url'=>'' ,'ajax'=>IS_AJAX);
break;
case 'resumegroup':
$status = 1;
$op_name = "正常";
$msg = array('success'=>'操作成功,状态恢复成功!', 'error'=>'状态恢复失败!', 'url'=>'' ,'ajax'=>IS_AJAX);
break;
case 'deletegroup':
$status = -1;
$op_name = "删除";
$op_type = 2;
$msg = array('success'=>'操作成功,删除成功!', 'error'=>'删除失败!', 'url'=>'' ,'ajax'=>IS_AJAX);
break;
}
$setFalg =false;
foreach ($lr as $k => $v) {
if($v['status'] != $status){
$setFalg = true;
addOperationLog(array(
"op_type"=>$op_type,
"key"=> $v['title'],
@ -297,22 +303,18 @@ class AuthManagerController extends AdminController{
));
}
}
//操作日志end
switch ( strtolower($method) ){
case 'forbidgroup':
\Think\Log::actionLog('AuthManager/changeStatus?method=forbidGroup','AuthGroup',$_REQUEST['id']);
$this->forbid('AuthGroup');
break;
case 'resumegroup':
\Think\Log::actionLog('AuthManager/changeStatus?method=resumegroup','AuthGroup',$_REQUEST['id']);
$this->resume('AuthGroup');
break;
case 'deletegroup':
\Think\Log::actionLog('AuthManager/changeStatus?method=deletegroup','AuthGroup',$_REQUEST['id']);
$this->delete('AuthGroup');
break;
default:
$this->error($method.'参数非法');
if($setFalg){
$savedata = [
"status"=>$status
];
$res = M("AuthGroup")->where("id in ({$ids})")->save($savedata);
if($res !==false ){
$this->success($msg['success'],$msg['url'],$msg['ajax']);
}else{
$this->error($msg['error'],$msg['url'],$msg['ajax']);
}
}else{
$this->success("操作成功,状态未改变",'',IS_AJAX);;
}
}

@ -200,7 +200,7 @@ class PartnerController extends ThinkController
public function add()
{
if ($_POST) {
$partner = I('post.partner', '');
$partner = trim(I('post.partner', ''));
$status = intval(I('post.status', 1));
if (empty($partner)) {
@ -209,21 +209,12 @@ class PartnerController extends ThinkController
if (!strlen(I('is_sign_contract'))) {
$this->error('请选择是否签署合同');
}
if (empty(I('settlement_type'))) {
$this->error('请选择结算方式');
}
if (empty(I('company_type'))) {
$this->error('请输入公司性质');
}
if (!strlen(I('has_game_evidence'))) {
$this->error('请选择是否有游戏资质');
}
if (empty(I('link_man'))) {
$this->error('请输入联系人');
}
if (empty(I('link_phone'))) {
$this->error('请输入联系电话');
}
@ -234,13 +225,16 @@ class PartnerController extends ThinkController
$this->error('合作方已存在');
}
if(!checkPhone(I('link_phone'))) {
if(!empty(I('link_phone')) && !checkPhone(I('link_phone'))) {
$this->error('联系电话格式不正确');
}
$res2 = $model->where(['link_phone' => I('link_phone')])->getField('id');
if ($res2) {
$this->error('已存在此联系电话');
if(!empty(I('link_phone'))){
$res2 = $model->where(['link_phone' => I('link_phone')])->getField('id');
if ($res2) {
$this->error('已存在此联系电话');
}
}
$time = time();
$save['partner'] = $partner;
$save['status'] = $status;
@ -297,7 +291,7 @@ class PartnerController extends ThinkController
$model = M($this->modelName, 'tab_');
if ($_POST) {
$partner = I('post.partner', '');
$partner = trim(I('post.partner', ''));
$status = intval(I('post.status', 1));
$id = intval(I('post.id', 0));
@ -307,21 +301,12 @@ class PartnerController extends ThinkController
if (!strlen(I('is_sign_contract'))) {
$this->error('请选择是否签署合同');
}
if (empty(I('settlement_type'))) {
$this->error('请选择结算方式');
}
if (empty(I('company_type'))) {
$this->error('请输入公司性质');
}
if (!strlen(I('has_game_evidence'))) {
$this->error('请选择是否有游戏资质');
}
if (empty(I('link_man'))) {
$this->error('请输入联系人');
}
if (empty(I('link_phone'))) {
$this->error('请输入联系电话');
}
$data = $model
->field('id,partner,link_man,link_phone,address,company_tax_no,payee_name,bank_account,opening_bank')
@ -336,17 +321,20 @@ class PartnerController extends ThinkController
$this->error('合作方已存在');
}
if(!checkPhone(I('link_phone'))) {
if(!empty(I('link_phone')) && !checkPhone(I('link_phone'))) {
$this->error('联系电话格式不正确');
}
$res2 = $model->where([
'link_phone' => I('link_phone'),
'id' => ['neq', $id]
])->getField('id');
if ($res2) {
$this->error('已存在此联系电话');
if(!empty(I('link_phone'))){
$res2 = $model->where([
'link_phone' => I('link_phone'),
'id' => ['neq', $id]
])->getField('id');
if ($res2) {
$this->error('已存在此联系电话');
}
}
$time = time();
$save['id'] = $id;
$save['partner'] = $partner;
@ -394,11 +382,17 @@ class PartnerController extends ThinkController
if (empty($data)) {
$this->error('数据异常', U('lists'));
}
if ($data['contract_start_time']) {
$data['contract_start_time'] = date('Y-m-d', $data['contract_start_time']);
}else{
$data['contract_start_time']='';
}
if ($data['contract_end_time']) {
$data['contract_end_time'] = date('Y-m-d', $data['contract_end_time']);
}else{
$data['contract_end_time']='';
}
$data['channel_rate'] *= 100;//存的是小数,显示百分比
$data['invoice_rate'] *= 100;//存的是小数,显示百分比

@ -449,28 +449,24 @@ class PlatformController extends ThinkController
$today = total(1);
$week = total(2);
$mounth = total(3);
if (isset($_REQUEST['promote_id'])) {
$map['tp1.id'] = $_REQUEST['promote_id'];
} else {
$map['tp1.chain'] = '/';
$promoter_ids = D("Promote")->where("chain like '%/{$_REQUEST['promote_id']}/%' or id={$_REQUEST['promote_id']}")->field('id')->select();
if ($promoter_ids) {
$map['u.promote_id'] = ['in', implode(',', array_column($promoter_ids, 'id'))];
}
}
//为数据权限添加
setPowerPromoteIds($map, 'u.promote_id');
$data = M('promote', 'tab_')->alias('tp1')
->field('tp1.account as promote_account,tp1.id,
date_format(FROM_UNIXTIME(register_time),"% ") AS time,
count(u.id) as count')
->join("tab_promote AS tp2 ON tp2.`chain` LIKE CONCAT('%/', tp1.id, '/%') OR tp2.id = tp1.id", 'left')
->join("tab_user as u on tp2.id = u.promote_id", 'left')
->join($play_map ? "tab_user_play as up on up.user_id = u.id " . $play_map : false)
->join($play_info_map ? "tab_user_play_info as upi on upi.user_id = u.id " . $play_info_map : false)
->where($map)
->group('tp1.id')
->order('count desc, register_time')
->select();
$data = M("User u","tab_")
->field("count(u.id) as count,IFNULL(if(substring_index(substring_index(promote.`chain`,'/',2),'/',-1)='',u.promote_id,substring_index(substring_index(promote.`chain`,'/',2),'/',-1)),0) id")
->join("tab_promote promote ON u.promote_id = promote.id","left")
->join($play_map ? "tab_user_play as up on up.user_id = u.id " . $play_map : false)
->join($play_info_map ? "tab_user_play_info as upi on upi.user_id = u.id " . $play_info_map : false)
->where($map)
->group('id')
->order('count desc, register_time')
->select();
//今日/本周/本月不变
$tmap = $map;
if(isset($tmap['register_time'])){
@ -486,21 +482,19 @@ class PlatformController extends ThinkController
}
$tmap['register_time'] = ['between', array($tmin,$tmonth[1][1])];
}
$tdata = M('promote', 'tab_')->alias('tp1')
->field('tp1.account as promote_account,tp1.id,
date_format(FROM_UNIXTIME(register_time),"% ") AS time,
count(IF(register_time ' . $today . ',1,null)) as today,
count(IF(register_time ' . $week . ',1,null)) as week,
count(IF(register_time ' . $mounth . ',1,null)) as mounth')
->join("tab_promote AS tp2 ON tp2.`chain` LIKE CONCAT('%/', tp1.id, '/%') OR tp2.id = tp1.id", 'left')
->join("tab_user as u on tp2.id = u.promote_id", 'left')
->join($play_map ? "tab_user_play as up on up.user_id = u.id " . $play_map : false)
->join($play_info_map ? "tab_user_play_info as upi on upi.user_id = u.id " . $play_info_map : false)
->where($tmap)
->group('tp1.id')
->order('register_time')
->select();
$tdata = M("User u","tab_")
->field("count(IF(register_time {$today},1,null)) as today,
count(IF(register_time {$week},1,null)) as week,
count(IF(register_time {$mounth},1,null)) as mounth,
IFNULL(if(substring_index(substring_index(promote.`chain`,'/',2),'/',-1)='',u.promote_id,substring_index(substring_index(promote.`chain`,'/',2),'/',-1)),0) id")
->join("tab_promote promote ON u.promote_id = promote.id","left")
->join($play_map ? "tab_user_play as up on up.user_id = u.id " . $play_map : false)
->join($play_info_map ? "tab_user_play_info as upi on upi.user_id = u.id " . $play_info_map : false)
->where($tmap)
->group('id')
->order('register_time')
->select();
$tmdata = [];
foreach($data as $k=>$v){
$v['today'] = 0;
@ -513,18 +507,24 @@ class PlatformController extends ThinkController
$tmdata[$v['id']]['today'] = $v['today'];
$tmdata[$v['id']]['week'] = $v['week'];
$tmdata[$v['id']]['mounth'] = $v['mounth'];
if (!$tmdata[$v['id']]['promote_account']) {
$tmdata[$v['id']]['promote_account'] = $v['promote_account'];
$tmdata[$v['id']]['count'] = 0;
}
$tmdata[$v['id']]['id'] = $v['id'];
}
}
if(count($tmdata) >0){
//获取推广员
$idstr = implode(",",array_keys($tmdata));
$promoteRes = M("Promote","tab_")->field("id,account promote_account")->where("id in ({$idstr})")->select();
foreach($promoteRes as $k=>$v){
$tmdata[$v['id']]['promote_account'] = $v['promote_account'];
}
}
$data = [];
foreach($tmdata as $k => $v){
if($v['id'] == 0){
$v['promote_account'] = "官方渠道";
}
$data[] = $v;
}
unset($map['tp1.id']);
unset($map['tp1.chain']);
unset($tmap['tp1.id']);
@ -532,38 +532,6 @@ class PlatformController extends ThinkController
$map['u.promote_id'] = 0;
$tmap['u.promote_id'] = 0;
$authorityData['count'] = 0;
//如果有官方渠道权限
$user_auth_promote_ids = session('user_auth_promote_ids');
if ($user_auth_promote_ids == 'all' || in_array('0', explode(",", $user_auth_promote_ids))) {
//官方渠道数据添加
$authorityData = M('user', 'tab_')->alias('u')
->field('date_format(FROM_UNIXTIME(register_time),"%Y-%m-%d") AS time,count(u.id) as count')
->join($play_map ? "tab_user_play as up on up.user_id = u.id " . $play_map : false)
->join($play_info_map ? "tab_user_play_info as upi on upi.user_id = u.id " . $play_info_map : false)
->where($map)
->find();
$tauthorityData = M('user', 'tab_')->alias('u')
->field('date_format(FROM_UNIXTIME(register_time),"%Y-%m-%d") AS time,
count(IF(register_time ' . $today . ',1,null)) as today,
count(IF(register_time ' . $week . ',1,null)) as week,
count(IF(register_time ' . $mounth . ',1,null)) as mounth')
->where($tmap)
->join($play_map ? "tab_user_play as up on up.user_id = u.id " . $play_map : false)
->join($play_info_map ? "tab_user_play_info as upi on upi.user_id = u.id " . $play_info_map : false)
->find();
$authorityData['today'] = $tauthorityData['today'];
$authorityData['week'] = $tauthorityData['week'];
$authorityData['mounth'] = $tauthorityData['mounth'];
}
$authorityData['promote_account'] = "官方渠道";
$authorityData['id'] = "1";
if (isset($_REQUEST['promote_id'])||$authorityData['count']==0) {
$authorityData = [];
} else {
array_push($data, $authorityData);
}
//数据排序
$last_names = array_column($data,'count');
array_multisort($last_names,SORT_DESC,$data);

@ -1471,7 +1471,7 @@ class PromoteController extends ThinkController
}
$data = array(
'promote_id' => $promote_id,
'company_belong' => $company_belong,
// 'company_belong' => $company_belong,
'company_relation' => $company_relation,
'can_view_recharge' => $can_view_recharge,
'company_type' => $company_type,

@ -109,7 +109,8 @@ class UserActionLogController extends AdminController
}
$this->checkListOrCountAuthRestMap($map,[]);
$show_data_power = (is_administrator()|| session('user_auth')['show_data']);
$this->assign('show_data_power', $show_data_power);
$this->assign('data',$data);
$this->display();

@ -200,7 +200,7 @@
平台币内充▼
<else />平台币内充<img src="__IMG__/up-down.png" width="13px">
</if>
</a> <span class="tooltiptext">管理后台直接下放给会长的平台币</span> </th>
</a> <span class="tooltiptext">管理后台直接下放给会长的平台币,因存在平台币回收,所以可能会存在负值</span> </th>
<th class="tooltip">渠道游戏内充值合计 <span class="tooltiptext">游戏现金金额(游戏现金流水+平台币支出+公会内充支出=总流水</span>
</th>
<th>操作</th>

@ -192,7 +192,7 @@
平台币内充▼
<else />平台币内充<img src="__IMG__/up-down.png" width="13px">
</if>
</a> <span class="tooltiptext">管理后台直接下放给会长的平台币</span> </th>
</a> <span class="tooltiptext">管理后台直接下放给会长的平台币,因存在平台币回收,所以可能会存在负值</span> </th>
<th class="tooltip">渠道游戏内充值合计 <span class="tooltiptext">游戏现金金额(游戏现金流水+平台币支出+公会内充支出=总流水</span> </th>
<th>操作</th>
</tr>

@ -37,7 +37,7 @@
</tr>
<tr>
<td class="l"><!--<i class="mustmark" style="margin-left:-7px">*</i>-->对应平台(简称)</td>
<td class="l">对应平台(简称)</td>
<td class="r" >
<input type="text" class="txt " name="matche_platform" value="" placeholder="请输入对应平台">
</td>
@ -52,14 +52,14 @@
</tr>
<tr>
<td class="l"><!--<i class="mustmark" style="margin-left:-7px">*</i>-->渠道费率:</td>
<td class="l">渠道费率:</td>
<td class="r" >
<input type="text" class="txt " name="channel_rate" value="" placeholder="请输入渠道费率"> <span style="margin-left: 3px;padding-top: 5px">%</span>
</td>
</tr>
<tr>
<td class="l"><!--<i class="mustmark" style="margin-left:-7px">*</i>-->开票税点:</td>
<td class="l">开票税点:</td>
<td class="r" >
<input type="text" class="txt " name="invoice_rate" value="" placeholder="请输入开票税点"><span style="margin-left: 3px;padding-top: 5px">%</span>
</td>
@ -68,58 +68,56 @@
<tr>
<td class="l noticeinfo"><i class="mustmark" style="margin-left:-7px">*</i>是否签署合同:</td>
<td class="l noticeinfo">是否签署合同:</td>
<td class="r">
<select name="is_sign_contract" class="select_gallery">
<option value="">请选择是否签署合同</option>
<option value="1" <if condition="$data['is_sign_contract'] eq '1'"> selected="selected"</if>>是</option>
<option value="0" <if condition="$data['is_sign_contract'] eq '0'"> selected="selected"</if>>否</option>
<option value="1"></option>
<option value="0" selected="selected"></option>
</select>
</td>
</tr>
<tr>
<td class="l noticeinfo"><i class="mustmark" style="margin-left:-7px">*</i>结算方式:</td>
<td class="l noticeinfo">结算方式:</td>
<td class="r">
<select name="settlement_type" class="select_gallery">
<option value="0">请选择结算方式</option>
<option value="1" <if condition="$data['settlement_type'] eq '1'"> selected="selected"</if>>周结</option>
<option value="2" <if condition="$data['settlement_type'] eq '2'"> selected="selected"</if>>月结</option>
<option value="0" selected></option>
<option value="1">周结</option>
<option value="2">月结</option>
</select>
</td>
</tr>
<tr>
<td class="l noticeinfo"><i class="mustmark" style="margin-left:-7px">*</i>公司性质:</td>
<td class="l noticeinfo">公司性质:</td>
<td class="r">
<select name="company_type" class="select_gallery">
<option value="0">请选择公司性质</option>
<option value="1" <if condition="$data['company_type'] eq '1'"> selected="selected"</if>>公司</option>
<option value="2" <if condition="$data['company_type'] eq '2'"> selected="selected"</if>>个人</option>
<!-- <option value="0">请选择公司性质</option> -->
<option value="1" selected>公司</option>
<option value="2">个人</option>
</select>
</td>
</tr>
<tr>
<td class="l noticeinfo"><i class="mustmark" style="margin-left:-7px">*</i>是否有游戏资质:</td>
<td class="l noticeinfo">是否有游戏资质:</td>
<td class="r">
<select name="has_game_evidence" class="select_gallery">
<option value="">请选择是否有游戏资质</option>
<option value="1" <if condition="$data['has_game_evidence'] eq '1'"> selected="selected"</if>>是</option>
<option value="0" <if condition="$data['has_game_evidence'] eq '0'"> selected="selected"</if>>否</option>
<option value="1"></option>
<option value="0" selected="selected"></option>
</select>
</td>
</tr>
<tr>
<td class="l"><i class="mustmark" style="margin-left:-7px">*</i>联系人:</td>
<td class="l">联系人:</td>
<td class="r" >
<input type="text" class="txt " name="link_man" value="" placeholder="请输入联系人">
</td>
</tr>
<tr>
<td class="l"><i class="mustmark" style="margin-left:-7px">*</i>联系电话:</td>
<td class="l">联系电话:</td>
<td class="r" >
<input type="text" class="txt " name="link_phone" value="" placeholder="请输入联系电话">
</td>

@ -37,7 +37,7 @@
</tr>
<tr>
<td class="l"><!--<i class="mustmark" style="margin-left:-7px">*</i>-->对应平台(简称)</td>
<td class="l">对应平台(简称)</td>
<td class="r" >
<input type="text" class="txt " name="matche_platform" value="{$data.matche_platform}" placeholder="请输入对应平台">
</td>
@ -52,14 +52,14 @@
</tr>
<tr>
<td class="l"><!--<i class="mustmark" style="margin-left:-7px">*</i>-->渠道费率:</td>
<td class="l">渠道费率:</td>
<td class="r" >
<input type="text" class="txt " name="channel_rate" value="{$data.channel_rate}" placeholder="请输入渠道费率"> <span style="margin-left: 3px;padding-top: 5px">%</span>
</td>
</tr>
<tr>
<td class="l"><!--<i class="mustmark" style="margin-left:-7px">*</i>-->开票税点:</td>
<td class="l">开票税点:</td>
<td class="r" >
<input type="text" class="txt " name="invoice_rate" value="{$data.invoice_rate}" placeholder="请输入开票税点"><span style="margin-left: 3px;padding-top: 5px">%</span>
</td>
@ -68,10 +68,10 @@
<tr>
<td class="l noticeinfo"><i class="mustmark" style="margin-left:-7px">*</i>是否签署合同:</td>
<td class="l noticeinfo">是否签署合同:</td>
<td class="r">
<select name="is_sign_contract" class="select_gallery">
<option value="">请选择是否签署合同</option>
<!-- <option value="">请选择是否签署合同</option> -->
<option value="1" <if condition="$data['is_sign_contract'] eq '1'"> selected="selected"</if>>是</option>
<option value="0" <if condition="$data['is_sign_contract'] eq '0'"> selected="selected"</if>>否</option>
</select>
@ -79,10 +79,10 @@
</tr>
<tr>
<td class="l noticeinfo"><i class="mustmark" style="margin-left:-7px">*</i>结算方式:</td>
<td class="l noticeinfo">结算方式:</td>
<td class="r">
<select name="settlement_type" class="select_gallery">
<option value="0">请选择结算方式</option>
<option value="0" <if condition="$data['settlement_type'] eq '0'"> selected="selected"</if>>无</option>
<option value="1" <if condition="$data['settlement_type'] eq '1'"> selected="selected"</if>>周结</option>
<option value="2" <if condition="$data['settlement_type'] eq '2'"> selected="selected"</if>>月结</option>
</select>
@ -90,10 +90,9 @@
</tr>
<tr>
<td class="l noticeinfo"><i class="mustmark" style="margin-left:-7px">*</i>公司性质:</td>
<td class="l noticeinfo">公司性质:</td>
<td class="r">
<select name="company_type" class="select_gallery">
<option value="0">请选择公司性质</option>
<option value="1" <if condition="$data['company_type'] eq '1'"> selected="selected"</if>>公司</option>
<option value="2" <if condition="$data['company_type'] eq '2'"> selected="selected"</if>>个人</option>
</select>
@ -101,10 +100,10 @@
</tr>
<tr>
<td class="l noticeinfo"><i class="mustmark" style="margin-left:-7px">*</i>是否签署合同:</td>
<td class="l noticeinfo">是否有游戏资质:</td>
<td class="r">
<select name="has_game_evidence" class="select_gallery">
<option value="">请选择是否有游戏资质</option>
<!-- <option value="">请选择是否有游戏资质</option> -->
<option value="1" <if condition="$data['has_game_evidence'] eq '1'"> selected="selected"</if>>是</option>
<option value="0" <if condition="$data['has_game_evidence'] eq '0'"> selected="selected"</if>>否</option>
</select>
@ -112,14 +111,14 @@
</tr>
<tr>
<td class="l"><i class="mustmark" style="margin-left:-7px">*</i>联系人:</td>
<td class="l">联系人:</td>
<td class="r" >
<input type="text" class="txt " name="link_man" value="{$data.link_man}" placeholder="请输入联系人">
</td>
</tr>
<tr>
<td class="l"><i class="mustmark" style="margin-left:-7px">*</i>联系电话:</td>
<td class="l">联系电话:</td>
<td class="r" >
<input type="text" class="txt " name="link_phone" value="{$data.link_phone}" placeholder="请输入联系电话">
</td>

@ -50,8 +50,9 @@
<!-- 表头 -->
<thead>
<tr>
<th style="width:5%;min-width:10px;">操作</th>
<!-- <th style="width:5%;min-width:10px;">操作</th>-->
<th>合同合作方名称</th>
<th>公司性质</th>
<th>对应平台</th>
<th>合同期限</th>
<th>开票税点</th>
@ -78,12 +79,13 @@
<else />
<volist name="listData" id="data">
<tr>
<td rowspan="{$data.row}">
<a href="{:U('edit',array('id'=>$data['id']))}">编辑</a>
<a href="{:U('edit',array('id'=>$data['id'],'action' => 'show'))}">查看</a>
<a href="{:U('del',array('id'=>$data['id']))}" class="confirm ajax-get">删除</a>
</td>
<!-- <td rowspan="{$data.row}">-->
<!-- <a href="{:U('edit',array('id'=>$data['id']))}">编辑</a>-->
<!-- <a href="{:U('edit',array('id'=>$data['id'],'action' => 'show'))}">查看</a>-->
<!-- <a href="{:U('del',array('id'=>$data['id']))}" class="confirm ajax-get">删除</a>-->
<!-- </td>-->
<td rowspan="{$data.row}">{$data.partner}</td>
<td rowspan="{$data.row}">{$data.company_type}</td>
<td rowspan="{$data.row}">{$data.matche_platform}</td>
<td rowspan="{$data.row}">{$data.contract_time}</td>
<td rowspan="{$data.row}">{$data.invoice_rate}%</td>
@ -107,11 +109,11 @@
<if condition="$ratiokey gt 0">
<tr>
<td>{$ratio['name']}</td>
<td>{$ratio['ratio']}</td>
<td>{$ratio['ratio']}%</td>
</tr>
<else />
<td>{$ratio['name']}</td>
<td>{$ratio['ratio']}</td>
<td>{$ratio['ratio']}%</td>
</if>
</foreach>
@ -130,11 +132,11 @@
<if condition="$ratiokey gt 0">
<tr>
<td>{$ratio['name']}</td>
<td>{$ratio['ratio']}</td>
<td>{$ratio['ratio']}%</td>
</tr>
<else />
<td>{$ratio['name']}</td>
<td>{$ratio['ratio']}</td>
<td>{$ratio['ratio']}%</td>
</if>
</foreach>

@ -150,13 +150,13 @@
<if condition="$ratiokey gt 0">
<tr>
<td>{$ratio['name']}</td>
<td>{$ratio['ratio']}</td>
<td>{$ratio['ratio']}%</td>
<!-- <td>{$ratio['name']}</td>-->
<!-- <td>{$ratio['my_ratio']}</td>-->
</tr>
<else />
<td>{$ratio['name']}</td>
<td>{$ratio['ratio']}</td>
<td>{$ratio['ratio']}%</td>
<!-- <td>{$ratio['name']}</td>-->
<!-- <td>{$ratio['my_ratio']}</td>-->
</if>
@ -181,13 +181,13 @@
<if condition="$ratiokey gt 0">
<tr>
<td>{$ratio['name']}</td>
<td>{$ratio['ratio']}</td>
<td>{$ratio['ratio']}%</td>
<!-- <td>{$ratio['name']}</td>-->
<!-- <td>{$ratio['my_ratio']}</td>-->
</tr>
<else />
<td>{$ratio['name']}</td>
<td>{$ratio['ratio']}</td>
<td>{$ratio['ratio']}%</td>
<!-- <td>{$ratio['name']}</td>-->
<!-- <td>{$ratio['my_ratio']}</td>-->
</if>

@ -90,7 +90,7 @@
</tr>
<tr>
<td class="l noticeinfo"><i class="mustmark" style="margin-left:-7px">*</i>是否签署合同:</td>
<td class="l noticeinfo"><i class="mustmark" style="margin-left:-7px">*</i>是否有游戏资质:</td>
<td class="r">
<select name="has_game_evidence" class="select_gallery" disabled="true">
<option value="">请选择是否有游戏资质</option>

@ -64,36 +64,15 @@
<input type="hidden" name="promote_id" value="{$data['promote_id']}">
<tr>
<!-- <tr>
<td class="l">工会归属:</td>
<td class="r table_radio">
<input id="company_belong" name="company_belong" value="{$data['company_belong']}" type="hidden">
<span class="form_radio">
{:getCompanyBlong($data['company_belong'])}
<!-- <label >
<input type="radio" value="3" name="company_belong" <?php if($data['company_belong'] ==3):?>
checked="checked"
<?php endif?> class="company_belong"> 无
</label>
<label >
<input type="radio" value="0" name="company_belong" <?php if($data['company_belong'] ==0):?>
checked="checked"
<?php endif?> class="company_belong"> 内团
</label >
<label >
<input type="radio" value="1" name="company_belong" <?php if($data['company_belong'] ==1):?>
checked="checked"
<?php endif?> class="company_belong"> 外团
</label>
<label >
<input type="radio" value="2" name="company_belong" <?php if($data['company_belong'] ==2):?>
checked="checked"
<?php endif?> class="company_belong"> 外团-分发联盟
</label> -->
</span>
<!-- <span class="notice-text"></span>-->
</td>
</tr>
</tr> -->
<tr id="company_relation">
<td class="l">工会关系:</td>

@ -19,7 +19,7 @@
<script type="text/javascript" src="__STATIC__/datetimepicker/js/bootstrap-datetimepicker.min.js"></script>
<script type="text/javascript" src="__STATIC__/datetimepicker/js/locales/bootstrap-datetimepicker.zh-CN.js"charset="UTF-8"></script>
<script src="__STATIC__/juicer-min.js" type="text/javascript"></script>
<script src="__STATIC__/czinputcheck.js?v=1.29" type="text/javascript"></script>
<script src="__STATIC__/czinputcheck.js?v=0527" type="text/javascript"></script>
<style>
.coin-detail{
display: block;
@ -82,12 +82,12 @@
</td>
</tr>
<tr>
<td class="l"><i class="mustmark" style="margin-left:-7px">*</i>公司性质:</td>
<td class="l">公司性质:</td>
<td class="r" >
<div class="input-list input-list-server search_label_rehab" style="margin:0;">
<select id="company_type" name="company_type" class="select_gallery" style="width: 215px;">
<option value="">请选择公司性质</option>
<option value="1">公司</option>
<!-- <option value="">请选择公司性质</option> -->
<option value="1" selected>公司</option>
<option value="2">个人</option>
</select>
</div>
@ -98,21 +98,21 @@
<td class="r" >
<div class="input-list input-list-server search_label_rehab" style="margin:0;">
<select id="is_sign_contact" name="is_sign_contact" class="select_gallery" style="width: 215px;">
<option value="">请选择是否签署合同</option>
<option value="0"></option>
<!-- <option value="">请选择是否签署合同</option> -->
<option value="0" selected></option>
<option value="1"></option>
</select>
</div>
</td>
</tr>
<tr>
<td class="l"><i class="mustmark" style="margin-left:-7px">*</i>团体归属:</td>
<td class="l">团体归属:</td>
<td class="r" >
<div class="input-list input-list-server search_label_rehab" style="margin:0;">
<select id="company_belong" name="company_belong" class="select_gallery" style="width: 215px;">
<option value="">请选择团体归属</option>
<!-- <option value="">请选择团体归属</option> -->
<volist name=":getCompanyBlong()" id="vo">
<option value="{$vo.id}">{$vo.name}</option>
<option value="{$vo.id}" <php> if($vo['id'] == 3)echo selected;</php>>{$vo.name}</option>
</volist>
</select>
</div>
@ -120,13 +120,13 @@
</tr>
<tr>
<td class="l"><i class="mustmark" style="margin-left:-7px">*</i>联系结算人:</td>
<td class="l">联系结算人:</td>
<td class="r" >
<input type="text" class="txt " name="settlement_contact" value="" placeholder="请输入结算联系人">
</td>
</tr>
<tr>
<td class="l"><i class="mustmark" style="margin-left:-7px">*</i>联系电话:</td>
<td class="l">联系电话:</td>
<td class="r" >
<input type="text" class="txt " name="contact_phone" value="" placeholder="请输入联系电话">
</td>
@ -156,13 +156,13 @@
</td>
</tr>
<tr>
<td class="l">开户网点</td>
<td class="l">账户名</td>
<td class="r" >
<input type="text" class="txt " name="bank_address" value="" placeholder="请输入开户网点">
<input type="text" class="txt " name="bank_address" value="" placeholder="请输入账户名">
</td>
</tr>
<tr>
<td class="l"><i class="mustmark" style="margin-left:-7px"></i>备注:</td>
<td class="l">备注:</td>
<td class="r" >
<input type="text" class="txt " name="content" value="" placeholder="">
</td>
@ -286,18 +286,18 @@
var obj = {
"company_name":["required","推广公司名称不允许为空"],
"platform_name":["nocheck"],
// "contact_begin":["date","合同开始时间不能为空"],
// "contact_end":["date","合同结束时间不能为空"],
"fax_ratio":["number","开票税率必须是数字如果无此项请填0"],
"company_type":["required","公司性质不能为空","select"],
// "is_sign_contact":["required","是否签署合同项不能为空","select"],
"company_belong":["required","团体归属不能为空","select"],
"settlement_contact":["required","结算联系人不能为空"],
"contact_phone":["phone","联系人电话格式不对或不能为空"],
// "address":["required","联系人地址不能为空"],
// "bank_card":["bankid","银行卡格式错误或不能为空"],
// "bank_name":["required","银行名称不能为空"],
// "bank_address":["required","银行开户网点不能为空"],
"contact_begin":["nocheck","合同开始时间不能为空"],
"contact_end":["nocheck","合同结束时间不能为空"],
"fax_ratio":[["number",true],"开票税率必须是数字如果无此项请填0"],
"company_type":["nocheck","公司性质不能为空","select"],
"is_sign_contact":["nocheck","是否签署合同项不能为空","select"],
"company_belong":["nocheck","团体归属不能为空","select"],
"settlement_contact":["nocheck","结算联系人不能为空"],
"contact_phone":[["phone",true],"联系人电话格式不对"],
"address":["nocheck","联系人地址不能为空"],
"bank_card":[["bankid",true],"银行卡格式错误"],
"bank_name":["nocheck","银行名称不能为空"],
"bank_address":["nocheck","银行开户网点不能为空"],
"content":["nocheck"],
"status":["nocheck","","radio"]
}

@ -82,11 +82,11 @@
</td>
</tr>
<tr>
<td class="l"><i class="mustmark" style="margin-left:-7px">*</i>公司性质:</td>
<td class="l">公司性质:</td>
<td class="r" >
<div class="input-list input-list-server search_label_rehab" style="margin:0;">
<select id="company_type" name="company_type" class="select_gallery" style="width: 215px;">
<option value="">请选择公司性质</option>
<!-- <option value="">请选择公司性质</option> -->
<option value="1" <if condition="$data['company_type'] eq 1">selected
</if>>公司</option>
<option value="2" <if condition="$data.company_type eq 2">selected
@ -100,7 +100,7 @@
<td class="r" >
<div class="input-list input-list-server search_label_rehab" style="margin:0;">
<select id="is_sign_contact" name="is_sign_contact" class="select_gallery" style="width: 215px;">
<option value="">请选择是否签署合同</option>
<!-- <option value="">请选择是否签署合同</option> -->
<option value="0" <if condition="$data['is_sign_contact'] eq 0">selected
</if>>否</option>
<option value="1" <if condition="$data['is_sign_contact'] eq 1">selected
@ -110,11 +110,11 @@
</td>
</tr>
<tr>
<td class="l"><i class="mustmark" style="margin-left:-7px">*</i>团体归属:</td>
<td class="l">团体归属:</td>
<td class="r" >
<div class="input-list input-list-server search_label_rehab" style="margin:0;">
<select id="company_belong" name="company_belong" class="select_gallery" style="width: 215px;">
<option value="">请选择团体归属</option>
<!-- <option value="">请选择团体归属</option> -->
<volist name=":getCompanyBlong()" id="vo">
<option value="{$vo.id}" <php> if($data['company_belong'] !='' && $vo['id'] == $data['company_belong'])echo selected;</php>>{$vo.name}</option>
</volist>
@ -124,13 +124,13 @@
</tr>
<tr>
<td class="l"><i class="mustmark" style="margin-left:-7px">*</i>联系结算人:</td>
<td class="l">联系结算人:</td>
<td class="r" >
<input type="text" class="txt " name="settlement_contact" value="{$data.settlement_contact}" placeholder="请输入结算联系人">
</td>
</tr>
<tr>
<td class="l"><i class="mustmark" style="margin-left:-7px">*</i>联系电话:</td>
<td class="l">联系电话:</td>
<td class="r" >
<input type="text" class="txt " name="contact_phone" value="{$data.contact_phone}" placeholder="请输入联系电话">
</td>
@ -160,13 +160,13 @@
</td>
</tr>
<tr>
<td class="l">开户网点</td>
<td class="l">账户名</td>
<td class="r" >
<input type="text" class="txt " name="bank_address" value="{$data.bank_address}" placeholder="请输入开户网点">
<input type="text" class="txt " name="bank_address" value="{$data.bank_address}" placeholder="请输入账户名">
</td>
</tr>
<tr>
<td class="l"><i class="mustmark" style="margin-left:-7px"></i>备注:</td>
<td class="l">备注:</td>
<td class="r" >
<input type="text" class="txt " name="content" value="{$data.content}" placeholder="">
</td>
@ -357,14 +357,14 @@
"platform_name":["nocheck"],
"contact_begin":["nocheck","合同开始时间不能为空"],
"contact_end":["nocheck","合同结束时间不能为空"],
"fax_ratio":["number","开票税率必须是数字如果无此项请填0"],
"company_type":["required","公司性质不能为空","select"],
"is_sign_contact":["required","是否签署合同项不能为空","select"],
"company_belong":["required","团体归属不能为空","select"],
"settlement_contact":["required","结算联系人不能为空"],
"contact_phone":["phone","联系人电话格式不对或不能为空"],
"fax_ratio":[["number",true],"开票税率必须是数字如果无此项请填0"],
"company_type":["nocheck","公司性质不能为空","select"],
"is_sign_contact":["nocheck","是否签署合同项不能为空","select"],
"company_belong":["nocheck","团体归属不能为空","select"],
"settlement_contact":["nocheck","结算联系人不能为空"],
"contact_phone":[["phone",true],"联系人电话格式不对"],
"address":["nocheck","联系人地址不能为空"],
"bank_card":["nocheck","银行卡格式错误或不能为空"],
"bank_card":[["bankid",true],"银行卡格式错误"],
"bank_name":["nocheck","银行名称不能为空"],
"bank_address":["nocheck","银行开户网点不能为空"],
"content":["nocheck"],

@ -112,7 +112,13 @@
<td >{$data.action_title}</td>
<td >{$data.action_content}</td>
<td >{$data.game_name}</td>
<td >{$data.account}</td>
<td >
<if condition="$show_data_power eq true ">
{$data.account}
<else />
{$data.account|encryptStr}
</if>
</td>
<td >{$data.create_time|date='Y-m-d H:i:s',###}</td>
<td >{$data.ip}</td>
<!-- <td ><a class="confirm del" data-id="{$data.id}">删除</a></td>-->

@ -0,0 +1,26 @@
<?php
namespace Api\Controller;
use Think\Controller;
use User\Api\MemberApi;
/**
* 用户操作接口
*
*/
class PartnerController extends Controller{
public function getPartnerList() {
// var_dump(md5(sha1('PARTNER_ID') . 'PARTNER_ID'));die();
if (md5(sha1('PARTNER_ID') . 'PARTNER_ID') != $_REQUEST['code']){
exit("error");
}
$data = M('partner','tab_')->field("id,partner name")->select();
header('Content-Type:application/json; charset=utf-8');
exit(json_encode($data));
}
}

@ -72,9 +72,9 @@
<div class="foot_bom">抵制不良网页游戏拒绝盗版游戏。注意自我保护谨防受骗上当。适度游戏益脑沉迷游戏伤身。合理安排时间享受健康生活。适龄提示适合12周岁以上使用。</div>
</div>
</div>
<!-- 侧导航 -->
<div class="side_tabbar" style="z-index: 1">
<!-- 侧导航 超级签-->
<!-- <div class="side_tabbar" style="z-index: 1">
<img src="__IMG__/index_about/qrcode.png" alt="">
</div>
</div> -->
</block>

@ -84,10 +84,10 @@
</div>
</div>
<!-- 侧导航 -->
<div class="side_tabbar" style="z-index: 1">
<!-- 侧导航 超级签-->
<!-- <div class="side_tabbar" style="z-index: 1">
<img src="__IMG__/index_about/qrcode.png" alt="">
</div>
</div> -->
<script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak=IlhuMR32KKlrV3pR6BuvSLVLQKQeEjwP"></script>
<script src="__JS__/collaborate.js" type="text/javascript"></script>
<!-- WPA start -->

@ -49,8 +49,8 @@
<div class="foot_bom">抵制不良网页游戏拒绝盗版游戏。注意自我保护谨防受骗上当。适度游戏益脑沉迷游戏伤身。合理安排时间享受健康生活。适龄提示适合12周岁以上使用。</div>
</div>
</div>
<!-- 侧导航 -->
<div class="side_tabbar" style="z-index: 1">
<!-- 侧导航 超级签-->
<!-- <div class="side_tabbar" style="z-index: 1">
<img src="__IMG__/index_about/qrcode.png" alt="">
</div>
</div> -->
</block>

@ -204,8 +204,8 @@
<div class="foot_bom">抵制不良网页游戏拒绝盗版游戏。注意自我保护谨防受骗上当。适度游戏益脑沉迷游戏伤身。合理安排时间享受健康生活。适龄提示适合12周岁以上使用。</div>
</div>
</div>
<!-- 侧导航 -->
<div class="side_tabbar">
<!-- 侧导航 超级签-->
<!-- <div class="side_tabbar">
<img src="__IMG__/index_about/qrcode.png" alt="">
</div>
</div> -->
</block>

@ -38,15 +38,15 @@
<div class="swiper-pagination"></div>
</div>
</div>
<div class="hot">
<!-- 超级签隐藏 -->
<!-- <div class="hot">
<div class="hot_box">
<div class="heading">
<div>热门活动</div>
<!-- <div>+更多</div>-->
</div>
<img src="__IMG__/new/slide.png" alt="" onclick="location.href='{:U(\'ssg/home\')}'">
</div>
</div>
</div> -->
<div class="recharge" style="display: none;">
<div class="recharge_box">
<div class="title">平台币充值</div>
@ -55,7 +55,7 @@
</div>
</div>
<!-- 底部标签 -->
<div class="foot_lable">
<div class="foot_lable" style="position: absolute;bottom:61px;width: 100%;text-align: center;">
<div>备案号:<a class="beian" href="http://www.beian.miit.gov.cn" target="_blank">琼ICP备19000556号-1</a></div>
<div>网络文化经营许可证编号琼网文20192354-200号</div>
<div>海南万盟天下科技有限公司</div>

@ -39,11 +39,12 @@
<a href="{$usergift}"><img src="__IMG__/new/libao (1).png" alt="">
<span>我的礼包</span></a>
</div>
<div class="control_box">
<!-- 超级签隐藏 -->
<!-- <div class="control_box">
<?php $exchangerecord = $user['id'] ? U('exchangerecord') : U('login');?>
<a href="/mobile.php/ssg/home.html"><img src="__IMG__/new/pingguo.png" alt="">
<span>超级签</span></a>
</div>
</div> -->
<div class="control_box">
<a href="mqqwpa://im/chat?chat_type=wpa&uin={:C('PC_SET_SERVER_QQ')}&version=1&src_type=web&web_src=oicqzone.com"><img src="__IMG__/new/kefuzhongxin.png" alt="">
<span>联系客服</span></a>

@ -31,32 +31,44 @@
cic.checkAddInput=function(arr){
var rearr = {};
for(var i in arr) {
var reg = cic.verify[arr[i][0]][0];
// var reg = cic.verify[arr[i][0]][0];
var name = "input";
var selecttypename='';
if(typeof arr[i][2] !== "undefined") name = arr[i][2];
if(name == "radio") {
name="input";
selecttypename=":checked";
}
if(!reg){
//nocheck时不验证
var val = $(name+"[name='"+i+"']"+selecttypename).val();
if(val != ''){
rearr[i]=val;
}
}else{
if(reg.test($(name+"[name='"+i+"']"+selecttypename).val())) {
rearr[i] = $(name+"[name='"+i+"']"+selecttypename).val();
}else {
layer.alert(arr[i][1], {
icon: 2,
skin: 'layer-ext-moon'
});
return false;
break;
}
}
}
var reg = arr[i][0];
if(!Array.isArray(reg) || reg.length == 1){
reg = [arr[i][0],false];//默认false
}
var val = $(name+"[name='"+i+"']"+selecttypename).val();
//为true不存在不报错
if(reg[1]){
if(val == ''){
continue;
}
}
var treg = cic.verify[reg[0]][0];
if(!treg){
if(val != ''){
rearr[i]=val;
}
}else{
if(treg.test(val)) {
rearr[i] =val;
}else {
layer.alert(arr[i][1], {
icon: 2,
skin: 'layer-ext-moon'
});
return false;
continue;
}
}
}
return rearr;
};

@ -0,0 +1,42 @@
<?php
// +----------------------------------------------------------------------
// | OneThink [ WE CAN DO IT JUST THINK IT ]
// +----------------------------------------------------------------------
// | Copyright (c) 2013 http://www.onethink.cn All rights reserved.
// +----------------------------------------------------------------------
// | Author: 麦当苗儿 <zuojiazi@vip.qq.com> <http://www.zjzit.cn>
// +----------------------------------------------------------------------
if(version_compare(PHP_VERSION,'5.3.0','<')) die('require PHP > 5.3.0 !');
/**
* 系统调试设置
* 项目正式部署后请设置为false
*/
define('APP_DEBUG', true );
define('BIND_MODULE','Api');
define('ROOTTT',dirname(__FILE__).'/');
define('ROOTTTTT',dirname(__FILE__));
define('FONTS',dirname(__FILE__).'/Public/Admin/fonts/');
/**
* 应用目录设置
* 安全期间建议安装调试完成后移动到非WEB目录
*/
define ( 'APP_PATH', './Application/' );
if(!is_file(APP_PATH . 'User/Conf/config.php')){
header('Location: ./install.php');
exit;
}
/**
* 缓存目录设置
* 此目录必须可写建议移动到非WEB目录
*/
define ( 'RUNTIME_PATH', './Runtime/' );
/**
* 引入核心入口
* ThinkPHP亦可移动到WEB以外的目录
*/
require './ThinkPHP/ThinkPHP.php';
Loading…
Cancel
Save