Merge branch 'category_03_12_liu'

app/JsonRpc/WebsiteService.php

@@ -1318,13 +1318,14 @@ class WebsiteService implements WebsiteServiceInterface
         }
         $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','suffix')->first();
+            ->select('id', 'website_name', 'logo', 'title', 'keywords', 'description','suffix','website_url')->first();
         if (empty($website_foot)) {
             return Result::error("暂无底部基础信息", 0);
         }
         if (empty($website_head)) {
             return Result::error("暂无头部基础信息", 0);
         }
+        $website_head['website_url'] = $website_head['website_url']?json_decode($website_head['website_url']):[];
         $result = [
             'website_foot' => $website_foot,
             'website_head' => $website_head,