diff --git a/app/admin/view/default/index/init.html b/app/admin/view/default/index/init.html index f330a50e7..6a87cc23f 100755 --- a/app/admin/view/default/index/init.html +++ b/app/admin/view/default/index/init.html @@ -464,9 +464,9 @@ {{if !empty($site_store_links) and !empty($site_store_links['community_website'])}} -
交流社区
+
交流提问
- ShopXO交流社区 + ShopXO交流提问
{{/if}} diff --git a/app/admin/view/default/order/module/goods.html b/app/admin/view/default/order/module/goods.html index 10d8cdd7f..afd4818a9 100644 --- a/app/admin/view/default/order/module/goods.html +++ b/app/admin/view/default/order/module/goods.html @@ -116,6 +116,9 @@ {{$item.title}} + {{if !empty($item['model'])}} + {{$item.model}} + {{/if}}
{{if !empty($item['spec_text'])}} diff --git a/app/admin/view/default/orderaftersale/module/goods.html b/app/admin/view/default/orderaftersale/module/goods.html index d6ce8f845..7c66cfe64 100644 --- a/app/admin/view/default/orderaftersale/module/goods.html +++ b/app/admin/view/default/orderaftersale/module/goods.html @@ -57,6 +57,9 @@
{{$module_data.order_data.items.title}} + {{if !empty($module_data.order_data.items.model)}} + {{$module_data.order_data.items.model}} + {{/if}} {{if !empty($module_data.order_data.items.spec)}}
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
- - - -
- - - {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}} -
- plugins_view_common_header_nav_search_inside + + -
- - {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}} -
- plugins_view_common_header_nav_content_inside_top -
- {{/if}} - {{if !empty($plugins_view_common_header_nav_content_inside_top_data) and is_array($plugins_view_common_header_nav_content_inside_top_data)}} - {{foreach $plugins_view_common_header_nav_content_inside_top_data as $hook}} - {{if is_string($hook) or is_int($hook)}} - {{$hook|raw}} - {{/if}} - {{/foreach}} - {{/if}} - - {{if empty($user)}} - -
- {{if !empty($home_user_login_type)}} - 登录 - {{/if}} - {{if !empty($home_user_reg_type)}} - 注册 - {{/if}} -
- {{/if}} - - - {{if !empty($nav_header)}} - - {{/if}} - - -
- - {{if MyC('home_navigation_main_quick_status') eq 1}} -
- - - -

{{:MyC('home_navigation_main_quick_name', '百宝箱', true)}}

- - + + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}} +
+ plugins_view_common_header_nav_search_inside
{{/if}} + {{if !empty($plugins_view_common_header_nav_search_inside_data) and is_array($plugins_view_common_header_nav_search_inside_data)}} + {{foreach $plugins_view_common_header_nav_search_inside_data as $hook}} + {{if is_string($hook) or is_int($hook)}} + {{$hook|raw}} + {{/if}} + {{/foreach}} + {{/if}} + + +
+ + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}} +
+ plugins_view_common_header_nav_content_inside_top +
+ {{/if}} + {{if !empty($plugins_view_common_header_nav_content_inside_top_data) and is_array($plugins_view_common_header_nav_content_inside_top_data)}} + {{foreach $plugins_view_common_header_nav_content_inside_top_data as $hook}} + {{if is_string($hook) or is_int($hook)}} + {{$hook|raw}} + {{/if}} + {{/foreach}} + {{/if}} + + {{if empty($user)}} + +
+ {{if !empty($home_user_login_type)}} + 登录 + {{/if}} + {{if !empty($home_user_reg_type)}} + 注册 + {{/if}} +
+ {{/if}} + + + {{if !empty($nav_header)}} + + {{/if}} + + +
+ + {{if MyC('home_navigation_main_quick_status') eq 1}} +
+ + + +

{{:MyC('home_navigation_main_quick_name', '百宝箱', true)}}

