切换导航条
此项目
正在载入...
登录
景龙
/
feifangu
·
提交
转到一个项目
GitLab
转到仪表盘
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
jinglong
5 years ago
提交
e00fdc013ba3ff86058acab0b9b5c9b2a2a11ded
1 个父辈
5fbb7d4d
1 个管道 的构建
通过
耗费 2 秒
修改自定义轮播图链接
变更
15
构建
1
隐藏空白字符变更
内嵌
并排对比
正在显示
15 个修改的文件
包含
108 行增加
和
15 行删除
application/admin/controller/Btbanner.php
application/admin/lang/zh-cn/btbanner.php
application/admin/lang/zh-cn/btype.php
application/admin/view/advert/add.html
application/admin/view/advert/edit.html
application/admin/view/banner/add.html
application/admin/view/banner/edit.html
application/admin/view/btbanner/add.html
application/admin/view/btbanner/edit.html
application/admin/view/btype/add.html
application/admin/view/btype/edit.html
application/api/controller/Brand.php
public/api.html
public/assets/js/backend/btbanner.js
public/assets/js/backend/btype.js
application/admin/controller/Btbanner.php
查看文件 @
e00fdc0
...
...
@@ -63,7 +63,7 @@ class Btbanner extends Backend
->
select
();
foreach
(
$list
as
$row
)
{
$row
->
visible
([
'id'
,
'image'
,
'createtime'
]);
$row
->
visible
([
'id'
,
'image'
,
'createtime'
,
'url'
]);
}
$list
=
collection
(
$list
)
->
toArray
();
...
...
application/admin/lang/zh-cn/btbanner.php
查看文件 @
e00fdc0
...
...
@@ -3,6 +3,7 @@
return
[
'Id'
=>
'ID'
,
'Image'
=>
'轮播图'
,
'Url'
=>
'跳转链接'
,
'Createtime'
=>
'创建时间'
,
'Updatetime'
=>
'更新时间'
];
...
...
application/admin/lang/zh-cn/btype.php
查看文件 @
e00fdc0
...
...
@@ -3,6 +3,7 @@
return
[
'Id'
=>
'ID'
,
'Image'
=>
'品牌logo'
,
'Tag'
=>
'品牌标签'
,
'Name'
=>
'品牌名称'
,
'Address'
=>
'品牌产地'
,
'Introduce'
=>
'品牌简介'
,
...
...
application/admin/view/advert/add.html
查看文件 @
e00fdc0
...
...
@@ -29,8 +29,8 @@
<div
class=
"form-group"
>
<label
class=
"control-label col-xs-12 col-sm-2"
></label>
<div
class=
"col-xs-12 col-sm-8"
>
<span
style=
"color:red;"
>
品牌详情页:
</span><br/>
<span
style=
"color:red;"
>
商品详情页:
</span>
<span
style=
"color:red;"
>
品牌详情页:/pages/index/brandDetail/brandDetail?id=10
</span><br/>
<span
style=
"color:red;"
>
商品详情页:/pages/index/goodsDetail/goodsDetail?id=10
</span>
</div>
</div>
<div
class=
"form-group layer-footer"
>
...
...
application/admin/view/advert/edit.html
查看文件 @
e00fdc0
...
...
@@ -26,6 +26,13 @@
<input
id=
"c-url"
class=
"form-control"
name=
"row[url]"
type=
"text"
value=
"{$row.url}"
>
</div>
</div>
<div
class=
"form-group"
>
<label
class=
"control-label col-xs-12 col-sm-2"
></label>
<div
class=
"col-xs-12 col-sm-8"
>
<span
style=
"color:red;"
>
品牌详情页:/pages/index/brandDetail/brandDetail?id=10
</span><br/>
<span
style=
"color:red;"
>
商品详情页:/pages/index/goodsDetail/goodsDetail?id=10
</span>
</div>
</div>
<div
class=
"form-group layer-footer"
>
<label
class=
"control-label col-xs-12 col-sm-2"
></label>
<div
class=
"col-xs-12 col-sm-8"
>
...
...
application/admin/view/banner/add.html
查看文件 @
e00fdc0
...
...
@@ -14,6 +14,19 @@
<ul
class=
"row list-inline plupload-preview"
id=
"p-image"
></ul>
</div>
</div>
<div
class=
"form-group"
>
<label
class=
"control-label col-xs-12 col-sm-2"
>
{:__('Url')}:
</label>
<div
class=
"col-xs-12 col-sm-8"
>
<input
id=
"c-url"
class=
"form-control"
name=
"row[url]"
type=
"text"
value=
""
>
</div>
</div>
<div
class=
"form-group"
>
<label
class=
"control-label col-xs-12 col-sm-2"
></label>
<div
class=
"col-xs-12 col-sm-8"
>
<span
style=
"color:red;"
>
品牌详情页:/pages/index/brandDetail/brandDetail?id=10
</span><br/>
<span
style=
"color:red;"
>
商品详情页:/pages/index/goodsDetail/goodsDetail?id=10
</span>
</div>
</div>
<div
class=
"form-group layer-footer"
>
<label
class=
"control-label col-xs-12 col-sm-2"
></label>
<div
class=
"col-xs-12 col-sm-8"
>
...
...
application/admin/view/banner/edit.html
查看文件 @
e00fdc0
...
...
@@ -14,6 +14,19 @@
<ul
class=
"row list-inline plupload-preview"
id=
"p-image"
></ul>
</div>
</div>
<div
class=
"form-group"
>
<label
class=
"control-label col-xs-12 col-sm-2"
>
{:__('Url')}:
</label>
<div
class=
"col-xs-12 col-sm-8"
>
<input
id=
"c-url"
class=
"form-control"
name=
"row[url]"
type=
"text"
value=
"{$row.url}"
>
</div>
</div>
<div
class=
"form-group"
>
<label
class=
"control-label col-xs-12 col-sm-2"
></label>
<div
class=
"col-xs-12 col-sm-8"
>
<span
style=
"color:red;"
>
品牌详情页:/pages/index/brandDetail/brandDetail?id=10
</span><br/>
<span
style=
"color:red;"
>
商品详情页:/pages/index/goodsDetail/goodsDetail?id=10
</span>
</div>
</div>
<div
class=
"form-group layer-footer"
>
<label
class=
"control-label col-xs-12 col-sm-2"
></label>
<div
class=
"col-xs-12 col-sm-8"
>
...
...
application/admin/view/btbanner/add.html
查看文件 @
e00fdc0
...
...
@@ -14,6 +14,19 @@
<ul
class=
"row list-inline plupload-preview"
id=
"p-image"
></ul>
</div>
</div>
<div
class=
"form-group"
>
<label
class=
"control-label col-xs-12 col-sm-2"
>
{:__('Url')}:
</label>
<div
class=
"col-xs-12 col-sm-8"
>
<input
id=
"c-url"
class=
"form-control"
name=
"row[url]"
type=
"text"
value=
""
>
</div>
</div>
<div
class=
"form-group"
>
<label
class=
"control-label col-xs-12 col-sm-2"
></label>
<div
class=
"col-xs-12 col-sm-8"
>
<span
style=
"color:red;"
>
品牌详情页:/pages/index/brandDetail/brandDetail?id=10
</span><br/>
<span
style=
"color:red;"
>
商品详情页:/pages/index/goodsDetail/goodsDetail?id=10'
</span>
</div>
</div>
<div
class=
"form-group layer-footer"
>
<label
class=
"control-label col-xs-12 col-sm-2"
></label>
<div
class=
"col-xs-12 col-sm-8"
>
...
...
application/admin/view/btbanner/edit.html
查看文件 @
e00fdc0
...
...
@@ -14,6 +14,19 @@
<ul
class=
"row list-inline plupload-preview"
id=
"p-image"
></ul>
</div>
</div>
<div
class=
"form-group"
>
<label
class=
"control-label col-xs-12 col-sm-2"
>
{:__('Url')}:
</label>
<div
class=
"col-xs-12 col-sm-8"
>
<input
id=
"c-url"
class=
"form-control"
name=
"row[url]"
type=
"text"
value=
"{$row.url}"
>
</div>
</div>
<div
class=
"form-group"
>
<label
class=
"control-label col-xs-12 col-sm-2"
></label>
<div
class=
"col-xs-12 col-sm-8"
>
<span
style=
"color:red;"
>
品牌详情页:/pages/index/brandDetail/brandDetail?id=10
</span><br/>
<span
style=
"color:red;"
>
商品详情页:/pages/index/goodsDetail/goodsDetail?id=10
</span>
</div>
</div>
<div
class=
"form-group layer-footer"
>
<label
class=
"control-label col-xs-12 col-sm-2"
></label>
<div
class=
"col-xs-12 col-sm-8"
>
...
...
application/admin/view/btype/add.html
查看文件 @
e00fdc0
...
...
@@ -21,6 +21,12 @@
</div>
</div>
<div
class=
"form-group"
>
<label
class=
"control-label col-xs-12 col-sm-2"
>
{:__('Tag')}:
</label>
<div
class=
"col-xs-12 col-sm-8"
>
<input
id=
"c-tag"
data-rule=
"required"
class=
"form-control"
name=
"row[tag]"
type=
"text"
placeholder=
"请输入商品标签(多个以'|'隔开)"
>
</div>
</div>
<div
class=
"form-group"
>
<label
class=
"control-label col-xs-12 col-sm-2"
>
{:__('Address')}:
</label>
<div
class=
"col-xs-12 col-sm-8"
>
<input
id=
"c-address"
data-rule=
"required"
class=
"form-control"
name=
"row[address]"
type=
"text"
>
...
...
application/admin/view/btype/edit.html
查看文件 @
e00fdc0
...
...
@@ -21,6 +21,12 @@
</div>
</div>
<div
class=
"form-group"
>
<label
class=
"control-label col-xs-12 col-sm-2"
>
{:__('Tag')}:
</label>
<div
class=
"col-xs-12 col-sm-8"
>
<input
id=
"c-tag"
data-rule=
"required"
class=
"form-control"
name=
"row[tag]"
type=
"text"
value=
"{$row.tag|htmlentities}"
placeholder=
"请输入商品标签(多个以'|'隔开)"
>
</div>
</div>
<div
class=
"form-group"
>
<label
class=
"control-label col-xs-12 col-sm-2"
>
{:__('Address')}:
</label>
<div
class=
"col-xs-12 col-sm-8"
>
<input
id=
"c-address"
data-rule=
"required"
class=
"form-control"
name=
"row[address]"
type=
"text"
value=
"{$row.address|htmlentities}"
>
...
...
application/api/controller/Brand.php
查看文件 @
e00fdc0
...
...
@@ -43,9 +43,17 @@ class Brand extends Api
"address": "葡萄牙2"
}
],
"images": [//品牌专区右侧轮播图
"http://jinglong.springchunjia.cn/uploads/20191127/febfea9a34c918cb2f100f669ede2547.png",
"http://jinglong.springchunjia.cn/uploads/20191127/042a3256122af7b10e26efb5e7649904.png"
"images": [//右侧轮播图
{
"id": 5,
"image": "/uploads/20191127/d36d8475bc3bdb999dff26d019c608ed.png",//图片
"url": "/pages/index/brandDetail/brandDetail?id=1"//路径
},
{
"id": 4,
"image": "/uploads/20191207/7a9772ee5e3947c8ad0e8bff2069e1ac.jpg",
"url": ""
},
]
}
})
...
...
@@ -59,12 +67,11 @@ class Brand extends Api
}
$arr
[
'data'
]
=
$res
;
//品牌专区轮播图
$res1
=
Common
::
selectData
(
'btbanner'
,
'id,image'
);
$images
=
[];
foreach
(
$res1
as
$value1
){
array_push
(
$images
,
$this
->
auth
->
absolutionUrlOne
(
$value1
[
'image'
]));
$res1
=
Common
::
selectData
(
'btbanner'
,
'id,image,url'
);
foreach
(
$res1
as
&
$value1
){
$value
[
'images'
]
=
$this
->
auth
->
absolutionUrlOne
(
$value1
[
'image'
]);
}
$arr
[
'images'
]
=
$
images
;
$arr
[
'images'
]
=
$
res1
;
$this
->
success
(
'成功'
,
$arr
);
}
else
{
$this
->
error
(
'请求方式错误'
);
...
...
public/api.html
查看文件 @
e00fdc0
...
...
@@ -332,9 +332,17 @@
"address": "葡萄牙2"
}
],
"images": [//品牌专区右侧轮播图
"http://jinglong.springchunjia.cn/uploads/20191127/febfea9a34c918cb2f100f669ede2547.png",
"http://jinglong.springchunjia.cn/uploads/20191127/042a3256122af7b10e26efb5e7649904.png"
"images": [//右侧轮播图
{
"id": 5,
"image": "/uploads/20191127/d36d8475bc3bdb999dff26d019c608ed.png",//图片
"url": "/pages/index/brandDetail/brandDetail?id=1"//路径
},
{
"id": 4,
"image": "/uploads/20191207/7a9772ee5e3947c8ad0e8bff2069e1ac.jpg",
"url": ""
},
]
}
}
</pre>
...
...
@@ -3126,6 +3134,7 @@
{
"id": 1,//轮播图id
"image": ""//图片路径
"url": ""//跳转链接
},
{
"id": 2,
...
...
@@ -3135,6 +3144,7 @@
"res_advert": {//活动广告位(没有则不显示)
"id": 1,//id
"image": "http://jinglong.springchunjia.cn/uploads/20191127/febfea9a34c918cb2f100f669ede2547.png"//图片路径
"url": ""//跳转链接
},
"res_design": [//设计师作品
{
...
...
@@ -3280,6 +3290,7 @@
"data": {//没有则不显示
"id": 2,//弹窗广告位id
"image": "http://jinglong.springchunjia.cn/uploads/20191127/0b20812d4f80307dd1025db71d690395.png"//图片路径
"url": ""//跳转链接
}
}
</pre>
</div>
...
...
@@ -7479,7 +7490,7 @@
<div
class=
"row mt0 footer"
>
<div
class=
"col-md-6"
align=
"left"
>
Generated on 2019-12-10 1
3:15:29
</div>
Generated on 2019-12-10 1
5:38:45
</div>
<div
class=
"col-md-6"
align=
"right"
>
<a
href=
"https://www.fastadmin.net"
target=
"_blank"
>
FastAdmin
</a>
</div>
...
...
public/assets/js/backend/btbanner.js
查看文件 @
e00fdc0
...
...
@@ -26,6 +26,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
{
checkbox
:
true
},
{
field
:
'id'
,
title
:
__
(
'Id'
)},
{
field
:
'image'
,
title
:
__
(
'Image'
),
events
:
Table
.
api
.
events
.
image
,
formatter
:
Table
.
api
.
formatter
.
image
},
{
field
:
'url'
,
title
:
__
(
'Url'
)},
{
field
:
'createtime'
,
title
:
__
(
'Createtime'
),
operate
:
'RANGE'
,
addclass
:
'datetimerange'
,
formatter
:
Table
.
api
.
formatter
.
datetime
},
{
field
:
'operate'
,
title
:
__
(
'Operate'
),
table
:
table
,
events
:
Table
.
api
.
events
.
operate
,
formatter
:
Table
.
api
.
formatter
.
operate
}
]
...
...
public/assets/js/backend/btype.js
查看文件 @
e00fdc0
...
...
@@ -27,6 +27,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
{
field
:
'id'
,
title
:
__
(
'Id'
)},
{
field
:
'image'
,
title
:
__
(
'Image'
),
events
:
Table
.
api
.
events
.
image
,
formatter
:
Table
.
api
.
formatter
.
image
},
{
field
:
'name'
,
title
:
__
(
'Name'
)},
{
field
:
'tag'
,
title
:
__
(
'Tag'
)},
{
field
:
'address'
,
title
:
__
(
'Address'
)},
{
field
:
'introduce'
,
title
:
__
(
'Introduce'
)},
// {field: 'file', title: __('File')},
...
...
请
注册
或
登录
后发表评论