gx

@@ -215,7 +215,7 @@ class BTemplateLogic extends BaseLogic
     public function getCommonMain($source,$source_id,$is_custom){
     public function getCommonMain($source,$source_id,$is_custom){
         $data = [];
         $data = [];
         if($is_custom == BTemplate::SOURCE_CUSTOM){
         if($is_custom == BTemplate::SOURCE_CUSTOM){
-            if($source_id != 0){$type = BTemplate::TYPE_SIX;}else{$type = BTemplate::TYPE_SEVEN;}
+            if($source_id != 0){$type = BTemplate::TYPE_CUSTOM_DETAIL;}else{$type = BTemplate::TYPE_CUSTOM_LIST;}
         }else{
         }else{
             if ($source == BTemplate::SOURCE_PRODUCT) {if ($source_id != 0) {$type = BTemplate::TYPE_TWO;} else {$type = BTemplate::TYPE_THREE;}}
             if ($source == BTemplate::SOURCE_PRODUCT) {if ($source_id != 0) {$type = BTemplate::TYPE_TWO;} else {$type = BTemplate::TYPE_THREE;}}
             if ($source == BTemplate::SOURCE_BLOG) {if ($source_id != 0) {$type = BTemplate::TYPE_FOUR;} else {$type = BTemplate::TYPE_FIVE;}}
             if ($source == BTemplate::SOURCE_BLOG) {if ($source_id != 0) {$type = BTemplate::TYPE_FOUR;} else {$type = BTemplate::TYPE_FIVE;}}

@@ -23,7 +23,7 @@ class ProjectCountryLogic extends BaseLogic
     public function country_info(){
     public function country_info(){
         $lists = $this->model->read(['project_id'=>$this->user['project_id']]);
         $lists = $this->model->read(['project_id'=>$this->user['project_id']]);
         if (empty($lists)){
         if (empty($lists)){
-            return [];
+            $lists['country_lists'] = '';
         }
         }
         $lists['country_lists'] = $this->countryListsFormat($lists['country_lists']);
         $lists['country_lists'] = $this->countryListsFormat($lists['country_lists']);
         return $this->success($lists);
         return $this->success($lists);

@@ -36,6 +36,9 @@ class BTemplate extends Base
     const TYPE_SEVEN = 7;//新闻列表
     const TYPE_SEVEN = 7;//新闻列表
     const TYPE_EIGHT = 8;//自定义页面
     const TYPE_EIGHT = 8;//自定义页面
 
 
+    const TYPE_CUSTOM_DETAIL = 11;//扩展详情
+    const TYPE_CUSTOM_LIST = 12;//扩展列表
+
     protected $table = 'gl_web_template';
     protected $table = 'gl_web_template';
     //连接数据库
     //连接数据库
     protected $connection = 'custom_mysql';
     protected $connection = 'custom_mysql';