From 4f73b139fbb15f4555f2ddef774408fceccffb8b Mon Sep 17 00:00:00 2001 From: Devil Date: Wed, 25 Aug 2021 11:27:35 +0800 Subject: [PATCH] =?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 --- .../view/default/order/module/goods.html | 10 +-- .../default/orderaftersale/module/goods.html | 6 +- app/admin/view/default/public/footer.html | 2 +- .../view/default/public/module/detail.html | 8 +- .../view/default/public/module/form.html | 8 +- .../public/module/form_operate_bottom.html | 2 +- .../public/module/form_operate_top.html | 2 +- .../default/public/module/form_table.html | 2 +- app/index/controller/Article.php | 58 +++++++----- app/index/view/default/article/index.html | 89 +++++++++++++++++-- app/index/view/default/buy/index.html | 34 +++---- app/index/view/default/cart/index.html | 22 ++--- app/index/view/default/goods/index.html | 50 +++++------ app/index/view/default/index/index.html | 22 ++--- app/index/view/default/order/detail.html | 16 ++-- .../view/default/order/module/goods.html | 10 +-- .../view/default/orderaftersale/detail.html | 14 +-- .../default/orderaftersale/module/goods.html | 6 +- app/index/view/default/public/footer.html | 8 +- app/index/view/default/public/footer_nav.html | 2 +- .../view/default/public/header_top_nav.html | 8 +- .../view/default/public/module/detail.html | 8 +- .../view/default/public/module/form.html | 8 +- .../public/module/form_operate_bottom.html | 2 +- .../public/module/form_operate_top.html | 2 +- .../default/public/module/form_table.html | 2 +- .../view/default/public/module/user_form.html | 8 +- app/index/view/default/public/nav_search.html | 4 +- app/index/view/default/search/content.html | 6 +- app/index/view/default/search/index.html | 26 +++--- 30 files changed, 269 insertions(+), 176 deletions(-) diff --git a/app/admin/view/default/order/module/goods.html b/app/admin/view/default/order/module/goods.html index d554e2264..82f4f4f49 100644 --- a/app/admin/view/default/order/module/goods.html +++ b/app/admin/view/default/order/module/goods.html @@ -1,7 +1,7 @@ {{if !empty($module_data) and !empty($module_data['items'])}} - {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
plugins_view_admin_order_list_base_top
@@ -63,7 +63,7 @@ {{/if}} - {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
plugins_view_admin_order_list_base_nav_bottom
@@ -86,7 +86,7 @@

- {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
plugins_view_admin_order_list_base_goods_top
@@ -135,7 +135,7 @@ {{/foreach}} - {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
plugins_view_admin_order_list_base_goods_bottom
@@ -160,7 +160,7 @@
{{$module_data.describe}}
- {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
plugins_view_admin_order_list_base_bottom
diff --git a/app/admin/view/default/orderaftersale/module/goods.html b/app/admin/view/default/orderaftersale/module/goods.html index dfca33ab2..405411f2d 100644 --- a/app/admin/view/default/orderaftersale/module/goods.html +++ b/app/admin/view/default/orderaftersale/module/goods.html @@ -1,7 +1,7 @@ {{if !empty($module_data) and !empty($module_data['order_data'])}} - {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
plugins_view_admin_orderaftersale_list_base_top
@@ -28,7 +28,7 @@

- {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
plugins_view_admin_orderaftersale_list_base_goods_top
@@ -74,7 +74,7 @@ - {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
plugins_view_admin_orderaftersale_list_base_bottom
diff --git a/app/admin/view/default/public/footer.html b/app/admin/view/default/public/footer.html index 8b04cbc0b..403167f6f 100755 --- a/app/admin/view/default/public/footer.html +++ b/app/admin/view/default/public/footer.html @@ -54,7 +54,7 @@ -{{if !empty($plugins_admin_view_common_bottom_data) and is_array($plugins_admin_view_common_bottom_data) and (!isset($is_footer) or $is_footer eq 1)}} +{{if !empty($plugins_admin_view_common_bottom_data) and is_array($plugins_admin_view_common_bottom_data)}} {{foreach $plugins_admin_view_common_bottom_data as $hook}} {{if is_string($hook) or is_int($hook)}} {{$hook|raw}} diff --git a/app/admin/view/default/public/module/detail.html b/app/admin/view/default/public/module/detail.html index 3e611c546..ab3f1f78a 100644 --- a/app/admin/view/default/public/module/detail.html +++ b/app/admin/view/default/public/module/detail.html @@ -1,7 +1,7 @@ {{include file="public/header" /}} -{{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} +{{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
{{$hook_name_detail_top}}
@@ -23,7 +23,7 @@
- {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
{{$hook_name_detail_inside_top}}
@@ -164,7 +164,7 @@ {{/if}} - {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
{{$hook_name_detail_inside_bottom}}
@@ -186,7 +186,7 @@ -{{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} +{{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
{{$hook_name_detail_bottom}}
diff --git a/app/admin/view/default/public/module/form.html b/app/admin/view/default/public/module/form.html index b43e23a94..f62f7a936 100644 --- a/app/admin/view/default/public/module/form.html +++ b/app/admin/view/default/public/module/form.html @@ -1,7 +1,7 @@ {{include file="public/header" /}} -{{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} +{{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
{{$hook_name_content_top}}
@@ -29,7 +29,7 @@
- {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
{{$hook_name_content_inside_top}}
@@ -98,7 +98,7 @@ - {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
{{$hook_name_content_inside_bottom}}
@@ -121,7 +121,7 @@ -{{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} +{{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
{{$hook_name_content_bottom}}
diff --git a/app/admin/view/default/public/module/form_operate_bottom.html b/app/admin/view/default/public/module/form_operate_bottom.html index fe8f38c8e..dfe37fad2 100644 --- a/app/admin/view/default/public/module/form_operate_bottom.html +++ b/app/admin/view/default/public/module/form_operate_bottom.html @@ -1,4 +1,4 @@ -{{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} +{{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
{{$hook_name_form_bottom_operate}}
diff --git a/app/admin/view/default/public/module/form_operate_top.html b/app/admin/view/default/public/module/form_operate_top.html index be8b2df0d..5167405a2 100644 --- a/app/admin/view/default/public/module/form_operate_top.html +++ b/app/admin/view/default/public/module/form_operate_top.html @@ -14,7 +14,7 @@ {{/if}} -{{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} +{{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
{{$hook_name_form_top_operate}}
diff --git a/app/admin/view/default/public/module/form_table.html b/app/admin/view/default/public/module/form_table.html index ce08aaad9..ca81aeabe 100644 --- a/app/admin/view/default/public/module/form_table.html +++ b/app/admin/view/default/public/module/form_table.html @@ -249,7 +249,7 @@ ])}} - {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
{{$hook_name_form_list_operate}}
diff --git a/app/index/controller/Article.php b/app/index/controller/Article.php index 60728cf60..9b812449c 100755 --- a/app/index/controller/Article.php +++ b/app/index/controller/Article.php @@ -65,13 +65,15 @@ class Article extends Common $ret = ArticleService::ArticleList($params); if(!empty($ret['data'][0])) { + $article = $ret['data'][0]; + // 访问统计 ArticleService::ArticleAccessCountInc(['id'=>$id]); // 是否外部链接 - if(!empty($ret['data'][0]['jump_url'])) + if(!empty($article['jump_url'])) { - return MyRedirect($ret['data'][0]['jump_url']); + return MyRedirect($article['jump_url']); } // 获取分类 @@ -79,18 +81,20 @@ class Article extends Common MyViewAssign('category_list', $article_category_content['data']); // seo - $seo_title = empty($ret['data'][0]['seo_title']) ? $ret['data'][0]['title'] : $ret['data'][0]['seo_title']; + $seo_title = empty($article['seo_title']) ? $article['title'] : $article['seo_title']; MyViewAssign('home_seo_site_title', SeoService::BrowserSeoTitle($seo_title, 2)); - if(!empty($ret['data'][0]['seo_keywords'])) + if(!empty($article['seo_keywords'])) { - MyViewAssign('home_seo_site_keywords', $ret['data'][0]['seo_keywords']); + MyViewAssign('home_seo_site_keywords', $article['seo_keywords']); } - if(!empty($ret['data'][0]['seo_desc'])) + if(!empty($article['seo_desc'])) { - MyViewAssign('home_seo_site_description', $ret['data'][0]['seo_desc']); + MyViewAssign('home_seo_site_description', $article['seo_desc']); } - $article = $ret['data'][0]; + + // 钩子 $this->PluginsHook($id, $article); + MyViewAssign('article', $article); return MyView(); } @@ -102,29 +106,43 @@ class Article extends Common /** * 钩子处理 - * @author whats - * @blog + * @author whats * @version 1.0.0 * @date 2019-04-22 * @desc description - * @param [int] $article_id [文章id] - * @param [array] $params [输入参数] + * @param [int] $article_id [文章id] + * @param [array] $article [文章内容] */ private function PluginsHook($article_id, &$article) { $hook_arr = [ - //文章内容内部钩子 - 'plugins_view_article_detail_content_within', + // 文章内容顶部钩子 + 'plugins_view_article_detail_top', + + // 文章底部钩子 + 'plugins_view_article_detail_bottom', + + // 文章内容顶部钩子 + 'plugins_view_article_detail_content_top', + + // 文章内容底部钩子 + 'plugins_view_article_detail_content_botton', + + // 文章左侧内部顶部钩子 + 'plugins_view_article_detail_left_inside_top', + + // 文章左侧内部底部钩子 + 'plugins_view_article_detail_left_inside_botton', ]; foreach($hook_arr as $hook_name) { MyViewAssign($hook_name.'_data', MyEventTrigger($hook_name, - [ - 'hook_name' => $hook_name, - 'is_backend' => false, - 'article_id' => $article_id, - 'article' => &$article, - ])); + [ + 'hook_name' => $hook_name, + 'is_backend' => false, + 'article_id' => $article_id, + 'article' => &$article, + ])); } } } diff --git a/app/index/view/default/article/index.html b/app/index/view/default/article/index.html index 6cd012c78..d4d8be9ae 100755 --- a/app/index/view/default/article/index.html +++ b/app/index/view/default/article/index.html @@ -12,7 +12,21 @@ {{include file="public/goods_category" /}} - + +{{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}} +
+ plugins_view_article_detail_top +
+{{/if}} +{{if !empty($plugins_view_article_detail_top_data) and is_array($plugins_view_article_detail_top_data)}} + {{foreach $plugins_view_article_detail_top_data as $hook}} + {{if is_string($hook) or is_int($hook)}} + {{$hook|raw}} + {{/if}} + {{/foreach}} +{{/if}} + +
@@ -24,15 +38,32 @@


-
{{$article.content|raw}}
- - {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + + + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
- plugins_view_article_detail_content_within + plugins_view_article_detail_content_top
{{/if}} - {{if !empty($plugins_view_article_detail_content_within_data) and is_array($plugins_view_article_detail_content_within_data)}} - {{foreach $plugins_view_article_detail_content_within_data as $hook}} + {{if !empty($plugins_view_article_detail_content_top_data) and is_array($plugins_view_article_detail_content_top_data)}} + {{foreach $plugins_view_article_detail_content_top_data as $hook}} + {{if is_string($hook) or is_int($hook)}} + {{$hook|raw}} + {{/if}} + {{/foreach}} + {{/if}} + + +
{{$article.content|raw}}
+ + + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}} +
+ plugins_view_article_detail_content_botton +
+ {{/if}} + {{if !empty($plugins_view_article_detail_content_botton_data) and is_array($plugins_view_article_detail_content_botton_data)}} + {{foreach $plugins_view_article_detail_content_botton_data as $hook}} {{if is_string($hook) or is_int($hook)}} {{$hook|raw}} {{/if}} @@ -44,6 +75,21 @@ @@ -75,6 +135,21 @@ 侧栏导航
+ + + +{{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}} +
+ plugins_view_article_detail_bottom +
+{{/if}} +{{if !empty($plugins_view_article_detail_bottom_data) and is_array($plugins_view_article_detail_bottom_data)}} + {{foreach $plugins_view_article_detail_bottom_data as $hook}} + {{if is_string($hook) or is_int($hook)}} + {{$hook|raw}} + {{/if}} + {{/foreach}} +{{/if}} {{include file="public/footer" /}} diff --git a/app/index/view/default/buy/index.html b/app/index/view/default/buy/index.html index 256f145bf..ede0a1b12 100755 --- a/app/index/view/default/buy/index.html +++ b/app/index/view/default/buy/index.html @@ -13,7 +13,7 @@ {{include file="public/goods_category" /}} -{{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} +{{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
plugins_view_buy_top
@@ -31,7 +31,7 @@
- {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
plugins_view_buy_user_note_bottom
@@ -587,7 +587,7 @@ - {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
plugins_view_buy_base_confirm_top
@@ -656,7 +656,7 @@ - {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
plugins_view_buy_form_inside
@@ -677,7 +677,7 @@
- {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
plugins_view_buy_inside_bottom
@@ -694,7 +694,7 @@
-{{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} +{{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
plugins_view_buy_bottom
diff --git a/app/index/view/default/cart/index.html b/app/index/view/default/cart/index.html index b3eaf2219..a478bcf19 100755 --- a/app/index/view/default/cart/index.html +++ b/app/index/view/default/cart/index.html @@ -35,7 +35,7 @@ - {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
plugins_view_cart_base_begin
@@ -83,7 +83,7 @@
- {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
plugins_view_cart_base_end
@@ -106,7 +106,7 @@ - {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
plugins_view_cart_price_begin
@@ -136,7 +136,7 @@ - {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
plugins_view_cart_price_end
@@ -159,7 +159,7 @@ - {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
plugins_view_cart_number_begin
@@ -195,7 +195,7 @@ {{/if}} - {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
plugins_view_cart_number_end
@@ -218,7 +218,7 @@ - {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
plugins_view_cart_total_price_begin
@@ -242,7 +242,7 @@ {{$currency_symbol}}{{$goods.total_price}} - {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
plugins_view_cart_total_price_end
@@ -267,7 +267,7 @@ 删除 - {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
plugins_view_cart_operate
@@ -303,7 +303,7 @@ 删除 - {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
plugins_view_cart_nav_left_inside
@@ -326,7 +326,7 @@ - {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
plugins_view_goods_detail_photo_bottom
@@ -101,7 +101,7 @@ {{/if}} - {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
plugins_view_goods_detail_photo_within
@@ -116,7 +116,7 @@ - {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
plugins_view_goods_detail_photo_bottom
@@ -133,7 +133,7 @@
- {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
plugins_view_goods_detail_right_content_top
@@ -150,7 +150,7 @@
- {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
plugins_view_goods_detail_right_content_inside_top
@@ -180,7 +180,7 @@ {{/if}} - {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
plugins_view_goods_detail_title
@@ -210,7 +210,7 @@ {{/if}} - {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
plugins_view_goods_detail_base_top
@@ -236,7 +236,7 @@ {{/if}} - {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
plugins_view_goods_detail_panel_price_top
@@ -265,7 +265,7 @@
- {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
plugins_view_goods_detail_panel_bottom
@@ -325,7 +325,7 @@
- {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
plugins_view_goods_detail_base_inventory_bottom
@@ -423,7 +423,7 @@ - {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
plugins_view_goods_detail_buy_nav_top
@@ -440,7 +440,7 @@
- {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
plugins_view_goods_detail_base_buy_nav_min_inside_begin
@@ -478,7 +478,7 @@ {{/if}} - {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
plugins_view_goods_detail_base_buy_nav_min_inside
@@ -550,7 +550,7 @@
- {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
plugins_view_goods_detail_right_content_inside_bottom
@@ -566,7 +566,7 @@
- {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
plugins_view_goods_detail_right_content_bottom
@@ -583,7 +583,7 @@ - {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
plugins_view_goods_detail_base_bottom
@@ -601,7 +601,7 @@
- {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
plugins_view_goods_detail_left_top
@@ -642,7 +642,7 @@
- {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
plugins_view_goods_detail_tabs_top
@@ -689,7 +689,7 @@
- {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
plugins_view_goods_detail_content_top
@@ -716,7 +716,7 @@
{{$goods.content_web|raw}}
- {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
plugins_view_goods_detail_content_bottom
@@ -804,7 +804,7 @@ {{/if}} - {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
plugins_view_goods_detail_tabs_content
@@ -821,7 +821,7 @@ {{/if}} - {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
plugins_view_goods_detail_tabs_bottom
diff --git a/app/index/view/default/index/index.html b/app/index/view/default/index/index.html index 405db875f..b89cdb30f 100755 --- a/app/index/view/default/index/index.html +++ b/app/index/view/default/index/index.html @@ -95,7 +95,7 @@ {{/if}} - {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
plugins_view_home_banner_mixed_bottom
@@ -113,7 +113,7 @@ {{/if}} -{{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} +{{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
plugins_view_home_floor_top
@@ -148,7 +148,7 @@ {{if !empty($goods_floor_list) and is_array($goods_floor_list)}} {{foreach $goods_floor_list as $key=>$floor}} - {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
plugins_view_home_floor_top_{{$key+1}}
@@ -189,7 +189,7 @@
- {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
plugins_view_home_floor_inside_top
@@ -228,7 +228,7 @@
- {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
plugins_view_home_aggregation_inside_bottom
@@ -255,7 +255,7 @@ - {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
plugins_view_home_goods_inside_price_top
@@ -305,7 +305,7 @@
- {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
plugins_view_home_goods_inside_bottom
@@ -330,7 +330,7 @@
- {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
plugins_view_home_floor_inside_bottom
@@ -353,7 +353,7 @@
- {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
plugins_view_home_floor_bottom_{{$key+1}}
@@ -378,7 +378,7 @@ {{/if}} -{{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} +{{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
plugins_view_home_floor_bottom
diff --git a/app/index/view/default/order/detail.html b/app/index/view/default/order/detail.html index c7506137a..6f928301c 100755 --- a/app/index/view/default/order/detail.html +++ b/app/index/view/default/order/detail.html @@ -23,7 +23,7 @@
- {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
plugins_view_user_order_detail_progress_top
@@ -110,7 +110,7 @@ {{/if}} - {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
plugins_view_user_order_detail_base_top
@@ -299,7 +299,7 @@ {{/if}} - {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
plugins_view_index_order_detail_operate
@@ -375,7 +375,7 @@
- {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
plugins_view_user_order_detail_base_bottom
@@ -419,7 +419,7 @@ {{/if}} - {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
plugins_view_user_order_detail_address_bottom
@@ -475,7 +475,7 @@ {{/if}} - {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
plugins_view_user_order_detail_fictitious_bottom
@@ -565,7 +565,7 @@
- {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
plugins_view_user_order_detail_goods_inside_bottom
@@ -642,7 +642,7 @@ {{/if}} - {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
plugins_view_user_order_detail_goods_bottom
diff --git a/app/index/view/default/order/module/goods.html b/app/index/view/default/order/module/goods.html index 126f078d4..60c7d8e79 100644 --- a/app/index/view/default/order/module/goods.html +++ b/app/index/view/default/order/module/goods.html @@ -1,7 +1,7 @@ {{if !empty($module_data) and !empty($module_data['items'])}} - {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
plugins_view_user_order_list_base_top
@@ -48,7 +48,7 @@ {{/if}} - {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
plugins_view_user_order_list_base_nav_bottom
@@ -71,7 +71,7 @@

- {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
plugins_view_user_order_list_base_goods_top
@@ -135,7 +135,7 @@ {{/foreach}} - {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
plugins_view_user_order_list_base_goods_bottom
@@ -160,7 +160,7 @@
{{$module_data.describe}}
- {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
plugins_view_user_order_list_base_bottom
diff --git a/app/index/view/default/orderaftersale/detail.html b/app/index/view/default/orderaftersale/detail.html index 8d10e906b..d3ea3868b 100644 --- a/app/index/view/default/orderaftersale/detail.html +++ b/app/index/view/default/orderaftersale/detail.html @@ -23,7 +23,7 @@
- {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
plugins_view_user_orderaftersale_detail_top
@@ -49,7 +49,7 @@
- {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
plugins_view_user_orderaftersale_detail_goods_inside_top
@@ -108,7 +108,7 @@ - {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
plugins_view_user_orderaftersale_detail_goods_inside_bottom
@@ -174,7 +174,7 @@
- {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
plugins_view_user_orderaftersale_detail_goods_inside_base_bottom
@@ -198,7 +198,7 @@
- {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
plugins_view_user_orderaftersale_detail_goods_bottom
@@ -285,7 +285,7 @@ {{/if}} - {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
plugins_view_user_orderaftersale_detail_base_top
@@ -419,7 +419,7 @@ {{/if}} - {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
plugins_view_user_orderaftersale_detail_bottom
diff --git a/app/index/view/default/orderaftersale/module/goods.html b/app/index/view/default/orderaftersale/module/goods.html index 73354d281..061180657 100644 --- a/app/index/view/default/orderaftersale/module/goods.html +++ b/app/index/view/default/orderaftersale/module/goods.html @@ -1,7 +1,7 @@ {{if !empty($module_data) and !empty($module_data['order_data'])}} - {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
plugins_view_user_orderaftersale_list_base_top
@@ -28,7 +28,7 @@

- {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
plugins_view_user_orderaftersale_list_base_goods_top
@@ -74,7 +74,7 @@
- {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
plugins_view_user_orderaftersale_list_base_bottom
diff --git a/app/index/view/default/public/footer.html b/app/index/view/default/public/footer.html index 1b8066c2c..b1f867f12 100755 --- a/app/index/view/default/public/footer.html +++ b/app/index/view/default/public/footer.html @@ -8,12 +8,12 @@ -{{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} +{{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
plugins_view_common_bottom
{{/if}} -{{if !empty($plugins_view_common_bottom_data) and is_array($plugins_view_common_bottom_data) and (!isset($is_footer) or $is_footer eq 1)}} +{{if !empty($plugins_view_common_bottom_data) and is_array($plugins_view_common_bottom_data)}} {{foreach $plugins_view_common_bottom_data as $hook}} {{if is_string($hook) or is_int($hook)}} {{$hook|raw}} @@ -103,7 +103,7 @@ {{:MyC('home_footer_info')}} -{{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} +{{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
plugins_js
@@ -131,7 +131,7 @@ {{/if}} -{{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} +{{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
plugins_common_page_bottom
diff --git a/app/index/view/default/public/footer_nav.html b/app/index/view/default/public/footer_nav.html index ef18d7845..bff4c3f50 100755 --- a/app/index/view/default/public/footer_nav.html +++ b/app/index/view/default/public/footer_nav.html @@ -1,5 +1,5 @@ -{{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} +{{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
plugins_view_common_footer_top
diff --git a/app/index/view/default/public/header_top_nav.html b/app/index/view/default/public/header_top_nav.html index 11240ce68..c37bac4fa 100755 --- a/app/index/view/default/public/header_top_nav.html +++ b/app/index/view/default/public/header_top_nav.html @@ -10,7 +10,7 @@ plugins_view_header_navigation_top_left_begin
{{/if}} - {{if !empty($plugins_view_header_navigation_top_left_begin_data) and is_array($plugins_view_header_navigation_top_left_begin_data) and (!isset($is_footer) or $is_footer eq 1)}} + {{if !empty($plugins_view_header_navigation_top_left_begin_data) and is_array($plugins_view_header_navigation_top_left_begin_data)}} {{foreach $plugins_view_header_navigation_top_left_begin_data as $hook}} {{if is_string($hook) or is_int($hook)}} {{$hook|raw}} @@ -43,7 +43,7 @@ plugins_view_header_navigation_top_left_end
{{/if}} - {{if !empty($plugins_view_header_navigation_top_left_end_data) and is_array($plugins_view_header_navigation_top_left_end_data) and (!isset($is_footer) or $is_footer eq 1)}} + {{if !empty($plugins_view_header_navigation_top_left_end_data) and is_array($plugins_view_header_navigation_top_left_end_data)}} {{foreach $plugins_view_header_navigation_top_left_end_data as $hook}} {{if is_string($hook) or is_int($hook)}} {{$hook|raw}} @@ -61,7 +61,7 @@ plugins_view_header_navigation_top_right_begin
{{/if}} - {{if !empty($plugins_view_header_navigation_top_right_begin_data) and is_array($plugins_view_header_navigation_top_right_begin_data) and (!isset($is_footer) or $is_footer eq 1)}} + {{if !empty($plugins_view_header_navigation_top_right_begin_data) and is_array($plugins_view_header_navigation_top_right_begin_data)}} {{foreach $plugins_view_header_navigation_top_right_begin_data as $hook}} {{if is_string($hook) or is_int($hook)}} {{$hook|raw}} @@ -127,7 +127,7 @@ plugins_view_header_navigation_top_right_end {{/if}} - {{if !empty($plugins_view_header_navigation_top_right_end_data) and is_array($plugins_view_header_navigation_top_right_end_data) and (!isset($is_footer) or $is_footer eq 1)}} + {{if !empty($plugins_view_header_navigation_top_right_end_data) and is_array($plugins_view_header_navigation_top_right_end_data)}} {{foreach $plugins_view_header_navigation_top_right_end_data as $hook}} {{if is_string($hook) or is_int($hook)}} {{$hook|raw}} diff --git a/app/index/view/default/public/module/detail.html b/app/index/view/default/public/module/detail.html index 3e611c546..ab3f1f78a 100644 --- a/app/index/view/default/public/module/detail.html +++ b/app/index/view/default/public/module/detail.html @@ -1,7 +1,7 @@ {{include file="public/header" /}} -{{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} +{{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
{{$hook_name_detail_top}}
@@ -23,7 +23,7 @@
- {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
{{$hook_name_detail_inside_top}}
@@ -164,7 +164,7 @@ {{/if}} - {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
{{$hook_name_detail_inside_bottom}}
@@ -186,7 +186,7 @@ -{{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} +{{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
{{$hook_name_detail_bottom}}
diff --git a/app/index/view/default/public/module/form.html b/app/index/view/default/public/module/form.html index 12d6293c5..c262c90ec 100644 --- a/app/index/view/default/public/module/form.html +++ b/app/index/view/default/public/module/form.html @@ -15,7 +15,7 @@
- {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
{{$hook_name_content_top}}
@@ -43,7 +43,7 @@
- {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
{{$hook_name_content_inside_top}}
@@ -111,7 +111,7 @@ - {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
{{$hook_name_content_inside_bottom}}
@@ -133,7 +133,7 @@ - {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
{{$hook_name_content_bottom}}
diff --git a/app/index/view/default/public/module/form_operate_bottom.html b/app/index/view/default/public/module/form_operate_bottom.html index fe8f38c8e..dfe37fad2 100644 --- a/app/index/view/default/public/module/form_operate_bottom.html +++ b/app/index/view/default/public/module/form_operate_bottom.html @@ -1,4 +1,4 @@ -{{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} +{{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
{{$hook_name_form_bottom_operate}}
diff --git a/app/index/view/default/public/module/form_operate_top.html b/app/index/view/default/public/module/form_operate_top.html index 153e81e60..5579b6894 100644 --- a/app/index/view/default/public/module/form_operate_top.html +++ b/app/index/view/default/public/module/form_operate_top.html @@ -14,7 +14,7 @@ {{/if}} -{{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} +{{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
{{$hook_name_form_top_operate}}
diff --git a/app/index/view/default/public/module/form_table.html b/app/index/view/default/public/module/form_table.html index ce08aaad9..ca81aeabe 100644 --- a/app/index/view/default/public/module/form_table.html +++ b/app/index/view/default/public/module/form_table.html @@ -249,7 +249,7 @@ ])}} - {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
{{$hook_name_form_list_operate}}
diff --git a/app/index/view/default/public/module/user_form.html b/app/index/view/default/public/module/user_form.html index a096044eb..ec5a0530c 100644 --- a/app/index/view/default/public/module/user_form.html +++ b/app/index/view/default/public/module/user_form.html @@ -23,7 +23,7 @@
- {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
{{$hook_name_content_top}}
@@ -51,7 +51,7 @@
- {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
{{$hook_name_content_inside_top}}
@@ -119,7 +119,7 @@ - {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
{{$hook_name_content_inside_bottom}}
@@ -141,7 +141,7 @@ - {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
{{$hook_name_content_bottom}}
diff --git a/app/index/view/default/public/nav_search.html b/app/index/view/default/public/nav_search.html index f5d3ea34c..694ebcfec 100755 --- a/app/index/view/default/public/nav_search.html +++ b/app/index/view/default/public/nav_search.html @@ -13,7 +13,7 @@
- {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
plugins_view_common_logo_right
@@ -46,7 +46,7 @@
- {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
plugins_view_common_search_right
diff --git a/app/index/view/default/search/content.html b/app/index/view/default/search/content.html index 1807cc722..54113efe5 100644 --- a/app/index/view/default/search/content.html +++ b/app/index/view/default/search/content.html @@ -4,7 +4,7 @@
- {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
plugins_view_search_goods_inside_top
@@ -37,7 +37,7 @@

- {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
plugins_view_search_goods_inside_price_top
@@ -62,7 +62,7 @@

- {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
plugins_view_search_goods_inside_bottom
diff --git a/app/index/view/default/search/index.html b/app/index/view/default/search/index.html index bd4782a9e..ef41b1405 100755 --- a/app/index/view/default/search/index.html +++ b/app/index/view/default/search/index.html @@ -13,7 +13,7 @@ {{include file="public/goods_category" /}} -{{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} +{{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
plugins_view_search_top
@@ -29,7 +29,7 @@
- {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
plugins_view_search_inside_top
@@ -54,7 +54,7 @@
- {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
plugins_view_search_map_top
@@ -73,7 +73,7 @@
    - {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
    plugins_view_search_map_inside_begin
    @@ -97,7 +97,7 @@ - {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
    plugins_view_search_map_inside_base_bottom
    @@ -229,7 +229,7 @@ {{/if}} - {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
    plugins_view_search_map_inside_end
    @@ -247,7 +247,7 @@
- {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
plugins_view_search_nav_top
@@ -264,7 +264,7 @@
    - {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
    plugins_view_search_nav_inside_begin
    @@ -308,7 +308,7 @@ - {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
    plugins_view_search_nav_inside_end
    @@ -324,7 +324,7 @@
- {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
plugins_view_search_data_top
@@ -341,7 +341,7 @@
    - {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
    plugins_view_search_data_bottom
    @@ -368,7 +368,7 @@
    - {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
    plugins_view_search_inside_bottom
    @@ -383,7 +383,7 @@
    -{{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} +{{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
    plugins_view_search_bottom