Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/paytime_summary

master
sunke 5 years ago
commit 51551e91df

@ -8,10 +8,10 @@ namespace Admin\Controller;
class AggregateFinanceStatementController extends ThinkController
{
public $verify_status = [
"-1"=>"审拒绝",
"-1"=>"审拒绝",
"0"=>"未申请开票",
"1"=>"申请开票",
"2"=>"审同意",
"2"=>"审同意",
"3"=>"已开票",
"4"=>"已上传凭证",
"5"=>"已到账"
@ -110,7 +110,8 @@ class AggregateFinanceStatementController extends ThinkController
$data[$key]['oplist'] = $this->OpAuth($value);
}
$count = M("aggregate_statement","tab_")->field("count(id) count,SUM(ratio_money) ratio_money,SUM(pay_money) pay_money")->where($map)->find();
$count = M("aggregate_statement","tab_")->field("count(id) count,SUM(ratio_money) ratio_money")->where($map)->find();
$pay_money_count = M("aggregate_statement","tab_")->field("SUM(pay_money) pay_money")->where($map)->where("withdraw_type <> 2")->find()['pay_money'];
//分页
$parameter['p'] = $page;
@ -123,7 +124,7 @@ class AggregateFinanceStatementController extends ThinkController
$this->assign('menubtn',$this->menuAuth());
$this->assign('data',$data);
$this->assign('total',$count['ratio_money']);
$this->assign('pay_money',$count['pay_money']);
$this->assign('pay_money',$pay_money_count);
$this->assign('channel',$this->getAggChannel());
$this->assign('verify_status',$this->verify_status);
$this->display();

@ -587,4 +587,15 @@ class AjaxController extends ThinkController{
$result = M('promote', 'tab_')->field("id,account,nickname")->where(['parent_id'=>$pid])->select();
$this->ajaxReturn(['code'=>1, 'data'=>$result]);
}
public function getPromotersByLevelResource()
{
$level = I('level');
if (!$level) {
// return $this->ajaxReturn(['code'=>1, 'msg'=>'获取成功', 'data'=>[]]);
$level = '';
}
$this->ajaxReturn(['code'=>1, 'msg'=>'获取成功', 'data'=>(new PromoteModel)->getPromotersByLevelResource($level)]);
}
}

@ -120,6 +120,13 @@ class AmericaIpForbitController extends ThinkController
}
fclose($fp);
addOperationLog(array(
"op_type"=>3,
"key"=> getNowDate(),
"menu"=>"游戏-游戏管理-ip限制白名单-导出",
"url"=>U("AmericaIpForbit/index")
));
$getData = $_GET;
unset($getData['id']);
unset($getData['xlsname']);
@ -147,6 +154,23 @@ class AmericaIpForbitController extends ThinkController
$is_change = M('forbit_ip','tab_')->where(['id'=>['in',$id]])->save(['status'=>$status]);
if ($is_change) {
if (I('status')) {
addOperationLog(array(
"op_type"=>1,
"key"=> getNowDate(),
"menu"=>"游戏-游戏管理-ip限制白名单-开启",
"url"=>U("AmericaIpForbit/index")
));
} else{
addOperationLog(array(
"op_type"=>1,
"key"=> getNowDate(),
"menu"=>"游戏-游戏管理-ip限制白名单-关闭",
"url"=>U("AmericaIpForbit/index")
));
}
$this->ajaxReturn(['code'=>1]);
} else {
$this->ajaxReturn(['code'=>0]);
@ -165,6 +189,14 @@ class AmericaIpForbitController extends ThinkController
$is_del = $is_change = M('forbit_ip','tab_')->where(['id'=>['in',$id]])->delete();
if ($is_del) {
$hav_firbit = M('forbit_ip','tab_')->where(['id'=>I('id')])->find();
addOperationLog(array(
"op_type"=>2,
"key"=> $hav_firbit['user_account'],
"menu"=>"游戏-游戏管理-ip限制白名单-删除",
"url"=>U("AmericaIpForbit/index")
));
$this->ajaxReturn(['code'=>1]);
} else {
$this->ajaxReturn(['code'=>0]);
@ -208,6 +240,14 @@ class AmericaIpForbitController extends ThinkController
$is_insert = M('forbit_ip','tab_')->add($insert);
if ($is_insert) {
addOperationLog(array(
"op_type"=>0,
"key"=> I('account'),
"menu"=>"游戏-游戏管理-ip限制白名单-新增",
"url"=>U("AmericaIpForbit/index")
));
$this->success('添加成功',U('AmericaIpForbit/index'));
} else {
$this->error('添加失败');

@ -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);;
}
}