+ + +
+ {{/if}} +
+ + + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}} +
+ plugins_view_common_header_nav_content_inside_bottom +
+ {{/if}} + {{if !empty($plugins_view_common_header_nav_content_inside_bottom_data) and is_array($plugins_view_common_header_nav_content_inside_bottom_data)}} + {{foreach $plugins_view_common_header_nav_content_inside_bottom_data as $hook}} + {{if is_string($hook) or is_int($hook)}} + {{$hook|raw}} + {{/if}} + {{/foreach}} + {{/if}}
- + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
- plugins_view_common_header_nav_content_inside_bottom + plugins_view_common_header_nav_right
{{/if}} - {{if !empty($plugins_view_common_header_nav_content_inside_bottom_data) and is_array($plugins_view_common_header_nav_content_inside_bottom_data)}} - {{foreach $plugins_view_common_header_nav_content_inside_bottom_data as $hook}} + {{if !empty($plugins_view_common_header_nav_right_data) and is_array($plugins_view_common_header_nav_right_data)}} + {{foreach $plugins_view_common_header_nav_right_data as $hook}} {{if is_string($hook) or is_int($hook)}} {{$hook|raw}} {{/if}} {{/foreach}} {{/if}}
- - - {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}} -
- plugins_view_common_header_nav_right -
- {{/if}} - {{if !empty($plugins_view_common_header_nav_right_data) and is_array($plugins_view_common_header_nav_right_data)}} - {{foreach $plugins_view_common_header_nav_right_data as $hook}} - {{if is_string($hook) or is_int($hook)}} - {{$hook|raw}} - {{/if}} - {{/foreach}} - {{/if}} -
- \ No newline at end of file + +{{/if}} \ No newline at end of file diff --git a/app/index/view/default/public/header_top_nav.html b/app/index/view/default/public/header_top_nav.html index 9abff1de7..ad4456f48 100755 --- a/app/index/view/default/public/header_top_nav.html +++ b/app/index/view/default/public/header_top_nav.html @@ -1,140 +1,142 @@ - -
-
- + + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}} +
+ 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)}} + {{foreach $plugins_view_header_navigation_top_right_end_data as $hook}} + {{if is_string($hook) or is_int($hook)}} + {{$hook|raw}} + {{/if}} + {{/foreach}} + {{/if}} + +
-
- \ No newline at end of file + +{{/if}} \ No newline at end of file diff --git a/app/index/view/default/public/nav_search.html b/app/index/view/default/public/nav_search.html index acaf418de..bb8ff8be3 100755 --- a/app/index/view/default/public/nav_search.html +++ b/app/index/view/default/public/nav_search.html @@ -1,92 +1,94 @@ - -
-
- -
- - {{:MyC('home_seo_site_title')}} - -
- - - {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}} -
- plugins_view_common_logo_right +{{if MyC('home_main_logo_search_status', 1) eq 1}} + +
+
+ +
+ + {{:MyC('home_seo_site_title')}} +
- {{/if}} - {{if !empty($plugins_view_common_logo_right_data) and is_array($plugins_view_common_logo_right_data)}} - {{foreach $plugins_view_common_search_right_data as $hook}} - {{if is_string($hook) or is_int($hook)}} - {{$hook|raw}} - {{/if}} - {{/foreach}} - {{/if}} -
- + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
- plugins_view_common_search_inside_left + plugins_view_common_logo_right
{{/if}} - {{if !empty($plugins_view_common_search_inside_left_data) and is_array($plugins_view_common_search_inside_left_data)}} - {{foreach $plugins_view_common_search_inside_left_data as $hook}} + {{if !empty($plugins_view_common_logo_right_data) and is_array($plugins_view_common_logo_right_data)}} + {{foreach $plugins_view_common_search_right_data as $hook}} {{if is_string($hook) or is_int($hook)}} {{$hook|raw}} {{/if}} {{/foreach}} {{/if}} - -
-
- - -
- {{if !empty($home_search_keywords)}} -
    - {{foreach $home_search_keywords as $v}} -
  • {{$v}}
    • - {{/foreach}} -
+
+ + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}} +
+ plugins_view_common_search_inside_left +
+ {{/if}} + {{if !empty($plugins_view_common_search_inside_left_data) and is_array($plugins_view_common_search_inside_left_data)}} + {{foreach $plugins_view_common_search_inside_left_data as $hook}} + {{if is_string($hook) or is_int($hook)}} + {{$hook|raw}} + {{/if}} + {{/foreach}} {{/if}} - - + +
+
+ + +
+ {{if !empty($home_search_keywords)}} +
    + {{foreach $home_search_keywords as $v}} +
  • {{$v}}
    • + {{/foreach}} +
+ {{/if}} +
+ + + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}} +
+ plugins_view_common_search_inside_right +
+ {{/if}} + {{if !empty($plugins_view_common_search_inside_right_data) and is_array($plugins_view_common_search_inside_right_data)}} + {{foreach $plugins_view_common_search_inside_right_data as $hook}} + {{if is_string($hook) or is_int($hook)}} + {{$hook|raw}} + {{/if}} + {{/foreach}} + {{/if}} +
+ + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
- plugins_view_common_search_inside_right + plugins_view_common_search_right
{{/if}} - {{if !empty($plugins_view_common_search_inside_right_data) and is_array($plugins_view_common_search_inside_right_data)}} - {{foreach $plugins_view_common_search_inside_right_data as $hook}} + {{if !empty($plugins_view_common_search_right_data) and is_array($plugins_view_common_search_right_data)}} + {{foreach $plugins_view_common_search_right_data as $hook}} {{if is_string($hook) or is_int($hook)}} {{$hook|raw}} {{/if}} {{/foreach}} {{/if}}
- - - {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}} -
- plugins_view_common_search_right -
- {{/if}} - {{if !empty($plugins_view_common_search_right_data) and is_array($plugins_view_common_search_right_data)}} - {{foreach $plugins_view_common_search_right_data as $hook}} - {{if is_string($hook) or is_int($hook)}} - {{$hook|raw}} - {{/if}} - {{/foreach}} - {{/if}}
-
- \ No newline at end of file + +{{/if}} \ No newline at end of file diff --git a/app/install/view/public/footer_nav.html b/app/install/view/public/footer_nav.html index c348ec77e..6919ad136 100755 --- a/app/install/view/public/footer_nav.html +++ b/app/install/view/public/footer_nav.html @@ -12,7 +12,7 @@ 应用商店   |    - 官方论坛 + 交流提问

由 ShopXO 提供技术支持

diff --git a/public/static/index/default/css/common.css b/public/static/index/default/css/common.css index 02e0b8ce5..baab0d0a1 100755 --- a/public/static/index/default/css/common.css +++ b/public/static/index/default/css/common.css @@ -375,19 +375,28 @@ input.add,input.min{width:15px} } /** - * 底部-手机简洁模式 + * 底部-简洁模式 */ -.mobile-concise-model { +.footer-base-content { border-top: 0; background: #fff; color: #999; margin-top: 0; padding: 0; } -.mobile-concise-model .am-footer-miscs { +.footer-base-content .am-footer-miscs { padding: 5px 0; margin-top: 0; } +.footer-base-content b { + color: #ededed; +} +.footer-base-content a { + color: #666; +} +.footer-base-content a:hover { + color: #333; +} /** * 友情链接