From 95e6f2c50da8a9bb73982c70ec1fef916c8cb333 Mon Sep 17 00:00:00 2001
From: devil_gong <devil_gong@wochacha.com>
Date: Wed, 30 Oct 2019 16:08:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=B4=E6=9D=A1=E5=B0=8F=E7=A8=8B=E5=BA=8F?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/goods-detail/goods-detail.js        | 18 ---------
 .../pages/goods-detail/goods-detail.ttml      | 37 +++----------------
 .../pages/goods-detail/goods-detail.ttss      |  1 +
 public/appmini/old/toutiao/pages/user/user.js |  3 --
 4 files changed, 6 insertions(+), 53 deletions(-)

diff --git a/public/appmini/old/toutiao/pages/goods-detail/goods-detail.js b/public/appmini/old/toutiao/pages/goods-detail/goods-detail.js
index f4436e8f9..ae93922bf 100755
--- a/public/appmini/old/toutiao/pages/goods-detail/goods-detail.js
+++ b/public/appmini/old/toutiao/pages/goods-detail/goods-detail.js
@@ -34,9 +34,6 @@ Page({
     goods_video_is_autoplay: false,
     common_app_is_use_mobile_detail: 1,
 
-    popup_share_status: false,
-    common_app_is_online_service: 0,
-
     // 限时秒杀插件
     common_app_is_limitedtimediscount: 0,
     plugins_limitedtimediscount_data: null,
@@ -57,9 +54,6 @@ Page({
       "brand_info": {},
     },
 
-    // 海报分享
-    common_app_is_poster_share: 0,
-
     // 优惠劵
     plugins_coupon_data: null,
 
@@ -139,7 +133,6 @@ Page({
 
               show_field_price_text: (data.goods.show_field_price_text == '销售价') ? null : (data.goods.show_field_price_text.replace(/<[^>]+>/g, "") || null),
               common_app_is_use_mobile_detail: data.common_app_is_use_mobile_detail || 0,
-              common_app_is_online_service: data.common_app_is_online_service || 0,
 
               common_app_is_limitedtimediscount: data.common_app_is_limitedtimediscount || 0,
               plugins_limitedtimediscount_data: data.plugins_limitedtimediscount_data || null,
@@ -153,7 +146,6 @@ Page({
               'share_product.src_mini_program_path': '/pages/goods-detail/goods-detail?goods_id='+data.goods.id,
               'share_product.brand_info.name': data.goods.brand_name,
 
-              common_app_is_poster_share: data.common_app_is_poster_share || 0,
               plugins_coupon_data: data.plugins_coupon_data || null,
               quick_nav_cart_count: data.common_cart_total || 0,
             });
@@ -669,16 +661,6 @@ Page({
     this.setData({ goods_video_is_autoplay: false });
   },
 
-  // 分享开启弹层
-  popup_share_event(e) {
-    this.setData({ popup_share_status: true });
-  },
-
-  // 分享弹层关闭
-  popup_share_close_event(e) {
-    this.setData({ popup_share_status: false });
-  },
-
   // 显示秒杀插件-倒计时
   plugins_limitedtimediscount_countdown() {
     // 销毁之前的任务
diff --git a/public/appmini/old/toutiao/pages/goods-detail/goods-detail.ttml b/public/appmini/old/toutiao/pages/goods-detail/goods-detail.ttml
index b78d9648b..1dd49cc36 100755
--- a/public/appmini/old/toutiao/pages/goods-detail/goods-detail.ttml
+++ b/public/appmini/old/toutiao/pages/goods-detail/goods-detail.ttml
@@ -38,9 +38,11 @@
   <!-- 基础息 -->
   <view class="goods-base bg-white">
     <view class="goods-price single-text">
-      <view class="goods-share tc" bindtap="popup_share_event">
-        <image src="/images/goods-detail-share-icon.png" mode="scaleToFill" class="dis-block" />
-        <view class="cr-888">分享</view>        
+      <view class="goods-share tc">
+        <button type="default" size="mini" open-type="share" hover-class="none">
+          <image src="/images/goods-detail-share-icon.png" mode="scaleToFill" class="dis-block" />
+          <view class="cr-888">分享</view>
+        </button>
       </view>
       <text tt:if="{{(show_field_price_text || null) != null}}" class="price-icon">{{show_field_price_text}}</text>
       <text class="sales-price">￥{{goods.price}}</text>
@@ -188,35 +190,6 @@
       <button class="goods-popup-submit bg-main" type="default" catchtap="goods_buy_confirm_event" hover-class="none">确定</button>
     </view>
   </component-popup>
-
-  <!-- 分享弹层 -->
-  <component-popup prop-show="{{popup_share_status}}" prop-position="bottom" bindonclose="popup_share_close_event">
-    <view class="share-popup bg-white">
-      <view class="close fr oh">
-        <view class="fr" catchtap="popup_share_close_event">
-          <icon type="clear" size="20" />
-        </view>
-      </view>
-      <view class="share-popup-content">
-        <view tt:if="{{common_app_is_good_thing == 1}}" class="share-items oh">
-          <share-button product="{{share_product}}" type="3" class="dis-block oh">
-            <image class="fl" src="/images/share-recomend-icon.png" mode="scaleToFill" />
-            <view class="cr-888 single-text fl">好物推荐、和大家一起分享你发现的宝贝</view>
-          </share-button>
-        </view>
-        <view class="share-items oh">
-          <button class="dis-block" type="default" size="mini" open-type="share" hover-class="none">
-            <image src="/images/share-weixin-icon.png" mode="scaleToFill" />
-            <text class="cr-888 single-text">一键分享给好友、群聊</text>
-          </button>
-        </view>
-        <view tt:if="{{common_app_is_poster_share == 1}}" class="share-items oh" bindtap="poster_event">
-          <image src="/images/share-friend-icon.png" mode="scaleToFill" />
-          <text class="cr-888 single-text">生成海报，分享到朋友圈、好友及群聊</text>
-        </view>
-      </view>
-    </view>
-  </component-popup>
 </view>
 
 <view tt:if="{{goods == null}}">
diff --git a/public/appmini/old/toutiao/pages/goods-detail/goods-detail.ttss b/public/appmini/old/toutiao/pages/goods-detail/goods-detail.ttss
index 07c657079..8ad6ee4fb 100755
--- a/public/appmini/old/toutiao/pages/goods-detail/goods-detail.ttss
+++ b/public/appmini/old/toutiao/pages/goods-detail/goods-detail.ttss
@@ -179,6 +179,7 @@
 }
 .goods-base button {
   background: #fff;
+  padding: 0;
 }
 .goods-base .goods-share {
   position: absolute;
diff --git a/public/appmini/old/toutiao/pages/user/user.js b/public/appmini/old/toutiao/pages/user/user.js
index 387333c68..6863b1789 100755
--- a/public/appmini/old/toutiao/pages/user/user.js
+++ b/public/appmini/old/toutiao/pages/user/user.js
@@ -29,8 +29,6 @@ Page({
 
     // 远程自定义导航
     navigation: [],
-
-    common_app_is_online_service: 0,
   },
 
   onShow() {
@@ -109,7 +107,6 @@ Page({
             message_total: ((data.common_message_total || 0) == 0) ? 0 : data.common_message_total,
             head_nav_list: temp_head_nav_list,
             navigation: data.navigation || [],
-            common_app_is_online_service: data.common_app_is_online_service || 0,
           });
         } else {
           app.showToast(res.data.msg);