Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
纵之格
ShopXO
提交
e1798f3d
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,体验更适合开发者的 AI 搜索 >>
提交
e1798f3d
编写于
3月 07, 2021
作者:
D
Devil
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
自提点新增loho图片展示
上级
f58f45e4
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
46 addition
and
30 deletion
+46
-30
application/admin/controller/Site.php
application/admin/controller/Site.php
+1
-1
application/admin/view/default/site/sitetype/index.html
application/admin/view/default/site/sitetype/index.html
+3
-8
application/index/view/default/buy/index.html
application/index/view/default/buy/index.html
+24
-17
changelog.txt
changelog.txt
+3
-0
public/static/admin/default/js/site.js
public/static/admin/default/js/site.js
+11
-4
public/static/index/default/css/buy.css
public/static/index/default/css/buy.css
+4
-0
未找到文件。
application/admin/controller/Site.php
浏览文件 @
e1798f3d
...
@@ -311,7 +311,7 @@ class Site extends Common
...
@@ -311,7 +311,7 @@ class Site extends Common
foreach
(
$address
as
$k
=>
$v
)
foreach
(
$address
as
$k
=>
$v
)
{
{
$address
[
$k
][
'id'
]
=
$k
;
$address
[
$k
][
'id'
]
=
$k
;
$address
[
$k
][
'logo'
]
=
ResourcesService
::
AttachmentPathHandle
(
$v
[
'logo'
]);
$address
[
$k
][
'logo'
]
=
empty
(
$v
[
'logo'
])
?
''
:
ResourcesService
::
AttachmentPathHandle
(
$v
[
'logo'
]);
}
}
$params
[
'common_self_extraction_address'
]
=
json_encode
(
$address
,
JSON_UNESCAPED_UNICODE
);
$params
[
'common_self_extraction_address'
]
=
json_encode
(
$address
,
JSON_UNESCAPED_UNICODE
);
}
}
...
...
application/admin/view/default/site/sitetype/index.html
浏览文件 @
e1798f3d
...
@@ -135,7 +135,7 @@
...
@@ -135,7 +135,7 @@
<!-- right content end -->
<!-- right content end -->
<!-- 自提点地址添加弹层 -->
<!-- 自提点地址添加弹层 -->
<div
class=
"am-popup"
id=
"popup-address-win"
data-default-logo=
"{{$attachment_host}}/static/admin/default/images/default-images.jpg"
>
<div
class=
"am-popup"
id=
"popup-address-win"
>
<div
class=
"am-popup-inner"
>
<div
class=
"am-popup-inner"
>
<div
class=
"am-popup-hd"
>
<div
class=
"am-popup-hd"
>
<h4
class=
"am-popup-title"
>
地址添加
</h4>
<h4
class=
"am-popup-title"
>
地址添加
</h4>
...
@@ -144,13 +144,8 @@
...
@@ -144,13 +144,8 @@
<div
class=
"am-popup-bd"
>
<div
class=
"am-popup-bd"
>
<form
class=
"am-form form-validation-address"
method=
"post"
request-type=
"sync"
request-value=
"ViewAddressModalBack"
>
<form
class=
"am-form form-validation-address"
method=
"post"
request-type=
"sync"
request-value=
"ViewAddressModalBack"
>
<div
class=
"am-form-group am-form-file"
>
<div
class=
"am-form-group am-form-file"
>
<label
class=
"block"
>
logo图片
<span
class=
"am-form-group-label-tips-must"
>
必传
</span><span
class=
"am-form-group-label-tips"
>
建议300x300px
</span></label>
<label
class=
"block"
>
logo图片
<span
class=
"am-form-group-label-tips"
>
选传
</span><span
class=
"am-form-group-label-tips"
>
建议300x300px
</span></label>
<ul
class=
"plug-file-upload-view sitetype-logo"
data-form-name=
"logo"
data-max-number=
"1"
data-delete=
"0"
data-dialog-type=
"images"
>
<ul
class=
"plug-file-upload-view sitetype-logo"
data-form-name=
"logo"
data-max-number=
"1"
data-dialog-type=
"images"
></ul>
<li>
<input
type=
"text"
name=
"logo"
value=
""
data-validation-message=
"请上传logo图片"
required
/>
<img
src=
"{{$attachment_host}}/static/admin/default/images/default-images.jpg"
/>
</li>
</ul>
<div
class=
"plug-file-upload-submit"
data-view-tag=
"ul.sitetype-logo"
>
+上传图片
</div>
<div
class=
"plug-file-upload-submit"
data-view-tag=
"ul.sitetype-logo"
>
+上传图片
</div>
</div>
</div>
<div
class=
"am-form-group"
>
<div
class=
"am-form-group"
>
...
...
application/index/view/default/buy/index.html
浏览文件 @
e1798f3d
...
@@ -173,23 +173,30 @@
...
@@ -173,23 +173,30 @@
<div
class=
"am-popup-bd"
>
<div
class=
"am-popup-bd"
>
<ul
class=
"am-list"
>
<ul
class=
"am-list"
>
{{foreach $base.extraction_address as $key=>$address}}
{{foreach $base.extraction_address as $key=>$address}}
<li
class=
"extraction-address-item"
data-value=
"{{$key}}"
>
<li
class=
"extraction-address-item am-nbfc"
data-value=
"{{$key}}"
>
<p>
{{if !empty($address['logo'])}}
{{if !empty($address['alias'])}}
<div
class=
"am-fl am-margin-right-xs"
>
<span
class=
"am-badge am-badge-secondary-plain am-radius am-margin-right-xs"
>
{{$address.alias}}
</span>
<img
src=
"{{$address.logo}}"
alt=
"{{$address.name}}"
class=
"am-img-thumbnail am-radius address-logo"
/>
{{/if}}
</div>
<span>
{{$address.name}}
</span>
{{/if}}
<span>
{{$address.tel}}
</span>
<div
class=
"am-fl"
>
</p>
<p>
<p
class=
"address-detail"
>
{{if !empty($address['alias'])}}
<span>
{{$address.province_name}}
</span>
<span
class=
"am-badge am-badge-secondary-plain am-radius am-margin-right-xs"
>
{{$address.alias}}
</span>
<span>
{{$address.city_name}}
</span>
{{/if}}
<span>
{{$address.county_name}}
</span>
<span>
{{$address.name}}
</span>
<span>
{{$address.address}}
</span>
<span>
{{$address.tel}}
</span>
{{if !empty($address['lng']) and !empty($address['lat'])}}
</p>
<a
href=
"javascript:;"
class=
"am-badge am-badge-default am-radius extraction-address-map-submit am-icon-map-marker am-margin-left-sm"
data-lng=
"{{$address.lng}}"
data-lat=
"{{$address.lat}}"
>
查看地图
</a>
<p
class=
"address-detail"
>
{{/if}}
<span>
{{$address.province_name}}
</span>
</p>
<span>
{{$address.city_name}}
</span>
<span>
{{$address.county_name}}
</span>
<span>
{{$address.address}}
</span>
{{if !empty($address['lng']) and !empty($address['lat'])}}
<a
href=
"javascript:;"
class=
"am-badge am-badge-default am-radius extraction-address-map-submit am-icon-map-marker am-margin-left-sm"
data-lng=
"{{$address.lng}}"
data-lat=
"{{$address.lat}}"
>
查看地图
</a>
{{/if}}
</p>
</div>
{{if (isset($params['address_id']) and $params['address_id'] eq $key) or (!empty($base['address']) and $base.address.id eq $key)}}
{{if (isset($params['address_id']) and $params['address_id'] eq $key) or (!empty($base['address']) and $base.address.id eq $key)}}
<button
type=
"button"
class=
"am-btn am-btn-default am-radius"
disabled
>
已选
</button>
<button
type=
"button"
class=
"am-btn am-btn-default am-radius"
disabled
>
已选
</button>
{{else /}}
{{else /}}
...
...
changelog.txt
浏览文件 @
e1798f3d
...
@@ -11,6 +11,8 @@
...
@@ -11,6 +11,8 @@
7. 新增翼支付方式
7. 新增翼支付方式
8. 商品详情购买导航按钮统一标准化
8. 商品详情购买导航按钮统一标准化
9. 非兼容模式去掉index.php
9. 非兼容模式去掉index.php
10. 已完成订单退数量,则释放销量
11. 自提取货点新增logo图片
web端
web端
1. 编辑器图片、附件、视频多选支持按照顺序选择插入编辑器
1. 编辑器图片、附件、视频多选支持按照顺序选择插入编辑器
...
@@ -28,6 +30,7 @@ web端
...
@@ -28,6 +30,7 @@ web端
插件
插件
1. 应用商店(在线自动安装应用插件、开发者提供优质插件、VIP授权管理)
1. 应用商店(在线自动安装应用插件、开发者提供优质插件、VIP授权管理)
2. 新增主题自动切换插件
+=========================================================+
+=========================================================+
...
...
public/static/admin/default/js/site.js
浏览文件 @
e1798f3d
...
@@ -103,8 +103,7 @@ $(function()
...
@@ -103,8 +103,7 @@ $(function()
$popup_address
.
attr
(
'
data-type
'
,
'
add
'
);
$popup_address
.
attr
(
'
data-type
'
,
'
add
'
);
// logo
// logo
$popup_address
.
find
(
'
.sitetype-logo input[name="logo"]
'
).
val
(
''
);
$popup_address
.
find
(
'
.sitetype-logo
'
).
html
(
''
);
$popup_address
.
find
(
'
.sitetype-logo img
'
).
attr
(
'
src
'
,
$popup_address
.
data
(
'
default-logo
'
));
// 清空数据
// 清空数据
FormDataFill
({
"
alias
"
:
""
,
"
name
"
:
""
,
"
tel
"
:
""
,
"
address
"
:
""
,
"
province
"
:
0
,
"
city
"
:
0
,
"
county
"
:
0
,
"
lng
"
:
""
,
"
lat
"
:
""
},
'
form.form-validation-address
'
);
FormDataFill
({
"
alias
"
:
""
,
"
name
"
:
""
,
"
tel
"
:
""
,
"
address
"
:
""
,
"
province
"
:
0
,
"
city
"
:
0
,
"
county
"
:
0
,
"
lng
"
:
""
,
"
lat
"
:
""
},
'
form.form-validation-address
'
);
...
@@ -155,8 +154,16 @@ $(function()
...
@@ -155,8 +154,16 @@ $(function()
}
}
// logo
// logo
$popup_address
.
find
(
'
.sitetype-logo input[name="logo"]
'
).
val
(
item
.
logo
||
''
);
var
html
=
''
;
$popup_address
.
find
(
'
.sitetype-logo img
'
).
attr
(
'
src
'
,
item
.
logo
||
$popup_address
.
data
(
'
default-logo
'
));
if
((
item
.
logo
||
null
)
!=
null
)
{
html
+=
'
<li>
'
;
html
+=
'
<input type="text" name="logo" value="
'
+
item
.
logo
+
'
" data-validation-message="请上传logo图片" required />
'
;
html
+=
'
<img src="
'
+
item
.
logo
+
'
" alt="
'
+
item
.
name
+
'
" />
'
;
html
+=
'
<i>×</i>
'
;
html
+=
'
</li>
'
;
}
$popup_address
.
find
(
'
.sitetype-logo
'
).
html
(
html
);
// 数据填充
// 数据填充
FormDataFill
(
item
,
'
form.form-validation-address
'
);
FormDataFill
(
item
,
'
form.form-validation-address
'
);
...
...
public/static/index/default/css/buy.css
浏览文件 @
e1798f3d
...
@@ -232,6 +232,10 @@ ul.address-list, .business-item ul { overflow: hidden; }
...
@@ -232,6 +232,10 @@ ul.address-list, .business-item ul { overflow: hidden; }
padding
:
10px
5px
;
padding
:
10px
5px
;
border-color
:
#eee
;
border-color
:
#eee
;
}
}
#extraction-address-popup
.address-logo
{
width
:
38px
;
height
:
38px
;
}
#extraction-address-popup
.am-list
>
li
:first-child
{
#extraction-address-popup
.am-list
>
li
:first-child
{
border-top
:
0
;
border-top
:
0
;
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录