From 81341584f90b03a5afb92f003ea6ac2108a09133 Mon Sep 17 00:00:00 2001
From: sws <1141121512@qq.com>
Date: Fri, 13 Oct 2023 20:26:17 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=B5=8B=E8=AF=95=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/goods-list/goods-list.vue    |  6 +++---
 pages/goods-category/goods-category.css |  8 ++++----
 pages/goods-category/goods-category.vue | 12 ++++++------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/components/goods-list/goods-list.vue b/components/goods-list/goods-list.vue
index e6c1d1f9..64c7e370 100644
--- a/components/goods-list/goods-list.vue
+++ b/components/goods-list/goods-list.vue
@@ -27,7 +27,7 @@
                                         </view>
                                         <block v-if="(item.is_error || 0) == 0 && is_show_cart">
                                             <view v-if="propOpenCart" class="bg-white right-cart-icon 123" :data-index="index" @tap.stop="goods_cart_event">
-                                                <iconfont name="icon-cart-dec" size="40rpx" :color="themeColor"></iconfont>
+                                                <iconfont name="icon-cart-inc" size="40rpx" :color="themeColor"></iconfont>
                                                 <view class="cart-badge-icon pa">
                                                     <component-badge :propNumber="item.user_cart_count || 0"></component-badge>
                                                 </view>
@@ -92,7 +92,7 @@
                                         <block v-else>
                                             <block v-if="(item.is_error || 0) == 0 && is_show_cart">
                                                 <view v-if="propOpenCart" class="bg-white pr" :data-index="index" @tap.stop="goods_cart_event">
-                                                    <iconfont name="icon-cart-dec" size="40rpx" :color="themeColor"></iconfont>
+                                                    <iconfont name="icon-cart-inc" size="40rpx" :color="themeColor"></iconfont>
                                                     <view class="cart-badge-icon pa">
                                                         <component-badge :propNumber="item.user_cart_count || 0"></component-badge>
                                                     </view>
@@ -148,7 +148,7 @@
 
                                                     <block v-if="(item.is_error || 0) == 0 && is_show_cart">
                                                         <view v-if="propOpenCart" class="pa bg-white right-cart-icon" :data-index="index" @tap.stop="goods_cart_event">
-                                                            <iconfont name="icon-cart-dec" size="40rpx" :color="themeColor"></iconfont>
+                                                            <iconfont name="icon-cart-inc" size="40rpx" :color="themeColor"></iconfont>
                                                             <view class="cart-badge-icon pa">
                                                                 <component-badge :propNumber="item.user_cart_count || 0"></component-badge>
                                                             </view>
diff --git a/pages/goods-category/goods-category.css b/pages/goods-category/goods-category.css
index 6cd8fa76..bf558a26 100644
--- a/pages/goods-category/goods-category.css
+++ b/pages/goods-category/goods-category.css
@@ -370,14 +370,14 @@
 }
 
 .cart-content .cart-list .goods-img {
-    width: 120rpx;
-    height: 120rpx !important;
+    width: 132rpx;
+    height: 132rpx !important;
 }
 
 .cart-content .cart-list .goods-base {
-    width: calc(100% - 160rpx);
+    padding-right: 0;
+    padding-left: 24rpx;
 }
-
 .cart-content .cart-list .goods-base-content {
     min-height: 60rpx;
 }
diff --git a/pages/goods-category/goods-category.vue b/pages/goods-category/goods-category.vue
index 85bc1657..57987f0e 100644
--- a/pages/goods-category/goods-category.vue
+++ b/pages/goods-category/goods-category.vue
@@ -296,20 +296,20 @@
                                 </view>
                                 <scroll-view :scroll-y="true" class="cart-list goods-list" :show-scrollbar="false">
                                     <view v-for="(goods, index) in cart.data" :key="index" class="item padding-main oh spacing-mb">
-                                        <navigator :url="goods.goods_url" hover-class="none">
-                                            <image :src="goods.images" mode="widthFix" class="goods-img radius fl br"></image>
-                                            <view class="goods-base fr">
+                                        <navigator :url="goods.goods_url" hover-class="none" class="flex-row jc-sb">
+                                            <image :src="goods.images" mode="widthFix" class="goods-img radius br"></image>
+                                            <view class="goods-base flex-1 flex-width flex-col jc-sb">
                                                 <view class="goods-base-content">
                                                     <view class="goods-title text-size-sm single-text">{{ goods.title }}</view>
-                                                    <view v-if="goods.spec != null" class="text-size-xs cr-grey margin-top-sm">
+                                                    <view v-if="goods.spec != null" class="text-size-xs cr-grey margin-top-xs">
                                                         <block v-for="(sv, si) in goods.spec" :key="si">
                                                             <text v-if="si > 0" class="padding-left-xs padding-right-xs">;</text>
                                                             <text>{{ sv.value }}</text>
                                                         </block>
                                                     </view>
                                                 </view>
-                                                <view class="margin-top-sm oh">
-                                                    <view class="sales-price text-size-sm single-text dis-inline-block va-m">{{ currency_symbol }}{{ goods.price }}</view>
+                                                <view class="margin-top-xs oh">
+                                                    <view class="sales-price text-size single-text dis-inline-block va-m pr top-sm">{{ currency_symbol }}{{ goods.price }}</view>
                                                     <view class="tc fr flex-row align-c">
                                                         <block v-if="goods.is_error == 0">
                                                             <view v-if="(goods.stock || 0) > 0" class="cp pr top-sm" :data-index="index" data-type="0" @tap.stop="cart_buy_number_event">