新增主导航和底部内容开关

app/admin/view/default/index/init.html

@@ -464,9 +464,9 @@
 						</dd>
 
 						{{if !empty($site_store_links) and !empty($site_store_links['community_website'])}}
-							<dt class="am-text-truncate">交流社区</dt>
+							<dt class="am-text-truncate">交流提问</dt>
 							<dd>
-								<a href="{{$site_store_links.community_website}}" target="_blank">ShopXO交流社区</a>
+								<a href="{{$site_store_links.community_website}}" target="_blank">ShopXO交流提问</a>
 							</dd>
 						{{/if}}
 

app/admin/view/default/order/module/goods.html

@@ -116,6 +116,9 @@
                     <img src="{{$item['images']}}" class="am-img-thumbnail am-radius am-margin-right-xs am-fl" width="35" height="35" />
                 </a>
                 <a href="{{:MyUrl('index/goods/index', ['id'=>$item['goods_id']])}}" target="_blank" title="{{$item.title}}" {{if !empty($item['title_color'])}} style="color:{{$item.title_color}};" {{/if}} class="am-nowrap-initial">{{$item.title}}</a>
+                {{if !empty($item['model'])}}
+                    <span class="am-badge am-badge-default-plain am-radius">{{$item.model}}</span>
+                {{/if}}
             </div>
             <div class="other am-nbfc">
                 {{if !empty($item['spec_text'])}}

app/admin/view/default/orderaftersale/module/goods.html

@@ -57,6 +57,9 @@
         </a>
         <div class="am-nbfc">
             <a href="{{$module_data.order_data.items.goods_url}}" target="_blank" class="am-nowrap-initial">{{$module_data.order_data.items.title}}</a>
+            {{if !empty($module_data.order_data.items.model)}}
+                <span class="am-badge am-badge-default-plain am-radius">{{$module_data.order_data.items.model}}</span>
+            {{/if}}
             {{if !empty($module_data.order_data.items.spec)}}
                 <ul class="goods-spec am-margin-top-xs">
                     {{foreach $module_data.order_data.items.spec as $spec}}

app/admin/view/default/site/siteset/extends.html

@@ -19,6 +19,47 @@
                     <h3 class="am-panel-title">基础配置</h3>
                 </div>
                 <div class="am-panel-bd am-padding-vertical-xs">
+                    <div class="am-form-group">
+                        <label>{{$data.home_main_header_status.name}}<span class="am-form-group-label-tips">{{$data.home_main_header_status.describe}}</span></label>
+                        <select name="{{$data.home_main_header_status.only_tag}}" class="am-radius chosen-select" data-validation-message="{{$data.home_main_header_status.error_tips}}" required>
+                            {{foreach $common_close_open_list as $v}}
+                                <option value="{{$v.value}}" {{if isset($data['home_main_header_status']['value']) and $data['home_main_header_status']['value'] eq $v['value']}}selected{{/if}}>{{$v.name}}</option>
+                            {{/foreach}}
+                        </select>
+                    </div>
+                    <div class="am-form-group">
+                        <label>{{$data.home_main_top_header_status.name}}<span class="am-form-group-label-tips">{{$data.home_main_top_header_status.describe}}</span></label>
+                        <select name="{{$data.home_main_top_header_status.only_tag}}" class="am-radius chosen-select" data-validation-message="{{$data.home_main_top_header_status.error_tips}}" required>
+                            {{foreach $common_close_open_list as $v}}
+                                <option value="{{$v.value}}" {{if isset($data['home_main_top_header_status']['value']) and $data['home_main_top_header_status']['value'] eq $v['value']}}selected{{/if}}>{{$v.name}}</option>
+                            {{/foreach}}
+                        </select>
+                    </div>
+                    <div class="am-form-group">
+                        <label>{{$data.home_main_logo_search_status.name}}<span class="am-form-group-label-tips">{{$data.home_main_logo_search_status.describe}}</span></label>
+                        <select name="{{$data.home_main_logo_search_status.only_tag}}" class="am-radius chosen-select" data-validation-message="{{$data.home_main_logo_search_status.error_tips}}" required>
+                            {{foreach $common_close_open_list as $v}}
+                                <option value="{{$v.value}}" {{if isset($data['home_main_logo_search_status']['value']) and $data['home_main_logo_search_status']['value'] eq $v['value']}}selected{{/if}}>{{$v.name}}</option>
+                            {{/foreach}}
+                        </select>
+                    </div>
+                    <div class="am-form-group">
+                        <label>{{$data.home_main_breadcrumb_header_status.name}}<span class="am-form-group-label-tips">{{$data.home_main_breadcrumb_header_status.describe}}</span></label>
+                        <select name="{{$data.home_main_breadcrumb_header_status.only_tag}}" class="am-radius chosen-select" data-validation-message="{{$data.home_main_breadcrumb_header_status.error_tips}}" required>
+                            {{foreach $common_close_open_list as $v}}
+                                <option value="{{$v.value}}" {{if isset($data['home_main_breadcrumb_header_status']['value']) and $data['home_main_breadcrumb_header_status']['value'] eq $v['value']}}selected{{/if}}>{{$v.name}}</option>
+                            {{/foreach}}
+                        </select>
+                    </div>
+                    <div class="am-form-group">
+                        <label>{{$data.home_main_footer_content_status.name}}<span class="am-form-group-label-tips">{{$data.home_main_footer_content_status.describe}}</span></label>
+                        <select name="{{$data.home_main_footer_content_status.only_tag}}" class="am-radius chosen-select" data-validation-message="{{$data.home_main_footer_content_status.error_tips}}" required>
+                            {{foreach $common_close_open_list as $v}}
+                                <option value="{{$v.value}}" {{if isset($data['home_main_footer_content_status']['value']) and $data['home_main_footer_content_status']['value'] eq $v['value']}}selected{{/if}}>{{$v.name}}</option>
+                            {{/foreach}}
+                        </select>
+                    </div>
+
                     <div class="am-form-group">
                         <label>{{$data.home_index_friendship_link_status.name}}<span class="am-form-group-label-tips">{{$data.home_index_friendship_link_status.describe}}</span></label>
                         <select name="{{$data.home_index_friendship_link_status.only_tag}}" class="am-radius chosen-select" data-validation-message="{{$data.home_index_friendship_link_status.error_tips}}" required>

