sileya-ai
/
vr-shopxo-source
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

web站点细节优化

feat/task1-c-wallet
devil_gong 2019-12-16 15:06:22 +08:00
parent 0ff81b948a
commit c9bb57e3a3
13 changed files with 126 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
application/admin/view/default/appconfig/app.html
View File

@ -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>

9
application/admin/view/default/appconfig/base.html
View File

@ -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}} />

18
application/index/view/default/public/footer_nav.html
View File

@ -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}}

2
application/index/view/default/public/header.html
View File

@ -67,7 +67,7 @@
{{/foreach}}
{{/if}}
</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">

140
application/index/view/default/public/header_nav.html
View File

@ -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>

3
application/index/view/default/user/index.html
View File

@ -10,9 +10,6 @@
<!-- search -->
{{include file="public/nav_search" /}}
<!-- header nav -->
{{include file="public/header_nav" /}}
<!-- goods category -->
{{include file="public/goods_category" /}}

12
application/service/BannerService.php
View File

@ -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)

2
public/static/index/default/css/buy.css
View File

@ -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; }
}

2
public/static/index/default/css/cart.css
View File

@ -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; }
}

8
public/static/index/default/css/category.css
View File

@ -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 {

25
public/static/index/default/css/common.css
View File

@ -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;
}

2
public/static/index/default/css/index.css
View File

@ -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; }

2
public/static/index/default/css/user.index.css
View File

@ -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;}