From d457edbc5398c220aa56e2c61b37ec31d054e7ea Mon Sep 17 00:00:00 2001
From: sws <1141121512@qq.com>
Date: Wed, 25 Sep 2024 13:47:45 +0800
Subject: [PATCH] 1.diy---header

---
 components/diy/footer.vue     | 16 ++++++++++------
 components/diy/goods-list.vue | 14 +++++++-------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/components/diy/footer.vue b/components/diy/footer.vue
index ce43fbb2..c477ec81 100644
--- a/components/diy/footer.vue
+++ b/components/diy/footer.vue
@@ -5,12 +5,12 @@
             <view class="bottom-line-exclude">
                 <view class="flex-row jc-sa align-c wh padding-0">
                     <view v-for="(item, index) in nav_content" :key="index" class="flex-1 flex-col jc-c align-c gap-5" :data-index="index" :data-value="item.link.page" @tap="url_event">
-                        <view v-if="nav_style !== 2" class="img pr">
+                        <view v-if="nav_style !== 2" class="img-content pr">
                             <view class="img-item pa border-radius-xs animate-linear" :class="is_active != index ? 'active' : ''">
-                                <image :src="item.img[0].url" class="wh-auto ht-auto dis-block"></image>
+                                <image :src="item.img[0].url" class="img dis-block" model="widthFix"></image>
                             </view>
                             <view class="img-item pa border-radius-xs animate-linear" :class="is_active == index ? 'active' : ''">
-                                <image :src="item.img_checked[0].url" class="wh-auto ht-auto dis-block"></image>
+                                <image :src="item.img_checked[0].url" class="img dis-block" model="widthFix"></image>
                             </view>
                         </view>
                         <text v-if="nav_style !== 1" class="animate-linear size-12 pr z-i" :style="is_active == index ? text_color_checked : default_text_color">{{ item.name }}</text>
@@ -106,9 +106,9 @@
         background-color: transparent;
         .footer-nav-content {
             min-height: 140rpx;
-            .img {
-                width: 40rpx;
-                height: 40rpx;
+            .img-content {
+                width: 44rpx;
+                height: 44rpx;
                 .img-item {
                     width: 44rpx;
                     height: 44rpx;
@@ -116,6 +116,10 @@
                     &.active {
                         opacity: 1;
                     }
+                    .img {
+                        width: 44rpx;
+                        height: 44rpx;
+                    }
                 }
             }
         }
diff --git a/components/diy/goods-list.vue b/components/diy/goods-list.vue
index d0cf1771..6a178e32 100644
--- a/components/diy/goods-list.vue
+++ b/components/diy/goods-list.vue
@@ -37,7 +37,7 @@
                                         <text v-if="is_show('price_unit')" class="identifying">{{ item.show_price_unit }}</text>
                                     </view>
                                     <view v-if="show_content && is_show('original_price') && !isEmpty(item.min_original_price)" class="text-size-xss flex-row">
-                                        <img v-if="form.static_img.length > 0" class="original-price-left" :src="form.static_img[0].url" />
+                                        <image v-if="form.static_img.length > 0" class="original-price-left" :src="form.static_img[0].url" model="widthFix"></image>
                                         <text :class="['original-price text-line-1', { 'flex-1': form.is_price_solo == '1' }]"
                                             >{{ item.show_original_price_symbol }}{{ item.min_original_price }}
                                             <block v-if="is_show('original_price_unit')">
@@ -75,7 +75,7 @@
                                         <text v-if="is_show('price_unit')" class="identifying">{{ item.show_price_unit }}</text>
                                     </view>
                                     <view v-if="show_content && is_show('original_price') && !isEmpty(item.min_original_price)" class="text-size-xss flex-row">
-                                        <img v-if="form.static_img.length > 0" class="original-price-left" :src="form.static_img[0].url" />
+                                        <image v-if="form.static_img.length > 0" class="original-price-left" :src="form.static_img[0].url" model="widthFix"></image>
                                         <text :class="['original-price text-line-1', { 'flex-1': form.is_price_solo == '1' }]"
                                             >{{ item.show_original_price_symbol }}{{ item.min_original_price }}
                                             <block v-if="is_show('original_price_unit')">
@@ -127,7 +127,7 @@
                                             <text v-if="is_show('price_unit')" class="identifying">{{ item.show_price_unit }}</text>
                                         </view>
                                         <view v-if="show_content && is_show('original_price') && !isEmpty(item.min_original_price)" class="text-size-xss flex">
-                                            <img v-if="form.static_img.length > 0" class="original-price-left" :src="form.static_img[0].url" />
+                                            <image v-if="form.static_img.length > 0" class="original-price-left" :src="form.static_img[0].url" model="widthFix"></image>
                                             <text :class="['original-price text-line-1', { 'flex-1': form.is_price_solo == '1' }]"
                                                 >{{ item.show_original_price_symbol }}{{ item.min_original_price }}
                                                 <block v-if="is_show('original_price_unit')">
@@ -156,7 +156,7 @@
         </view>
         <!-- 商品购买 -->
         <component-goods-buy v-if="is_show_cart" ref="goods_buy" v-on:CartSuccessEvent="goods_cart_back_event"></component-goods-buy>
-        
+
         <!-- 购物车抛物线 -->
         <component-cart-para-curve v-if="is_show_cart" ref="cart_para_curve"></component-cart-para-curve>
     </view>
@@ -174,7 +174,7 @@
             imageEmpty,
             componentBadge,
             componentGoodsBuy,
-            componentCartParaCurve
+            componentCartParaCurve,
         },
         props: {
             value: {
@@ -274,7 +274,7 @@
                     }));
                 } else if (!isEmpty(this.form.data_auto_list) && this.form.data_type == '1') {
                     // 筛选商品并且筛选商品数组不为空
-                    new_list = this.form.data_auto_list
+                    new_list = this.form.data_auto_list;
                 } else {
                     // 为空的时候走默认数据
                     new_list = Array(4).fill(this.default_list);
@@ -587,4 +587,4 @@
         top: -20rpx;
         right: 0;
     }
-</style>
\ No newline at end of file
+</style>