From 363a7d6035ad84c4d95e1aed2c281174208e181b Mon Sep 17 00:00:00 2001
From: devil_gong <devil_gong@wochacha.com>
Date: Thu, 8 Aug 2019 21:03:42 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/tags.php                          | 82 +------------------
 .../pages/goods-detail/goods-detail.axml      |  4 +-
 .../pages/goods-detail/goods-detail.swan      |  6 +-
 .../pages/goods-detail/goods-detail.wxml      |  6 +-
 4 files changed, 9 insertions(+), 89 deletions(-)

diff --git a/application/tags.php b/application/tags.php
index 15dca883e..15a4930e1 100755
--- a/application/tags.php
+++ b/application/tags.php
@@ -32,89 +32,9 @@ return array (
   'log_write' => 
   array (
   ),
-  'plugins_css' => 
-  array (
-    0 => 'app\\plugins\\limitedtimediscount\\Hook',
-    1 => 'app\\plugins\\membershiplevelvip\\Hook',
-    2 => 'app\\plugins\\goodsphototag\\Hook',
-  ),
-  'plugins_js' => 
-  array (
-    0 => 'app\\plugins\\limitedtimediscount\\Hook',
-  ),
   'plugins_service_navigation_header_handle' => 
   array (
-    0 => 'app\\plugins\\limitedtimediscount\\Hook',
-  ),
-  'plugins_service_goods_handle_end' => 
-  array (
-    0 => 'app\\plugins\\limitedtimediscount\\Hook',
-    1 => 'app\\plugins\\membershiplevelvip\\Hook',
-  ),
-  'plugins_service_goods_spec_base' => 
-  array (
-    0 => 'app\\plugins\\limitedtimediscount\\Hook',
-    1 => 'app\\plugins\\membershiplevelvip\\Hook',
-  ),
-  'plugins_view_goods_detail_base_top' => 
-  array (
-    0 => 'app\\plugins\\limitedtimediscount\\Hook',
-  ),
-  'plugins_view_home_floor_top' => 
-  array (
-    0 => 'app\\plugins\\limitedtimediscount\\Hook',
-  ),
-  'plugins_service_buy_handle' => 
-  array (
-    0 => 'app\\plugins\\membershiplevelvip\\Hook',
-  ),
-  'plugins_service_user_login_success_record' => 
-  array (
-    0 => 'app\\plugins\\membershiplevelvip\\Hook',
-  ),
-  'plugins_service_goods_spec_extends_handle' => 
-  array (
-    0 => 'app\\plugins\\membershiplevelvip\\Hook',
-  ),
-  'plugins_view_admin_user_save' => 
-  array (
-    0 => 'app\\plugins\\membershiplevelvip\\Hook',
-  ),
-  'plugins_service_user_save_handle' => 
-  array (
-    0 => 'app\\plugins\\membershiplevelvip\\Hook',
-  ),
-  'plugins_service_goods_save_handle' => 
-  array (
-    0 => 'app\\plugins\\membershiplevelvip\\Hook',
-  ),
-  'plugins_view_goods_detail_panel_price_top' => 
-  array (
-    0 => 'app\\plugins\\membershiplevelvip\\Hook',
-  ),
-  'plugins_view_home_goods_inside_bottom' => 
-  array (
-    0 => 'app\\plugins\\membershiplevelvip\\Hook',
-  ),
-  'plugins_view_search_goods_inside_bottom' => 
-  array (
-    0 => 'app\\plugins\\membershiplevelvip\\Hook',
-  ),
-  'plugins_service_goods_spec_type' => 
-  array (
-    0 => 'app\\plugins\\membershiplevelvip\\Hook',
-  ),
-  'plugins_view_goods_detail_photo_within' => 
-  array (
-    0 => 'app\\plugins\\goodsphototag\\Hook',
-  ),
-  'plugins_view_home_goods_inside_top' => 
-  array (
-    0 => 'app\\plugins\\goodsphototag\\Hook',
-  ),
-  'plugins_view_search_goods_inside_top' => 
-  array (
-    0 => 'app\\plugins\\goodsphototag\\Hook',
+    0 => 'app\\plugins\\answers\\Hook',
   ),
 );
 ?>
\ No newline at end of file
diff --git a/public/appmini/old/alipay/pages/goods-detail/goods-detail.axml b/public/appmini/old/alipay/pages/goods-detail/goods-detail.axml
index 5b113d60f..86cf0f05e 100644
--- a/public/appmini/old/alipay/pages/goods-detail/goods-detail.axml
+++ b/public/appmini/old/alipay/pages/goods-detail/goods-detail.axml
@@ -35,7 +35,7 @@
       </view>
       <text a:if="{{(show_field_price_text || null) != null}}" class="price-icon">{{show_field_price_text}}</text>
       <text class="sales-price">￥{{goods.price}}</text>
-      <view a:if="{{(goods.original_price || null) != null}}" class="original-price">￥{{goods.original_price}}</view>
+      <view a:if="{{(goods.original_price || null) != null && goods.original_price > 0}}" class="original-price">￥{{goods.original_price}}</view>
     </view>
     <view class="base-grid oh">
       <view class="fl tl">
