Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
纵之格
ShopXO
提交
8e7d86b6
ShopXO
项目概览
纵之格
/
ShopXO
通知
394
Star
16
Fork
11
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
ShopXO
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
8e7d86b6
编写于
5月 06, 2019
作者:
D
devil_gong
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
细节优化
上级
6c4b7795
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
72 addition
and
31 deletion
+72
-31
application/index/view/default/index/index.html
application/index/view/default/index/index.html
+1
-5
application/plugins/view/wallet/walletadmin/saveinfo.html
application/plugins/view/wallet/walletadmin/saveinfo.html
+19
-5
application/plugins/wallet/Walletadmin.php
application/plugins/wallet/Walletadmin.php
+21
-4
public/static/index/default/css/index.css
public/static/index/default/css/index.css
+9
-12
public/static/plugins/css/wallet/admin/walletadmin.css
public/static/plugins/css/wallet/admin/walletadmin.css
+22
-5
未找到文件。
application/index/view/default/index/index.html
浏览文件 @
8e7d86b6
...
...
@@ -154,11 +154,7 @@
{{if !empty($floor['items'])}}
{{foreach $floor.items as $category_key=>$category}}
{{if $category_key lt 6 and isset($category['is_home_recommended']) and $category['is_home_recommended'] eq 1}}
<a
href=
"{{:MyUrl('index/search/index', ['category_id'=>$category['id']])}}"
class=
"outer"
target=
"_blank"
>
<span
class=
"inner"
>
<b
class=
"text"
>
{{:mb_substr($category['name'], 0, 4, 'utf-8')}}
</b>
</span>
</a>
<a
href=
"{{:MyUrl('index/search/index', ['category_id'=>$category['id']])}}"
class=
"outer"
target=
"_blank"
>
{{:mb_substr($category['name'], 0, 4, 'utf-8')}}
</a>
{{/if}}
{{/foreach}}
{{/if}}
...
...
application/plugins/view/wallet/walletadmin/saveinfo.html
浏览文件 @
8e7d86b6
...
...
@@ -8,22 +8,36 @@
<a
href=
"{{:PluginsAdminUrl('wallet', 'walletadmin', 'index')}}"
class=
"fr fs-14 m-t-5 am-icon-mail-reply"
>
返回
</a>
</legend>
<div
class=
"
membershiplevel
-content"
>
<div
class=
"
wallet
-content"
>
<!-- form start -->
<form
class=
"am-form form-validation view-save"
action=
"{{:PluginsAdminUrl('membershiplevel', 'level', 'save')}}"
method=
"POST"
request-type=
"ajax-url"
request-value=
"{{:PluginsAdminUrl('wallet', 'walletadmin', 'index')}}"
enctype=
"multipart/form-data"
>
<form
class=
"am-form form-validation view-save"
action=
"{{:PluginsAdminUrl('wallet', 'level', 'save')}}"
method=
"POST"
request-type=
"ajax-url"
request-value=
"{{:PluginsAdminUrl('wallet', 'walletadmin', 'index')}}"
enctype=
"multipart/form-data"
>
<div
class=
"am-alert am-alert-secondary saveinfo-view"
data-am-alert=
""
>
<div>
<span>
有效金额:
</span>
<span
class=
"normal-money"
>
{{$data.normal_money}}
</span>
</div>
<div>
<span>
冻结金额:
</span>
<span
class=
"frozen-money"
>
{{$data.frozen_money}}
</span>
</div>
<div>
<span>
赠送金额:
</span>
<span
class=
"give-money"
>
{{$data.give_money}}
</span>
</div>
</div>
<div
class=
"am-form-group"
>
<label>
有效金额
<span
class=
"am-form-group-label-tips"
>
包含赠送金额
</span></label>
<input
type=
"number"
name=
"normal_money"
placeholder=
"有效金额"
step=
"0.01"
data-validation-message=
"请输入有效的有效金额"
class=
"am-radius"
{{
if
!
empty
($
data
['
normal_money
'])
and
$
data
['
normal_money
']
gt
0}}
value=
"{{$data.normal_money}}"
{{/
if
}}
/>
<input
type=
"number"
name=
"normal_money"
placeholder=
"有效金额"
step=
"0.01"
min=
"0.00"
data-validation-message=
"请输入有效的有效金额"
class=
"am-radius"
{{
if
!
empty
($
data
['
normal_money
'])
and
$
data
['
normal_money
']
gt
0}}
value=
"{{$data.normal_money}}"
{{/
if
}}
/>
</div>
<div
class=
"am-form-group"
>
<label>
冻结金额
</label>
<input
type=
"number"
name=
"frozen_money"
placeholder=
"冻结金额"
step=
"0.01"
data-validation-message=
"请输入有效的冻结金额"
class=
"am-radius"
{{
if
!
empty
($
data
['
frozen_money
'])
and
$
data
['
frozen_money
']
gt
0}}
value=
"{{$data.frozen_money}}"
{{/
if
}}
/>
<input
type=
"number"
name=
"frozen_money"
placeholder=
"冻结金额"
step=
"0.01"
min=
"0.00"
data-validation-message=
"请输入有效的冻结金额"
class=
"am-radius"
{{
if
!
empty
($
data
['
frozen_money
'])
and
$
data
['
frozen_money
']
gt
0}}
value=
"{{$data.frozen_money}}"
{{/
if
}}
/>
</div>
<div
class=
"am-form-group"
>
<label>
赠送金额
</label>
<input
type=
"number"
name=
"give_money"
placeholder=
"赠送金额"
step=
"0.01"
data-validation-message=
"请输入有效的赠送金额"
class=
"am-radius"
{{
if
!
empty
($
data
['
give_money
'])
and
$
data
['
give_money
']
gt
0}}
value=
"{{$data.frozen
_money}}"
{{/
if
}}
/>
<input
type=
"number"
name=
"give_money"
placeholder=
"赠送金额"
step=
"0.01"
min=
"0.00"
data-validation-message=
"请输入有效的赠送金额"
class=
"am-radius"
{{
if
!
empty
($
data
['
give_money
'])
and
$
data
['
give_money
']
gt
0}}
value=
"{{$data.give
_money}}"
{{/
if
}}
/>
</div>
<div
class=
"am-form-group"
>
...
...
application/plugins/wallet/Walletadmin.php
浏览文件 @
8e7d86b6
...
...
@@ -86,10 +86,27 @@ class Walletadmin extends Controller
*/
public
function
saveinfo
(
$params
=
[])
{
// 静态数据
$this
->
assign
(
'wallet_status_list'
,
WalletService
::
$wallet_status_list
);
return
$this
->
fetch
(
'../../../plugins/view/wallet/walletadmin/saveinfo'
);
if
(
!
empty
(
$params
[
'id'
]))
{
$data_params
=
array
(
'm'
=>
0
,
'n'
=>
1
,
'where'
=>
[
'id'
=>
intval
(
$params
[
'id'
])],
);
$data
=
WalletService
::
WalletList
(
$data_params
);
if
(
empty
(
$data
[
'data'
][
0
]))
{
return
'钱包有误'
;
}
$this
->
assign
(
'data'
,
$data
[
'data'
][
0
]);
// 静态数据
$this
->
assign
(
'wallet_status_list'
,
WalletService
::
$wallet_status_list
);
return
$this
->
fetch
(
'../../../plugins/view/wallet/walletadmin/saveinfo'
);
}
else
{
return
'钱包id有误'
;
}
}
}
?>
\ No newline at end of file
public/static/index/default/css/index.css
浏览文件 @
8e7d86b6
...
...
@@ -63,10 +63,8 @@ text-align: center;float:none}
.recommendation
.info
h3
{
font-size
:
12px
;
color
:
#F03726
}
/*小标签*/
.list
.word
{
padding
:
5px
10px
;
overflow
:
hidden
;}
.word
.outer
{
margin
:
5px
;
width
:
50px
;
height
:
50px
;
text-align
:
center
;
color
:
#2f2f2f
;
background-color
:
#fff
;
border-radius
:
50px
;
display
:
inline-block
;
}
.word
.outer
.inner
{
display
:
table-cell
;
vertical-align
:
middle
;
width
:
50px
;
height
:
50px
;}
.word
.outer
.text
{
font-weight
:
400
;
display
:
inline-block
;
max-width
:
35px
;
margin
:
0
auto
;}
.list
.word
{
padding
:
5px
;
overflow
:
hidden
;}
.word
.outer
{
margin
:
5px
;
width
:
calc
(
50%
-
12px
);
height
:
28px
;
line-height
:
28px
;
text-align
:
center
;
color
:
#fff
;
background-color
:
rgba
(
0
,
0
,
0
,
0.03
);
border-radius
:
3px
;
display
:
inline-block
;
border
:
1px
solid
#fff
;
text-decoration
:
none
;
overflow
:
hidden
;}
/*楼层左侧*/
.list
.outer-con
.describe
{
color
:
#fff
;
max-width
:
100%
;
overflow
:
hidden
;
text-overflow
:
ellipsis
;
display
:
-webkit-box
;
-webkit-line-clamp
:
3
;
-webkit-box-orient
:
vertical
;
}
...
...
@@ -151,11 +149,11 @@ text-align: center;float:none}
.flood
.list
img
{
position
:
absolute
;
top
:
auto
;
left
:
0
;
bottom
:
0
;
max-width
:
100%
;}
/*楼层 hover*/
.word
.outer
:hover
{
background
:
#f
9918f
;
color
:
#fff
!important
;
-webkit-transition
:
background
.2s
ease-in
;
-moz-transition
:
background
.2s
ease-in
;
-ms-transition
:
background
.2s
ease-in
;
-o-transition
:
background
.2s
ease-in
;
transition
:
background
.2s
ease-in
;
}
.goods-items
:before
{
content
:
""
;
position
:
absolute
;
top
:
0
;
left
:
-100%
;
display
:
block
;
height
:
100%
;
width
:
50%
;
z-index
:
999
;
background-color
:
rgba
(
255
,
255
,
255
,
0.3
);
-webkit-transition
:
all
1s
ease
0s
;
-moz-transition
:
all
1s
ease
0s
;
-o-transition
:
all
1s
ease
0s
;
transition
:
all
1s
ease
0s
;
-ms-transform
:
skewX
(
-20deg
);
-webkit-transform
:
skewX
(
-20deg
);
-o-transform
:
skewX
(
-20deg
);
transform
:
skewX
(
-20deg
);
background
:
-webkit-linear-gradient
(
90deg
,
transparent
0
,
rgba
(
255
,
255
,
255
,
0.4
)
100%
);
background
:
-moz-linear-gradient
(
90deg
,
transparent
0
,
rgba
(
255
,
255
,
255
,
0.4
)
100%
);
background
:
-o-linear-gradient
(
90deg
,
transparent
0
,
rgba
(
255
,
255
,
255
,
0.4
)
100%
);
background
:
linear-gradient
(
90deg
,
transparent
0
,
rgba
(
255
,
255
,
255
,
0.4
)
100%
);
filter
:
progid
:
DXImageTransform
.
Microsoft
.
gradient
(
startColorstr
=
transparent
,
endColorstr
=
rgba
(
255
,
255
,
255
,
0.4
),
GradientType
=
0.9
);
}
.goods-items
:hover:before
{
left
:
100%
;
}
.word
.outer
:hover
{
background
:
#f
ff
;
color
:
#d2354c
!important
;
-webkit-transition
:
background
.2s
ease-in
;
-moz-transition
:
background
.2s
ease-in
;
-ms-transition
:
background
.2s
ease-in
;
-o-transition
:
background
.2s
ease-in
;
transition
:
background
.2s
ease-in
;
-webkit-transition
:
color
.2s
ease-in
;
-moz-transition
:
color
.2s
ease-in
;
-ms-transition
:
color
.2s
ease-in
;
-o-transition
:
color
.2s
ease-in
;
transition
:
color
.2s
ease-in
;
}
/*
.goods-items:before { content: ""; position: absolute; top: 0; left: -100%; display: block; height: 100%; width: 50%; z-index: 999; background-color: rgba(255, 255, 255, 0.3); -webkit-transition: all 1s ease 0s; -moz-transition: all 1s ease 0s; -o-transition: all 1s ease 0s; transition: all 1s ease 0s; -ms-transform: skewX(-20deg); -webkit-transform: skewX(-20deg); -o-transform: skewX(-20deg); transform: skewX(-20deg); background: -webkit-linear-gradient(90deg, transparent 0, rgba(255, 255, 255, 0.4) 100%); background: -moz-linear-gradient(90deg, transparent 0, rgba(255, 255, 255, 0.4) 100%); background: -o-linear-gradient(90deg, transparent 0, rgba(255, 255, 255, 0.4) 100%); background: linear-gradient(90deg, transparent 0, rgba(255, 255, 255, 0.4) 100%); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=transparent, endColorstr=rgba(255, 255, 255, 0.4),GradientType=0.9); }
.goods-items:hover:before { left: 100%; }
*/
.goods-items
:hover
{
z-index
:
99
;
-webkit-box-shadow
:
0
15px
30px
rgba
(
0
,
0
,
0
,
0.1
);
-moz-box-shadow
:
0
15px
30px
rgba
(
0
,
0
,
0
,
0.1
);
box-shadow
:
0
15px
30px
rgba
(
0
,
0
,
0
,
0.1
);
-webkit-transition
:
box-shadow
.2s
ease-in
;
-moz-transition
:
box-shadow
.2s
ease-in
;
-ms-transition
:
box-shadow
.2s
ease-in
;
-o-transition
:
box-shadow
.2s
ease-in
;
transition
:
box-shadow
.2s
ease-in
;
}
.flood
.list
img
{
-webkit-transition
:
transform
.
2s
ease-in
;
-moz-transition
:
transform
.2s
ease-in
;
-ms-transition
:
transform
.2s
ease-in
;
-o-transition
:
transform
.2s
ease-in
;
transition
:
transform
.2
s
ease-in
;
}
.flood
.list
img
{
-webkit-transition
:
transform
.
6s
ease-in
;
-moz-transition
:
transform
.6s
ease-in
;
-ms-transition
:
transform
.6s
ease-in
;
-o-transition
:
transform
.6s
ease-in
;
transition
:
transform
.6
s
ease-in
;
}
.flood
.list
img
:hover
{
transform
:
scale
(
1.1
);
-moz-transform
:
scale
(
1.1
);
-webkit-transform
:
scale
(
1.1
);
-o-transform
:
scale
(
1.1
);
-ms-transform
:
scale
(
1.1
);
}
}
...
...
@@ -259,6 +257,7 @@ text-align: center;float:none}
/*楼层左侧*/
.flood
.list
{
width
:
222px
;
height
:
456px
;
}
.list
.word
{
padding
:
5px
10px
;
}
/*楼层商品*/
.flood
.goods-list
.goods-items
{
height
:
228px
;
}
...
...
@@ -313,12 +312,10 @@ text-align: center;float:none}
/*楼层*/
.flood
.list
{
width
:
100%
;
height
:
auto
;
}
.
word
.outer
{
display
:
inline-flex
;
padding
:
5px
0
;
height
:
auto
;
background-color
:
transparent
;
width
:
32.33%
;
margin
:
0
;
}
.word
.outer
.inner
{
color
:
#2f2f2f
;
background-color
:
#fff
;
border-radius
:
50px
;
margin
:
0
auto
;
padding
:
0
12px
;
}
.
list
.word
{
padding
:
10px
;
}
.word
.outer
{
width
:
calc
(
33%
-
12px
);
}
.flood
.goods-list
.goods-items
{
width
:
50%
;
float
:
left
;
padding
:
10px
;
border-bottom
:
1px
solid
#eee
;
}
.flood
.goods-list
.goods-items
img
{
padding
:
10px
;
}
.flood
.goods-list
.goods-items
:nth-of-type
(
2
n
+
1
)
{
border-right
:
1px
solid
#eee
;
}
.flood
.goods-list
.goods-items
:nth-of-type
(
2
n
)
{
border-left
:
1px
solid
transparent
;
}
.list
.word
{
padding
:
10px
0
;
}
.word
.outer
.text
{
display
:
table-cell
;
vertical-align
:
middle
;
width
:
35px
;
height
:
50px
;
}
}
public/static/plugins/css/wallet/admin/walletadmin.css
浏览文件 @
8e7d86b6
...
...
@@ -30,15 +30,32 @@
max-height
:
75px
;
margin-right
:
5px
;
}
.wallet-content
table
.am-table
.money
span
{
/**
* 金额
*/
.wallet-content
.normal-money
,
.wallet-content
.frozen-money
,
.wallet-content
.give-money
{
font-weight
:
700
;
}
.wallet-content
table
.am-table
.normal-money
{
.wallet-content
.normal-money
{
color
:
#4CAF50
;
}
.wallet-content
table
.am-table
.frozen-money
{
.wallet-content
.frozen-money
{
color
:
#FF9800
;
}
.wallet-content
table
.am-table
.give-money
{
.wallet-content
.give-money
{
color
:
#666
;
}
\ No newline at end of file
}
/**
* 编辑
*/
@media
only
screen
and
(
min-width
:
641px
)
{
.wallet-content
form
.am-alert
{
margin
:
0
;
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录