From bab4daff52f2e7b76ebcd61ec5c4fb882e054b9f Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Sun, 19 Mar 2023 23:44:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=9A=E5=AE=A2=E5=95=86=E5=93=81=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=E7=BB=9F=E4=B8=80=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/plugins/binding/index/index.vue         |  2 +-
 pages/plugins/blog/detail/detail.css          | 16 ------------
 pages/plugins/blog/detail/detail.vue          | 25 ++++++-------------
 pages/plugins/blog/index/index.css            | 17 -------------
 pages/plugins/blog/index/index.vue            | 18 +++----------
 pages/plugins/blog/search/search.vue          |  2 +-
 .../signin/index-detail/index-detail.css      | 17 -------------
 .../signin/index-detail/index-detail.vue      | 22 ++++++----------
 8 files changed, 20 insertions(+), 99 deletions(-)
 delete mode 100644 pages/plugins/blog/detail/detail.css

diff --git a/pages/plugins/binding/index/index.vue b/pages/plugins/binding/index/index.vue
index bb330028..060e7c97 100644
--- a/pages/plugins/binding/index/index.vue
+++ b/pages/plugins/binding/index/index.vue
@@ -29,7 +29,7 @@
 
                 <!-- 结尾 -->
                 <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
-                
+
                 <!-- 回到店铺 -->
                 <view v-if="(shop || null) != null" class="bottom-fixed padding-main">
                     <button class="bg-main br-main cr-white round dis-block" type="default" hover-class="none" size="mini" @tap="shop_event" :data-value="shop.url">
diff --git a/pages/plugins/blog/detail/detail.css b/pages/plugins/blog/detail/detail.css
deleted file mode 100644
index 76a1ddce..00000000
--- a/pages/plugins/blog/detail/detail.css
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- * 商品
- */
-.goods-list .item {
-    width: calc(50% - 10rpx);
-}
-.goods-list .item:nth-child(2n) {
-    float: right;
-}
-.goods-list .item:nth-child(2n+1) {
-    float: left;
-}
-.goods-list .item .goods-img {
-    width: 100%;
-    height: 380rpx !important;
-}
\ No newline at end of file
diff --git a/pages/plugins/blog/detail/detail.vue b/pages/plugins/blog/detail/detail.vue
index 1839392c..00df7264 100644
--- a/pages/plugins/blog/detail/detail.vue
+++ b/pages/plugins/blog/detail/detail.vue
@@ -58,24 +58,12 @@
                 </view>
 
                 <!-- 相关商品 -->
-                <view v-if="(data.goods_list || null) != null && data.goods_list.length > 0" class="goods-list oh">
+                <view v-if="(data.goods_list || null) != null && data.goods_list.length > 0">
                     <view class="spacing-nav-title">
                         <text class="text-wrapper">相关商品</text>
                         <navigator url="/pages/goods-search/goods-search" hover-class="none" class="arrow-right padding-right-xxxl cr-gray fr">更多</navigator>
-                    </view>
-                    <view class="goods-list oh">
-                        <view v-for="(item, index) in data.goods_list" :key="index" class="item padding-bottom-sm border-radius-main bg-white margin-bottom-main oh">
-                            <navigator :url="item.goods_url" hover-class="none">
-                                <image class="goods-img dis-block" :src="item.images" mode="aspectFit"></image>
-                                <view class="base padding-horizontal-main margin-top-sm">
-                                    <view class="multi-text">{{item.title}}</view>
-                                    <view class="price margin-top">
-                                        <text class="sales-price">{{currency_symbol}}{{item.min_price}}</text>
-                                    </view>
-                                </view>
-                            </navigator>
-                        </view>
-                    </view>
+                    </view>
+                    <component-goods-list :propData="{style_type: 1, goods_list: data.goods_list}" :propCurrencySymbol="currency_symbol"></component-goods-list>
                 </view>
             </view>
         </view>
