Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
jcy2004x
ShopXO
提交
291ff7ae
ShopXO
项目概览
jcy2004x
/
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,发现更多精彩内容 >>
提交
291ff7ae
编写于
5月 27, 2021
作者:
D
Devil
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
v2.0.3
上级
894cc145
变更
10
显示空白变更内容
内联
并排
Showing
10 changed file
with
40 addition
and
297 deletion
+40
-297
application/index/view/default/config.json
application/index/view/default/config.json
+1
-1
application/lang/zh-cn.php
application/lang/zh-cn.php
+1
-0
application/tags.php
application/tags.php
+0
-259
changelog.txt
changelog.txt
+4
-3
config/shopxo.php
config/shopxo.php
+1
-1
config/shopxo.sql
config/shopxo.sql
+29
-29
public/core.php
public/core.php
+1
-1
public/static/common/lib/ueditor/dialogs/map/map.html
public/static/common/lib/ueditor/dialogs/map/map.html
+1
-1
public/static/common/lib/ueditor/dialogs/map/show.html
public/static/common/lib/ueditor/dialogs/map/show.html
+1
-1
public/static/index/default/css/cart.css
public/static/index/default/css/cart.css
+1
-1
未找到文件。
application/index/view/default/config.json
浏览文件 @
291ff7ae
{
"name"
:
"默认主题"
,
"ver"
:
"2.0.
2
"
,
"ver"
:
"2.0.
3
"
,
"author"
:
"Devil"
,
"home"
:
"https://shopxo.net/"
}
\ No newline at end of file
application/lang/zh-cn.php
浏览文件 @
291ff7ae
...
...
@@ -35,6 +35,7 @@ return [
'2.0.0'
=>
[
'value'
=>
'2.0.0'
,
'name'
=>
'v2.0.0'
],
'2.0.1'
=>
[
'value'
=>
'2.0.1'
,
'name'
=>
'v2.0.1'
],
'2.0.2'
=>
[
'value'
=>
'2.0.2'
,
'name'
=>
'v2.0.2'
],
'2.0.3'
=>
[
'value'
=>
'2.0.3'
,
'name'
=>
'v2.0.3'
],
],
// 用户注册类型列表
...
...
application/tags.php
浏览文件 @
291ff7ae
...
...
@@ -32,264 +32,5 @@ return array (
'log_write'
=>
array
(
),
'plugins_admin_css'
=>
array
(
0
=>
'app\\plugins\\shop\\Hook'
,
),
'plugins_css'
=>
array
(
0
=>
'app\\plugins\\shop\\Hook'
,
1
=>
'app\\plugins\\excellentbuyreturntocash\\Hook'
,
2
=>
'app\\plugins\\coupon\\Hook'
,
3
=>
'app\\plugins\\distribution\\Hook'
,
4
=>
'app\\plugins\\exchangerate\\Hook'
,
),
'plugins_js'
=>
array
(
0
=>
'app\\plugins\\shop\\Hook'
,
1
=>
'app\\plugins\\coupon\\Hook'
,
2
=>
'app\\plugins\\distribution\\Hook'
,
3
=>
'app\\plugins\\exchangerate\\Hook'
,
),
'plugins_service_navigation_header_handle'
=>
array
(
0
=>
'app\\plugins\\shop\\Hook'
,
1
=>
'app\\plugins\\coupon\\Hook'
,
),
'plugins_service_users_center_left_menu_handle'
=>
array
(
0
=>
'app\\plugins\\shop\\Hook'
,
1
=>
'app\\plugins\\excellentbuyreturntocash\\Hook'
,
2
=>
'app\\plugins\\coupon\\Hook'
,
3
=>
'app\\plugins\\distribution\\Hook'
,
),
'plugins_service_header_navigation_top_right_handle'
=>
array
(
0
=>
'app\\plugins\\shop\\Hook'
,
1
=>
'app\\plugins\\excellentbuyreturntocash\\Hook'
,
2
=>
'app\\plugins\\coupon\\Hook'
,
3
=>
'app\\plugins\\distribution\\Hook'
,
4
=>
'app\\plugins\\exchangerate\\Hook'
,
),
'plugins_service_goods_save_handle'
=>
array
(
0
=>
'app\\plugins\\shop\\Hook'
,
),
'plugins_service_editor_path_type_admin_goods_saveinfo'
=>
array
(
0
=>
'app\\plugins\\shop\\Hook'
,
),
'plugins_view_goods_detail_right_content_bottom'
=>
array
(
0
=>
'app\\plugins\\shop\\Hook'
,
),
'plugins_view_goods_detail_base_bottom'
=>
array
(
0
=>
'app\\plugins\\shop\\Hook'
,
),
'plugins_view_goods_detail_base_buy_nav_min_inside_begin'
=>
array
(
0
=>
'app\\plugins\\shop\\Hook'
,
),
'plugins_service_warehouse_handle_end'
=>
array
(
0
=>
'app\\plugins\\shop\\Hook'
,
),
'plugins_service_buy_handle'
=>
array
(
0
=>
'app\\plugins\\shop\\Hook'
,
),
'plugins_service_buy_order_insert_begin'
=>
array
(
0
=>
'app\\plugins\\shop\\Hook'
,
1
=>
'app\\plugins\\excellentbuyreturntocash\\Hook'
,
),
'plugins_service_buy_order_insert_end'
=>
array
(
0
=>
'app\\plugins\\shop\\Hook'
,
1
=>
'app\\plugins\\excellentbuyreturntocash\\Hook'
,
2
=>
'app\\plugins\\distribution\\Hook'
,
),
'plugins_service_order_status_change_history_success_handle'
=>
array
(
0
=>
'app\\plugins\\shop\\Hook'
,
1
=>
'app\\plugins\\excellentbuyreturntocash\\Hook'
,
2
=>
'app\\plugins\\coupon\\Hook'
,
3
=>
'app\\plugins\\distribution\\Hook'
,
),
'plugins_service_order_aftersale_audit_handle_end'
=>
array
(
0
=>
'app\\plugins\\shop\\Hook'
,
1
=>
'app\\plugins\\excellentbuyreturntocash\\Hook'
,
2
=>
'app\\plugins\\distribution\\Hook'
,
),
'plugins_view_admin_goods_save'
=>
array
(
0
=>
'app\\plugins\\shop\\Hook'
,
),
'plugins_service_goods_handle_end'
=>
array
(
0
=>
'app\\plugins\\shop\\Hook'
,
1
=>
'app\\plugins\\distribution\\Hook'
,
2
=>
'app\\plugins\\exchangerate\\Hook'
,
),
'plugins_module_form_admin_goods_index'
=>
array
(
0
=>
'app\\plugins\\shop\\Hook'
,
),
'plugins_module_form_admin_goods_detail'
=>
array
(
0
=>
'app\\plugins\\shop\\Hook'
,
),
'plugins_service_goods_buy_nav_button_handle'
=>
array
(
0
=>
'app\\plugins\\shop\\Hook'
,
),
'plugins_view_goods_detail_panel_bottom'
=>
array
(
0
=>
'app\\plugins\\excellentbuyreturntocash\\Hook'
,
1
=>
'app\\plugins\\coupon\\Hook'
,
),
'plugins_view_goods_detail_title'
=>
array
(
0
=>
'app\\plugins\\excellentbuyreturntocash\\Hook'
,
),
'plugins_view_buy_group_goods_inside_bottom'
=>
array
(
0
=>
'app\\plugins\\coupon\\Hook'
,
),
'plugins_service_buy_group_goods_handle'
=>
array
(
0
=>
'app\\plugins\\coupon\\Hook'
,
),
'plugins_view_buy_form_inside'
=>
array
(
0
=>
'app\\plugins\\coupon\\Hook'
,
),
'plugins_service_buy_order_insert_success'
=>
array
(
0
=>
'app\\plugins\\coupon\\Hook'
,
),
'plugins_service_user_register_end'
=>
array
(
0
=>
'app\\plugins\\coupon\\Hook'
,
1
=>
'app\\plugins\\thirdpartylogin\\Hook'
,
),
'plugins_service_base_data_return_api_goods_detail'
=>
array
(
0
=>
'app\\plugins\\coupon\\Hook'
,
),
'plugins_service_base_data_return_api_buy_index'
=>
array
(
0
=>
'app\\plugins\\coupon\\Hook'
,
),
'plugins_view_admin_goods_list_operate'
=>
array
(
0
=>
'app\\plugins\\intellectstools\\Hook'
,
),
'plugins_view_admin_order_list_operate'
=>
array
(
0
=>
'app\\plugins\\intellectstools\\Hook'
,
),
'plugins_service_site_extraction_address_list'
=>
array
(
0
=>
'app\\plugins\\distribution\\Hook'
,
),
'plugins_service_goods_spec_extends_handle'
=>
array
(
0
=>
'app\\plugins\\distribution\\Hook'
,
),
'plugins_view_admin_user_save'
=>
array
(
0
=>
'app\\plugins\\distribution\\Hook'
,
),
'plugins_service_user_save_handle'
=>
array
(
0
=>
'app\\plugins\\distribution\\Hook'
,
),
'plugins_service_goods_spec_base'
=>
array
(
0
=>
'app\\plugins\\distribution\\Hook'
,
1
=>
'app\\plugins\\exchangerate\\Hook'
,
),
'plugins_view_goods_detail_panel_price_top'
=>
array
(
0
=>
'app\\plugins\\distribution\\Hook'
,
),
'plugins_module_form_admin_user_index'
=>
array
(
0
=>
'app\\plugins\\distribution\\Hook'
,
),
'plugins_module_form_admin_user_detail'
=>
array
(
0
=>
'app\\plugins\\distribution\\Hook'
,
),
'plugins_service_quick_navigation_pc'
=>
array
(
0
=>
'app\\plugins\\distribution\\Hook'
,
1
=>
'app\\plugins\\exchangerate\\Hook'
,
),
'plugins_service_quick_navigation_h5'
=>
array
(
0
=>
'app\\plugins\\distribution\\Hook'
,
1
=>
'app\\plugins\\exchangerate\\Hook'
,
),
'plugins_service_quick_navigation_weixin'
=>
array
(
0
=>
'app\\plugins\\distribution\\Hook'
,
1
=>
'app\\plugins\\exchangerate\\Hook'
,
),
'plugins_service_quick_navigation_alipay'
=>
array
(
0
=>
'app\\plugins\\distribution\\Hook'
,
1
=>
'app\\plugins\\exchangerate\\Hook'
,
),
'plugins_service_quick_navigation_baidu'
=>
array
(
0
=>
'app\\plugins\\distribution\\Hook'
,
1
=>
'app\\plugins\\exchangerate\\Hook'
,
),
'plugins_service_quick_navigation_qq'
=>
array
(
0
=>
'app\\plugins\\distribution\\Hook'
,
1
=>
'app\\plugins\\exchangerate\\Hook'
,
),
'plugins_service_quick_navigation_toutiao'
=>
array
(
0
=>
'app\\plugins\\distribution\\Hook'
,
1
=>
'app\\plugins\\exchangerate\\Hook'
,
),
'plugins_view_common_bottom'
=>
array
(
0
=>
'app\\plugins\\exchangerate\\Hook'
,
),
'plugins_service_currency_data'
=>
array
(
0
=>
'app\\plugins\\exchangerate\\Hook'
,
),
'plugins_view_user_login_inside_bottom'
=>
array
(
0
=>
'app\\plugins\\thirdpartylogin\\Hook'
,
),
'plugins_view_user_reg_info_inside_bottom'
=>
array
(
0
=>
'app\\plugins\\thirdpartylogin\\Hook'
,
),
'plugins_view_user_login_info_top'
=>
array
(
0
=>
'app\\plugins\\thirdpartylogin\\Hook'
,
),
'plugins_view_user_reg_info'
=>
array
(
0
=>
'app\\plugins\\thirdpartylogin\\Hook'
,
),
'plugins_service_user_login_end'
=>
array
(
0
=>
'app\\plugins\\thirdpartylogin\\Hook'
,
),
'plugins_service_users_personal_show_field_list_handle'
=>
array
(
0
=>
'app\\plugins\\thirdpartylogin\\Hook'
,
),
);
?>
\ No newline at end of file
changelog.txt
浏览文件 @
291ff7ae
+=========================================================+
ShopXO 2.0.3 Release
000000
http://shopxo.net
ShopXO 2.0.3 Release
20210527
http://shopxo.net
+=========================================================+
全局
1.
1. 用户注册新增用户隐私协议
2. 文件下载安全修复
web端
1. 系统更新+插件更新优化
...
...
@@ -11,12 +12,12 @@ web端
4. 插件/主题打包新增版本号
5. 商品编辑优化
6. api接口新增更多配置信息
7. 用户注册新增用户隐私协议
插件
1. 优购返现插件新增按照订单金额返券
2. 优惠券插件修复web端未登录点击领取无响应
3. 新增智能工具箱插件
4. 新增第三方登录插件
+=========================================================+
...
...
config/shopxo.php
浏览文件 @
291ff7ae
...
...
@@ -28,7 +28,7 @@ if(substr($cdn_public_host, -1) != DS)
// 配置信息
return
[
// 开发模式
'is_develop'
=>
tru
e
,
'is_develop'
=>
fals
e
,
// 默认编码
'default_charset'
=>
'utf-8'
,
...
...
config/shopxo.sql
浏览文件 @
291ff7ae
因为 它太大了无法显示 source diff 。你可以改为
查看blob
。
public/core.php
浏览文件 @
291ff7ae
...
...
@@ -13,7 +13,7 @@
if
(
version_compare
(
PHP_VERSION
,
'5.6.0'
,
'<'
))
die
(
'PHP版本最低 5.6.0'
);
// 系统版本
define
(
'APPLICATION_VERSION'
,
'v2.0.
2
'
);
define
(
'APPLICATION_VERSION'
,
'v2.0.
3
'
);
// 定义系统目录分隔符
define
(
'DS'
,
'/'
);
...
...
public/static/common/lib/ueditor/dialogs/map/map.html
浏览文件 @
291ff7ae
...
...
@@ -4,7 +4,7 @@
<meta
http-equiv=
"Content-Type"
content=
"text/html; charset=utf-8"
/>
<title></title>
<script
type=
"text/javascript"
src=
"../internal.js"
></script>
<script
type=
"text/javascript"
src=
"https://api.map.baidu.com/api?v=2.0&ak=
XSdiGjfg3wOHiKjpYEMG6CYA
"
></script>
<script
type=
"text/javascript"
src=
"https://api.map.baidu.com/api?v=2.0&ak=
{{common_baidu_map_ak}}
"
></script>
<style
type=
"text/css"
>
.content
{
width
:
530px
;
height
:
350px
;
margin
:
10px
auto
;}
.content
table
{
width
:
100%
}
...
...
public/static/common/lib/ueditor/dialogs/map/show.html
浏览文件 @
291ff7ae
...
...
@@ -14,7 +14,7 @@
overflow
:
hidden
;
}
</style>
<script
type=
"text/javascript"
src=
"https://api.map.baidu.com/api?v=2.0&ak=
XSdiGjfg3wOHiKjpYEMG6CYA
"
></script>
<script
type=
"text/javascript"
src=
"https://api.map.baidu.com/api?v=2.0&ak=
{{common_baidu_map_ak}}
"
></script>
</head>
<body
onload=
"initMap();"
>
...
...
public/static/index/default/css/cart.css
浏览文件 @
291ff7ae
...
...
@@ -10,7 +10,7 @@
.line-price
{
color
:
#3c3c3c
;
}
.line-price
,
strong
.total-price-content
,
.nav-total-price
{
font-weight
:
700
;
}
.stock-tag
{
width
:
100px
;
}
.stock-tag
.am-form-field
{
padding
:
3px
;
height
:
25px
;
text-align
:
center
;
font-size
:
1
6px
!important
;
}
.stock-tag
.am-form-field
{
padding
:
3px
;
height
:
25px
;
text-align
:
center
;
font-size
:
1
4px
!important
;
width
:
80px
;
}
.stock-tag
.am-input-group-label
{
line-height
:
23px
;
height
:
25px
;
font-size
:
14px
!important
;
padding
:
0
10px
;
}
.stock-tag
.am-input-group-label
,
.cart-nav
label
{
cursor
:
pointer
;
}
.selected-tips
strong
,
.nav-total-price
{
font-size
:
16px
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录