From 7c79d2cf65cf72d7215b5a772a76ea92e9614255 Mon Sep 17 00:00:00 2001
From: Galen Zhao <github@zhenggangzhao.org>
Date: Wed, 24 Jul 2019 19:42:35 +0800
Subject: [PATCH] add share hidden func (#239)

---
 .../org/linlinjava/litemall/wx/web/WxGoodsController.java     | 4 ++++
 litemall-wx/pages/goods/goods.js                              | 4 +++-
 litemall-wx/pages/goods/goods.wxml                            | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxGoodsController.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxGoodsController.java
index df42cf315..de6b06658 100644
--- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxGoodsController.java
+++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxGoodsController.java
@@ -4,6 +4,7 @@
 import com.mysql.jdbc.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.linlinjava.litemall.core.system.SystemConfig;
 import org.linlinjava.litemall.core.util.ResponseUtil;
 import org.linlinjava.litemall.core.validator.Order;
 import org.linlinjava.litemall.core.validator.Sort;
@@ -185,6 +186,9 @@ public Object detail(@LoginUser Integer userId, @NotNull Integer id) {
 			data.put("attribute", goodsAttributeListTask.get());
 			data.put("brand", brandCallableTask.get());
 			data.put("groupon", grouponRulesCallableTask.get());
+			//SystemConfig.isAutoCreateShareImage()
+			data.put("share", SystemConfig.isAutoCreateShareImage());
+
 		}
 		catch (Exception e) {
 			e.printStackTrace();
diff --git a/litemall-wx/pages/goods/goods.js b/litemall-wx/pages/goods/goods.js
index 276dcb8cd..460a1f977 100644
--- a/litemall-wx/pages/goods/goods.js
+++ b/litemall-wx/pages/goods/goods.js
@@ -6,6 +6,7 @@ var user = require('../../utils/user.js');
 
 Page({
   data: {
+    canShare: false,
     id: 0,
     goods: {},
     groupon: [], //该商品支持的团购规格
@@ -166,7 +167,8 @@ Page({
           userHasCollect: res.data.userHasCollect,
           shareImage: res.data.shareImage,
           checkedSpecPrice: res.data.info.retailPrice,
-          groupon: res.data.groupon
+          groupon: res.data.groupon,
+          canShare: res.data.share,
         });
 
         //如果是通过分享的团购参加团购，则团购项目应该与分享的一致并且不可更改
diff --git a/litemall-wx/pages/goods/goods.wxml b/litemall-wx/pages/goods/goods.wxml
index aca5491c6..b8623e95d 100644
--- a/litemall-wx/pages/goods/goods.wxml
+++ b/litemall-wx/pages/goods/goods.wxml
@@ -7,7 +7,7 @@
   <!-- 分享 -->
   <view class='goods_name'>
     <view class='goods_name_left'>{{goods.name}}</view>
-    <view class="goods_name_right" bindtap="shareFriendOrCircle">分享</view>
+    <view hidden="{{!canShare}}" class="goods_name_right" bindtap="shareFriendOrCircle">分享</view>
   </view>
   <view class="share-pop-box" hidden="{{!openShare}}">
     <view class="share-pop">