Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
starsw001
ShopXO
提交
7a526da9
ShopXO
项目概览
starsw001
/
ShopXO
与 Fork 源项目一致
Fork自
纵之格 / ShopXO
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
ShopXO
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
7a526da9
编写于
7月 01, 2019
作者:
G
gongfuxiang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
小程序细节优化
上级
1f4dcb11
变更
11
隐藏空白更改
内联
并排
Showing
11 changed file
with
81 addition
and
39 deletion
+81
-39
application/admin/view/default/appconfig/app.html
application/admin/view/default/appconfig/app.html
+9
-0
application/api/controller/Index.php
application/api/controller/Index.php
+7
-6
application/index/view/default/public/nav_search.html
application/index/view/default/public/nav_search.html
+26
-24
application/service/UserService.php
application/service/UserService.php
+1
-1
public/appmini/old/alipay/pages/index/index.acss
public/appmini/old/alipay/pages/index/index.acss
+13
-0
public/appmini/old/alipay/pages/index/index.axml
public/appmini/old/alipay/pages/index/index.axml
+2
-1
public/appmini/old/alipay/pages/index/index.js
public/appmini/old/alipay/pages/index/index.js
+2
-0
public/appmini/old/weixin/pages/index/index.js
public/appmini/old/weixin/pages/index/index.js
+2
-0
public/appmini/old/weixin/pages/index/index.wxml
public/appmini/old/weixin/pages/index/index.wxml
+2
-1
public/appmini/old/weixin/pages/index/index.wxss
public/appmini/old/weixin/pages/index/index.wxss
+13
-0
public/static/index/default/css/common.css
public/static/index/default/css/common.css
+4
-6
未找到文件。
application/admin/view/default/appconfig/app.html
浏览文件 @
7a526da9
...
...
@@ -60,6 +60,15 @@
</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 c-p"
data-validation-message=
"{{$data.common_app_is_header_nav_fixed.error_tips}}"
required
>
{{foreach $common_is_text_list as $v}}
<option
value=
"{{$v.id}}"
{{
if
isset
($
data
['
common_app_is_header_nav_fixed
']['
value
'])
and
$
data
['
common_app_is_header_nav_fixed
']['
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>
...
...
application/api/controller/Index.php
浏览文件 @
7a526da9
...
...
@@ -46,12 +46,13 @@ class Index extends Common
public
function
Index
()
{
$result
=
[
'navigation'
=>
AppNavService
::
AppHomeNav
(),
'banner_list'
=>
BannerService
::
Banner
(),
'data_list'
=>
GoodsService
::
HomeFloorList
(),
'common_shop_notice'
=>
MyC
(
'common_shop_notice'
,
null
,
true
),
'common_app_is_enable_search'
=>
(
int
)
MyC
(
'common_app_is_enable_search'
,
1
),
'common_app_is_enable_answer'
=>
(
int
)
MyC
(
'common_app_is_enable_answer'
,
1
),
'navigation'
=>
AppNavService
::
AppHomeNav
(),
'banner_list'
=>
BannerService
::
Banner
(),
'data_list'
=>
GoodsService
::
HomeFloorList
(),
'common_shop_notice'
=>
MyC
(
'common_shop_notice'
,
null
,
true
),
'common_app_is_enable_search'
=>
(
int
)
MyC
(
'common_app_is_enable_search'
,
1
),
'common_app_is_enable_answer'
=>
(
int
)
MyC
(
'common_app_is_enable_answer'
,
1
),
'common_app_is_header_nav_fixed'
=>
(
int
)
MyC
(
'common_app_is_header_nav_fixed'
,
0
),
];
// 返回数据
...
...
application/index/view/default/public/nav_search.html
浏览文件 @
7a526da9
<!-- 搜索框 start -->
<div
class=
"nav-search white am-hide-sm-only"
>
<div
class=
"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>
</div>
<div
class=
"logo-big am-hide-sm-only"
>
<a
href=
"{{$Think.__MY_URL__}}"
>
<img
src=
"{{$attachment_host}}{{:MyC('home_site_logo')}}"
alt=
"{{:MyC('home_seo_site_title')}}"
/>
</a>
</div>
<div
class=
"am-container"
>
<div
class=
"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>
</div>
<div
class=
"logo-big am-hide-sm-only"
>
<a
href=
"{{$Think.__MY_URL__}}"
>
<img
src=
"{{$attachment_host}}{{:MyC('home_site_logo')}}"
alt=
"{{:MyC('home_seo_site_title')}}"
/>
</a>
</div>
<div
class=
"search-bar"
>
<form
action=
"{{:MyUrl('index/search/index')}}"
method=
"POST"
>
<div
class=
"search-group"
>
<input
id=
"search-input"
name=
"wd"
type=
"text"
placeholder=
"其实搜索很简单^_^ !"
value=
"{{if !empty($params['wd'])}}{{$params.wd}}{{/if}}"
autocomplete=
"off"
/>
<input
id=
"ai-topsearch"
class=
"submit am-btn"
index=
"1"
type=
"submit"
value=
"搜索"
/>
</div>
{{if !empty($home_search_keywords)}}
<ul
class=
"search-hot-keywords"
>
{{foreach $home_search_keywords as $v}}
<li><a
href=
"{{:MyUrl('index/search/index', ['wd'=>StrToAscii($v)])}}"
target=
"_blank"
>
{{$v}}
</a></li>
{{/foreach}}
</ul>
{{/if}}
</form>
<div
class=
"search-bar"
>
<form
action=
"{{:MyUrl('index/search/index')}}"
method=
"POST"
>
<div
class=
"search-group"
>
<input
id=
"search-input"
name=
"wd"
type=
"text"
placeholder=
"其实搜索很简单^_^ !"
value=
"{{if !empty($params['wd'])}}{{$params.wd}}{{/if}}"
autocomplete=
"off"
/>
<input
id=
"ai-topsearch"
class=
"submit am-btn"
index=
"1"
type=
"submit"
value=
"搜索"
/>
</div>
{{if !empty($home_search_keywords)}}
<ul
class=
"search-hot-keywords"
>
{{foreach $home_search_keywords as $v}}
<li><a
href=
"{{:MyUrl('index/search/index', ['wd'=>StrToAscii($v)])}}"
target=
"_blank"
>
{{$v}}
</a></li>
{{/foreach}}
</ul>
{{/if}}
</form>
</div>
</div>
</div>
<!-- 搜索框 end -->
\ No newline at end of file
application/service/UserService.php
浏览文件 @
7a526da9
...
...
@@ -1674,7 +1674,7 @@ class UserService
if
(
$user
[
'is_mandatory_bind_mobile'
]
==
0
||
(
$user
[
'is_mandatory_bind_mobile'
]
==
1
&&
!
empty
(
$user
[
'mobile'
])))
{
$user
[
'token'
]
=
md5
(
md5
(
$user
[
'id'
]
.
time
())
.
rand
(
100
,
1000000
));
cache
(
config
(
'shopxo.cache_user_info'
)
.
$user
[
'token'
],
$user
,
3600
*
24
*
15
);
cache
(
config
(
'shopxo.cache_user_info'
)
.
$user
[
'token'
],
$user
);
}
else
{
$user
[
'token'
]
=
''
;
}
...
...
public/appmini/old/alipay/pages/index/index.acss
浏览文件 @
7a526da9
...
...
@@ -26,6 +26,19 @@
line-height: 70rpx;
}
/**
* 导航固定
*/
.search-fixed {
position: fixed;
top: 0;
left: 0;
z-index: 2;
}
.search-fixed-seat {
padding-top: 110rpx;
}
/**
* 楼层数据
*/
...
...
public/appmini/old/alipay/pages/index/index.axml
浏览文件 @
7a526da9
<!-- 搜索 -->
<view a:if="{{load_status == 1 && common_app_is_enable_search == 1}}" class="search wh-auto">
<view a:if="{{common_app_is_header_nav_fixed == 1}}" class="search-fixed-seat"></view>
<view a:if="{{load_status == 1 && common_app_is_enable_search == 1}}" class="search wh-auto {{common_app_is_header_nav_fixed == 1 ? 'search-fixed' : ''}}">
<view class="search-content bg-white oh">
<icon type="search" size="16" />
<input type="text" confirm-type="search" placeholder="其实搜索很简单^_^!" class="wh-auto cr-888" onConfirm="search_input_event" />
...
...
public/appmini/old/alipay/pages/index/index.js
100755 → 100644
浏览文件 @
7a526da9
...
...
@@ -9,6 +9,7 @@ Page({
common_shop_notice
:
null
,
common_app_is_enable_search
:
1
,
common_app_is_enable_answer
:
1
,
common_app_is_header_nav_fixed
:
0
,
load_status
:
0
,
},
...
...
@@ -45,6 +46,7 @@ Page({
common_shop_notice
:
data
.
common_shop_notice
||
null
,
common_app_is_enable_search
:
data
.
common_app_is_enable_search
,
common_app_is_enable_answer
:
data
.
common_app_is_enable_answer
,
common_app_is_header_nav_fixed
:
data
.
common_app_is_header_nav_fixed
,
data_list_loding_status
:
data
.
data_list
.
length
==
0
?
0
:
3
,
data_bottom_line_status
:
true
,
});
...
...
public/appmini/old/weixin/pages/index/index.js
浏览文件 @
7a526da9
...
...
@@ -9,6 +9,7 @@ Page({
common_shop_notice
:
null
,
common_app_is_enable_search
:
1
,
common_app_is_enable_answer
:
1
,
common_app_is_header_nav_fixed
:
0
,
load_status
:
0
,
},
...
...
@@ -44,6 +45,7 @@ Page({
common_shop_notice
:
data
.
common_shop_notice
||
null
,
common_app_is_enable_search
:
data
.
common_app_is_enable_search
,
common_app_is_enable_answer
:
data
.
common_app_is_enable_answer
,
common_app_is_header_nav_fixed
:
data
.
common_app_is_header_nav_fixed
,
data_list_loding_status
:
data
.
data_list
.
length
==
0
?
0
:
3
,
data_bottom_line_status
:
true
,
});
...
...
public/appmini/old/weixin/pages/index/index.wxml
浏览文件 @
7a526da9
<!-- 搜索 -->
<view wx:if="{{load_status == 1 && common_app_is_enable_search == 1}}" class="search wh-auto">
<view wx:if="{{common_app_is_header_nav_fixed == 1}}" class="search-fixed-seat"></view>
<view wx:if="{{load_status == 1 && common_app_is_enable_search == 1}}" class="search wh-auto {{common_app_is_header_nav_fixed == 1 ? 'search-fixed' : ''}}">
<view class="search-content bg-white oh">
<icon type="search" size="16" />
<input type="text" confirm-type="search" placeholder="其实搜索很简单^_^!" class="wh-auto cr-888" bindconfirm="search_input_event" confirm-type="search" />
...
...
public/appmini/old/weixin/pages/index/index.wxss
浏览文件 @
7a526da9
...
...
@@ -26,6 +26,19 @@
line-height: 70rpx;
}
/**
* 导航固定
*/
.search-fixed {
position: fixed;
top: 0;
left: 0;
z-index: 2;
}
.search-fixed-seat {
padding-top: 110rpx;
}
/**
* 楼层数据
*/
...
...
public/static/index/default/css/common.css
浏览文件 @
7a526da9
...
...
@@ -102,13 +102,12 @@ color: #F5F5F2;font-size: 12px;cursor:pointer;border-radius:0px 0px; position: a
@media
only
screen
and
(
min-width
:
640px
)
{
.am-container
{
padding-left
:
0px
;
padding-right
:
0px
;}
.nav-search
{
background
:
none
;}
.nav-search
{
background
:
#fff
;
margin
:
20px
0
5px
0
;}
.header
{
display
:
block
;
height
:
30px
;}
.top-nav-left
{
float
:
left
;}
.top-nav-left
.top-nav-items
,
.top-nav-right
.top-nav-items
{
padding
:
0px
8px
;
height
:
30px
;
line-height
:
30px
;
}
.top-nav-right
{
position
:
absolute
;
top
:
0
;
right
:
0
;
}
.top-nav-right
.top-nav-items
{
float
:
left
;}
.nav-search
.logo-big
{
float
:
left
;
height
:
40px
;
width
:
135px
;
margin
:
0px
auto
;
margin-left
:
5px
;
margin-right
:
5px
;}
.nav-search
.logo-big
img
{
width
:
100%
;}
...
...
@@ -116,7 +115,6 @@ color: #F5F5F2;font-size: 12px;cursor:pointer;border-radius:0px 0px; position: a
.search-bar
input
{
width
:
79%
;
height
:
30px
;}
.classified
{
display
:
none
;}
.mobile-navigation
{
display
:
none
;}
.nav-search
{
position
:
relative
;
top
:
0px
;
z-index
:
0
;
margin-bottom
:
5px
;
margin-top
:
20px
;}
#ai-topsearch
{
font-size
:
14px
;
height
:
30px
;
line-height
:
18px
;
font-weight
:
500
;
width
:
20%
;
}
/*底部*/
...
...
@@ -180,9 +178,9 @@ color: #F5F5F2;font-size: 12px;cursor:pointer;border-radius:0px 0px; position: a
@media
only
screen
and
(
min-width
:
1025px
)
{
.am-container
{
padding-left
:
0rem
;
padding-right
:
0rem
;
max-width
:
1000px
;}
.mui-mbar-tabs
{
display
:
block
;}
.nav-search
{
padding-
left
:
0px
;
max-width
:
1000px
;
margin
:
0px
auto
;
padding-
top
:
20px
;
height
:
100px
;}
.nav-search
{
padding-top
:
20px
;
height
:
100px
;}
.nav-search
.logo-big
{
display
:
-webkit-inline-box
;
float
:
left
;
height
:
60px
;
width
:
220px
;
margin
:
0px
;}
.search-bar
{
margin
:
auto
;
width
:
50%
;
padding-left
:
1
0
%
;}
.search-bar
{
margin
:
auto
;
width
:
50%
;
padding-left
:
1
5
%
;}
.shopMain
{
margin
:
0px
0px
0px
5px
;}
.shopCon
li
{
width
:
20%
;
padding
:
10px
;}
.tip
{
display
:
block
;}
...
...
@@ -194,7 +192,7 @@ color: #F5F5F2;font-size: 12px;cursor:pointer;border-radius:0px 0px; position: a
@media
only
screen
and
(
min-width
:
1260px
)
{
.am-container
,
.
nav-search
,
.
footer
,
.nav-table
{
padding-left
:
0rem
;
padding-right
:
0rem
;
max-width
:
1200px
;}
.am-container
,
.footer
,
.nav-table
{
padding-left
:
0rem
;
padding-right
:
0rem
;
max-width
:
1200px
;}
.footer
{
margin
:
auto
;}
/*导航*/
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录