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

---
 App.vue                   |  4 +++-
 changelog.md              | 11 +++++++++++
 common/js/common/share.js | 18 ++++++++++++------
 3 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/App.vue b/App.vue
index a992617c..3c9eddb4 100644
--- a/App.vue
+++ b/App.vue
@@ -30,7 +30,9 @@
                 // 成功圆形提示图片
                 default_round_success_icon: "/static/images/common/round-success-icon.png",
                 // 错误圆形提示图片
-                default_round_error_icon: "/static/images/common/round-error-icon.png",
+                default_round_error_icon: "/static/images/common/round-error-icon.png",
+                // 分享及转发使用页面设置的默认图片及系统默认图片（true 是, false 否）
+                is_share_use_image: true,
                 // tabbar页面
                 tabbar_pages: [
                     "/pages/index/index",
diff --git a/changelog.md b/changelog.md
index b6fd507c..41d10e3f 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,3 +1,14 @@
+## v2.2.5（2022-03-10）
+* 基础组件类库更新
+* 商品详情新增智能工具插件信息提示
+* 订单取消后隐藏支付按钮，细节优化
+* 登录加提现优化
+* 去除微信圈子组件
+* 分享默认地址优化
+* 新增门店独立首页和搜索页
+* 新增分享及转发使用页面设置的图片开关
+
+
 ## v2.2.4（2022-02-16）
 * 商品海报配置优化
 * 博客支持首页展示及优化
diff --git a/common/js/common/share.js b/common/js/common/share.js
index 81f47ce7..bf333f06 100644
--- a/common/js/common/share.js
+++ b/common/js/common/share.js
@@ -18,22 +18,28 @@ export default {
     onShareAppMessage() {
         var app = getApp();
         var share = app.globalData.share_content_handle(this.share_info || {});
-        return {
+        var data = {
             title: share.title,
             desc: share.desc,
-            path: share.path + share.query,
-            imageUrl: share.img
+            path: share.path + share.query
         }
+        if(app.globalData.data.is_share_use_image) {
+            data['imageUrl'] = share.img;
+        }
+        return data;
     },
 
     // 分享朋友圈
     onShareTimeline() {
         var app = getApp();
         var share = app.globalData.share_content_handle(this.share_info || {});
-        return {
+        var data = {
             title: share.title,
-            query: ((share.query || null) != null && share.query.substr(0, 1) == '?') ? share.query.slice(1) : share.query,
-            imageUrl: share.img
+            query: ((share.query || null) != null && share.query.substr(0, 1) == '?') ? share.query.slice(1) : share.query
         };
+        if(app.globalData.data.is_share_use_image) {
+            data['imageUrl'] = share.img;
+        }
+        return data;
     }
 }
\ No newline at end of file