Merge pull request 'feature/1211' (#8) from feature/1211 into release

Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/8
master
张谷成 4 years ago
commit 6e63a3857e

@ -466,6 +466,7 @@ ADD COLUMN `kefu_qq` varchar(255) NULL DEFAULT '' COMMENT 'kefu_qq_type为2 时
$otherData['flooring_page_video_cover'] = $sibling['flooring_page_video_cover'];
$otherData['kefu_qq'] = I('post.kefu_qq');
$otherData['kefu_qq_type'] = I('post.kefu_qq_type');
$otherData['data_share'] = I('post.data.share');
M('Game', 'tab_')->data($otherData)->where(array('id' => $another['id']))->save();
//同时修改代充游戏折扣

@ -514,6 +514,16 @@ class MemberController extends ThinkController
/* if (!empty($data['idcard']) && !preg_match('/^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$|^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/', $data['idcard'])) {
$this->error('请输入正确的身份证号码');
}*/
if ($data['age_status'] == 2 || $data['age_status'] == 3) {
$user = A('User', 'Event');
$userInfo = $user->user_entity($id);
if (empty($userInfo['real_name'])) {
$this->error('真实姓名不能为空');
}
if (empty($userInfo['idcard'])) {
$this->error('身份证号不能为空');
}
}
$res = $member->updateInfo($data);
if ($res !== false) {
@ -713,7 +723,10 @@ class MemberController extends ThinkController
public function changephone()
{
if (preg_match('/^[1][3578][0-9]{9}/', $_POST['phone'])) {
if (strlen($_POST['phone']) != 11) {
$this->ajaxReturn(array("status" => 0, "msg" => "手机长度有误"));
}
if (preg_match('/^[1][0-9]{10}$/', $_POST['phone'])) {
//重复判断
$where['phone'] = $_POST['phone'];
$user = M('User', 'tab_')->where($where)->field('id,account')->find();

@ -676,6 +676,15 @@
</td>
</tr>
<tr>
<td class="l noticeinfo">安卓IOS数据是否互通</td>
<td class="r">
<select name="data_share">
<option value="0">不互通</option>
<option value="1">互通</option>
</select>
</td>
</tr>
</tbody>
</table>
</div>

@ -892,6 +892,15 @@
</td>
</tr>
<tr>
<td class="l noticeinfo">安卓IOS数据是否互通</td>
<td class="r">
<select name="data_share">
<option value="0"<if condition="$data['data_share'] eq 0"> selected </if>>不互通</option>
<option value="1"<if condition="$data['data_share'] eq 1"> selected </if>>互通</option>
</select>
</td>
</tr>
</tbody>
</table>

@ -97,13 +97,13 @@
<td class="l noticeinfo">实名认证</td>
<td class="r table_radio">
<span class="form_radio table_btn player_table_btn">
<switch name="data.age_status">
<case value="0">未认证</case>
<case value="1">未通过</case>
<case value="2">已认证</case>
<case value="3">未成年</case>
<default />意外数据
</switch>
<select name="age_status">
<option value="0" <if condition="$data['age_status'] eq 0">selected</if> >未认证</option>
<option value="1" <if condition="$data['age_status'] eq 1">selected</if> >未通过</option>
<option value="2" <if condition="$data['age_status'] eq 2">selected</if> >已认证</option>
<option value="3" <if condition="$data['age_status'] eq 3">selected</if> >未成年</option>
</select>
</span><span class="notice-text">需玩家认证真实姓名和身份证号码</span></td>
</tr>
<tr>
@ -450,7 +450,7 @@
value: ''
}, function (phone) {
var jsid = $('#selfid').val();
preg = /^[1][3578][0-9]{9}/;
preg = /^[1][0-9]{10}$/;
if (!preg.test(phone)) {
layer.msg("手机号码不正确");
return false;

@ -5,6 +5,8 @@
<style>
#form .txt_area.download_url {width:400px;}
.tabcon1711 .table_radio2 .table_btn {width:215px;}
.move200 {margin-left: -1000px;}
.move150 {margin-left: -150px;}
</style>
</block>
<block name="body">
@ -36,7 +38,7 @@
<tr>
<td class="l">合同合作方名称:</td>
<td class="r" >
<input type="text" class="txt " name="partner" value="{$data.partner}" placeholder="请输入合作方名称" readonly>
<input type="text" class="txt " name="partner" id="partner" value="{$data.partner}" placeholder="请输入合作方名称" readonly>
</td>
</tr>
@ -133,7 +135,7 @@
<table border="0" cellspacing="0" cellpadding="0">
<tbody>
<?php if($relation):?>
<tr>
<!--<tr>
<td class="l"><i class="mustmark" style="margin-left:-7px">*</i>合作方式:</td>
<td class="r">
<select name="relation[collaborate_way]" disabled id="collaborate_way" class="select_gallery">
@ -142,8 +144,27 @@
</select>
<span class="notice-text"></span>
</td>
</tr>
</tr>-->
<tr>
<td class="l"><i class="mustmark" style="margin-left:-7px">*</i>甲方公司类型:</td>
<td class="l" style="width: 50px;">
<select name="part_a_type" id="part_a_type" class="select_gallery" disabled>
<option value="1" selected>上游CP公司</option>
<option value="2">己方公司</option>
</select>
<span class="notice-text"></span>
</td>
<td class="l" style="width: 100px;"><i class="mustmark" >*</i>乙方公司类型:</td>
<td class="r">
<select name="part_b_type" id="part_b_type" class="select_gallery" disabled>
<option value="1" >上游CP公司</option>
<option value="2" selected>己方公司</option>
</select>
<span class="notice-text"></span>
</td>
</tr>
<!--<tr>
<td class="l"><i class="mustmark" style="margin-left:-7px">*</i>己方公司:</td>
<td class="r">
<select name="relation[self_company_id]" disabled id="self_company" class="select_gallery">
@ -154,7 +175,26 @@
</select>
<span class="notice-text"></span>
</td>
</tr>-->
<tr>
<td class="l"><i class="mustmark" style="margin-left:-7px">*</i>甲方公司:</td>
<td class="l" style="width: 50px;">
<select name="part_a" id="part_a" class="select_gallery" disabled>
</select>
<span class="notice-text"></span>
</td>
<td class="l" style="width: 90px;"><i class="mustmark" >*</i>乙方公司:</td>
<td class="r">
<select name="part_b" id="part_b" class="select_gallery" disabled>
<?php foreach($selfCompanies as $selfCompany):?>
<option value="<?=$selfCompany['id']?>" <?php if($selfCompany['company_name']==''):?>selected<?php endif;?>><?=$selfCompany['company_name']?></option>
<?php endforeach;?>
</select>
<span class="notice-text"></span>
</td>
</tr>
<tr>
<td class="l"><i class="mustmark" style="margin-left:-7px">*</i>结算周期:</td>
<td class="r">
@ -186,7 +226,7 @@
<tr>
<td class="l">是否有打款流程:</td>
<td class="r table_radio">
<span class="form_radio table_btn">
<span class="form_radio table_btn" style="width: 100px;">
<label>
<input type="radio" value="1" disabled name="relation[is_payment]" <?php if($relation['is_payment'] == 1):?>checked<?php endif;?>> 是
</label>
@ -210,7 +250,7 @@
<?php endif;?>
<tr>
<td class="l">结算生效期限:</td>
<td class="r">
<td class="r" style="width: 640px;">
<input type="text" class="txt time time3" name="validity_start_time" value="{$data.validity_start_time}" placeholder="生效开始时间" readonly>
-<input type="text" class="txt time time4" name="validity_end_time" value="{$data.validity_end_time}" placeholder="生效结束时间" readonly>
</td>
@ -411,6 +451,75 @@
</script>
<script>
// 切换select
function selectRemove(id, typeId) {
$(id).children().remove();
indexNum = $(typeId).children('option:selected').index();
if (indexNum == 0) {
$(id).append("<option value='1'>" + $("#partner").val() + "</option>");
}
if (indexNum == 1) {
"<?php foreach($selfCompanies as $selfCompany):?>"
$(id).append(
"<option value=\"<?=$selfCompany['id']?>\" <?php if($selfCompany['company_name']=='海南万盟天下科技有限公司'):?>selected<?php endif;?>><?=$selfCompany['company_name']?></option>"
);
"<?php endforeach;?>";
}
}
$(function() {
if (!$("#partner").val()) {
$("#tab_tab1").click();
} else {
$("#part_a").children().remove();
$("#part_a").append("<option value='1'>" + $("#partner").val() + "</option>");
}
$("#tab_tab2").click(function() {
if (!$("#partner").val()) {
alert('请填写合作方名称');
$("#tab_tab1").click();
}
$("#part_a").children().remove();
$("#part_a").append("<option value='1'>" + $("#partner").val() + "</option>");
return false;
});
$("#part_a_type").change(function() {
selectRemove("#part_a", "#part_a_type");
indexBSelect = 0;
if (indexNum == 0) {
indexBSelect = 1;
}
if (indexNum == 1) {
indexBSelect = 0;
}
$("#part_b_type").get(0).selectedIndex = indexBSelect;
selectRemove("#part_b", "#part_b_type");
});
$("#part_b_type").change(function() {
selectRemove("#part_b", "#part_b_type");
indexASelect = 0;
if (indexNum == 0) {
indexASelect = 1;
}
if (indexNum == 1) {
indexASelect = 0;
}
$("#part_a_type").get(0).selectedIndex = indexASelect;
selectRemove("#part_a", "#part_a_type");
});
});
showTab();
<?php if($data['file_info']):?>
var doc = <?=$data['file_info']?>

@ -376,6 +376,21 @@
</td>
</tr>
<tr>
<td class="l noticeinfo"><i class="mustmark" style="margin-left:-7px">*</i>是否特殊公司:</td>
<td class="r table_radio">
<span class="form_radio table_btn">
<label>
<input type="radio" class="inp_radio" value="1" name="type" >
</label>
<label>
<input type="radio" class="inp_radio" value="0" name="type" checked>
</label>
</span>
<span class="notice-text"></span>
</td>
</tr>
<tr class="site-custom-item" style="display: none;">
<td class="l"><i class="mustmark" style="margin-left:-7px">*</i>推广后台域名前缀:</td>
<td class="r" >

@ -378,6 +378,21 @@
</td>
</tr>
<tr>
<td class="l noticeinfo"><i class="mustmark" style="margin-left:-7px">*</i>是否特殊公司:</td>
<td class="r table_radio">
<span class="form_radio table_btn">
<label>
<input type="radio" class="inp_radio" value="1" name="type" <if condition="$data['type'] eq 1">checked</if>> 是
</label>
<label>
<input type="radio" class="inp_radio" value="0" name="type" <if condition="$data['type'] eq 0">checked</if>> 否
</label>
</span>
<span class="notice-text"></span>
</td>
</tr>
<tr class="site-custom-item" <?php if($data['is_site_custom'] == 0):?>style="display:none"<?php endif;?>>
<td class="l"><i class="mustmark" style="margin-left:-7px">*</i>推广后台域名前缀:</td>
<td class="r" >

@ -9,6 +9,8 @@
<style>
#form .txt_area.download_url {width:400px;}
.tabcon1711 .table_radio2 .table_btn {width:215px;}
.move200 {margin-left: -1000px;}
.move150 {margin-left: -150px;}
</style>
</block>
<block name="body">
@ -158,7 +160,7 @@
<tr>
<td class="l"><i class="mustmark" style="margin-left:-7px">*</i>推广公司名称:</td>
<td class="r" >
<input type="text" class="txt " name="company_name" value="{$data.company_name}" readonly placeholder="请输入推广公司名称">
<input type="text" class="txt " name="company_name" id="partner" value="{$data.company_name}" readonly placeholder="请输入推广公司名称">
</td>
</tr>
@ -392,6 +394,23 @@
</td>
</tr>
<tr>
<td class="l noticeinfo"><i class="mustmark" style="margin-left:-7px">*</i>是否特殊公司:</td>
<td class="r table_radio">
<span class="form_radio table_btn">
<label>
<input type="radio" disabled class="inp_radio" value="1" name="type" <if condition="$data['type'] eq 1">checked
</if>> 是
</label>
<label>
<input type="radio" disabled class="inp_radio" value="0" name="type" <if condition="$data['type'] eq 0">checked
</if>> 否
</label>
</span>
<span class="notice-text"></span>
</td>
</tr>
<?php if(isset($data['is_site_custom']) && $data['is_site_custom'] == 1):?>
<?php
$domain = C('DOMAIN', null, null);
@ -453,7 +472,7 @@
<table border="0" cellspacing="0" cellpadding="0">
<tbody>
<?php if($relation):?>
<tr>
<!--<tr>
<td class="l"><i class="mustmark" style="margin-left:-7px">*</i>合作方式:</td>
<td class="r">
<select name="relation[collaborate_way]" disabled id="collaborate_way" class="select_gallery">
@ -462,8 +481,27 @@
</select>
<span class="notice-text"></span>
</td>
</tr>
</tr>-->
<tr>
<td class="l"><i class="mustmark" style="margin-left:-7px">*</i>甲方公司类型:</td>
<td class="r" style="width: 50px;">
<select name="part_a_type" id="part_a_type" class="select_gallery" disabled>
<option value="1" selected>下游推广公司</option>
<option value="2">己方公司</option>
</select>
<span class="notice-text"></span>
</td>
<td class="l" style="width: 100px;"><i class="mustmark" >*</i>乙方公司类型:</td>
<td class="r">
<select name="part_b_type" id="part_b_type" class="select_gallery" disabled>
<option value="1" >下游推广公司</option>
<option value="2" selected>己方公司</option>
</select>
<span class="notice-text"></span>
</td>
</tr>
<!--<tr>
<td class="l"><i class="mustmark" style="margin-left:-7px">*</i>己方公司:</td>
<td class="r">
<select name="relation[self_company_id]" disabled id="self_company" class="select_gallery">
@ -474,7 +512,26 @@
</select>
<span class="notice-text"></span>
</td>
</tr>-->
<tr>
<td class="l"><i class="mustmark" style="margin-left:-7px">*</i>甲方公司:</td>
<td class="r" style="width: 50px;">
<select name="part_a" id="part_a" class="select_gallery" disabled>
</select>
<span class="notice-text"></span>
</td>
<td class="l" style="width: 90px"><i class="mustmark" >*</i>乙方公司:</td>
<td class="r">
<select name="part_b" id="part_b" class="select_gallery" disabled>
<?php foreach($selfCompanies as $selfCompany):?>
<option value="<?=$selfCompany['id']?>" <?php if($selfCompany['company_name']==''):?>selected<?php endif;?>><?=$selfCompany['company_name']?></option>
<?php endforeach;?>
</select>
<span class="notice-text"></span>
</td>
</tr>
<tr>
<td class="l"><i class="mustmark" style="margin-left:-7px">*</i>结算周期:</td>
<td class="r">
@ -506,7 +563,7 @@
<tr>
<td class="l">是否支付宝打款:</td>
<td class="r table_radio">
<span class="form_radio table_btn">
<span class="form_radio table_btn" style="width: 100px;">
<label>
<input type="radio" value="1" disabled name="relation[is_payment]" <?php if($relation['is_payment'] == 1):?>checked<?php endif;?>> 是
</label>
@ -530,7 +587,7 @@
<?php endif;?>
<tr>
<td class="l">结算生效期限:</td>
<td class="r">
<td class="r" style="width: 640px;">
<input type="text" class="txt time time3" readonly name="validity_start_time" value="{$data.validity_start_time}" placeholder="生效开始时间">
&nbsp;-&nbsp;<input type="text" class="txt time time4" readonly name="validity_end_time" value="{$data.validity_end_time}" placeholder="生效结束时间">
</td>
@ -747,6 +804,76 @@
<block name="script">
<script type="text/javascript">
// 切换select
function selectRemove(id, typeId) {
$(id).children().remove();
indexNum = $(typeId).children('option:selected').index();
if (indexNum == 0) {
$(id).append("<option value='1'>" + $("#partner").val() + "</option>");
}
if (indexNum == 1) {
"<?php foreach($selfCompanies as $selfCompany):?>"
$(id).append(
"<option value=\"<?=$selfCompany['id']?>\" <?php if($selfCompany['company_name']=='海南万盟天下科技有限公司'):?>selected<?php endif;?>><?=$selfCompany['company_name']?></option>"
);
"<?php endforeach;?>";
}
}
$(function() {
if (!$("#partner").val()) {
$("#tab_tab1").click();
} else {
$("#part_a").children().remove();
$("#part_a").append("<option value='1'>" + $("#partner").val() + "</option>");
}
$("#tab_tab2").click(function() {
if (!$("#partner").val()) {
alert('请填写合作方名称');
$("#tab_tab1").click();
}
$("#part_a").children().remove();
$("#part_a").append("<option value='1'>" + $("#partner").val() + "</option>");
return false;
});
$("#part_a_type").change(function() {
selectRemove("#part_a", "#part_a_type");
indexBSelect = 0;
if (indexNum == 0) {
indexBSelect = 1;
}
if (indexNum == 1) {
indexBSelect = 0;
}
$("#part_b_type").get(0).selectedIndex = indexBSelect;
selectRemove("#part_b", "#part_b_type");
});
$("#part_b_type").change(function() {
selectRemove("#part_b", "#part_b_type");
indexASelect = 0;
if (indexNum == 0) {
indexASelect = 1;
}
if (indexNum == 1) {
indexASelect = 0;
}
$("#part_a_type").get(0).selectedIndex = indexASelect;
selectRemove("#part_a", "#part_a_type");
});
});
//导航高亮
highlight_subnav("{:U('PromoteCompany/lists')}");
$('#submit').click(function(){

@ -17,6 +17,9 @@ class PromoteCompanyService
3 => '无',
];
const TYPE_NORMAL = 0; // 默认推广公司
const TYPE_CUSTOM = 1; // 定制推广公司 隐藏某些功能
public function getOutBelongs()
{
return [

@ -2,6 +2,7 @@
namespace Home\Controller;
use Base\Service\PromoteCompanyService;
use Think\Controller;
use Base\Service\PromoteService;

@ -132,7 +132,7 @@
<a href="{:U('TestingResource/batches')}" class="<?=is_active_class(['TestingResource'], ['batches'])?>">测试资源申请记录</a>
</div>
<?php endif;?>
<?php if(C('APP_ENV') == 'dev' || in_array($loginer['company_id'], [334, 370])):?>
<?php if(C('APP_ENV') == 'dev' || $company['type'] == 1):?>
<div class="subNav jssubNav"><i class="prev_icon icon_fenbao"></i><span>评级管理</span><i class="arrow_icon"></i></div>
<div class="navContent jsnavContent">
<?php if($loginer['level'] <= 2):?>

Loading…
Cancel
Save