From e1b2d47dea445b30b952b02668c3483e10f7647b Mon Sep 17 00:00:00 2001
From: sws <1141121512@qq.com>
Date: Mon, 30 Oct 2023 16:40:21 +0800
Subject: [PATCH] =?UTF-8?q?1.=E9=A6=96=E9=A1=B5=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/magic-list/magic-list.vue | 23 +++++------------------
 1 file changed, 5 insertions(+), 18 deletions(-)

diff --git a/components/magic-list/magic-list.vue b/components/magic-list/magic-list.vue
index 27da0c3b..fb8722a0 100644
--- a/components/magic-list/magic-list.vue
+++ b/components/magic-list/magic-list.vue
@@ -7,13 +7,14 @@
                         <view class="padding-horizontal-main">
                             <view class="flex-row align-c margin-bottom-xs">
                                 <text class="text-size fw-b single-text">{{ item.title }}</text>
-                                <view class="hot-go border-radius-main margin-left-sm pr">
-                                    <text class="cr-white padding-right-xs text-size-xs single-text dis-inline-block more-width">{{ item.icon }}</text>
-                                    <iconfont name="icon-index-xptj-jiantou" class="cr-white pa top-0" size="20rpx"></iconfont>
+                                <view class="hot-go margin-left-sm">
+                                    <block v-if="(item.icon || null) !== null">
+                                        <image :src="item.icon" mode="heightFix" class="ht-auto"> </image>
+                                    </block>
                                 </view>
                             </view>
                             <view class="cr-grey-9 text-size-xs margin-bottom-sm">{{ item.describe }}</view>
-                            <swiper class="swiper" circular :autoplay="propAutoplay" :vertical="propVertical" :interval="propInterval" :duration="propDuration">
+                            <swiper class="swiper" circular :autoplay="(item.rolling_time || null) !== null ? true : false" :vertical="propVertical" :interval="(item.rolling_time || null) !== null ? Number(item.rolling_time) * 1000 : '6000'" :duration="propDuration">
                                 <swiper-item v-for="(swiperItem, swiperIndex) in item.data" :key="swiperIndex">
                                     <view class="swiper-item">
                                         <view class="flex-row">
@@ -53,14 +54,6 @@
                 type: Boolean,
                 default: true,
             },
-            propInterval: {
-                type: Number,
-                default: 6000,
-            },
-            propAutoplay: {
-                type: Boolean,
-                default: true,
-            },
             propDuration: {
                 type: Number,
                 default: 1000,
@@ -123,9 +116,6 @@
     }
 
     .hot-go {
-        background: linear-gradient(90deg, #ff8f42 0%, #fe541e 100%);
-        padding-left: 12rpx;
-        padding-right: 34rpx;
         height: 34rpx;
         line-height: 34rpx;
     }
@@ -133,7 +123,4 @@
     .flex-width-half-2 {
         width: 25%;
     }
-    .more-width {
-        max-width: 70rpx;
-    }
 </style>