@@ -117,7 +117,7 @@
         <view class="goods-popup-base-content">
           <view class="goods-price">
             <view class="sales-price">￥{{goods_spec_base_price}}</view>
-            <view a:if="{{(goods_spec_base_original_price || null) != null}}" class="original-price">￥{{goods_spec_base_original_price}}</view>
+            <view a:if="{{(goods_spec_base_original_price || null) != null && goods_spec_base_original_price > 0}}" class="original-price">￥{{goods_spec_base_original_price}}</view>
           </view>
           <view class="inventory">
             <text class="cr-888">库存</text>
diff --git a/public/appmini/old/baidu/pages/goods-detail/goods-detail.swan b/public/appmini/old/baidu/pages/goods-detail/goods-detail.swan
index 81d73b5a9..1bf5bf2e0 100755
--- a/public/appmini/old/baidu/pages/goods-detail/goods-detail.swan
+++ b/public/appmini/old/baidu/pages/goods-detail/goods-detail.swan
@@ -29,7 +29,7 @@
     <template is="limitedtimediscount" data="{{{plugins_limitedtimediscount_data: plugins_limitedtimediscount_data, plugins_limitedtimediscount_is_show_time: plugins_limitedtimediscount_is_show_time, plugins_limitedtimediscount_time_millisecond: plugins_limitedtimediscount_time_millisecond}}}"></template>
   </view>
 
-  <!-- 基础信息 -->
+  <!-- 基础信息 -->
   <view class="goods-base bg-white">
     <view class="goods-price single-text">
       <view class="goods-share tc" bindtap="popup_share_event">
@@ -39,7 +39,7 @@
       </view>
       <text s-if="(show_field_price_text || null) != null" class="price-icon">{{show_field_price_text}}</text>
       <text class="sales-price">￥{{goods.price}}</text>
-      <view s-if="(goods.original_price || null) != null" class="original-price">￥{{goods.original_price}}</view>
+      <view s-if="(goods.original_price || null) != null && goods.original_price > 0" class="original-price">￥{{goods.original_price}}</view>
     </view>
     <view class="base-grid oh">
       <view class="fl tl">
@@ -121,7 +121,7 @@
         <view class="goods-popup-base-content">
           <view class="goods-price">
             <view class="sales-price">￥{{goods_spec_base_price}}</view>
-            <view s-if="(goods_spec_base_original_price || null) != null" class="original-price">￥{{goods_spec_base_original_price}}</view>
+            <view s-if="(goods_spec_base_original_price || null) != null && goods_spec_base_original_price > 0" class="original-price">￥{{goods_spec_base_original_price}}</view>
           </view>
           <view class="inventory">
             <text class="cr-888">库存</text>
diff --git a/public/appmini/old/weixin/pages/goods-detail/goods-detail.wxml b/public/appmini/old/weixin/pages/goods-detail/goods-detail.wxml
index cfb6f9136..67801e87d 100755
--- a/public/appmini/old/weixin/pages/goods-detail/goods-detail.wxml
+++ b/public/appmini/old/weixin/pages/goods-detail/goods-detail.wxml
@@ -35,7 +35,7 @@
     <template is="limitedtimediscount" data="{{plugins_limitedtimediscount_data: plugins_limitedtimediscount_data, plugins_limitedtimediscount_is_show_time: plugins_limitedtimediscount_is_show_time, plugins_limitedtimediscount_time_millisecond: plugins_limitedtimediscount_time_millisecond}}"></template>
   </view>
 
-  <!-- 基础信息 -->
+  <!-- 基础息 -->
   <view class="goods-base bg-white">
     <view class="goods-price single-text">
       <view class="goods-share tc" bindtap="popup_share_event">
@@ -44,7 +44,7 @@
       </view>
       <text wx:if="{{(show_field_price_text || null) != null}}" class="price-icon">{{show_field_price_text}}</text>
       <text class="sales-price">￥{{goods.price}}</text>
-      <view wx:if="{{(goods.original_price || null) != null}}" class="original-price">￥{{goods.original_price}}</view>
+      <view wx:if="{{(goods.original_price || null) != null && goods.original_price > 0}}" class="original-price">￥{{goods.original_price}}</view>
     </view>
     <view class="base-grid oh">
       <view class="fl tl">
@@ -126,7 +126,7 @@
         <view class="goods-popup-base-content">
           <view class="goods-price">
             <view class="sales-price">￥{{goods_spec_base_price}}</view>
-            <view wx:if="{{(goods_spec_base_original_price || null) != null}}" class="original-price">￥{{goods_spec_base_original_price}}</view>
+            <view wx:if="{{(goods_spec_base_original_price || null) != null && goods_spec_base_original_price > 0}}" class="original-price">￥{{goods_spec_base_original_price}}</view>
           </view>
           <view class="inventory">
             <text class="cr-888">库存</text>
-- 
GitLab