@ -62,7 +62,7 @@ class PartnerController extends ThinkController
//获取分页数据
$query = $model->alias('p')
->field("p.partner,p.matche_platform,p.invoice_rate,p.settlement_type,p.bank_account,
p.opening_bank,p.id,p.contract_start_time,p.contract_end_time,p.remark,p.company_type")
p.opening_bank,p.id,p.contract_start_time,p.contract_end_time,p.remark,p.company_type,p.has_game_evidence,p.is_sign_contract")
->where($map)
->order("id desc");
if($is_export){
@ -143,8 +143,8 @@ class PartnerController extends ThinkController
$parseData = array();
foreach ($partners as $key =>$value) {
$value['game'] = $parseGames[$value['id']];
$value['has_game_evidence'] = $parseGames['has_game_evidence'] ? '有' : '没有';
$value['is_sign_contract'] = $parseGames['is_sign_contract'] ? '是' : '否';
$value['has_game_evidence'] = $value['has_game_evidence'] ? '是' : '否';
$value['is_sign_contract'] = $value['is_sign_contract'] ? '是' : '否';
$value['channel_rate'] *= 100;
$value['invoice_rate'] *= 100;
if ($value['settlement_type'] == 0) {
@ -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);

@ -252,6 +252,9 @@ class PromoteCompanyController extends ThinkController
if(isset($save['resources'])){
$save['resources'] = json_encode($save['resources'],JSON_UNESCAPED_UNICODE);
}
if(empty($save['contact_phone'])){
$save['contact_phone'] = 0;
}
$res = $model->add($save);
if ($res) {
@ -326,6 +329,9 @@ class PromoteCompanyController extends ThinkController
if(isset($save['company_belong']) && ($y_belong != $save['company_belong'])){
$is_change_belong = true;
}
if(empty($save['contact_phone'])){
$save['contact_phone'] = 0;
}
$res = $model->save($save);
if ($res) {
\Think\Log::actionLog('PromoteCompany/edit', 'partner', $res);
@ -361,6 +367,9 @@ class PromoteCompanyController extends ThinkController
}else{
$data['contact_begin']='';
}
if(empty($data['contact_phone'])){
$data['contact_phone'] = '';
}
if($data['contact_end'] >0){
$data['contact_end']=date("Y-m-d",$data['contact_end']);
}else{

@ -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,

@ -78,8 +78,23 @@ class TestResourceController extends ThinkController
if(!empty(I('user_account'))){
$map['tab_test_resource.user_account']=['like','%'.I('user_account').'%'];
}
if(!empty(I('promote_name'))){
$map['tab_test_resource.promote_account']=['like','%'.I('promote_name').'%'];
if(!empty(I('promote_id')) || I('promote_id')=="0"){
$promote_id = I('promote_id');
$promnote_arr = M("promote","tab_")->field("id")->where("chain like '%/{$promote_id}/%'")->select();
$promnote_arr = array_column($promnote_arr,"id");
array_push($promnote_arr,$promote_id);
$promnote_arr = implode(",",$promnote_arr);
$map['tab_test_resource.promote_id']=['in',$promnote_arr];
if (!I("promote_level")) {
$map['tab_test_resource.promote_id']=I('promote_id');
}
}
//为数据权限添加
setPowerPromoteIds($map, 'tab_test_resource.promote_id');
@ -91,6 +106,8 @@ class TestResourceController extends ThinkController
->order('tab_test_resource.create_time DESC')
->select();
// var_dump($data);die();
foreach ($data as $key => $value) {
$data[$key]['create_time'] = date('Y-m-d H:i:s',$value['create_time']);
}

@ -149,7 +149,7 @@ class ToolController extends ThinkController {
*/
public function smsset($value='')
{
$this->BaseConfig("sms_set,alidayu,jiguang,alidayunew,zhongwang");
$this->BaseConfig("sms_set,alidayu,jiguang,alidayunew,zhongwang,juhedata");
$this->meta_title = '短信设置';
$this->m_title = '短信设置';
@ -166,7 +166,7 @@ class ToolController extends ThinkController {
*/
public function age($value='')
{
$this->BaseConfig("tool_age");
$this->BaseConfig("tool_age,juhe_age");
$this->meta_title = '实名认证';
$this->m_title = '实名认证';

@ -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();

@ -450,5 +450,30 @@ class PromoteModel extends Model{
}
public function getPromotersByLevelResource($level)
{
if ($level) {
$where['level'] = $level;
}
$userAuth = session('user_auth');
setPowerPromoteIds($where,'id');
$offcialData = [0=>['id'=>0,'nickname'=>'官方渠道']];
$result = $this->field("*")->where($where)->select();
foreach ($result as &$item) {
$item['nickname'] = $item['account'] . ($item['nickname'] ? "({$item['nickname']})" : "");
}
if ((in_array('0',explode(',',$where['id'][1]))||$userAuth['data_empower_type']==1)) {
$result = array_merge($offcialData,$result);
// dump($result);die();
}
return $result;
}
}

@ -224,10 +224,10 @@
<tr>
<th style="border-right: solid 1px #b6cad2;">结算时间</th>
<th style="border-right: solid 1px #b6cad2;">产品</th>
<th style="border-right: solid 1px #b6cad2;">平台总额</th>
<th style="border-right: solid 1px #b6cad2;">平台总额(元)</th>
<th style="border-right: solid 1px #b6cad2;">分成比例</th>
<th style="border-right: solid 1px #b6cad2;">税费费率</th>
<th >结算金额</th>
<th >结算金额(元)</th>
</tr>
</thead>
@ -408,20 +408,20 @@
<tr>
<td>${it.begintime}~${it.endtime}</td>
<td>${it.game_name}</td>
<td>${it.money}</td>
<td>${it.money}</td>
<td><input type="text" class="txt statementchange" name="ratio" data-index ="${index}" data-change="statement_info[${index}]['ratio']" value="${it.ratio}" style="width: 40px;">%</td>
<td><input type="text" class="txt statementchange" name="fax_ratio" data-index ="${index}" data-change="statement_info[${index}]['fax_ratio']" value="${it.fax_ratio}" style="width: 40px;">%</td>
<td>${it.ratio_money}</td>
<td>${it.ratio_money}</td>
</tr>
{@/each}
<tr>
<td>合计</td>
<td></td>
<td>${count.pay_money}</td>
<td>${count.pay_money}</td>
<td></td>
<td></td>
<td>${count.ratio_money}</td>
<td>${count.ratio_money}</td>
</tr>
<tr>
<td colspan=5>本月分成总金额(人民币大写):</td>

@ -210,10 +210,10 @@
<tr>
<th style="border-right: solid 1px #b6cad2;">结算时间</th>
<th style="border-right: solid 1px #b6cad2;">产品</th>
<th style="border-right: solid 1px #b6cad2;">平台总额</th>
<th style="border-right: solid 1px #b6cad2;">平台总额(元)</th>
<th style="border-right: solid 1px #b6cad2;">分成比例</th>
<th style="border-right: solid 1px #b6cad2;">税费费率</th>
<th >结算金额</th>
<th >结算金额(元)</th>
</tr>
</thead>
@ -394,20 +394,20 @@
<tr>
<td>${it.begintime}~${it.endtime}</td>
<td>${it.game_name}</td>
<td>${it.money}</td>
<td>${it.money}</td>
<td><input type="text" class="txt statementchange" name="ratio" data-index ="${index}" data-change="statement_info[${index}]['ratio']" value="${it.ratio}" style="width: 40px;">%</td>
<td><input type="text" class="txt statementchange" name="fax_ratio" data-index ="${index}" data-change="statement_info[${index}]['fax_ratio']" value="${it.fax_ratio}" style="width: 40px;">%</td>
<td>${it.ratio_money}</td>
<td>${it.ratio_money}</td>
</tr>
{@/each}
<tr>
<td>合计</td>
<td></td>
<td>${count.pay_money}</td>
<td>${count.pay_money}</td>
<td></td>
<td></td>
<td>${count.ratio_money}</td>
<td>${count.ratio_money}</td>
</tr>
<tr>
<td colspan=5>本月分成总金额(人民币大写):</td>

@ -49,7 +49,7 @@
<div class="cf main-place top_nav_list navtab_list">
<h3 class="page_title">聚合渠道结算单管理</h3>
<p class="description_text">流程说明:结算自动生成对账单--->发起人申请开票--->财务审开票--->寄发票--->发起人上传收款凭证--->财务确认到账</p>
<p class="description_text">流程说明:结算自动生成对账单--->发起人申请开票--->财务审开票--->寄发票--->发起人上传收款凭证--->财务确认到账</p>
</div>
<div class="cf top_nav_list" style="height: 38px;">
<!-- 高级搜索 -->
@ -89,7 +89,7 @@
<div class="input-list input-list-promote search_label_rehab">
<select id="verify_status" name="verify_status" class="select_gallery" >
<option value="">请选择审状态</option>
<option value="">请选择审状态</option>
<foreach name="verify_status" item="vo" >
<option value="{$key}" <?php echo (isset($_REQUEST['verify_status']) && $key == I('verify_status')) ? 'selected':''; ?> >{$vo}</option>
</foreach>
@ -132,6 +132,7 @@
<th>结算日期</th>
<th>结算周期</th>
<th>结算类型</th>
<th>结算流水</th>
<th>结算金额</th>
<th>审批状态</th>
<th>操作人</th>
@ -156,6 +157,7 @@
<td>{$data.begintime}-{$data.endtime}</td>
<td>{$data.withdraw_type_1}</td>
<td>{$data.withdraw_type_2}</td>
<td>{$data.pay_money}</td>
<td>{$data.ratio_money}</td>
<td>{$data.verify_status_str}</td>
<td>{$data.admin_name}</td>
@ -168,7 +170,7 @@
</tr>
</volist>
<tr><td>合计</td><td colspan="10">结算总流水:{$pay_money}元&#12288;&#12288;&#12288;&#12288;结算金额:{$total}元 </td></tr>
<tr><td>合计</td><td colspan="10">结算总流水:{$pay_money}元(补点单据不重复计算在内)&#12288;&#12288;&#12288;&#12288;结算金额:{$total}元 </td></tr>
</notemtpy>
</tbody>
</table>
@ -239,7 +241,7 @@
}
}).get().join(",");
if(text == ''){
layer.msg("<font style='color:white'>" + '无需要审核通过的结算单,仅[已申请发票]状态可以进行审核通过' + "</font>");
layer.msg("<font style='color:white'>" + '无需要审批通过的结算单,仅[已申请发票]状态可以进行审批通过' + "</font>");
return;
}
if(flag){
@ -280,7 +282,7 @@
}
}).get().join(",");
if(text == ''){
layer.msg("<font style='color:white'>" + '无需要审核拒绝的结算单,仅[已申请发票]状态可以进行审核拒绝' + "</font>");
layer.msg("<font style='color:white'>" + '无需要批拒绝的结算单,仅[已申请发票]状态可以进行审批拒绝' + "</font>");
return;
}
if(flag){
@ -321,11 +323,11 @@
}
}).get().join(",");
if(text == ''){
layer.msg("<font style='color:white'>" + '无需要进行已开票的结算单,仅[审同意]状态可以进行已开票' + "</font>");
layer.msg("<font style='color:white'>" + '无需要进行已开票的结算单,仅[审同意]状态可以进行已开票' + "</font>");
return;
}
if(flag){
layer.confirm("已开票仅会对 [审同意] 结算单处理,选择中包含其他的状态的结算单将被忽略,点击取消停止操作",{title:false}, function(index){
layer.confirm("已开票仅会对 [审同意] 结算单处理,选择中包含其他的状态的结算单将被忽略,点击取消停止操作",{title:false}, function(index){
_doInvoiced();
layer.close(index);
});
@ -403,7 +405,7 @@
// return $(elem).val();
}).get().join(",");
if(text == ''){
layer.msg("<font style='color:white'>" + '无需要进行重新结算的结算单,仅[未申请发票][申请开票][审拒绝]状态可以进行重新结算' + "</font>");
layer.msg("<font style='color:white'>" + '无需要进行重新结算的结算单,仅[未申请发票][申请开票][审拒绝]状态可以进行重新结算' + "</font>");
return;
}
layer.confirm("重算结算金额会对结算单回退到未申请发票状态,请慎重处理,点击取消停止操作",{title:false}, function(index){
@ -575,10 +577,10 @@
content:"<div style='width: 300;height:auto;margin: auto;padding:20px;'>"+remark+"</div>"
});
});
//撤销审
//撤销审
$(".cancelVerify").click(function(){
var id = $(this).data("id");
layer.confirm("撤销审将回退到[已申请开票]状态,点击取消停止操作",{title:false}, function(index){
layer.confirm("撤销审将回退到[已申请开票]状态,点击取消停止操作",{title:false}, function(index){
$.ajax({
type: "POST",
url: "{:U('cancelVerify')}",

@ -192,10 +192,10 @@
<tr>
<th style="border-right: solid 1px #b6cad2;">结算时间</th>
<th style="border-right: solid 1px #b6cad2;">产品</th>
<th style="border-right: solid 1px #b6cad2;">平台总额</th>
<th style="border-right: solid 1px #b6cad2;">平台总额(元)</th>
<th style="border-right: solid 1px #b6cad2;">分成比例</th>
<th style="border-right: solid 1px #b6cad2;">税费费率</th>
<th >结算金额</th>
<th >结算金额(元)</th>
</tr>
</thead>
<tbody id="statementShow">
@ -203,10 +203,10 @@
<tr>
<td>{$it.begintime}~{$it.endtime}</td>
<td>{$it.game_name}</td>
<td>{$it.money}</td>
<td>{$it.money}</td>
<td><input type="text" class="txt statementchange" name="ratio" disabled="disabled" value="{$it.ratio}" style="width: 40px;">%</td>
<td><input type="text" class="txt statementchange" name="fax_ratio" disabled="disabled" value="{$it.fax_ratio}" style="width: 40px;">%</td>
<td>{$it.ratio_money}</td>
<td>{$it.ratio_money}</td>
</tr>
<!-- {$key}|{$vo} -->
</foreach>
@ -214,10 +214,10 @@
<tr>
<td>合计</td>
<td></td>
<td>{$data.statement_count.pay_money}</td>
<td>{$data.statement_count.pay_money}</td>
<td></td>
<td></td>
<td>{$data.statement_count.ratio_money}</td>
<td>{$data.statement_count.ratio_money}</td>
</tr>
<tr>
<td colspan=5>本月分成总金额(人民币大写):</td>

@ -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>

@ -30,14 +30,14 @@
<table border="0" cellspacing="0" cellpadding="0">
<tbody>
<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="partner" value="{$data.partner}" placeholder="请输入合作方名称" readonly>
</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="matche_platform" value="{$data.matche_platform}" placeholder="请输入对应平台" readonly>
</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="请输入渠道费率" readonly> <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="inoice_rate" value="{$data.inoice_rate}" placeholder="请输入开票税点" readonly><span style="margin-left: 3px;padding-top: 5px">%</span>
</td>
@ -68,7 +68,7 @@
<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" disabled="true">
<option value="">请选择是否签署合同</option>
@ -79,7 +79,7 @@
</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" disabled="true">
<option value="0">请选择结算方式</option>
@ -90,7 +90,7 @@
</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" disabled="true">
<option value="">请选择是否有游戏资质</option>
@ -101,14 +101,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="请输入联系人" readonly>
</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="请输入联系电话" readonly>
</td>
@ -158,7 +158,7 @@
</tr>
<tr>
<td class="l noticeinfo"><i class="mustmark" style="margin-left:-7px">*</i>显示状态:</td>
<td class="l noticeinfo">显示状态:</td>
<td class="r table_radio">
<span class="form_radio table_btn">
<label>

@ -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>
@ -354,20 +354,20 @@
$("#submit").on("click",function(){
var obj = {
"company_name":["required","推广公司名称不允许为空"],
"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","联系人电话格式不对或不能为空"],
"address":["nocheck","联系人地址不能为空"],
"bank_card":["nocheck","银行卡格式错误或不能为空"],
"bank_name":["nocheck","银行名称不能为空"],
"bank_address":["nocheck","银行开户网点不能为空"],
"content":["nocheck"],
"platform_name":[["nocheck",true]],
"contact_begin":[["nocheck",true],"合同开始时间不能为空"],
"contact_end":[["nocheck",true],"合同结束时间不能为空"],
"fax_ratio":[["number",true],"开票税率必须是数字如果无此项请填0"],
"company_type":["nocheck","公司性质不能为空","select"],
"is_sign_contact":["nocheck","是否签署合同项不能为空","select"],
"company_belong":["nocheck","团体归属不能为空","select"],
"settlement_contact":[["nocheck",true],"结算联系人不能为空"],
"contact_phone":[["phone",true],"联系人电话格式不对"],
"address":[["nocheck",true],"联系人地址不能为空"],
"bank_card":[["bankid",true],"银行卡格式错误"],
"bank_name":[["nocheck",true],"银行名称不能为空"],
"bank_address":[["nocheck",true],"银行开户网点不能为空"],
"content":[["nocheck",true]],
"status":["nocheck","","radio"]
}
var cres = CIC.checkAddInput(obj);
@ -382,7 +382,7 @@
cres.resources = doc;
cres.id = id;
console.log(cres);
//添加
$.ajax({
url:"{:U('PromoteCompany/edit')}",

@ -159,9 +159,9 @@
</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}" readonly placeholder="请输入开户网点">
<input type="text" class="txt " name="bank_address" value="{$data.bank_address}" readonly placeholder="请输入账户名">
</td>
</tr>
<tr>

@ -74,10 +74,27 @@
<input type="text" name="user_account" placeholder="测试账号" class="" value="{:I('user_account')}"/>&nbsp;
</div>
<div class="input-list">
<input type="text" name="promote_name" placeholder="所属推广员" class="" value="{:I('promote_name')}"/>&nbsp;
<!-- <div class="input-list">-->
<!-- <input type="text" name="promote_name" placeholder="所属推广员" class="" value="{:I('promote_name')}"/>&nbsp;-->
<!-- </div>-->
<div class="input-list search_item input-list-gamenoticestatus">
<select name="promote_level" style="color:#444" class="select_gallery" id="promote_level">
<option value="">请选择推广员等级</option>
<option value="1" <?php if ($_POST['promote_level'] == 1):?>selected<?php endif;?>>会长</option>
<option value="2" <?php if ($_POST['promote_level'] == 2):?>selected<?php endif;?>>部门长</option>
<option value="3" <?php if ($_POST['promote_level'] == 3):?>selected<?php endif;?>>组长</option>
<option value="4" <?php if ($_POST['promote_level'] == 4):?>selected<?php endif;?>>组员</option>
</select>
-
</div>
<div class="input-list search_item input-list-gamenoticestatus">
<select name="promote_id" style="color:#444" class="select_gallery" id="promote_id">
<option value="">请选择推广员</option>
</select>
</div>
</empty>
<input type="hidden" name="" value="" class="sortBy">
<input type="hidden" name="type" value="{$_GET['type']}">
@ -200,6 +217,7 @@
<script type="text/javascript">
//导航高亮
highlight_subnav('{:U('testResource/supportNumberList')}');
$(".select_gallery").select2();
$(function(){
$('.froze-btn').on({
@ -221,6 +239,29 @@
}
})
var promote_id = "{:I('promote_id')}";
$("#promote_level").change(function(){
$.ajax({
url:"{:U('Ajax/getPromotersByLevelResource')}",
type:"get",
data:{level:$("#promote_level option:selected").val()},
dataType:'json',
success:function(response){
str = '<option value="">请选择推广员</option>' +
// '<option value="0"'+(promote_id && 0 == promote_id?'selected':'')+'>官方渠道</option>' +
'';
data = response.data;
for (var i in data){
str += "<option value='"+data[i].id+"' "+(promote_id && data[i].id == promote_id?'selected':'')+">"+data[i].nickname+"</option>"
}
$("#promote_id").empty();
$("#promote_id").append(str);
$("#promote_id").select2();
}
})
});
$("#promote_level").change();
$('#batch_freeze').click(function () {
var ids = $('.ids:checked');

@ -4,6 +4,10 @@
<!--end 添加至常用设置悬浮弹窗-->
<div class="cf main-place top_nav_list navtab_list">
<ul class="tabnav1711 fr jstabnav">
<li data-tab="tab1" class="current"><a href="javascript:void(0);" >阿里云实名</a></li>
<li data-tab="tab2"><a href="javascript:void(0);" >聚合数据实名</a></li>
</ul>
<h3 class="page_title">{$meta_title}</h3>
<p class="description_text">用于配置实名认证相关参数的功能;需要到阿里云创建实名认证接口参数</p>
</div>
@ -35,8 +39,8 @@
<span class="notice-text">短信设置启用状态</span>
</td>
</tr>
</tbody>
</table>
<input type="hidden" name="name" value="tool_age">
@ -44,8 +48,43 @@
</form>
</div>
</div>
<div class="tab-content tabcon1711 tabcon17112">
<div id="tab2" class="tab-pane tab2">
<form action="{:U('saveTool')}" method="post" class="form-horizontal juhe_age form_info_ml">
<table border="0" cellspacing="0" cellpadding="0">
<tbody>
<tr>
<td class="l noticeinfo">Appkey</td>
<td class="r table_radio">
<input name="config[appkey]" type="text" value="{$juhe_age['appkey']}" class="input-large">
<span class="notice-text">阿里云实名认证接口 控制台->云市场->appcode</span>
</td>
</tr><tr>
<td class="l noticeinfo">启用状态</td>
<td class="r table_radio">
<span class="form_radio">
<label>
<input type="radio" name="status" value="0" <eq name="juhe_age['status']" value="0">checked="checked"</eq>> 禁用
</label>
<label>
<input type="radio" name="status" value="1" <eq name="juhe_age['status']" value="1">checked="checked"</eq>> 启用
</label>
</span>
<span class="notice-text">短信设置启用状态</span>
</td>
</tr>
</tbody>
</table>
<input type="hidden" name="name" value="juhe_age">
<input type="submit" value="保存" target-form="juhe_age" class="submit_btn form_btn ajax-post mlspacing">
</form>
</div>
</div>
</div>
<div class="common_settings">
<span class="plus_icon"><span><img src="__IMG__/zwmimages/icon_jia.png"></span></span>
<form class="addShortcutIcon">

@ -10,6 +10,7 @@
<li data-tab="tab3"><a href="javascript:void(0);" >极光</a></li>
<li data-tab="tab4"><a href="javascript:void(0);" >阿里大鱼(新)</a></li>
<li data-tab="tab5"><a href="javascript:void(0);" >中网</a></li>
<li data-tab="tab6"><a href="javascript:void(0);" >聚合数据</a></li>
</ul>
<h3 class="page_title">{$meta_title}</h3>
<p class="description_text">用于配置短信通知功能相关参数的功能</p>
@ -347,6 +348,56 @@
</form>
</div>
</div>
<div class="tab-content tabcon1711 tabcon17112">
<div id="tab6" class="tab-pane tab6">
<form action="{:U('saveTool')}" method="post" class="form-horizontal juhedata form_info_ml">
<table border="0" cellspacing="0" cellpadding="0">
<tbody>
<tr>
<td class="l noticeinfo">模板id</td>
<td class="r table_radio">
<input name="config[tpl_id]" type="text" value="{$juhedata['tpl_id']}" class="">
<span class="notice-text">模板id</span>
</td>
</tr>
<tr>
<td class="l noticeinfo">AppKey</td>
<td class="r table_radio">
<input name="config[key]" type="text" value="{$juhedata['key']}" class="">
<span class="notice-text">AppKey</span>
</td>
</tr>
<tr>
<td class="l noticeinfo">每日IP发送数量</td>
<td class="r table_radio">
<input name="config[limit]" type="text" value="{$juhedata['limit']}" class="">
<span class="notice-text">0或空则不限制</span>
</td>
</tr>
<tr>
<td class="l noticeinfo">启用状态</td>
<td class="r table_radio">
<span class="form_radio">
<label>
<input type="radio" name="status" value="0" <eq name="juhedata['status']" value="0">checked="checked"</eq>> 禁用
</label>
<label>
<input type="radio" name="status" value="1" <eq name="juhedata['status']" value="1">checked="checked"</eq>> 启用
</label>
</span>
<span class="notice-text">短信设置启用状态</span>
</td>
</tr>
</tbody>
</table>
<input type="hidden" name="name" value="juhedata">
<input type="submit" value="保存" target-form="juhedata" class="submit_btn form_btn ajax-post mlspacing">
</form>
</div>
</div>
<div class="common_settings">

@ -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));
}
}

@ -229,6 +229,10 @@ class GameSourceService {
$gameSourceUrl = $this->getGameSourceUrl($gameSource);
if ($gameSource == null || !file_exists($gameSourceUrl)) {
M('apply', 'tab_')->where(['id' => $apply['id']])->setField('enable_status', -1);
return [
'status' => false,
'message' => '打包失败,原包或原包路径不存在!',
];
}
/* 检测是否存在投放申请,存在则更改投放申请信息,否则进行渠道打包 */
@ -351,20 +355,27 @@ class GameSourceService {
'base_uri' => C('PACKAGE_CHUNK_URL'),
'timeout' => 30.0,
]);
$response = $client->post('/upload', [
'verify' => false,
'form_params' => [
'file' => $localFilePath,
'dest' => $distFilePath,
'is_delete_local' => ($isDeleteLocal ? 1 : 0),
]
]);
$result = (string)$response->getBody();
$result = json_decode($result, true);
if (!$result) {
try {
$response = $client->post('/upload', [
'verify' => false,
'form_params' => [
'file' => $localFilePath,
'dest' => $distFilePath,
'is_delete_local' => ($isDeleteLocal ? 1 : 0),
]
]);
$result = (string)$response->getBody();
$result = json_decode($result, true);
if (!$result) {
return [
'status' => false,
'message' => '请求异常',
];
}
} catch (\Exception $e) {
return [
'status' => false,
'message' => '请求打包失败',
'message' => '请求异常: ' . $e->getMessage(),
];
}
return $result;

@ -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>

@ -1748,4 +1748,8 @@ ALTER TABLE `sj_game_user`.`sj_user`
ADD COLUMN `platform_account` varchar(60) NULL COMMENT '游戏渠道玩家账号' AFTER `age_type`;
ALTER TABLE `tab_deposit`
ADD COLUMN `old_change_promote_id` int(11) NULL DEFAULT 0 COMMENT '修改配置前渠道' ,
ADD COLUMN `old_change_promote_account` varchar(30) NULL COMMENT '修改配置前渠道账号' ;
ADD COLUMN `old_change_promote_account` varchar(30) NULL COMMENT '修改配置前渠道账号' ;
-- zyx 20200515
INSERT INTO `tab_tool`( `name`, `title`, `config`, `template`, `type`, `status`, `create_time`) VALUES ('juhedata', '聚合数据', '{\"tpl_id\":\"215303\",\"key\":\"1aa07a33b6d6408e835e416fafcd6f22\",\"limit\":\"\",\"status\":\"1\"}', NULL, 1, 1, 1589361782);
INSERT INTO `tab_tool`( `name`, `title`, `config`, `template`, `type`, `status`, `create_time`) VALUES ('juhe_age', '聚合身份认证', '{\"appkey\":\"80427f4769c6938f12a870f51014ddbe\",\"status\":\"1\"}', NULL, 1, 1, 1464164373);

@ -31,32 +31,45 @@
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 == ''){
rearr[i]=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