From c9bb57e3a3d50ca5bf87ce3fa7245f14d2f9a531 Mon Sep 17 00:00:00 2001
From: devil_gong <devil_gong@wochacha.com>
Date: Mon, 16 Dec 2019 15:06:22 +0800
Subject: [PATCH] =?UTF-8?q?web=E7=AB=99=E7=82=B9=E7=BB=86=E8=8A=82?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/view/default/appconfig/app.html     |  17 ---
 .../admin/view/default/appconfig/base.html    |   9 ++
 .../index/view/default/public/footer_nav.html |  18 ++-
 .../index/view/default/public/header.html     |   2 +-
 .../index/view/default/public/header_nav.html | 140 +++++++++---------
 .../index/view/default/user/index.html        |   3 -
 application/service/BannerService.php         |  12 +-
 public/static/index/default/css/buy.css       |   2 +-
 public/static/index/default/css/cart.css      |   2 +-
 public/static/index/default/css/category.css  |   8 +-
 public/static/index/default/css/common.css    |  25 ++--
 public/static/index/default/css/index.css     |   2 +-
 .../static/index/default/css/user.index.css   |   2 +-
 13 files changed, 126 insertions(+), 116 deletions(-)

diff --git a/application/admin/view/default/appconfig/app.html b/application/admin/view/default/appconfig/app.html
index 9d248e898..3fd48ee74 100644
--- a/application/admin/view/default/appconfig/app.html
+++ b/application/admin/view/default/appconfig/app.html
@@ -52,23 +52,6 @@
                 </select>
             </div>
 