@@ -92,7 +80,8 @@
     const app = getApp();
     import componentNoData from "../../../../components/no-data/no-data";
     import componentBottomLine from "../../../../components/bottom-line/bottom-line";
-    import componentBlogComments from "../../../../components/blog-comments/blog-comments";
+    import componentBlogComments from "../../../../components/blog-comments/blog-comments";
+    import componentGoodsList from "../../../../components/goods-list/goods-list";
 
     var common_static_url = app.globalData.get_static_url('common');
     export default {
@@ -118,7 +107,8 @@
         components: {
             componentNoData,
             componentBottomLine,
-            componentBlogComments
+            componentBlogComments,
+            componentGoodsList
         },
         props: {},
 
@@ -218,5 +208,4 @@
     };
 </script>
 <style>
-    @import './detail.css';
 </style>
\ No newline at end of file
diff --git a/pages/plugins/blog/index/index.css b/pages/plugins/blog/index/index.css
index 780f384c..fba65f55 100644
--- a/pages/plugins/blog/index/index.css
+++ b/pages/plugins/blog/index/index.css
@@ -14,23 +14,6 @@
     width: calc(100% - 210rpx);
 }
 
-/**
- * 商品
- */
-.goods-list .item {
-    width: calc(50% - 10rpx);
-}
-.goods-list .item:nth-child(2n) {
-    float: right;
-}
-.goods-list .item:nth-child(2n+1) {
-    float: left;
-}
-.goods-list .item .goods-img {
-    width: 100%;
-    height: 380rpx !important;
-}
-
 /**
  * 分类导航
  */
diff --git a/pages/plugins/blog/index/index.vue b/pages/plugins/blog/index/index.vue
index 600c1c5e..2ddf50ad 100644
--- a/pages/plugins/blog/index/index.vue
+++ b/pages/plugins/blog/index/index.vue
@@ -105,19 +105,7 @@
                     <text class="text-wrapper">推荐商品</text>
                     <navigator url="/pages/goods-search/goods-search" hover-class="none" class="arrow-right padding-right-xxxl cr-gray fr">更多</navigator>
                 </view>
-                <view class="goods-list oh">
-                    <view v-for="(item, index) in goods_list" :key="index" class="item padding-bottom-sm border-radius-main bg-white margin-bottom-main oh">
-                        <navigator :url="item.goods_url" hover-class="none">
-                            <image class="goods-img dis-block" :src="item.images" mode="aspectFit"></image>
-                            <view class="base padding-horizontal-main margin-top-sm">
-                                <view class="multi-text">{{item.title}}</view>
-                                <view class="price margin-top">
-                                    <text class="sales-price">{{currency_symbol}}{{item.min_price}}</text>
-                                </view>
-                            </view>
-                        </navigator>
-                    </view>
-                </view>
+                <component-goods-list :propData="{style_type: 1, goods_list: goods_list}" :propCurrencySymbol="currency_symbol"></component-goods-list>
             </view>
 
             <!-- 结尾 -->
@@ -136,6 +124,7 @@
     import componentCountdown from "../../../../components/countdown/countdown";
     import componentNoData from "../../../../components/no-data/no-data";
     import componentBottomLine from "../../../../components/bottom-line/bottom-line";
