From 120cbd9ba97dde8b1109068980122894f350f884 Mon Sep 17 00:00:00 2001 From: gongfuxiang Date: Fri, 4 Mar 2022 17:28:31 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=AF=E8=A7=86=E5=8C=96=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/layout/service/BaseLayout.php | 49 +++++++++++++++++-- .../modal/modal_module_list_config.html | 2 +- .../modal/modal_module_pages_select.html | 8 ++- .../modal/modal_module_rolling_config.html | 2 +- .../modal/modal_module_title_keywords.html | 2 +- .../offcanvas_module_config_goods.html | 2 +- 6 files changed, 52 insertions(+), 13 deletions(-) diff --git a/app/layout/service/BaseLayout.php b/app/layout/service/BaseLayout.php index be49d8b7c..944965bc0 100644 --- a/app/layout/service/BaseLayout.php +++ b/app/layout/service/BaseLayout.php @@ -484,8 +484,12 @@ class BaseLayout 'user_message_list' => MyUrl('index/message/index'), // 多商户 - 'plugins-shop-home' => PluginsHomeUrl('shop', 'index', 'index'), - 'plugins-shop-favor' => PluginsHomeUrl('shop', 'shopfavor', 'index'), + 'plugins-blog-home' => PluginsHomeUrl('blog', 'index', 'index'), + 'plugins-blog-favor' => PluginsHomeUrl('blog', 'shopfavor', 'index'), + + // 博客 + 'plugins-blog-home' => PluginsHomeUrl('blog', 'index', 'index'), + 'plugins-blog-search' => PluginsHomeUrl('blog', 'index', 'search'), // 品牌 'plugins-brand-home' => PluginsHomeUrl('brand', 'index', 'index'), @@ -525,7 +529,7 @@ class BaseLayout 'user_center' => '/pages/user/user', 'user_order_list' => '/pages/user-order/user-order', 'user_order_aftersale_list' => '/pages/user-orderaftersale/user-orderaftersale', - 'user_goods_favor_list' => '/pages/user-faovr/user-faovr', + 'user_goods_favor_list' => '/pages/user-favor/user-favor', 'user_address_list' => '/pages/user-address/user-address', 'user_goods_browse_list' => '/pages/user-goods-browse/user-goods-browse', 'user_integral_list' => '/pages/user-integral/user-integral', @@ -534,7 +538,15 @@ class BaseLayout // 多商户 'plugins-shop-home' => '/pages/plugins/shop/index/index', - 'plugins-shop-faovr' => '/pages/plugins/shop/favor/favor', + 'plugins-shop-favor' => '/pages/plugins/shop/favor/favor', + + // 门店 + 'plugins-realstore-home' => '/pages/plugins/realstore/index/index', + 'plugins-realstore-favor' => '/pages/plugins/realstore/favor/favor', + + // 博客 + 'plugins-blog-home' => '/pages/plugins/blog/index/index', + 'plugins-blog-search' => '/pages/plugins/blog/search/search', // 品牌 'plugins-brand-home' => '/pages/plugins/brand/index/index', @@ -567,6 +579,7 @@ class BaseLayout ]; // 静态地址 + $url = ''; $static_url_arr = ($client_type == 'pc') ? $static_url_web_arr : $static_url_app_arr; if(array_key_exists($type, $static_url_arr)) { @@ -976,6 +989,34 @@ class BaseLayout ], ], ], + [ + 'name' => '多门店', + 'value' => 'realstore', + 'data' => [ + [ + 'value' => 'home', + 'name' => '所有店铺', + ], + [ + 'value' => 'favor', + 'name' => '店铺收藏', + ], + ], + ], + [ + 'name' => '博客', + 'value' => 'blog', + 'data' => [ + [ + 'value' => 'home', + 'name' => '博客首页', + ], + [ + 'value' => 'search', + 'name' => '博客搜索', + ], + ], + ], [ 'name' => '品牌', 'value' => 'brand', diff --git a/app/layout/view/public/modal/modal_module_list_config.html b/app/layout/view/public/modal/modal_module_list_config.html index dedc985fd..e80f66b43 100644 --- a/app/layout/view/public/modal/modal_module_list_config.html +++ b/app/layout/view/public/modal/modal_module_list_config.html @@ -9,7 +9,7 @@ {{include file="../../../layout/view/public/style/margin" key="" required="" /}}
- +
diff --git a/app/layout/view/public/modal/modal_module_pages_select.html b/app/layout/view/public/modal/modal_module_pages_select.html index 0b3c196ee..e761fa7a3 100644 --- a/app/layout/view/public/modal/modal_module_pages_select.html +++ b/app/layout/view/public/modal/modal_module_pages_select.html @@ -74,10 +74,8 @@
{{foreach :MyConst('common_platform_type') as $v}} -
- - - +
+ {{$v.name}}
{{/foreach}} @@ -87,7 +85,7 @@
- +
{{else /}} diff --git a/app/layout/view/public/modal/modal_module_rolling_config.html b/app/layout/view/public/modal/modal_module_rolling_config.html index bf9e93510..320d89f86 100644 --- a/app/layout/view/public/modal/modal_module_rolling_config.html +++ b/app/layout/view/public/modal/modal_module_rolling_config.html @@ -26,7 +26,7 @@
- +
diff --git a/app/layout/view/public/modal/modal_module_title_keywords.html b/app/layout/view/public/modal/modal_module_title_keywords.html index 860fbab84..48e6882ef 100644 --- a/app/layout/view/public/modal/modal_module_title_keywords.html +++ b/app/layout/view/public/modal/modal_module_title_keywords.html @@ -19,7 +19,7 @@
- +
diff --git a/app/layout/view/public/offcanvas/offcanvas_module_config_goods.html b/app/layout/view/public/offcanvas/offcanvas_module_config_goods.html index 41b7a281c..4133f70f2 100644 --- a/app/layout/view/public/offcanvas/offcanvas_module_config_goods.html +++ b/app/layout/view/public/offcanvas/offcanvas_module_config_goods.html @@ -53,7 +53,7 @@
- +