Преглед изворни кода

修改网站获取底部基础信息及底部导航相关

15313670163 пре 2 месеци
родитељ
комит
2f9df6b90a

+ 21 - 12
app/JsonRpc/WebsiteService.php

@@ -1286,19 +1286,28 @@ class WebsiteService implements WebsiteServiceInterface
      */
     public function getWebsiteFootInfo(array $data): array
     {
-        if(isset($data['website_id'])){
-            $website = Website::query()->where('id',$data['website_id'])->first();
+        if(isset($data['website_id']) && !empty($data['website_id'])){
+            $website = Website::where('id',$data['website_id'])->where('status',1)->first();
             if (empty($website)) {
                 return Result::error("找不到网站",0); 
             }
         }else{
             return Result::error("参数错误",0);
         }
-        $websiteInfo = WebsiteTemplateInfo::where('website_id',$data['website_id'])->first();
-        if (empty($websiteInfo)) {
+        $website_foot = WebsiteTemplateInfo::where('website_id',$data['website_id'])->where('status',2)->first();
+        $website_head = Website::where('id',$data['website_id'])
+        ->select('id','website_name','logo','title','keywords','description')->first();
+        if (empty($website_foot)) {
             return Result::error("暂无底部基础信息",0);
         }
-        return Result::success($websiteInfo->toArray());
+        if (empty($website_head)) {
+            return Result::error("暂无头部基础信息",0);
+        }
+        $result = [
+            'website_foot'=>$website_foot,
+            'website_head'=>$website_head
+        ];
+        return Result::success($result);
     }
     /**
      * 获取网站底部导航
@@ -1307,8 +1316,8 @@ class WebsiteService implements WebsiteServiceInterface
      */
     public function getWebsiteFooterCategory(array $data): array
     {
-        if(isset($data['website_id'])){
-            $website = Website::query()->where('id',$data['website_id'])->first();
+        if(isset($data['website_id']) && !empty($data['website_id'])){
+            $website = Website::where('id',$data['website_id'])->where('status',1)->first();
             if (empty($website)) {
                 return Result::error("找不到网站",0); 
             }
@@ -1328,8 +1337,8 @@ class WebsiteService implements WebsiteServiceInterface
      */
     public function getWebsiteFooterCategoryList(array $data): array
     {
-        if(isset($data['website_id'])){
-            $website = Website::query()->where('id',$data['website_id'])->first();
+        if(isset($data['website_id']) && !empty($data['website_id'])){
+            $website = Website::where('id',$data['website_id'])->where('status',1)->first();
             if (empty($website)) {
                 return Result::error("找不到网站",0); 
             }
@@ -1353,14 +1362,14 @@ class WebsiteService implements WebsiteServiceInterface
         return Result::success($result);
     }
     /**
-     * 获取网站底部基础信息
+     * 获取网站底部导航
      * @param array $data
      * @return array
      */
     public function getWebsiteFooterCategoryInfo(array $data): array
     {
-        if(isset($data['website_id'])){
-            $website = Website::query()->where('id',$data['website_id'])->first();
+        if(isset($data['website_id']) && !empty($data['website_id'])){
+            $website = Website::where('id',$data['website_id'])->where('status',1)->first();
             if (empty($website)) {
                 return Result::error("找不到网站",0); 
             }

+ 27 - 0
app/Model/FooterCategory.php

@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Model;
+
+use Hyperf\DbConnection\Model\Model;
+
+/**
+ */
+class FooterCategory extends Model
+{
+    /**
+     * The table associated with the model.
+     */
+    protected ?string $table = 'footer_category';
+
+    /**
+     * The attributes that are mass assignable.
+     */
+    protected array $fillable = [];
+
+    /**
+     * The attributes that should be cast to native types.
+     */
+    protected array $casts = [];
+}

+ 27 - 0
app/Model/FooterContent.php

@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Model;
+
+use Hyperf\DbConnection\Model\Model;
+
+/**
+ */
+class FooterContent extends Model
+{
+    /**
+     * The table associated with the model.
+     */
+    protected ?string $table = 'footer_content';
+
+    /**
+     * The attributes that are mass assignable.
+     */
+    protected array $fillable = [];
+
+    /**
+     * The attributes that should be cast to native types.
+     */
+    protected array $casts = [];
+}

+ 27 - 0
app/Model/WebsiteTemplateInfo.php

@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Model;
+
+use Hyperf\DbConnection\Model\Model;
+
+/**
+ */
+class WebsiteTemplateInfo extends Model
+{
+    /**
+     * The table associated with the model.
+     */
+    protected ?string $table = 'website_template_info';
+
+    /**
+     * The attributes that are mass assignable.
+     */
+    protected array $fillable = [];
+
+    /**
+     * The attributes that should be cast to native types.
+     */
+    protected array $casts = [];
+}

Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
runtime/container/scan.cache


+ 3 - 0
vendor/composer/autoload_classmap.php

@@ -26,6 +26,8 @@ return array(
     'App\\Model\\Category' => $baseDir . '/app/Model/Category.php',
     'App\\Model\\Department' => $baseDir . '/app/Model/Department.php',
     'App\\Model\\District' => $baseDir . '/app/Model/District.php',
+    'App\\Model\\FooterCategory' => $baseDir . '/app/Model/FooterCategory.php',
+    'App\\Model\\FooterContent' => $baseDir . '/app/Model/FooterContent.php',
     'App\\Model\\LetterOfComplaint' => $baseDir . '/app/Model/LetterOfComplaint.php',
     'App\\Model\\LetterType' => $baseDir . '/app/Model/LetterType.php',
     'App\\Model\\Link' => $baseDir . '/app/Model/Link.php',
@@ -39,6 +41,7 @@ return array(
     'App\\Model\\WebsiteColumn' => $baseDir . '/app/Model/WebsiteColumn.php',
     'App\\Model\\WebsiteRole' => $baseDir . '/app/Model/WebsiteRole.php',
     'App\\Model\\WebsiteRoleUser' => $baseDir . '/app/Model/WebsiteRoleUser.php',
+    'App\\Model\\WebsiteTemplateInfo' => $baseDir . '/app/Model/WebsiteTemplateInfo.php',
     'App\\Tools\\Result' => $baseDir . '/app/Tools/Result.php',
     'Attribute' => $vendorDir . '/symfony/polyfill-php80/Resources/stubs/Attribute.php',
     'CURLStringFile' => $vendorDir . '/symfony/polyfill-php81/Resources/stubs/CURLStringFile.php',

+ 3 - 0
vendor/composer/autoload_static.php

@@ -715,6 +715,8 @@ class ComposerStaticInit88f2a4d4a4e81dc7d415bcdf39930654
         'App\\Model\\Category' => __DIR__ . '/../..' . '/app/Model/Category.php',
         'App\\Model\\Department' => __DIR__ . '/../..' . '/app/Model/Department.php',
         'App\\Model\\District' => __DIR__ . '/../..' . '/app/Model/District.php',
+        'App\\Model\\FooterCategory' => __DIR__ . '/../..' . '/app/Model/FooterCategory.php',
+        'App\\Model\\FooterContent' => __DIR__ . '/../..' . '/app/Model/FooterContent.php',
         'App\\Model\\LetterOfComplaint' => __DIR__ . '/../..' . '/app/Model/LetterOfComplaint.php',
         'App\\Model\\LetterType' => __DIR__ . '/../..' . '/app/Model/LetterType.php',
         'App\\Model\\Link' => __DIR__ . '/../..' . '/app/Model/Link.php',
@@ -728,6 +730,7 @@ class ComposerStaticInit88f2a4d4a4e81dc7d415bcdf39930654
         'App\\Model\\WebsiteColumn' => __DIR__ . '/../..' . '/app/Model/WebsiteColumn.php',
         'App\\Model\\WebsiteRole' => __DIR__ . '/../..' . '/app/Model/WebsiteRole.php',
         'App\\Model\\WebsiteRoleUser' => __DIR__ . '/../..' . '/app/Model/WebsiteRoleUser.php',
+        'App\\Model\\WebsiteTemplateInfo' => __DIR__ . '/../..' . '/app/Model/WebsiteTemplateInfo.php',
         'App\\Tools\\Result' => __DIR__ . '/../..' . '/app/Tools/Result.php',
         'Attribute' => __DIR__ . '/..' . '/symfony/polyfill-php80/Resources/stubs/Attribute.php',
         'CURLStringFile' => __DIR__ . '/..' . '/symfony/polyfill-php81/Resources/stubs/CURLStringFile.php',

Неке датотеке нису приказане због велике количине промена