From eb475e9e15bae0d39a482d706b9d77762f4d0d2f Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Tue, 8 Mar 2022 12:02:12 +0800
Subject: [PATCH] v2.2.5

---
 README.md                          |  1 +
 app/index/view/default/config.json |  2 +-
 app/service/ConstService.php       |  1 +
 changelog.txt                      | 21 +++++++++++++++++++++
 public/core.php                    |  2 +-
 5 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index f426972a5..6dbb51a5e 100755
--- a/README.md
+++ b/README.md
@@ -47,6 +47,7 @@
 * 官方2群：641730223
 * 官方3群：1127073697
 * 官方多商户群：782971010
+* 官方多门店群：281418967
 * 官方uniapp群：679303149
 
 ### 当前项目源代码平台
diff --git a/app/index/view/default/config.json b/app/index/view/default/config.json
index b1082ea1b..922e8b1a2 100755
--- a/app/index/view/default/config.json
+++ b/app/index/view/default/config.json
@@ -1,6 +1,6 @@
 {
 	"name":"默认主题",
-	"ver":"2.2.4",
+	"ver":"2.2.5",
 	"author":"Devil",
 	"home":"https://shopxo.net/"
 }
\ No newline at end of file
diff --git a/app/service/ConstService.php b/app/service/ConstService.php
index 2d8aedfd9..639a673dd 100644
--- a/app/service/ConstService.php
+++ b/app/service/ConstService.php
@@ -90,6 +90,7 @@ class ConstService
                 '2.2.2' => ['value' => '2.2.2', 'name' => 'v2.2.2'],
                 '2.2.3' => ['value' => '2.2.3', 'name' => 'v2.2.3'],
                 '2.2.4' => ['value' => '2.2.4', 'name' => 'v2.2.4'],
+                '2.2.5' => ['value' => '2.2.5', 'name' => 'v2.2.5'],
             ],
 
             // 用户注册类型列表
diff --git a/changelog.txt b/changelog.txt
index 00e80b88c..eab14e010 100755
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,24 @@
++=========================================================+
+   ShopXO 2.2.5 Release 20220310 http://shopxo.net
++=========================================================+
+全局
+	1. 物流插件新增菜鸟调试接口
+	2. 系统购买商品赠送积分优化、增加脚本按周期发放
+	3. 用户管理新增锁定积分修改
+	4. 分页组件新增提示信息
+	5. 下单支付优化
+	6. 可视化拖拽设计模块新增门店和博客
+	7. 新增挂账支付方式
+	8. 删除插件会删除附件修复
+	9. 动态列表组件支持模块引入单独配置
+	10. 去除微信圈子组件
+	11. 图片验证码精度优化
+	12. 多商户插件商家中心UI全新优化、独立后台、独立登录页
+	13. 门店支持独立登录页、扫描录单、新增扩展模块（货物寄存、挂账支付）
+	14. 智能工具插件新增商品详情信息提示
+	15. 支付宝+百度支付插件方法更新适配php8
+
+
 +=========================================================+
    ShopXO 2.2.4 Release 20220216 http://shopxo.net
 +=========================================================+
diff --git a/public/core.php b/public/core.php
index 7a15666f6..722811358 100755
--- a/public/core.php
+++ b/public/core.php
@@ -10,7 +10,7 @@
 // +----------------------------------------------------------------------
 
 // 系统版本
-define('APPLICATION_VERSION', 'v2.2.4');
+define('APPLICATION_VERSION', 'v2.2.5');
 
 // 检测PHP环境
 if(version_compare(PHP_VERSION,'7.4.0','<'))