diff --git a/Application/Admin/Common/function.php b/Application/Admin/Common/function.php index 828eff9a7..1642dc963 100644 --- a/Application/Admin/Common/function.php +++ b/Application/Admin/Common/function.php @@ -621,7 +621,7 @@ function getPromoteCompany() ->field('id,company_name') ->where("status = 1") ->select(); - array_unshift($list,array("id"=>0,"company_name"=>"万盟天下科技"));//默认0 + array_unshift($list,array("id"=>0,"company_name"=>C(DEFAULT_COMPANY)));//默认0 return $list; } diff --git a/Application/Admin/Conf/config.php b/Application/Admin/Conf/config.php index 1ad717e8e..b811c5edb 100644 --- a/Application/Admin/Conf/config.php +++ b/Application/Admin/Conf/config.php @@ -110,5 +110,6 @@ return array( 'TMPL_ACTION_ERROR' => MODULE_PATH.'View/Public/error.html', // 默认错误跳转对应的模板文件 'TMPL_ACTION_SUCCESS' => MODULE_PATH.'View/Public/success.html', // 默认成功跳转对应的模板文件 'TMPL_EXCEPTION_FILE' => MODULE_PATH.'View/Public/exception.html',// 异常页面的模板文件 - + /*默认公司名称*/ + 'DEFAULT_COMPANY'=>"海南万盟天下科技有限公司", ); \ No newline at end of file diff --git a/Application/Admin/Controller/FinancePromoteController.class.php b/Application/Admin/Controller/FinancePromoteController.class.php index 0dafcc27c..a2bbb9684 100644 --- a/Application/Admin/Controller/FinancePromoteController.class.php +++ b/Application/Admin/Controller/FinancePromoteController.class.php @@ -2,10 +2,11 @@ namespace Admin\Controller; class FinancePromoteController extends AdminController { - public $COMPANY_NAME = "万盟天下科技"; + public $COMPANY_NAME = ""; public function _initialize() { parent::_initialize(); + $this->COMPANY_NAME =C(DEFAULT_COMPANY); // echo "
"; } public function index($p=1) diff --git a/Application/Admin/Controller/QueryController.class.php b/Application/Admin/Controller/QueryController.class.php index 391d2101e..1e26a082b 100644 --- a/Application/Admin/Controller/QueryController.class.php +++ b/Application/Admin/Controller/QueryController.class.php @@ -1891,7 +1891,7 @@ class QueryController extends ThinkController $records = []; if (!empty($promotes)) { foreach ($promotes as $promote) { - $promote['company_name'] = ($companyList[$promote['company_id']] ? $companyList[$promote['company_id']] : ($promote['company_id'] == 0 ? '万盟天下科技' : '未知')); + $promote['company_name'] = ($companyList[$promote['company_id']] ? $companyList[$promote['company_id']] : ($promote['company_id'] == 0 ? C(DEFAULT_COMPANY) : '未知')); if ($promote['auto_review_withdraw_status'] == 0) { $className = 'auto-closed'; $text = '关闭'; diff --git a/Application/Admin/Controller/StatementMangementController.class.php b/Application/Admin/Controller/StatementMangementController.class.php index 357521b3c..bd8fd468f 100644 --- a/Application/Admin/Controller/StatementMangementController.class.php +++ b/Application/Admin/Controller/StatementMangementController.class.php @@ -43,9 +43,9 @@ class StatementMangementController extends ThinkController if ($_REQUEST['company_id']) { $map['company_name'] = $_REQUEST['company_id']; - if ($_REQUEST['company_id']=='万盟天下科技') { - $map['company_name'] = '海南万盟天下科技有限公司'; - } + // if ($_REQUEST['company_id']=='万盟天下科技') { + // $map['company_name'] = '海南万盟天下科技有限公司'; + // } } $data = M("statement","tab_") diff --git a/Application/Admin/View/Promote/add.html b/Application/Admin/View/Promote/add.html index dc05f83fe..2ede9818d 100644 --- a/Application/Admin/View/Promote/add.html +++ b/Application/Admin/View/Promote/add.html @@ -44,7 +44,7 @@