-            <div class="am-form-group">
-                <label>{{$data.common_is_app_inside_close_header.name}}<span class="am-form-group-label-tips">{{$data.common_is_app_inside_close_header.describe}}</span></label>
-                <select name="{{$data.common_is_app_inside_close_header.only_tag}}" class="am-radius chosen-select" data-validation-message="{{$data.common_is_app_inside_close_header.error_tips}}" required>
-                    {{foreach $common_is_text_list as $v}}
-                        <option value="{{$v.id}}" {{if isset($data['common_is_app_inside_close_header']['value']) and $data['common_is_app_inside_close_header']['value'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
-                    {{/foreach}}
-                </select>
-            </div>
-            <div class="am-form-group">
-                <label>{{$data.common_is_app_inside_close_footer.name}}<span class="am-form-group-label-tips">{{$data.common_is_app_inside_close_footer.describe}}</span></label>
-                <select name="{{$data.common_is_app_inside_close_footer.only_tag}}" class="am-radius chosen-select" data-validation-message="{{$data.common_is_app_inside_close_footer.error_tips}}" required>
-                    {{foreach $common_is_text_list as $v}}
-                        <option value="{{$v.id}}" {{if isset($data['common_is_app_inside_close_footer']['value']) and $data['common_is_app_inside_close_footer']['value'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
-                    {{/foreach}}
-                </select>
-            </div>
-
             <div class="am-form-group">
                 <label>{{$data.common_app_is_header_nav_fixed.name}}<span class="am-form-group-label-tips">{{$data.common_app_is_header_nav_fixed.describe}}</span></label>
                 <select name="{{$data.common_app_is_header_nav_fixed.only_tag}}" class="am-radius chosen-select" data-validation-message="{{$data.common_app_is_header_nav_fixed.error_tips}}" required>
diff --git a/application/admin/view/default/appconfig/base.html b/application/admin/view/default/appconfig/base.html
index b7926bec2..701711f1b 100755
--- a/application/admin/view/default/appconfig/base.html
+++ b/application/admin/view/default/appconfig/base.html
@@ -9,6 +9,15 @@
 
 		<!-- form start -->
 		<form class="am-form form-validation view-save" action="{{:MyUrl('admin/appconfig/save')}}" method="POST" request-type="ajax-url" request-value="{{:MyUrl('admin/appconfig/index')}}">
+			<div class="am-form-group">
+                <label>{{$data.common_is_mobile_concise_model.name}}<span class="am-form-group-label-tips">{{$data.common_is_mobile_concise_model.describe}}</span></label>
+                <select name="{{$data.common_is_mobile_concise_model.only_tag}}" class="am-radius chosen-select" data-validation-message="{{$data.common_is_mobile_concise_model.error_tips}}" required>
+                    {{foreach $common_is_text_list as $v}}
+                        <option value="{{$v.id}}" {{if isset($data['common_is_mobile_concise_model']['value']) and $data['common_is_mobile_concise_model']['value'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
+                    {{/foreach}}
+                </select>
+            </div>
+            
 			<div class="am-form-group">
 				<label>{{$data.common_app_customer_service_tel.name}}</label>
 				<input type="text" name="{{$data.common_app_customer_service_tel.only_tag}}" placeholder="{{$data.common_app_customer_service_tel.name}}" data-validation-message="{{$data.common_app_customer_service_tel.error_tips}}" class="am-radius" {{if !empty($data)}}value="{{$data.common_app_customer_service_tel.value}}"{{/if}} />
diff --git a/application/index/view/default/public/footer_nav.html b/application/index/view/default/public/footer_nav.html
index 7e69eb6e5..5df07709b 100755
--- a/application/index/view/default/public/footer_nav.html
+++ b/application/index/view/default/public/footer_nav.html
@@ -1,4 +1,4 @@
-{{if MyC('common_is_app_inside_close_header') neq 1 or !in_array(MiniAppEnv(), config('shopxo.mini_app_type_list'))}}
+{{if MyC('common_is_mobile_concise_model') neq 1}}
 	<!-- 友情链接 -->
 	{{if !empty($link_list)}}
 		<div class="friendship-list am-hide-sm-only">
@@ -31,9 +31,9 @@
 {{/if}}
 
 
-{{if MyC('common_is_app_inside_close_header') neq 1 or !in_array(MiniAppEnv(), config('shopxo.mini_app_type_list'))}}
+{{if MyC('common_is_mobile_concise_model') neq 1}}
 	<!-- 底部导航 -->
-	<footer data-am-widget="footer" class="am-footer am-footer-default am-hide-sm-only" data-am-footer="{}">
+	<footer data-am-widget="footer" class="am-footer am-footer-default" data-am-footer="{}">
 		<div class="am-container">
 			<!-- 底部导航 -->
 			{{if !empty($nav_footer)}}
@@ -113,6 +113,14 @@
 		</div>
 	</footer>
 {{else /}}
-	<!-- 保留标签，兼容mobile导航样式 -->
-	<footer class="am-footer"></footer>
+	<footer class="am-footer am-footer am-footer-default mobile-concise-model">
+		<!-- 页脚信息 -->
+		<div class="am-footer-miscs">
+			<p class="powered">
+				Powered by <a href="http://shopxo.net/" title="ShopXO电商系统" target="_blank">
+					<span class="b">Shop</span><span class="o">XO</span>
+				</a> {{$Think.APPLICATION_VERSION}}
+			</p>
+		</div>
+	</footer>
 {{/if}}
\ No newline at end of file
diff --git a/application/index/view/default/public/header.html b/application/index/view/default/public/header.html
index d6aae0c6d..1a6070f94 100755
--- a/application/index/view/default/public/header.html
+++ b/application/index/view/default/public/header.html
@@ -67,7 +67,7 @@
 		{{/foreach}}
 	{{/if}}
 <meta http-equiv='Content-Security-Policy' content='upgrade-insecure-requests'/></head>
-<body {{if MyC('common_is_app_inside_close_header') eq 1 and in_array(MiniAppEnv(), config('shopxo.mini_app_type_list'))}}class="mini-app-env"{{/if}}>
+<body {{if in_array(MiniAppEnv(), config('shopxo.mini_app_type_list'))}}class="mini-app-env"{{/if}}>
 <!-- css钩子 -->
 {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_header) or $is_header eq 1)}}
     <div class="plugins-tag">
diff --git a/application/index/view/default/public/header_nav.html b/application/index/view/default/public/header_nav.html
index 11afab70c..467038092 100755
--- a/application/index/view/default/public/header_nav.html
+++ b/application/index/view/default/public/header_nav.html
@@ -1,81 +1,79 @@
-{{if MyC('common_is_app_inside_close_header') neq 1 or !in_array(MiniAppEnv(), config('shopxo.mini_app_type_list'))}}
-    <header class="am-topbar shop-navigation">
-        <div class="am-container">
-            <button class="am-topbar-btn am-topbar-toggle am-btn am-btn-sm am-btn-default am-show-sm-only switch-submit" data-am-collapse="{target: '#doc-topbar-collapse'}"><span class="am-sr-only">导航切换</span> <span class="am-icon-bars"></span></button>
+<header class="am-topbar shop-navigation">
+    <div class="am-container">
+        <button class="am-topbar-btn am-topbar-toggle am-btn am-btn-sm am-btn-default am-show-sm-only switch-submit" data-am-collapse="{target: '#doc-topbar-collapse'}"><span class="am-sr-only">导航切换</span> <span class="am-icon-bars"></span></button>
 
-            <h1 class="am-topbar-brand wap-logo am-show-sm-only">
-                <a href="{{$Think.__MY_URL__}}">
-                    <img src="{{:AttachmentPathViewHandle(MyC('home_site_logo_wap'))}}" alt="{{:MyC('home_seo_site_title')}}" />
-                </a>
-            </h1>
-
-            <a href="{{:MyUrl('index/category/index')}}" class="am-show-md-only">
-                <div class="goods-category-title am-hide-sm-only">
-                    <span class="all-goods">全部分类</span>
-                </div>
+        <h1 class="am-topbar-brand wap-logo am-show-sm-only">
+            <a href="{{$Think.__MY_URL__}}">
+                <img src="{{:AttachmentPathViewHandle(MyC('home_site_logo_wap'))}}" alt="{{:MyC('home_seo_site_title')}}" />
             </a>
+        </h1>
 
-            <form class="am-topbar-form am-topbar-left am-form-inline am-show-sm-only navigation-search" role="search" action="{{:MyUrl('index/search/index')}}" method="POST">
-                <div class="am-input-group am-input-group-sm">
-                    <input type="text" name="wd" class="am-form-field" placeholder="其实搜索很简单^_^ !" value="{{if !empty($params['wd'])}}{{$params.wd}}{{/if}}" autocomplete="off" />
-                    <span class="am-input-group-btn">
-                        <button class="am-btn am-btn-default" type="submit">
-                            <span class="am-icon-search am-icon-xs"></span>
-                        </button>
-                    </span>
-                </div>
-            </form>
+        <a href="{{:MyUrl('index/category/index')}}" class="am-show-md-only">
+            <div class="goods-category-title am-hide-sm-only">
+                <span class="all-goods">全部分类</span>
+            </div>
+        </a>
 
-            <div class="am-collapse am-topbar-collapse" id="doc-topbar-collapse">
-                {{if empty($user)}}
-                    <!-- 未登录 -->
-                    <div class="navigation-button am-show-sm-only">
-                        {{if MyC('home_user_login_state') eq 1}}
-                            <a href="{{:MyUrl('index/user/logininfo')}}" class="am-btn am-btn-primary am-topbar-btn am-btn-sm">登录</a>
-                        {{/if}}
-                        {{if in_array('sms', MyC('home_user_reg_state')) or in_array('email', MyC('home_user_reg_state')) or in_array('username', MyC('home_user_reg_state'))}}
-                            <a href="{{:MyUrl('index/user/regInfo')}}" class="am-btn am-btn-success am-topbar-btn am-btn-sm">注册</a>
-                        {{/if}}
-                    </div>
-                {{/if}}
+        <form class="am-topbar-form am-topbar-left am-form-inline am-show-sm-only navigation-search" role="search" action="{{:MyUrl('index/search/index')}}" method="POST">
+            <div class="am-input-group am-input-group-sm">
+                <input type="text" name="wd" class="am-form-field" placeholder="其实搜索很简单^_^ !" value="{{if !empty($params['wd'])}}{{$params.wd}}{{/if}}" autocomplete="off" />
+                <span class="am-input-group-btn">
+                    <button class="am-btn am-btn-default" type="submit">
+                        <span class="am-icon-search am-icon-xs"></span>
+                    </button>
+                </span>
+            </div>
+        </form>
 
-                <!-- 主导航 -->
-                <ul class="am-nav am-nav-pills am-topbar-nav">
-                    <li><a href="{{$Think.__MY_URL__}}">首页</a></li>
-                    {{if !empty($nav_header)}}
-                        {{foreach $nav_header as $nav}}
-                            {{if empty($nav['items'])}}
-                                <li>
-                                    <a href="{{$nav.url}}" {{if $nav['is_new_window_open'] eq 1}}target="_blank"{{/if}} title="{{$nav.name}}">{{$nav.name}}</a>
-                                </li>
-                            {{else /}}
-                                <li class="am-dropdown" data-am-dropdown>
-                                <a class="am-dropdown-toggle" data-am-dropdown-toggle href="javascript:;">
-                                    {{$nav.name}} <span class="am-icon-angle-down"></span>
-                                </a>
-                                <ul class="am-dropdown-content">
-                                    {{foreach $nav.items as $navs}}
-                                        <li>
-                                            <a href="{{$navs.url}}" title="{{$navs.name}}">{{$navs.name}}</a>
-                                        </li>
-                                    {{/foreach}}
-                                </ul>
-                            {{/if}}
-                        {{/foreach}}
+        <div class="am-collapse am-topbar-collapse" id="doc-topbar-collapse">
+            {{if empty($user)}}
+                <!-- 未登录 -->
+                <div class="navigation-button am-show-sm-only">
+                    {{if MyC('home_user_login_state') eq 1}}
+                        <a href="{{:MyUrl('index/user/logininfo')}}" class="am-btn am-btn-primary am-topbar-btn am-btn-sm">登录</a>
                     {{/if}}
-                </ul>
+                    {{if in_array('sms', MyC('home_user_reg_state')) or in_array('email', MyC('home_user_reg_state')) or in_array('username', MyC('home_user_reg_state'))}}
+                        <a href="{{:MyUrl('index/user/regInfo')}}" class="am-btn am-btn-success am-topbar-btn am-btn-sm">注册</a>
+                    {{/if}}
+                </div>
+            {{/if}}
 
-                <div class="am-topbar-right am-hide-sm-only">
-                    <div class="navigation-user {{if empty($user)}}login-event{{/if}}">
-                        <a href="{{if empty($user)}}javascript:;{{else /}}{{:MyUrl('index/user/index')}}{{/if}}">
-                            <img src="{{if !empty($user['avatar'])}}{{$user.avatar}}{{else /}}{{$attachment_host}}/static/{{$module_name}}/{{$default_theme}}/images/default-user-avatar.jpg{{/if}}" class="nav-user" />
-                            <b></b>
-                            <span>我的商城</span>
-                            <i class="am-icon-angle-right"></i>
-                        </a>
-                    </div>
+            <!-- 主导航 -->
+            <ul class="am-nav am-nav-pills am-topbar-nav">
+                <li><a href="{{$Think.__MY_URL__}}">首页</a></li>
+                {{if !empty($nav_header)}}
+                    {{foreach $nav_header as $nav}}
+                        {{if empty($nav['items'])}}
+                            <li>
+                                <a href="{{$nav.url}}" {{if $nav['is_new_window_open'] eq 1}}target="_blank"{{/if}} title="{{$nav.name}}">{{$nav.name}}</a>
+                            </li>
+                        {{else /}}
+                            <li class="am-dropdown" data-am-dropdown>
+                            <a class="am-dropdown-toggle" data-am-dropdown-toggle href="javascript:;">
+                                {{$nav.name}} <span class="am-icon-angle-down"></span>
+                            </a>
+                            <ul class="am-dropdown-content">
+                                {{foreach $nav.items as $navs}}
+                                    <li>
+                                        <a href="{{$navs.url}}" title="{{$navs.name}}">{{$navs.name}}</a>
+                                    </li>
+                                {{/foreach}}
+                            </ul>
+                        {{/if}}
+                    {{/foreach}}
+                {{/if}}
+            </ul>
+
+            <div class="am-topbar-right am-hide-sm-only">
+                <div class="navigation-user {{if empty($user)}}login-event{{/if}}">
+                    <a href="{{if empty($user)}}javascript:;{{else /}}{{:MyUrl('index/user/index')}}{{/if}}">
+                        <img src="{{if !empty($user['avatar'])}}{{$user.avatar}}{{else /}}{{$attachment_host}}/static/{{$module_name}}/{{$default_theme}}/images/default-user-avatar.jpg{{/if}}" class="nav-user" />
+                        <b></b>
+                        <span>我的商城</span>
+                        <i class="am-icon-angle-right"></i>
+                    </a>
                 </div>
             </div>
         </div>
-    </header>
-{{/if}}
+    </div>
+</header>
\ No newline at end of file
diff --git a/application/index/view/default/user/index.html b/application/index/view/default/user/index.html
index 6a65f6dd2..0cca90b45 100755
--- a/application/index/view/default/user/index.html
+++ b/application/index/view/default/user/index.html
@@ -10,9 +10,6 @@
 <!-- search -->
 {{include file="public/nav_search" /}}
 
-<!-- header nav -->
-{{include file="public/header_nav" /}}
-
 <!-- goods category -->
 {{include file="public/goods_category" /}}
 
diff --git a/application/service/BannerService.php b/application/service/BannerService.php
index 1d7dfbcdb..36801ffbc 100755
--- a/application/service/BannerService.php
+++ b/application/service/BannerService.php
@@ -33,7 +33,17 @@ class BannerService
      */
     public static function Banner($params = [])
     {
-        $banner = Db::name('Slide')->field('name,images_url,event_value,event_type,bg_color')->where(['platform'=>APPLICATION_CLIENT_TYPE, 'is_enable'=>1])->order('sort asc')->select();
+        // 平台
+        $platform = APPLICATION_CLIENT_TYPE;
+
+        // web端手机访问
+        if($platform == 'pc' && IsMobile())
+        {
+            $platform = 'h5';
+        }
+
+        // 获取banner数据
+        $banner = Db::name('Slide')->field('name,images_url,event_value,event_type,bg_color')->where(['platform'=>$platform, 'is_enable'=>1])->order('sort asc,id asc')->select();
         if(!empty($banner))
         {
             foreach($banner as &$v)
diff --git a/public/static/index/default/css/buy.css b/public/static/index/default/css/buy.css
index 059933dda..d50b05098 100755
--- a/public/static/index/default/css/buy.css
+++ b/public/static/index/default/css/buy.css
@@ -159,7 +159,7 @@ ul.address-list, .business-item ul { overflow: hidden; }
   .pay-confirm em { font-size: 12px; }
   .pay-confirm .nav-total-price { color: #d2364c; font-weight: 700; }
   .order-nav { background: #f5f5f5; z-index: 100; }
-  .am-footer { padding-bottom: 45px; }
+  .am-footer { padding-bottom: 40px; }
 }
 
 
diff --git a/public/static/index/default/css/cart.css b/public/static/index/default/css/cart.css
index 03cf1fe70..5da73a979 100755
--- a/public/static/index/default/css/cart.css
+++ b/public/static/index/default/css/cart.css
@@ -52,5 +52,5 @@ strong.total-price-content, .selected-tips strong, .nav-total-price { color: #d2
     .goods-base { margin-left: 45px; }
     .stock-tag { width: 85px; }
 
-    .am-footer { padding-bottom: 55px; }
+    .am-footer { padding-bottom: 50px; }
 }
\ No newline at end of file
diff --git a/public/static/index/default/css/category.css b/public/static/index/default/css/category.css
index 7df940e91..8ae89f00c 100755
--- a/public/static/index/default/css/category.css
+++ b/public/static/index/default/css/category.css
@@ -8,7 +8,7 @@
 }
 .category-list ul.category-nav {
     width: 100px;
-    background: #f1f1f1;
+    background: #f5f5f5;
 }
 .category-list ul.category-nav li {
     height: 45px;
@@ -25,7 +25,7 @@
     border-left: 3px solid #d2364c;
 }
 .category-list ul.category-nav li:not(:first-child) {
-    border-top: 1px solid #e5e5e5;
+    border-top: 1px solid #e9e9e9;
 }
 .category-list .category-content .category-icon {
     max-width: 50px;
@@ -86,11 +86,11 @@
     }
 }
 @media only screen and (max-width:640px) {
-    .am-footer { padding-bottom: 55px; }
+    .am-footer { padding-bottom: 50px; }
 
     .category-list ul.category-nav,
     .category-list .category-content {
-        height: calc(100vh - 97px);
+        height: calc(100vh - 138px);
     }
 
     .category-list .category-content .category-item {
diff --git a/public/static/index/default/css/common.css b/public/static/index/default/css/common.css
index f306325be..df8976273 100755
--- a/public/static/index/default/css/common.css
+++ b/public/static/index/default/css/common.css
@@ -352,6 +352,21 @@ color: #F5F5F2;font-size: 12px;cursor:pointer;border-radius:0px 0px; position: a
     }
 }
 
+/**
+ * 底部-手机简洁模式
+ */
+.mobile-concise-model {
+    border-top: 0;
+    background: #fff;
+    color: #999;
+    margin-top: 0;
+    padding: 0;
+}
+.mobile-concise-model .am-footer-miscs {
+    padding: 5px 0;
+    margin-top: 0;
+}
+
 /**
  * 友情链接
  */
@@ -843,14 +858,4 @@ legend a.am-fr {
 }
 .items-value-empty {
     color: #999;
-}
-
-/**
- * mini环境中
- */
-body.mini-app-env .user-main {
-    padding-top: 5px;
-}
-body.mini-app-env .user-center {
-    padding-top: 0;
 }
\ No newline at end of file
diff --git a/public/static/index/default/css/index.css b/public/static/index/default/css/index.css
index 3f86a967d..566b33dc1 100755
--- a/public/static/index/default/css/index.css
+++ b/public/static/index/default/css/index.css
@@ -170,7 +170,7 @@ text-align: center;float:none}
 @media only screen and (max-width: 640px) {
     .items-nav-title{ padding: 0 10%;}
     .banner-news-title{line-height: 30px; height: 30px; color: #333; }
-    .am-footer { padding-bottom: 55px; }
+    .am-footer { padding-bottom: 50px; }
 
     /*楼层*/
     .floor .aggregation { width: 100%; height: auto; }
diff --git a/public/static/index/default/css/user.index.css b/public/static/index/default/css/user.index.css
index 453f58b84..250c130a6 100755
--- a/public/static/index/default/css/user.index.css
+++ b/public/static/index/default/css/user.index.css
@@ -44,7 +44,7 @@ ul.order-base li span.am-badge{position: absolute; top: -7px; left: 55%;}
  * 手机
  */
 @media only screen and (max-width:640px) {
-    .am-footer{padding-bottom: 55px;}
+    .am-footer{padding-bottom: 50px;}
     .nav-search{display: none;} .user-main{padding-top: 0;}
     .user-content-body{padding: 0;}
     .user-base{text-align: center; height: 210px;}