+    import componentGoodsList from "../../../../components/goods-list/goods-list";
 
     export default {
         data() {
@@ -162,7 +151,8 @@
             componentBanner,
             componentCountdown,
             componentNoData,
-            componentBottomLine
+            componentBottomLine,
+            componentGoodsList
         },
         props: {},
 
diff --git a/pages/plugins/blog/search/search.vue b/pages/plugins/blog/search/search.vue
index 5340ef75..7f2e2cae 100644
--- a/pages/plugins/blog/search/search.vue
+++ b/pages/plugins/blog/search/search.vue
@@ -16,7 +16,7 @@
                     <view :class="'item cr-gray dis-inline-block padding-horizontal-main ' + (nav_active_value == item.id ? 'cr-main' : '')" @tap="nav_event" :data-value="item.id">{{item.name}}</view>
                 </block>
             </scroll-view>
-            
+
             <!-- 列表 -->
             <scroll-view :scroll-y="true" class="scroll-box" @scrolltolower="scroll_lower" lower-threshold="60">
                 <view v-if="(data_list || null) != null && data_list.length > 0" class="plugins-blog-list padding-horizontal-main padding-top-main oh">
diff --git a/pages/plugins/signin/index-detail/index-detail.css b/pages/plugins/signin/index-detail/index-detail.css
index 2a73802f..add70e1b 100644
--- a/pages/plugins/signin/index-detail/index-detail.css
+++ b/pages/plugins/signin/index-detail/index-detail.css
@@ -77,21 +77,4 @@
 .coming-tips-container image {
     max-width: 100%;
     margin-top: 60rpx;
-}
-
-/**
-* 商品列表
-*/
-.data-list .item {
-    width: calc(50% - 10rpx);
-}
-.data-list .item:nth-child(2n) {
-    float: right;
-}
-.data-list .item:nth-child(2n+1) {
-    float: left;
-}
-.data-list .item .goods-img {
-    width: 100%;
-    height: 380rpx !important;
 }
\ No newline at end of file
diff --git a/pages/plugins/signin/index-detail/index-detail.vue b/pages/plugins/signin/index-detail/index-detail.vue
index ee1bf639..87481e95 100644
--- a/pages/plugins/signin/index-detail/index-detail.vue
+++ b/pages/plugins/signin/index-detail/index-detail.vue
@@ -40,7 +40,7 @@
                 <view  v-if="(data.right_images || null) != null" class="spacing-mb">
                     <image class="wh-auto dis-block border-radius-main" :src="data.right_images" mode="widthFix" @tap="right_images_event"></image>
                 </view>
-                
+
                 <!-- 公告信息 -->
                 <view v-if="(data_base.signin_desc || null) != null && data_base.signin_desc.length > 0" class="spacing-mb">
                     <view class="notice-content">
@@ -53,18 +53,8 @@
                     <view class="spacing-nav-title">
                         <text class="text-wrapper">推荐商品</text>
                         <navigator url="/pages/goods-search/goods-search" hover-class="none" class="arrow-right padding-right-xxxl cr-gray fr">更多</navigator>
-                    </view>
-                    <view class="data-list oh">
-                        <view v-for="(item, index) in data.goods_list" :key="index" class="item padding-bottom-sm border-radius-main bg-white margin-bottom-main">
-                            <navigator :url="item.goods_url" hover-class="none">
-                                <image class="goods-img dis-block" :src="item.images" mode="aspectFit"></image>
-                                <view class="padding-horizontal-main margin-top-sm">
-                                    <view class="multi-text">{{item.title}}</view>
-                                    <view class="sales-price single-text margin-top-sm">{{currency_symbol}}{{item.min_price}}</view>
-                                </view>
-                            </navigator>
-                        </view>
-                    </view>
+                    </view>
+                    <component-goods-list :propData="{style_type: 1, goods_list: data.goods_list}" :propCurrencySymbol="currency_symbol"></component-goods-list>
                 </view>
             </view>
 
@@ -93,7 +83,8 @@
 <script>
     const app = getApp();
     import componentNoData from "../../../../components/no-data/no-data";
-    import componentBottomLine from "../../../../components/bottom-line/bottom-line";
+    import componentBottomLine from "../../../../components/bottom-line/bottom-line";
+    import componentGoodsList from "../../../../components/goods-list/goods-list";
 
     var static_url = app.globalData.get_static_url('signin', true);
     export default {
@@ -120,7 +111,8 @@
 
         components: {
             componentNoData,
-            componentBottomLine
+            componentBottomLine,
+            componentGoodsList
         },
         props: {},