Skip to content

ShopXO
ShopXO

alading2018 / ShopXO
与 Fork 源项目一致

Fork自 纵之格 / ShopXO

通知 1
Star 0
Fork 0
ShopXO
ShopXO

体验新版 GitCode，发现更多精彩内容 >>

提交 4cd45bc0 编写于 作者: G gongfuxiang
浏览文件
操作

web站点兼容小程序互通

上级 12d6137c
隐藏空白更改
内联 并排
Showing with 533 addition and 182 deletion
application/admin/controller/Appconfig.php
浏览文件 @ 4cd45bc0
......@@ -55,7 +55,10 @@ class AppConfig extends Common
// 是否
$this->assign('common_is_text_list', lang('common_is_text_list'));
return $this->fetch();
// 导航/视图
$nav_type = input('nav_type', 'base');
$this->assign('nav_type', $nav_type);
return $this->fetch($nav_type);
}
/**
......
application/admin/view/default/appconfig/app.html 0 → 100644
浏览文件 @ 4cd45bc0
{{include file="public/header" /}}
<!-- right content start -->
<div class="content-right">
<div class="content">
<!-- table nav start -->
{{include file="appconfig/nav" /}}
<!-- table nav end -->
<!-- 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', ['nav_type'=>'app'])}}" enctype="multipart/form-data">
<div class="am-form-group">
<label>{{$data.common_app_is_use_mobile_detail.name}}<span class="am-form-group-label-tips">{{$data.common_app_is_use_mobile_detail.describe}}</span></label>
<select name="{{$data.common_app_is_use_mobile_detail.only_tag}}" class="am-radius chosen-select c-p" data-validation-message="{{$data.common_app_is_use_mobile_detail.error_tips}}" required>
{{foreach $common_is_text_list as $v}}
<option value="{{$v.id}}" {{if isset($data['common_app_is_use_mobile_detail']['value']) and $data['common_app_is_use_mobile_detail']['value'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
{{/foreach}}
</select>
</div>
<div class="am-form-group">
<label>{{$data.common_user_is_mandatory_bind_mobile.name}}<span class="am-form-group-label-tips">{{$data.common_user_is_mandatory_bind_mobile.describe}}</span></label>
<select name="{{$data.common_user_is_mandatory_bind_mobile.only_tag}}" class="am-radius chosen-select c-p" data-validation-message="{{$data.common_user_is_mandatory_bind_mobile.error_tips}}" required>
{{foreach $common_is_text_list as $v}}
<option value="{{$v.id}}" {{if isset($data['common_user_is_mandatory_bind_mobile']['value']) and $data['common_user_is_mandatory_bind_mobile']['value'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
{{/foreach}}
</select>
</div>
<div class="am-form-group">
<label>{{$data.common_app_is_enable_search.name}}</label>
<select name="{{$data.common_app_is_enable_search.only_tag}}" class="am-radius chosen-select c-p" data-validation-message="{{$data.common_app_is_enable_search.error_tips}}" required>
{{foreach $common_is_text_list as $v}}
<option value="{{$v.id}}" {{if isset($data['common_app_is_enable_search']['value']) and $data['common_app_is_enable_search']['value'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
{{/foreach}}
</select>
</div>
<div class="am-form-group">
<label>{{$data.common_app_is_enable_answer.name}}</label>
<select name="{{$data.common_app_is_enable_answer.only_tag}}" class="am-radius chosen-select c-p" data-validation-message="{{$data.common_app_is_enable_answer.error_tips}}" required>
{{foreach $common_is_text_list as $v}}
<option value="{{$v.id}}" {{if isset($data['common_app_is_enable_answer']['value']) and $data['common_app_is_enable_answer']['value'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
{{/foreach}}
</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 c-p" 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 c-p" 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 am-form-group-refreshing">
<input type="hidden" name="nav_type" value="{{$nav_type}}" />
<button type="submit" class="am-btn am-btn-primary am-radius btn-loading-example am-btn-sm am-btn-block" data-am-loading="{loadingText:'处理中...'}">保存</button>
</div>
</form>
<!-- form end -->
</div>
</div>
<!-- right content end -->
<!-- footer start -->
{{include file="public/footer" /}}
<!-- footer end
\ No newline at end of file
application/admin/view/default/appconfig/index.html → application/admin/view/default/appconfig/base.html
浏览文件 @ 4cd45bc0
......@@ -3,40 +3,12 @@
<!-- right content start -->
<div class="content-right">
<div class="content">
<!-- table nav start -->
{{include file="appconfig/nav" /}}
<!-- table nav end -->
<!-- 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_app_is_enable_search.name}}</label>
<select name="{{$data.common_app_is_enable_search.only_tag}}" class="am-radius chosen-select c-p" data-validation-message="{{$data.common_app_is_enable_search.error_tips}}" required>
{{foreach $common_is_text_list as $v}}
<option value="{{$v.id}}" {{if isset($data['common_app_is_enable_search']['value']) and $data['common_app_is_enable_search']['value'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
{{/foreach}}
</select>
</div>
<div class="am-form-group">
<label>{{$data.common_app_is_enable_answer.name}}</label>
<select name="{{$data.common_app_is_enable_answer.only_tag}}" class="am-radius chosen-select c-p" data-validation-message="{{$data.common_app_is_enable_answer.error_tips}}" required>
{{foreach $common_is_text_list as $v}}
<option value="{{$v.id}}" {{if isset($data['common_app_is_enable_answer']['value']) and $data['common_app_is_enable_answer']['value'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
{{/foreach}}
</select>
</div>
<div class="am-form-group">
<label>{{$data.common_app_is_use_mobile_detail.name}}<span class="am-form-group-label-tips">{{$data.common_app_is_use_mobile_detail.describe}}</span></label>
<select name="{{$data.common_app_is_use_mobile_detail.only_tag}}" class="am-radius chosen-select c-p" data-validation-message="{{$data.common_app_is_use_mobile_detail.error_tips}}" required>
{{foreach $common_is_text_list as $v}}
<option value="{{$v.id}}" {{if isset($data['common_app_is_use_mobile_detail']['value']) and $data['common_app_is_use_mobile_detail']['value'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
{{/foreach}}
</select>
</div>
<div class="am-form-group">
<label>{{$data.common_user_is_mandatory_bind_mobile.name}}<span class="am-form-group-label-tips">{{$data.common_user_is_mandatory_bind_mobile.describe}}</span></label>
<select name="{{$data.common_user_is_mandatory_bind_mobile.only_tag}}" class="am-radius chosen-select c-p" data-validation-message="{{$data.common_user_is_mandatory_bind_mobile.error_tips}}" required>
{{foreach $common_is_text_list as $v}}
<option value="{{$v.id}}" {{if isset($data['common_user_is_mandatory_bind_mobile']['value']) and $data['common_user_is_mandatory_bind_mobile']['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}} />
......
application/admin/view/default/appconfig/nav.html 0 → 100644
浏览文件 @ 4cd45bc0
<ul class="am-nav am-nav-pills table-nav m-b-10">
<li {{if $nav_type eq 'base'}}class="am-active"{{/if}} data-type="base">
<a href="{{:MyUrl('admin/appconfig/index', ['nav_type'=>'base'])}}">基础配置</a>
</li>
<li {{if $nav_type eq 'app'}}class="am-active"{{/if}} data-type="app">
<a href="{{:MyUrl('admin/appconfig/index', ['nav_type'=>'app'])}}">APP/小程序</a>
</li>
</ul>
\ No newline at end of file
application/index/view/default/public/footer_nav.html
浏览文件 @ 4cd45bc0
<!-- 友情链接 -->
{{if !empty($link_list)}}
<div class="friendship-list">
<div class="am-container">
<h2>友情链接</h2>
<ul>
{{foreach $link_list as $v}}
<li>
<a href="{{$v.url}}" {{if $v['is_new_window_open'] eq 1}} target="_blank"{{/if}} title="{{$v.describe}}">{{$v.name}}</a>
</li>
{{/foreach}}
</ul>
{{if MyC('common_is_app_inside_close_header') neq 1 or !in_array(MiniAppEnv(), config('shopxo.mini_app_type_list'))}}
<!-- 友情链接 -->
{{if !empty($link_list)}}
<div class="friendship-list">
<div class="am-container">
<h2>友情链接</h2>
<ul>
{{foreach $link_list as $v}}
<li>
<a href="{{$v.url}}" {{if $v['is_new_window_open'] eq 1}} target="_blank"{{/if}} title="{{$v.describe}}">{{$v.name}}</a>
</li>
{{/foreach}}
</ul>
</div>
</div>
</div>
{{/if}}
{{/if}}
<!-- 底部导航上面钩子 -->
......@@ -29,69 +31,74 @@
{{/if}}
<!-- 底部导航 -->
<footer data-am-widget="footer" class="am-footer am-footer-default" data-am-footer="{}">
<div class="am-container">
<!-- 底部导航 -->
{{if !empty($nav_footer)}}
<ul data-am-widget="gallery" class="am-gallery am-avg-sm-2 am-avg-md-4 am-avg-lg-4 am-gallery-overlay am-no-layout am-u-md-8 footer-nav-list" data-am-gallery="{}">
{{foreach $nav_footer as $k=>$v}}
{{if $k lt 4}}
<li>
<div class="am-gallery-item">
<p class="footer-nav-title am-text-truncate">{{$v.name}}</p>
{{if !empty($v['items'])}}
{{foreach $v.items as $vs}}
<p class="am-text-truncate">
<a href="{{$vs.url}}" {{if $vs['is_new_window_open'] eq 1}}target="_blank"{{/if}}>{{$vs.name}}</a>
</p>
{{/foreach}}
{{/if}}
</div>
</li>
{{/if}}
{{/foreach}}
</ul>
{{/if}}
<!-- 商店信息 -->
<ul class="footer-about am-u-md-4">
{{if !empty($common_customer_store_tel)}}
<li class="tel">
<i class="am-icon-volume-control-phone"></i>
<a href="tel:{{$common_customer_store_tel}}">{{$common_customer_store_tel}}</a>
</li>
{{/if}}
{{if !empty($common_customer_store_address)}}
<li class="address">
<i class="am-icon-map-marker"></i>
<span>{{$common_customer_store_address}}</span>
</li>
{{/if}}
{{if !empty($common_customer_store_email)}}
<li class="email">
<i class="am-icon-envelope"></i>
<span>{{$common_customer_store_email}}</span>
</li>
{{/if}}
{{if !empty($common_customer_store_qrcode)}}
<li class="qrcode">
<img src="{{$attachment_host}}{{$common_customer_store_qrcode}}" alt="{{:MyC('home_seo_site_title')}}" />
</li>
{{/if}}
</ul>
</div>
<div class="am-footer-miscs">
{{if MyC('common_is_app_inside_close_header') neq 1 or !in_array(MiniAppEnv(), config('shopxo.mini_app_type_list'))}}
<!-- 底部导航 -->
<footer data-am-widget="footer" class="am-footer am-footer-default" data-am-footer="{}">
<div class="am-container">
<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>
<p>
<a href="http://www.beian.miit.gov.cn/" target="_blank">{{:MyC('home_site_icp')}}</a>
</p>
<!-- 底部导航 -->
{{if !empty($nav_footer)}}
<ul data-am-widget="gallery" class="am-gallery am-avg-sm-2 am-avg-md-4 am-avg-lg-4 am-gallery-overlay am-no-layout am-u-md-8 footer-nav-list" data-am-gallery="{}">
{{foreach $nav_footer as $k=>$v}}
{{if $k lt 4}}
<li>
<div class="am-gallery-item">
<p class="footer-nav-title am-text-truncate">{{$v.name}}</p>
{{if !empty($v['items'])}}
{{foreach $v.items as $vs}}
<p class="am-text-truncate">
<a href="{{$vs.url}}" {{if $vs['is_new_window_open'] eq 1}}target="_blank"{{/if}}>{{$vs.name}}</a>
</p>
{{/foreach}}
{{/if}}
</div>
</li>
{{/if}}
{{/foreach}}
</ul>
{{/if}}
<!-- 商店信息 -->
<ul class="footer-about am-u-md-4">
{{if !empty($common_customer_store_tel)}}
<li class="tel">
<i class="am-icon-volume-control-phone"></i>
<a href="tel:{{$common_customer_store_tel}}">{{$common_customer_store_tel}}</a>
</li>
{{/if}}
{{if !empty($common_customer_store_address)}}
<li class="address">
<i class="am-icon-map-marker"></i>
<span>{{$common_customer_store_address}}</span>
</li>
{{/if}}
{{if !empty($common_customer_store_email)}}
<li class="email">
<i class="am-icon-envelope"></i>
<span>{{$common_customer_store_email}}</span>
</li>
{{/if}}
{{if !empty($common_customer_store_qrcode)}}
<li class="qrcode">
<img src="{{$attachment_host}}{{$common_customer_store_qrcode}}" alt="{{:MyC('home_seo_site_title')}}" />
</li>
{{/if}}
</ul>
</div>
<div class="am-footer-miscs">
<div class="am-container">
<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>
<p>
<a href="http://www.beian.miit.gov.cn/" target="_blank">{{:MyC('home_site_icp')}}</a>
</p>
</div>
</div>
</div>
</footer>
\ No newline at end of file
</footer>
{{else /}}
<!-- 保留标签，兼容mobile导航样式 -->
<footer class="am-footer"></footer>
{{/if}}
\ No newline at end of file
application/index/view/default/public/header.html
浏览文件 @ 4cd45bc0
......@@ -67,7 +67,7 @@
{{/foreach}}
{{/if}}
</head>
<body>
<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}}>
<!-- 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">
......
application/index/view/default/public/header_nav.html
浏览文件 @ 4cd45bc0
<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>
{{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>
<h1 class="am-topbar-brand wap-logo am-show-sm-only">
<a href="{{$Think.__MY_URL__}}">
<img src="{{$attachment_host}}{{: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>
</a>
<h1 class="am-topbar-brand wap-logo am-show-sm-only">
<a href="{{$Think.__MY_URL__}}">
<img src="{{$attachment_host}}{{: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}}
<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>
{{/if}}
</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>
<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}}
{{/foreach}}
</div>
{{/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>
<!-- 主导航 -->
<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>
</div>
</div>
</header>
</header>
{{/if}}
application/index/view/default/user/index.html
浏览文件 @ 4cd45bc0
......@@ -17,7 +17,7 @@
{{include file="public/goods_category" /}}
<!-- content -->
<div class="am-container user-main">
<div class="am-container user-main user-center">
<!-- user menu start -->
{{include file="public/user_menu" /}}
......
application/service/UserService.php
浏览文件 @ 4cd45bc0
......@@ -46,7 +46,7 @@ class UserService
$user = session('user');
// token仅小程序浏览器环境和api接口环境中有效
if(empty($user) && !empty($params['token']) && in_array(MiniAppEnv(), ['weixin', 'alipay', 'baidu']))
if(empty($user) && !empty($params['token']) && in_array(MiniAppEnv(), config('shopxo.mini_app_type_list')))
{
$user = cache(config('shopxo.cache_user_info').$params['token']);
if(isset($user['id']))
......
config/shopxo.php
浏览文件 @ 4cd45bc0
......@@ -70,5 +70,8 @@ return [
// 线下支付方式
'under_line_list' => ['CashPayment', 'DeliveryPayment'],
// 小程序平台
'mini_app_type_list' => ['weixin', 'alipay', 'baidu'],
];
?>
\ No newline at end of file
config/shopxo.sql
浏览文件 @ 4cd45bc0
因为 它太大了无法显示 source diff 。你可以改为 查看blob。
public/static/index/default/css/common.css
浏览文件 @ 4cd45bc0
......@@ -834,4 +834,14 @@ legend a {
}
.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
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或