From cfbbf8e76b9f2b374941db9920c972880e308bcc Mon Sep 17 00:00:00 2001 From: chenzhi Date: Wed, 4 Mar 2020 17:04:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=BB=98=E8=AE=A4=E5=85=AC?= =?UTF-8?q?=E5=8F=B8=E5=90=8D=E7=A7=B0=E4=B8=BA=E6=B5=B7=E5=8D=97=E4=B8=87?= =?UTF-8?q?=E7=9B=9F=E5=A4=A9=E4=B8=8B=E7=A7=91=E6=8A=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Common/function.php | 2 +- Application/Admin/Conf/config.php | 3 ++- .../Admin/Controller/FinancePromoteController.class.php | 3 ++- Application/Admin/Controller/QueryController.class.php | 2 +- .../Admin/Controller/StatementMangementController.class.php | 6 +++--- Application/Admin/View/Promote/add.html | 2 +- Application/Admin/View/Promote/edit.html | 2 +- 7 files changed, 11 insertions(+), 9 deletions(-) diff --git a/Application/Admin/Common/function.php b/Application/Admin/Common/function.php index cca1ec6e1..4189b7f1f 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 @@