diff --git a/Application/Admin/Controller/GameController.class.php b/Application/Admin/Controller/GameController.class.php index f27ca6064..6e05c02fa 100644 --- a/Application/Admin/Controller/GameController.class.php +++ b/Application/Admin/Controller/GameController.class.php @@ -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(); //同时修改代充游戏折扣 diff --git a/Application/Admin/Controller/MemberController.class.php b/Application/Admin/Controller/MemberController.class.php index 5e38df6c1..5af746288 100644 --- a/Application/Admin/Controller/MemberController.class.php +++ b/Application/Admin/Controller/MemberController.class.php @@ -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(); diff --git a/Application/Admin/View/Game/add.html b/Application/Admin/View/Game/add.html index 1575e142f..199f3a918 100644 --- a/Application/Admin/View/Game/add.html +++ b/Application/Admin/View/Game/add.html @@ -676,6 +676,15 @@ + + 安卓IOS数据是否互通 + + + + diff --git a/Application/Admin/View/Game/edit.html b/Application/Admin/View/Game/edit.html index e36b7e21e..dcd64a47c 100644 --- a/Application/Admin/View/Game/edit.html +++ b/Application/Admin/View/Game/edit.html @@ -892,6 +892,15 @@ + + 安卓IOS数据是否互通 + + + + diff --git a/Application/Admin/View/Member/edit.html b/Application/Admin/View/Member/edit.html index 6c633c3e7..e3cc35045 100644 --- a/Application/Admin/View/Member/edit.html +++ b/Application/Admin/View/Member/edit.html @@ -97,13 +97,13 @@ 实名认证 - - 未认证 - 未通过 - 已认证 - 未成年 - 意外数据 - + + 需玩家认证真实姓名和身份证号码 @@ -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; diff --git a/Application/Admin/View/Partner/show.html b/Application/Admin/View/Partner/show.html index 32ceaa210..72d65cda1 100644 --- a/Application/Admin/View/Partner/show.html +++ b/Application/Admin/View/Partner/show.html @@ -5,6 +5,8 @@ @@ -36,7 +38,7 @@ 合同合作方名称: - + @@ -133,7 +135,7 @@ - + + + + + + + + + + + + + + - @@ -411,6 +451,75 @@
*甲方公司类型: + + + *乙方公司类型: + + +
*甲方公司: + + + *乙方公司: + + +
*结算周期: @@ -186,7 +226,7 @@
是否有打款流程: - + @@ -210,7 +250,7 @@
结算生效期限: + -