From 61800bb7e48a312efdd4697e7eb8cc2d16a48b26 Mon Sep 17 00:00:00 2001
From: pushuo <229102104@qq.com>
Date: Thu, 11 Aug 2022 11:24:31 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E5=B0=BE=E7=BC=96=E8=BE=91=20+?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 beike/Admin/Repositories/PageRepo.php         |  2 +-
 .../builder/component/link_selector.blade.php | 25 +++++++++++--------
 .../pages/design/builder/footer.blade.php     |  2 +-
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/beike/Admin/Repositories/PageRepo.php b/beike/Admin/Repositories/PageRepo.php
index c99c4d11..a8ce9619 100644
--- a/beike/Admin/Repositories/PageRepo.php
+++ b/beike/Admin/Repositories/PageRepo.php
@@ -88,7 +88,7 @@ class PageRepo
         foreach ($pages as $page) {
             $results[] = [
                 'id' => $page->id,
-                'title' => $page->description->title,
+                'name' => $page->description->title,
                 'status' => $page->active
             ];
         }
diff --git a/resources/beike/admin/views/pages/design/builder/component/link_selector.blade.php b/resources/beike/admin/views/pages/design/builder/component/link_selector.blade.php
index 333e4926..15064a20 100644
--- a/resources/beike/admin/views/pages/design/builder/component/link_selector.blade.php
+++ b/resources/beike/admin/views/pages/design/builder/component/link_selector.blade.php
@@ -35,14 +35,13 @@
           <a :href="linkTypeAdmin" target="_blank" v-if="link.type != 'custom' && link.type != 'static'">管理@{{ dialogTitle }}</a>
         </div>
 
-        <div class="link-text" v-if="showText">
-          <div class="module-edit-group" style="margin-bottom: 10px;">
-            <div class="module-edit-title">标题（覆盖下方选择的链接名称）</div>
-            <text-i18n v-model="link.text"></text-i18n>
-          </div>
-        </div>
-
         <template v-if="link.type == 'custom'">
+          <div class="link-text">
+            <div class="module-edit-group" style="margin-bottom: 10px;">
+              <div class="module-edit-title">标题</div>
+              <text-i18n v-model="link.text"></text-i18n>
+            </div>
+          </div>
           <div class="linkDialog-custom">
             <el-input v-model="link.value" placeholder="请输入链接地址"></el-input>
           </div>
@@ -130,9 +129,9 @@
     data: function () {
       return {
         types: [
-          {type: 'product',label: '商品'},
-          {type: 'category',label: '分类'},
-          {type: 'page',label: '信息页面'},
+          {type: 'product', label: '商品'},
+          {type: 'category', label: '分类'},
+          {type: 'page', label: '信息页面'},
           {type: 'brand', label: '品牌'},
           {type: 'static',label: '固定连接'},
           // {type: 'blog',label: '博客'},
@@ -282,6 +281,9 @@
           case 'brand':
             url = 'brands/autocomplete?name=';
             break;
+            case 'page':
+            url = 'pages/autocomplete?name=';
+            break;
           default:
             null;
         }
@@ -331,6 +333,9 @@
           case 'brand':
             url = `brands/${this.link.value}/name`;
             break;
+            case 'page':
+            url = `pages/${this.link.value}/name`;
+            break;
           default:
             null;
         }
diff --git a/resources/beike/admin/views/pages/design/builder/footer.blade.php b/resources/beike/admin/views/pages/design/builder/footer.blade.php
index f2724a6a..52abd706 100644
--- a/resources/beike/admin/views/pages/design/builder/footer.blade.php
+++ b/resources/beike/admin/views/pages/design/builder/footer.blade.php
@@ -233,7 +233,7 @@
         },
 
         topLinkAddLinkButtonClicked(index) {
-          this.form.content['link' + index].links.push({type: '', value: '', text: {}});
+          this.form.content['link' + index].links.push({type: 'page', value: '', text: {}});
         },
 
         removeLink(item, index) {