app/index/view/default/public/breadcrumb_data.html

@@ -1,4 +1,4 @@
-{{if !empty($breadcrumb_data)}}
+{{if !empty($breadcrumb_data) and MyC('home_main_breadcrumb_header_status', 1) eq 1}}
     <div class="breadcrumb-data am-hide-sm-only">
         <div class="am-container">
             <ol class="am-breadcrumb am-margin-bottom-0">

app/index/view/default/public/footer_filing.html

@@ -0,0 +1,33 @@
+{{if !empty($home_site_icp)}}
+    <b>|</b>
+    <p class="footer-icp">
+        <a href="https://beian.miit.gov.cn/" target="_blank">
+            <img src="{{$attachment_host}}/static/common/images/beian-icp-icon.png" alt="ICP备案" />
+            {{$home_site_icp}}
+        </a>
+    </p>
+{{/if}}
+{{if !empty($home_site_security_record_name)}}
+    <b>|</b>
+    <p class="footer-icp">
+        <a {{if empty($home_site_security_record_url)}}href="javascript:;"{{else /}}href="{{$home_site_security_record_url}}" target="_blank"{{/if}}>
+            <img src="{{$attachment_host}}/static/common/images/beian-gongan-icon.png" alt="公安备案" />
+            {{$home_site_security_record_name}}
+        </a>
+    </p>
+{{/if}}
+{{if !empty($home_site_company_license)}}
+    <b>|</b>
+    <p class="footer-icp">
+        <a href="{{$home_site_company_license}}" target="_blank">
+            <img src="{{$attachment_host}}/static/common/images/beian-company-license-icon.png" alt="电子营业执照亮照" />
+            电子营业执照亮照
+        </a>
+    </p>
+{{/if}}
+{{if !empty($home_site_telecom_license)}}
+    <b>|</b>
+    <p class="footer-icp">
+        <a href="javascript:;">{{$home_site_telecom_license}}</a>
+    </p>
+{{/if}}

app/index/view/default/public/footer_nav.html

@@ -12,7 +12,8 @@
     {{/foreach}}
 {{/if}}
 
-{{if !IsMobile() or (IsMobile() and MyC('common_is_mobile_concise_model') neq 1)}}
+<!-- 底部内容及页脚 -->
+{{if MyC('home_main_footer_content_status', 1) eq 1 and (!IsMobile() or (IsMobile() and MyC('common_is_mobile_concise_model') neq 1))}}
 	<!-- 底部导航 -->
 	<footer data-am-widget="footer" class="am-footer am-footer-default" data-am-footer="{}">
 		<div class="am-container">
@@ -86,49 +87,18 @@
 				<p class="powered">
 					{{$home_theme_footer_bottom_powered|raw}} {{$Think.APPLICATION_VERSION}}
 				</p>
