add share hidden func (linlinjava#239)

386408003 · Jul 24, 2019 · 7c79d2c · 7c79d2c
1 parent 39526de
commit 7c79d2c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 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
@@ -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
@@ -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
@@ -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">