From bd99133ec1591a2a7ba9819620378165a449e5b4 Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Tue, 31 Oct 2023 11:41:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E7=B1=BB=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/goods-category/goods-category.css | 11 +++++++----
 pages/goods-category/goods-category.vue |  8 ++++----
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/pages/goods-category/goods-category.css b/pages/goods-category/goods-category.css
index bf558a26..88b815ee 100644
--- a/pages/goods-category/goods-category.css
+++ b/pages/goods-category/goods-category.css
@@ -97,10 +97,6 @@
     font-weight: 600;
 }
 
-.content-item .desc {
-    margin-bottom: 56rpx;
-}
-
 .content-item .icon {
     width: 92rpx;
     height: 92rpx;
@@ -117,6 +113,13 @@
 
 .model-one .content-item:nth-child(3n) {
     border-right: 0;
+}
+.model-one .content .desc {
+    min-height: 52rpx;
+    line-height: 26rpx;
+}
+.model-one .content {
+    height: 240rpx;
 }
 
 .one-content image {
diff --git a/pages/goods-category/goods-category.vue b/pages/goods-category/goods-category.vue
index 623449cd..324c2993 100644
--- a/pages/goods-category/goods-category.vue
+++ b/pages/goods-category/goods-category.vue
@@ -29,9 +29,9 @@
                                     <view class="content-item cp" :data-value="item.id" @tap="category_event">
                                         <view class="padding-sm">
                                             <view class="content bg-white border-radius-main">
-                                                <image v-if="(item.icon || null) != null" :src="item.icon" mode="aspectFit" class="icon circle"></image>
+                                                <image v-if="(item[category_goods_model_icon_field] || null) != null" :src="item[category_goods_model_icon_field]" mode="aspectFit" class="icon circle"></image>
                                                 <view class="text single-text margin-top-sm" :class="'text-random-' + (Math.floor(Math.random() * 9) + 1)">{{ item.name }}</view>
-                                                <view class="desc single-text nargin-top-xs padding-top-xss cr-grey-9 text-size-xss">{{ item.describe }}</view>
+                                                <view class="desc multi-text margin-top-xs padding-top-xss cr-grey-9 text-size-xss">{{ item.describe }}</view>
                                             </view>
                                         </view>
                                     </view>
@@ -227,7 +227,7 @@
                                                         <block v-for="(v, index) in data_content.items" :key="index">
                                                             <view class="content-item tc cp two-img" :data-value="v.id" @tap="category_event">
                                                                 <view class="content">
-                                                                    <image v-if="(v.icon || null) != null" :src="v.icon" mode="aspectFit" class="icon radius padding-bottom-main"></image>
+                                                                    <image v-if="(v.icon || null) != null" :src="v.icon" mode="aspectFit" class="icon radius margin-bottom-main"></image>
                                                                     <view class="single-text text-size-sm cr-grey">{{ v.name }}</view>
                                                                 </view>
                                                             </view>
@@ -248,7 +248,7 @@
                                                             <block v-for="(vs, index2) in v.items" :key="index2">
                                                                 <view class="content-item two-img tc cp" :data-value="vs.id" @tap="category_event">
                                                                     <view class="content">
-                                                                        <image v-if="(vs.icon || null) != null" :src="vs.icon" mode="aspectFit" class="icon radius padding-bottom-main"></image>
+                                                                        <image v-if="(vs.icon || null) != null" :src="vs.icon" mode="aspectFit" class="icon radius margin-bottom-main"></image>
                                                                         <view class="single-text text-size-sm cr-grey">{{ vs.name }}</view>
                                                                     </view>
                                                                 </view>