-				{{if !empty($home_site_icp)}}
+				{{include file="public/footer_filing" /}}
-					<b>|</b>
-					<p class="footer-icp">
-						<a href="https://beian.miit.gov.cn/" target="_blank">
-							<img src="{{$attachment_host}}/static/common/images/beian-icp-icon.png" alt="ICP备案" />
-							{{$home_site_icp}}
-						</a>
-					</p>
-				{{/if}}
-				{{if !empty($home_site_security_record_name)}}
-					<b>|</b>
-					<p class="footer-icp">
-						<a {{if empty($home_site_security_record_url)}}href="javascript:;"{{else /}}href="{{$home_site_security_record_url}}" target="_blank"{{/if}}>
-							<img src="{{$attachment_host}}/static/common/images/beian-gongan-icon.png" alt="公安备案" />
-							{{$home_site_security_record_name}}
-						</a>
-					</p>
-				{{/if}}
-				{{if !empty($home_site_company_license)}}
-					<b>|</b>
-					<p class="footer-icp">
-						<a href="{{$home_site_company_license}}" target="_blank">
-							<img src="{{$attachment_host}}/static/common/images/beian-company-license-icon.png" alt="电子营业执照亮照" />
-							电子营业执照亮照
-						</a>
-					</p>
-				{{/if}}
-				{{if !empty($home_site_telecom_license)}}
-					<b>|</b>
-					<p class="footer-icp">
-						<a href="javascript:;">{{$home_site_telecom_license}}</a>
-					</p>
-				{{/if}}
 			</div>
 		</div>
 	</footer>
 {{else /}}
-	<footer class="am-footer am-footer am-footer-default mobile-concise-model">
 	<!-- 页脚信息 -->
+	<footer class="am-footer am-footer am-footer-default footer-base-content">
 		<div class="am-footer-miscs">
 			<p class="powered">
 				{{$home_theme_footer_bottom_powered|raw}} {{$Think.APPLICATION_VERSION}}
 			</p>
+			{{include file="public/footer_filing" /}}
 		</div>
 	</footer>
 {{/if}}

app/index/view/default/public/goods_category.html

@@ -1,11 +1,13 @@
 <!-- 商品分类  -->
 <div id="goods-category" class="am-container am-hide-sm-only am-hide-md-only" data-controller-name="{{$controller_name}}">
     <div class="goods-category-s">
+        {{if MyC('home_main_header_status', 1) eq 1}}
             <a href="{{:MyUrl('index/category/index')}}">
                 <div class="goods-category-title">
                     <span class="all-goods">全部分类</span>
                 </div>
             </a>
+        {{/if}}
         <div class="category-content" {{if (isset($common_goods_category_hidden) and $common_goods_category_hidden eq 1)}}style="display:none;"{{/if}}>
             <div class="category">
                 <ul class="category-list">

app/index/view/default/public/header_nav.html

@@ -1,4 +1,5 @@
-<header class="am-topbar shop-navigation">
+{{if MyC('home_main_header_status', 1) eq 1}}
+    <header class="am-topbar shop-navigation">
         <div class="am-container">
             <!-- 中间导航左侧 -->
             {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
@@ -154,4 +155,5 @@
                 {{/foreach}}
             {{/if}}
         </div>
-</header>
+    </header>
+{{/if}}

app/index/view/default/public/header_top_nav.html

@@ -1,5 +1,6 @@
-<!-- 顶部导航条 start -->
+{{if MyC('home_main_top_header_status', 1) eq 1}}
-<div class="header-top">
+    <!-- 顶部导航条 start -->
+    <div class="header-top">
         <div class="am-container header">
             <ul class="top-nav-left">
                 <div class="top-nav-items">
@@ -136,5 +137,6 @@
                 {{/if}}
             </ul>
         </div>
-</div>
+    </div>
-<!-- 顶部导航条 end -->
+    <!-- 顶部导航条 end -->
+{{/if}}

app/index/view/default/public/nav_search.html

@@ -1,5 +1,6 @@
-<!-- 搜索框 start -->
+{{if MyC('home_main_logo_search_status', 1) eq 1}}
-<div class="nav-search white am-hide-sm-only">
+    <!-- 搜索框 start -->
+    <div class="nav-search white am-hide-sm-only">
         <div class="am-container">
             <div class="logo am-show-sm-only">
                 <a href="{{$home_url}}">
@@ -88,5 +89,6 @@
                 {{/foreach}}
             {{/if}}
         </div>
-</div>
+    </div>
-<!-- 搜索框 end -->
+    <!-- 搜索框 end -->
+{{/if}}

app/install/view/public/footer_nav.html

@@ -12,7 +12,7 @@
         <a href="http://store.shopxo.net/" target="_blank" title="应用商店">应用商店</a>
         </span>
         <span class="am-footer-divider"> &nbsp;&nbsp;| &nbsp;&nbsp; </span>
-        <a href="http://ask.shopxo.net/" target="_blank" title="官方论坛">官方论坛</a>
+        <a href="http://ask.shopxo.net/" target="_blank" title="交流提问">交流提问</a>
     </div>
     <div class="am-footer-miscs">
         <p>由 <a href="http://shopxo.net/" title="ShopXO" target="_blank" class="">ShopXO</a> 提供技术支持</p>

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;
+}
 
 /**
  * 友情链接