From e55218330cfde7443ca11b440e73532b546eb171 Mon Sep 17 00:00:00 2001
From: owen <owen@evolsun.com>
Date: Sat, 4 Nov 2023 22:06:40 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E8=90=A5=E9=94=80=EF=BC=9A=E8=A3=85?=
 =?UTF-8?q?=E4=BF=AE=E9=A1=B5=E9=9D=A2=E9=80=82=E9=85=8D=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.vue                         |  2 +-
 .../components/s-block-item/s-block-item.vue  |  2 +-
 sheep/components/s-block/s-block.vue          | 29 ++++++++++---------
 .../s-search-block/s-search-block.vue         | 17 +++++------
 4 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/pages/index/index.vue b/pages/index/index.vue
index 64e6e4a..50ea810 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -2,7 +2,7 @@
 	<view v-if="template">
 		<s-layout title="首页" navbar="custom" tabbar="/pages/index/index" :bgStyle="template.page"
 			:navbarStyle="template.style?.navbar" onShareAppMessage>
-			<s-block v-for="(item, index) in template.components" :key="index" :styles="item.style">
+			<s-block v-for="(item, index) in template.components" :key="index" :styles="item.property.style">
 				<s-block-item :type="item.id" :data="item.property" :styles="item.property.style" />
 			</s-block>
 			<!-- 广告模块 -->
diff --git a/sheep/components/s-block-item/s-block-item.vue b/sheep/components/s-block-item/s-block-item.vue
index ee5b3fc..1b98456 100644
--- a/sheep/components/s-block-item/s-block-item.vue
+++ b/sheep/components/s-block-item/s-block-item.vue
@@ -6,7 +6,7 @@
     <s-image-cube v-if="type === 'imageCube'" :data="data" :styles="styles" />
 
     <s-notice-block v-if="type === 'NoticeBar'" :data="data" />
-    <s-search-block v-if="type === 'searchBlock'" :data="data" :navbar="false" />
+    <s-search-block v-if="type === 'SearchBar'" :data="data" :styles="styles" :navbar="false" />
     <s-title-block v-if="type === 'titleBlock'" :data="data" :styles="styles" />
     <s-line-block v-if="type === 'lineBlock'" :data="data" />
 
