From cafdc39f2a353a88e92e7c7a0c4bbfd062ba7833 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Fri, 17 Jul 2020 16:44:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PromoteCompanyController.class.php | 12 ++ .../Model/PromoteCompanyVerifyModel.class.php | 2 +- .../Admin/View/PromoteCompany/add.html | 30 +-- .../Admin/View/PromoteCompany/edit.html | 197 +++++++++++++++++- 4 files changed, 221 insertions(+), 20 deletions(-) diff --git a/Application/Admin/Controller/PromoteCompanyController.class.php b/Application/Admin/Controller/PromoteCompanyController.class.php index 8002060cf..339f87f52 100644 --- a/Application/Admin/Controller/PromoteCompanyController.class.php +++ b/Application/Admin/Controller/PromoteCompanyController.class.php @@ -337,10 +337,22 @@ class PromoteCompanyController extends ThinkController }else{ $data['contact_end']=''; } + if($data['validity_start_time'] >0){ + $data['validity_start_time']=date("Y-m-d",$data['validity_start_time']); + }else{ + $data['validity_start_time']=''; + } + if($data['validity_end_time'] >0){ + $data['validity_end_time']=date("Y-m-d",$data['validity_end_time']); + }else{ + $data['validity_end_time']=''; + } + if($data['resources'] == ''){ $data['resources'] ="[]"; } $data['turnover_ratio'] = $data['turnover_ratio'] ? json_decode($data['turnover_ratio'], true) : $data['turnover_ratio']; + // $data['game_ids'] = explode(',', $data['game_ids']); $this->assign('serviceAgreements', M('service_agreement', 'tab_')->select()); $this->assign('data', $data); $this->display(); diff --git a/Application/Admin/Model/PromoteCompanyVerifyModel.class.php b/Application/Admin/Model/PromoteCompanyVerifyModel.class.php index 60bd9a9d9..ce5c747f4 100644 --- a/Application/Admin/Model/PromoteCompanyVerifyModel.class.php +++ b/Application/Admin/Model/PromoteCompanyVerifyModel.class.php @@ -40,7 +40,7 @@ class PromoteCompanyVerifyModel extends Model $verifydata = [ "company_id"=>$p_id, - "company_name"=>$info['partner'], + "company_name"=>$info['company_name'], "verify_status"=>0, "create_time"=>time(), 'verify_log'=>json_encode(["create_user"=>$_SESSION['onethink_admin']['user_auth']['username'],"create_time"=>date("Y-m-d H:i:s")]) diff --git a/Application/Admin/View/PromoteCompany/add.html b/Application/Admin/View/PromoteCompany/add.html index 462b70634..5ff0f6fef 100644 --- a/Application/Admin/View/PromoteCompany/add.html +++ b/Application/Admin/View/PromoteCompany/add.html @@ -412,8 +412,7 @@