diff --git a/sheep/components/s-block/s-block.vue b/sheep/components/s-block/s-block.vue
index 529839c..19638fc 100644
--- a/sheep/components/s-block/s-block.vue
+++ b/sheep/components/s-block/s-block.vue
@@ -20,12 +20,12 @@
 
   const elBackground = computed(() => {
     if (props.styles) {
-      if (props.styles.background.type == 'color')
-        return { background: props.styles.background.bgColor };
-      if (props.styles.background.type == 'image')
+      if (props.styles.bgType === 'color')
+        return { background: props.styles.bgColor };
+      if (props.styles.bgType === 'img')
         return {
           background: `url(${sheep.$url.cdn(
-            props.styles.background.bgImage,
+            props.styles.bgImage,
           )}) no-repeat top center / 100% auto`,
         };
     }
@@ -34,15 +34,18 @@
   const elStyles = computed(() => {
     if (props.styles) {
       return {
-        marginTop: `${props.styles.marginTop}px`,
-        marginBottom: props.styles.marginBottom + 'px',
-        marginLeft: `${props.styles.marginLeft}px`,
-        marginRight: props.styles.marginRight + 'px',
-        'border-top-left-radius': props.styles.borderRadiusTop + 'px',
-        'border-top-right-radius': props.styles.borderRadiusTop + 'px',
-        'border-bottom-left-radius': props.styles.borderRadiusBottom + 'px',
-        'border-bottom-right-radius': props.styles.borderRadiusBottom + 'px',
-        padding: props.styles.padding + 'px',
+        marginTop: `${props.styles.marginTop || 0}px`,
+        marginBottom: `${props.styles.marginBottom || 0}px`,
+        marginLeft: `${props.styles.marginLeft || 0}px`,
+        marginRight: `${props.styles.marginRight || 0}px`,
+        paddingTop: `${props.styles.paddingTop || 0}px`,
+        paddingRight: `${props.styles.paddingRight || 0}px`,
+        paddingBottom: `${props.styles.paddingBottom || 0}px`,
+        paddingLeft: `${props.styles.paddingLeft || 0}px`,
+        borderTopLeftRadius: `${props.styles.borderTopLeftRadius || 0}px`,
+        borderTopRightRadius: `${props.styles.borderTopRightRadius || 0}px`,
+        borderBottomRightRadius: `${props.styles.borderBottomRightRadius || 0}px`,
+        borderBottomLeftRadius: `${props.styles.borderBottomLeftRadius || 0}px`,
         overflow: 'hidden',
       };
     }
diff --git a/sheep/components/s-search-block/s-search-block.vue b/sheep/components/s-search-block/s-search-block.vue
index 5e3e08f..1e9c2b5 100644
--- a/sheep/components/s-search-block/s-search-block.vue
+++ b/sheep/components/s-search-block/s-search-block.vue
@@ -29,24 +29,23 @@
       v-model="state.searchVal"
     />
     <view class="keyword-link ss-flex">
-      <view v-for="(item, index) in data.keywords" :key="index">
+      <view v-for="(item, index) in data.hotKeywords" :key="index">
         <view
           class="ss-m-r-16"
-          :style="[{ color: item.color }]"
-          @tap.stop="sheep.$router.go('/pages/goods/list', { keyword: item.text })"
-          >{{ item.text }}</view
+          :style="[{ color: data.textColor }]"
+          @tap.stop="sheep.$router.go('/pages/goods/list', { keyword: item })"
+          >{{ item }}</view
         >
       </view>
     </view>
-
-    <view v-if="data.keywords && data.keywords.length && navbar" class="ss-flex">
+    <view v-if="data.hotKeywords && data.hotKeywords.length && navbar" class="ss-flex">
       <button
         class="ss-reset-button keyword-btn"
-        v-for="(item, index) in data.keywords"
+        v-for="(item, index) in data.hotKeywords"
         :key="index"
-        :style="[{ color: item.color, marginRight: '10rpx' }]"
+        :style="[{ color: data.textColor, marginRight: '10rpx' }]"
       >
-        {{ item.text }}
+        {{ item }}
       </button>
     </view>
   </view>

From 75d0f7511dc61fe87e6245d151e0664ed2223ce3 Mon Sep 17 00:00:00 2001
From: owen <owen@evolsun.com>
Date: Sun, 5 Nov 2023 20:42:49 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E8=90=A5=E9=94=80=EF=BC=9A=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=95=86=E5=9F=8E=E8=A3=85=E4=BF=AE=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E3=80=90=E5=9B=BE=E7=89=87=E5=B1=95=E7=A4=BA=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sheep/components/s-block-item/s-block-item.vue   | 2 +-
 sheep/components/s-image-block/s-image-block.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sheep/components/s-block-item/s-block-item.vue b/sheep/components/s-block-item/s-block-item.vue
index 1b98456..dc1b4f4 100644
--- a/sheep/components/s-block-item/s-block-item.vue
+++ b/sheep/components/s-block-item/s-block-item.vue
@@ -1,6 +1,6 @@
 <template>
   <view>
-    <s-image-block v-if="type === 'imageBlock'" :data="data" :styles="styles" />
+    <s-image-block v-if="type === 'ImageBar'" :data="data" :styles="styles" />
     <s-image-banner v-if="type === 'imageBanner'" :data="data" :styles="styles" />
     <s-video-block v-if="type === 'videoPlayer'" :data="data" :styles="styles" />
     <s-image-cube v-if="type === 'imageCube'" :data="data" :styles="styles" />
diff --git a/sheep/components/s-image-block/s-image-block.vue b/sheep/components/s-image-block/s-image-block.vue
index 27983f8..ff9348c 100644
--- a/sheep/components/s-image-block/s-image-block.vue
+++ b/sheep/components/s-image-block/s-image-block.vue
@@ -1,6 +1,6 @@
 <template>
   <view @tap="sheep.$router.go(data?.url)">
-    <su-image :src="sheep.$url.cdn(data.src)" mode="widthFix"></su-image>
+    <su-image :src="sheep.$url.cdn(data.imgUrl)" mode="widthFix"></su-image>
   </view>
 </template>
 

From f0d54f4fec621e408f958d6f516af5b9c56c1bc5 Mon Sep 17 00:00:00 2001
From: owen <owen@evolsun.com>
Date: Sun, 5 Nov 2023 22:53:29 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E8=90=A5=E9=94=80=EF=BC=9A=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=95=86=E5=9F=8E=E8=A3=85=E4=BF=AE=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E3=80=90=E8=A7=86=E9=A2=91=E6=92=AD=E6=94=BE=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sheep/components/s-block-item/s-block-item.vue   | 2 +-
 sheep/components/s-video-block/s-video-block.vue | 3 ++-
 sheep/ui/su-video/su-video.vue                   | 5 +++++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/sheep/components/s-block-item/s-block-item.vue b/sheep/components/s-block-item/s-block-item.vue
index dc1b4f4..f85700b 100644
--- a/sheep/components/s-block-item/s-block-item.vue
+++ b/sheep/components/s-block-item/s-block-item.vue
@@ -2,7 +2,7 @@
   <view>
     <s-image-block v-if="type === 'ImageBar'" :data="data" :styles="styles" />
     <s-image-banner v-if="type === 'imageBanner'" :data="data" :styles="styles" />
-    <s-video-block v-if="type === 'videoPlayer'" :data="data" :styles="styles" />
+    <s-video-block v-if="type === 'VideoPlayer'" :data="data" :styles="styles" />
     <s-image-cube v-if="type === 'imageCube'" :data="data" :styles="styles" />
 
     <s-notice-block v-if="type === 'NoticeBar'" :data="data" />
diff --git a/sheep/components/s-video-block/s-video-block.vue b/sheep/components/s-video-block/s-video-block.vue
index 7911ca0..7a659ad 100644
--- a/sheep/components/s-video-block/s-video-block.vue
+++ b/sheep/components/s-video-block/s-video-block.vue
@@ -4,8 +4,9 @@
     class="sss"
     :uid="guid()"
     :src="sheep.$url.cdn(data.videoUrl)"
-    :poster="sheep.$url.cdn(data.src)"
+    :poster="sheep.$url.cdn(data.posterUrl)"
     :height="styles.height * 2"
+    :autoplay="data.autoplay"
   ></su-video>
 </template>
 
diff --git a/sheep/ui/su-video/su-video.vue b/sheep/ui/su-video/su-video.vue
index a1af8a5..a75a79c 100644
--- a/sheep/ui/su-video/su-video.vue
+++ b/sheep/ui/su-video/su-video.vue
@@ -18,6 +18,7 @@
       @pause="pause"
       @ended="end"
       :poster="poster"
+      :autoplay="autoplay"
     >
       <!-- #ifdef APP-PLUS -->
       <cover-view :style="{ transform: 'translateX(' + moveX + 'px)' }" />
@@ -90,6 +91,10 @@
       type: String,
       default: 'https://img1.baidu.com/it/u=1601695551,235775011&fm=26&fmt=auto',
     },
+    autoplay: {
+      type: Boolean,
+      default: false,
+    }
   });
 
   // 事件

From ee06d3396259e25782e33fd330ef64a7ea0d0673 Mon Sep 17 00:00:00 2001
From: owen <owen@evolsun.com>
Date: Mon, 6 Nov 2023 09:31:41 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E8=90=A5=E9=94=80=EF=BC=9A=E9=80=82?=
 =?UTF-8?q?=E9=85=8D=E5=95=86=E5=9F=8E=E8=A3=85=E4=BF=AE=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E3=80=90=E8=BD=AE=E6=92=AD=E5=9B=BE=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/s-block-item/s-block-item.vue  |  2 +-
 .../s-image-banner/s-image-banner.vue         | 26 ++++++++++---------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/sheep/components/s-block-item/s-block-item.vue b/sheep/components/s-block-item/s-block-item.vue
index f85700b..52c1078 100644
--- a/sheep/components/s-block-item/s-block-item.vue
+++ b/sheep/components/s-block-item/s-block-item.vue
@@ -1,7 +1,7 @@
 <template>
   <view>
     <s-image-block v-if="type === 'ImageBar'" :data="data" :styles="styles" />
-    <s-image-banner v-if="type === 'imageBanner'" :data="data" :styles="styles" />
+    <s-image-banner v-if="type === 'Carousel'" :data="data" :styles="styles" />
     <s-video-block v-if="type === 'VideoPlayer'" :data="data" :styles="styles" />
     <s-image-cube v-if="type === 'imageCube'" :data="data" :styles="styles" />
 
diff --git a/sheep/components/s-image-banner/s-image-banner.vue b/sheep/components/s-image-banner/s-image-banner.vue
index 4e03ae9..64feffd 100644
--- a/sheep/components/s-image-banner/s-image-banner.vue
+++ b/sheep/components/s-image-banner/s-image-banner.vue
@@ -1,12 +1,13 @@
 <template>
   <su-swiper
     :list="imgList"
-    :dotStyle="dotMap[data.indicator]"
-    imageMode="widthFix"
+    :dotStyle="data.indicator === 'dot' ? 'long' : 'tag'"
+    imageMode="scaleToFill"
     dotCur="bg-mask-40"
     :seizeHeight="300"
     :autoplay="data.autoplay"
-    :interval="Number(data.interval)"
+    :interval="data.interval * 1000"
+    :mode="data.type"
   />
 </template>
 
@@ -14,10 +15,7 @@
   import { computed } from 'vue';
   import sheep from '@/sheep';
 
-  const dotMap = {
-    1: 'long',
-    2: 'tag',
-  };
+  // 轮播图
   const props = defineProps({
     data: {
       type: Object,
@@ -30,11 +28,15 @@
   });
 
   const imgList = computed(() =>
-    props.data.list.map((item) => ({
-      ...item,
-      src: sheep.$url.cdn(item.src),
-      poster: sheep.$url.cdn(item.poster),
-    })),
+      props.data.items.map((item) => {
+        const src = item.type === 'img' ? item.imgUrl : item.videoUrl;
+        return {
+          ...item,
+          type: item.type === 'img' ? 'image' : 'video',
+          src: sheep.$url.cdn(src),
+          poster: sheep.$url.cdn(item.imgUrl),
+        };
+      }),
   );
 </script>