From 8bd5f9f3cc9e5b01071a0642a2bcbd842efff055 Mon Sep 17 00:00:00 2001
From: owen <owen@evolsun.com>
Date: Fri, 3 Nov 2023 06:47:45 +0800
Subject: [PATCH 01/10] =?UTF-8?q?=E8=90=A5=E9=94=80=EF=BC=9A=E8=A3=85?=
 =?UTF-8?q?=E4=BF=AE=E6=A8=A1=E6=9D=BF=EF=BC=8C=E5=BA=95=E9=83=A8=E5=AF=BC?=
 =?UTF-8?q?=E8=88=AA=E9=80=82=E9=85=8DAPP?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sheep/api/promotion/diy/template.js        | 10 ++++++++
 sheep/components/s-tabbar/s-tabbar.vue     | 28 ++++++++++++----------
 sheep/store/app.js                         | 12 ++++++++++
 sheep/ui/su-tabbar-item/su-tabbar-item.vue |  6 ++---
 4 files changed, 40 insertions(+), 16 deletions(-)
 create mode 100644 sheep/api/promotion/diy/template.js

diff --git a/sheep/api/promotion/diy/template.js b/sheep/api/promotion/diy/template.js
new file mode 100644
index 00000000..8c1312c3
--- /dev/null
+++ b/sheep/api/promotion/diy/template.js
@@ -0,0 +1,10 @@
+import request from '@/sheep/request';
+
+export default {
+  // TODO 芋艿：测试
+  getUsedDiyTemplate: () =>
+    request({
+      url: '/app-api/promotion/diy-template/used',
+      method: 'GET',
+    }),
+};
diff --git a/sheep/components/s-tabbar/s-tabbar.vue b/sheep/components/s-tabbar/s-tabbar.vue
index 279019cb..11c6cf34 100644
--- a/sheep/components/s-tabbar/s-tabbar.vue
+++ b/sheep/components/s-tabbar/s-tabbar.vue
@@ -1,29 +1,29 @@
 <template>
-  <view class="u-page__item" v-if="tabbar?.list.length > 0">
+  <view class="u-page__item" v-if="tabbar?.items.length > 0">
     <su-tabbar
       :value="path"
       :fixed="true"
       :placeholder="true"
       :safeAreaInsetBottom="true"
-      :inactiveColor="tabbar.inactiveColor"
-      :activeColor="tabbar.activeColor"
+      :inactiveColor="tabbar.style.color"
+      :activeColor="tabbar.style.activeColor"
       :midTabBar="tabbar.mode === 2"
       :customStyle="tabbarStyle"
     >
       <su-tabbar-item
-        v-for="(item, index) in tabbar.list"
+        v-for="(item, index) in tabbar.items"
         :key="item.text"
         :text="item.text"
         :name="item.url"
         :isCenter="getTabbarCenter(index)"
-        :centerImage="sheep.$url.cdn(item.inactiveIcon)"
+        :centerImage="sheep.$url.cdn(item.iconUrl)"
         @tap="sheep.$router.go(item.url)"
       >
         <template v-slot:active-icon>
-          <image class="u-page__item__slot-icon" :src="sheep.$url.cdn(item.activeIcon)"></image>
+          <image class="u-page__item__slot-icon" :src="sheep.$url.cdn(item.activeIconUrl)"></image>
         </template>
         <template v-slot:inactive-icon>
-          <image class="u-page__item__slot-icon" :src="sheep.$url.cdn(item.inactiveIcon)"></image>
+          <image class="u-page__item__slot-icon" :src="sheep.$url.cdn(item.iconUrl)"></image>
         </template>
       </su-tabbar-item>
     </su-tabbar>
@@ -39,20 +39,22 @@
   });
 
   const tabbarStyle = computed(() => {
-    const backgroundStyle = tabbar.value.background;
-    if (backgroundStyle.type == 'color') return { background: backgroundStyle.bgColor };
-    if (backgroundStyle.type == 'image')
+    const backgroundStyle = tabbar.value.style;
+    if (backgroundStyle.bgType === 'color') {
+      return { background: backgroundStyle.bgColor };
+    }
+    if (backgroundStyle.bgType === 'img')
       return {
         background: `url(${sheep.$url.cdn(
-          backgroundStyle.bgImage,
+          backgroundStyle.bgImg,
         )}) no-repeat top center / 100% auto`,
       };
   });
 
   const getTabbarCenter = (index) => {
     if (unref(tabbar).mode !== 2) return false;
-    return unref(tabbar).list % 2 > 0
-      ? Math.ceil(unref(tabbar).list.length / 2) === index + 1
+    return unref(tabbar).items % 2 > 0
+      ? Math.ceil(unref(tabbar).items.length / 2) === index + 1
       : false;
   };
 
diff --git a/sheep/store/app.js b/sheep/store/app.js
index 4aac0879..f1caf8b1 100644
--- a/sheep/store/app.js
+++ b/sheep/store/app.js
@@ -1,4 +1,5 @@
 import appApi from '@/sheep/api/app';
+import diyTemplateApi from '@/sheep/api/promotion/diy/template';
 import { defineStore } from 'pinia';
 import $platform from '@/sheep/platform';
 import $router from '@/sheep/router';
@@ -71,6 +72,17 @@ const app = defineStore({
         }
         this.chat = res.data.chat;
 
+        const diyTemplate = await diyTemplateApi.getUsedDiyTemplate();
+        if (diyTemplate?.data?.property) {
+          const templateProperty = JSON.parse(diyTemplate?.data?.property)
+          this.template.basic.tabbar = templateProperty.tabBar
+          if (templateProperty?.tabBar.theme) {
+            this.template.basic.theme = templateProperty?.tabBar.theme;
+          }
+        } else {
+          $router.error('TemplateError');
+        }
+
         // 加载主题
         const sysStore = sys();
         sysStore.setTheme();
diff --git a/sheep/ui/su-tabbar-item/su-tabbar-item.vue b/sheep/ui/su-tabbar-item/su-tabbar-item.vue
index e46a77b3..2fc5696f 100644
--- a/sheep/ui/su-tabbar-item/su-tabbar-item.vue
+++ b/sheep/ui/su-tabbar-item/su-tabbar-item.vue
@@ -8,7 +8,7 @@
         <image
           v-if="icon"
           :name="icon"
-          :color="isActive ? parentData.activeColor : parentData.inactiveColor"
+          :color="isActive ? parentData.activeColor : parentData.color"
           :size="20"
         ></image>
         <block v-else>
@@ -29,7 +29,7 @@
         <text
           class="u-tabbar-item__text"
           :style="{
-            color: isActive ? parentData.activeColor : parentData.inactiveColor,
+            color: isActive ? parentData.activeColor : parentData.color,
           }"
         >
           {{ text }}
@@ -120,7 +120,7 @@
         parentData: {
           value: null,
           activeColor: '',
-          inactiveColor: '',
+          color: '',
         },
         parent: {},
       };

From 614f8bb9fdf4221f17f628527956156798b746f2 Mon Sep 17 00:00:00 2001
From: owen <owen@evolsun.com>
Date: Fri, 3 Nov 2023 09:18:03 +0800
Subject: [PATCH 02/10] =?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?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.vue                         | 23 +++--------------
 .../components/s-block-item/s-block-item.vue  |  2 +-
 sheep/components/s-layout/s-layout.vue        |  8 +++---
 .../s-notice-block/s-notice-block.vue         |  9 ++++---
 sheep/store/app.js                            | 25 +++++++++++--------
 5 files changed, 29 insertions(+), 38 deletions(-)

diff --git a/pages/index/index.vue b/pages/index/index.vue
index 41567d99..64e6e4aa 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,9 +1,9 @@
 <template>
 	<view v-if="template">
-		<s-layout title="首页" navbar="custom" tabbar="/pages/index/index" :bgStyle="template.style?.background"
+		<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.data" :key="index" :styles="item.style">
-				<s-block-item :type="item.type" :data="item.data" :styles="item.style" />
+			<s-block v-for="(item, index) in template.components" :key="index" :styles="item.style">
+				<s-block-item :type="item.id" :data="item.property" :styles="item.property.style" />
 			</s-block>
 			<!-- 广告模块 -->
 			<s-popup-image />
@@ -22,25 +22,10 @@
 	} from '@dcloudio/uni-app';
 	import sheep from '@/sheep';
 	import $share from '@/sheep/platform/share';
-	import index2Api from '@/sheep/api/index2';
 	// 隐藏原生tabBar
 	uni.hideTabBar();
 
 	const template = computed(() => sheep.$store('app').template?.home);
-	// 在此处拦截改变一下首页轮播图 此处先写死后期复活
-	(async function() {
-		let {
-			data
-		} = await index2Api.decorate();
-		template.value.data[0].data.list = JSON.parse(data[0].value).map(item => {
-			return {
-				src: item.picUrl,
-				url: item.url,
-				title: item.name,
-				type: "image"
-			}
-		})
-	}())
 
 	onLoad((options) => {
 		// #ifdef MP
@@ -81,4 +66,4 @@
 	onPageScroll(() => {});
 </script>
 
-<style></style>
\ No newline at end of file
+<style></style>
diff --git a/sheep/components/s-block-item/s-block-item.vue b/sheep/components/s-block-item/s-block-item.vue
index 4a94b5e1..ee5b3fc8 100644
--- a/sheep/components/s-block-item/s-block-item.vue
+++ b/sheep/components/s-block-item/s-block-item.vue
@@ -5,7 +5,7 @@
     <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 === 'noticeBlock'" :data="data" />
+    <s-notice-block v-if="type === 'NoticeBar'" :data="data" />
     <s-search-block v-if="type === 'searchBlock'" :data="data" :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-layout/s-layout.vue b/sheep/components/s-layout/s-layout.vue
index 2aac7905..f3bcb689 100644
--- a/sheep/components/s-layout/s-layout.vue
+++ b/sheep/components/s-layout/s-layout.vue
@@ -161,8 +161,8 @@
   const bgMain = computed(() => {
     if (navbarMode.value === 'inner') {
       return {
-        background: `${props.bgStyle.color} url(${sheep.$url.cdn(
-          props.bgStyle.src,
+        background: `${props.bgStyle.backgroundColor} url(${sheep.$url.cdn(
+          props.bgStyle.backgroundImage,
         )}) no-repeat top center / 100% auto`,
       };
     }
@@ -173,8 +173,8 @@
   const bgBody = computed(() => {
     if (navbarMode.value === 'normal') {
       return {
-        background: `${props.bgStyle.color} url(${sheep.$url.cdn(
-          props.bgStyle.src,
+        background: `${props.bgStyle.backgroundColor} url(${sheep.$url.cdn(
+          props.bgStyle.backgroundImage,
         )}) no-repeat top center / 100% auto`,
       };
     }
diff --git a/sheep/components/s-notice-block/s-notice-block.vue b/sheep/components/s-notice-block/s-notice-block.vue
index 8ef01b87..c0c76655 100644
--- a/sheep/components/s-notice-block/s-notice-block.vue
+++ b/sheep/components/s-notice-block/s-notice-block.vue
@@ -1,15 +1,16 @@
 <template>
   <view class="ss-flex ss-col-center notice-wrap">
-    <image class="icon-img" :src="sheep.$url.cdn(data.src)" mode="heightFix"></image>
+    <image class="icon-img" :src="sheep.$url.cdn(data.iconUrl)" mode="heightFix"></image>
+    <!-- todo：@owen 暂时只支持一个公告   -->
     <su-notice-bar
       style="flex: 1"
       :showIcon="false"
       scrollable
       single
-      :text="data.title.text"
+      :text="data.contents[0].text"
       :speed="50"
-      :color="data.title.color"
-      @tap="sheep.$router.go(data.url)"
+      :color="data.textColor"
+      @tap="sheep.$router.go(data.contents[0].url)"
     ></su-notice-bar>
   </view>
 </template>
diff --git a/sheep/store/app.js b/sheep/store/app.js
index f1caf8b1..23b87c8f 100644
--- a/sheep/store/app.js
+++ b/sheep/store/app.js
@@ -72,16 +72,7 @@ const app = defineStore({
         }
         this.chat = res.data.chat;
 
-        const diyTemplate = await diyTemplateApi.getUsedDiyTemplate();
-        if (diyTemplate?.data?.property) {
-          const templateProperty = JSON.parse(diyTemplate?.data?.property)
-          this.template.basic.tabbar = templateProperty.tabBar
-          if (templateProperty?.tabBar.theme) {
-            this.template.basic.theme = templateProperty?.tabBar.theme;
-          }
-        } else {
-          $router.error('TemplateError');
-        }
+        await adaptTemplate(this.template);
 
         // 加载主题
         const sysStore = sys();
@@ -108,4 +99,18 @@ const app = defineStore({
   },
 });
 
+// todo: @owen 先做数据适配，后期重构
+const adaptTemplate = async (appTemplate) => {
+  const diyTemplate = await diyTemplateApi.getUsedDiyTemplate();
+  const tabBar = diyTemplate?.data?.property?.tabBar;
+  if (tabBar) {
+    appTemplate.basic.tabbar = tabBar
+    if (tabBar?.theme) {
+      appTemplate.basic.theme = tabBar?.theme;
+    }
+  }
+  appTemplate.home = diyTemplate?.data?.home;
+  // appTemplate.user = diyTemplate?.data?.user;
+}
+
 export default app;

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 03/10] =?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 64e6e4aa..50ea8101 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 ee5b3fc8..1b98456e 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 529839cb..19638fca 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 5e3e08fa..1e9c2b51 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 04/10] =?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 1b98456e..dc1b4f49 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 27983f84..ff9348ca 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 05/10] =?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 dc1b4f49..f85700b5 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 7911ca0f..7a659ad8 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 a1af8a5f..a75a79c9 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 06/10] =?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 f85700b5..52c10785 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 4e03ae98..64feffd4 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>
 

From 4af42e294977a6c87048c267681e294733d90dd3 Mon Sep 17 00:00:00 2001
From: owen <owen@evolsun.com>
Date: Wed, 8 Nov 2023 19:27:28 +0800
Subject: [PATCH 07/10] =?UTF-8?q?=E8=90=A5=E9=94=80=EF=BC=9A=E6=95=B4?=
 =?UTF-8?q?=E7=90=86=E5=95=86=E5=9F=8E=E8=A3=85=E4=BF=AE=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/s-block-item/s-block-item.vue  | 63 +++++++++++++------
 1 file changed, 43 insertions(+), 20 deletions(-)

diff --git a/sheep/components/s-block-item/s-block-item.vue b/sheep/components/s-block-item/s-block-item.vue
index 52c10785..599027c2 100644
--- a/sheep/components/s-block-item/s-block-item.vue
+++ b/sheep/components/s-block-item/s-block-item.vue
@@ -1,34 +1,57 @@
 <template>
   <view>
-    <s-image-block v-if="type === 'ImageBar'" :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" />
-
-    <s-notice-block v-if="type === 'NoticeBar'" :data="data" />
+    <!-- 基础组件：搜索框 -->
     <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" />
-
+    <!-- 基础组件：公告栏 -->
+    <s-notice-block v-if="type === 'NoticeBar'" :data="data" />
+    <!-- 基础组件：菜单导航 -->
     <s-menu-button v-if="type === 'menuButton'" :data="data" :styles="styles" />
+    <!-- 基础组件：列表导航 -->
     <s-menu-list v-if="type === 'menuList'" :data="data" />
+    <!-- 基础组件：宫格导航 -->
     <s-menu-grid v-if="type === 'menuGrid'" :data="data" />
 
-    <s-user-card v-if="type === 'userCard'" />
-    <s-wallet-card v-if="type === 'walletCard'" />
-    <s-order-card v-if="type === 'orderCard'" :data="data" />
+    <!-- 图文组件：图片展示 -->
+    <s-image-block v-if="type === 'ImageBar'" :data="data" :styles="styles" />
+    <!-- 图文组件：图片轮播 -->
+    <s-image-banner v-if="type === 'Carousel'" :data="data" :styles="styles" />
+    <!-- 基础组件：标题栏 -->
+    <s-title-block v-if="type === 'titleBlock'" :data="data" :styles="styles" />
+    <!-- 图文组件：广告魔方 -->
+    <s-image-cube v-if="type === 'imageCube'" :data="data" :styles="styles" />
+    <!-- 图文组件：视频播放 -->
+    <s-video-block v-if="type === 'VideoPlayer'" :data="data" :styles="styles" />
+    <!-- 基础组件：辅助线 -->
+    <s-line-block v-if="type === 'lineBlock'" :data="data" />
+    <!-- 图文组件：富文字 -->
+    <s-richtext-block v-if="type === 'richtext'" :data="data" :styles="styles" />
+    <!-- 图文组件：热区 -->
+    <s-hotzone-block v-if="type === 'hotzone'" :data="data" :styles="styles" />
 
-    <s-coupon-card v-if="type === 'couponCard'" />
+    <!-- 商品组件：商品卡片 -->
     <s-goods-card v-if="type === 'goodsCard'" :data="data" :styles="styles" />
-    <s-score-block v-if="type === 'scoreGoods'" :data="data" :styles="styles" />
+    <!-- 商品组件：商品栏 -->
     <s-goods-shelves v-if="type === 'goodsShelves'" :data="data" :styles="styles" />
-    <s-coupon-block v-if="type === 'coupon'" :data="data" :styles="styles"></s-coupon-block>
-    <s-live-block v-if="type === 'mplive'" :data="data" :styles="styles"></s-live-block>
-    <s-seckill-block v-if="type === 'seckill'" :data="data" :styles="styles"></s-seckill-block>
-    <s-groupon-block v-if="type === 'groupon'" :data="data" :styles="styles"></s-groupon-block>
-    <s-richtext-block v-if="type === 'richtext'" :data="data" :styles="styles"></s-richtext-block>
-    <s-hotzone-block v-if="type === 'hotzone'" :data="data" :styles="styles"></s-hotzone-block>
 
+    <!-- 营销组件：拼团 -->
+    <s-groupon-block v-if="type === 'groupon'" :data="data" :styles="styles" />
+    <!-- 营销组件：秒杀 -->
+    <s-seckill-block v-if="type === 'seckill'" :data="data" :styles="styles" />
+    <!-- 营销组件：积分商城 -->
+    <s-score-block v-if="type === 'scoreGoods'" :data="data" :styles="styles" />
+    <!-- 营销组件：小程序直播 -->
+    <s-live-block v-if="type === 'mplive'" :data="data" :styles="styles" />
+    <!-- 营销组件：优惠券 -->
+    <s-coupon-block v-if="type === 'coupon'" :data="data" :styles="styles" />
+
+    <!-- 会员组件：会员卡片 -->
+    <s-user-card v-if="type === 'userCard'" />
+    <!-- 会员组件：订单卡片 -->
+    <s-order-card v-if="type === 'orderCard'" :data="data" />
+    <!-- 会员组件：资产卡片 -->
+    <s-wallet-card v-if="type === 'walletCard'" />
+    <!-- 会员组件：卡券卡片 -->
+    <s-coupon-card v-if="type === 'couponCard'" />
   </view>
 </template>
 

From b050edae8d8f67e2ccf9af137c263897714015b5 Mon Sep 17 00:00:00 2001
From: owen <owen@evolsun.com>
Date: Wed, 8 Nov 2023 21:10:04 +0800
Subject: [PATCH 08/10] =?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=E5=88=97=E8=A1=A8=E5=AF=BC=E8=88=AA=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-menu-list/s-menu-list.vue   | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/sheep/components/s-block-item/s-block-item.vue b/sheep/components/s-block-item/s-block-item.vue
index 599027c2..2b52818c 100644
--- a/sheep/components/s-block-item/s-block-item.vue
+++ b/sheep/components/s-block-item/s-block-item.vue
@@ -7,7 +7,7 @@
     <!-- 基础组件：菜单导航 -->
     <s-menu-button v-if="type === 'menuButton'" :data="data" :styles="styles" />
     <!-- 基础组件：列表导航 -->
-    <s-menu-list v-if="type === 'menuList'" :data="data" />
+    <s-menu-list v-if="type === 'MenuList'" :data="data" />
     <!-- 基础组件：宫格导航 -->
     <s-menu-grid v-if="type === 'menuGrid'" :data="data" />
 
diff --git a/sheep/components/s-menu-list/s-menu-list.vue b/sheep/components/s-menu-list/s-menu-list.vue
index ecf6b12a..652df903 100644
--- a/sheep/components/s-menu-list/s-menu-list.vue
+++ b/sheep/components/s-menu-list/s-menu-list.vue
@@ -11,25 +11,25 @@
         <template v-slot:header>
           <view class="ss-flex ss-col-center">
             <image
-              v-if="item.src"
+              v-if="item.iconUrl"
               class="list-icon"
-              :src="sheep.$url.cdn(item.src)"
+              :src="sheep.$url.cdn(item.iconUrl)"
               mode="aspectFit"
             ></image>
             <view
               class="title-text ss-flex ss-row-center ss-col-center ss-m-l-20"
-              :style="[{ color: item.title.color }]"
+              :style="[{ color: item.titleColor }]"
             >
-              {{ item.title.text }}
+              {{ item.title }}
             </view>
           </view>
         </template>
         <template v-slot:footer>
           <view
             class="notice-text ss-flex ss-row-center ss-col-center"
-            :style="[{ color: item.tip.color }]"
+            :style="[{ color: item.subtitleColor }]"
           >
-            {{ item.tip.text }}
+            {{ item.subtitle }}
           </view>
         </template>
       </uni-list-item>

From a40aa1218d9ba8f90b20582b92aaab7bb5122da5 Mon Sep 17 00:00:00 2001
From: owen <owen@evolsun.com>
Date: Wed, 8 Nov 2023 22:22:34 +0800
Subject: [PATCH 09/10] =?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=E5=AE=AB=E6=A0=BC=E5=AF=BC=E8=88=AA=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-menu-grid/s-menu-grid.vue   | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/sheep/components/s-block-item/s-block-item.vue b/sheep/components/s-block-item/s-block-item.vue
index 2b52818c..60e7280c 100644
--- a/sheep/components/s-block-item/s-block-item.vue
+++ b/sheep/components/s-block-item/s-block-item.vue
@@ -9,7 +9,7 @@
     <!-- 基础组件：列表导航 -->
     <s-menu-list v-if="type === 'MenuList'" :data="data" />
     <!-- 基础组件：宫格导航 -->
-    <s-menu-grid v-if="type === 'menuGrid'" :data="data" />
+    <s-menu-grid v-if="type === 'MenuGrid'" :data="data" />
 
     <!-- 图文组件：图片展示 -->
     <s-image-block v-if="type === 'ImageBar'" :data="data" :styles="styles" />
diff --git a/sheep/components/s-menu-grid/s-menu-grid.vue b/sheep/components/s-menu-grid/s-menu-grid.vue
index e6c385b4..3cf62485 100644
--- a/sheep/components/s-menu-grid/s-menu-grid.vue
+++ b/sheep/components/s-menu-grid/s-menu-grid.vue
@@ -1,5 +1,5 @@
 <template>
-  <uni-grid :showBorder="Boolean(data.border)" :column="data.col">
+  <uni-grid :showBorder="Boolean(data.border)" :column="data.column">
     <uni-grid-item
       v-for="(item, index) in data.list"
       :key="index"
@@ -10,19 +10,19 @@
           <view
             class="tag-box"
             v-if="item.badge.show"
-            :style="[{ background: item.badge.bgColor, color: item.badge.color }]"
+            :style="[{ background: item.badge.bgColor, color: item.badge.textColor }]"
           >
             {{ item.badge.text }}
           </view>
-          <image class="menu-image" :src="sheep.$url.cdn(item.src)"></image>
+          <image class="menu-image" :src="sheep.$url.cdn(item.iconUrl)"></image>
         </view>
 
         <view class="title-box ss-flex ss-flex-col ss-row-center ss-col-center">
-          <view class="grid-text" :style="[{ color: item.title.color }]">
-            {{ item.title.text }}
+          <view class="grid-text" :style="[{ color: item.titleColor }]">
+            {{ item.title }}
           </view>
-          <view class="grid-tip" :style="[{ color: item.tip.color }]">
-            {{ item.tip.text }}
+          <view class="grid-tip" :style="[{ color: item.subtitleColor }]">
+            {{ item.subtitle }}
           </view>
         </view>
       </view>

From e4af437545e9ff293feb0cae2269761684408941 Mon Sep 17 00:00:00 2001
From: owen <owen@evolsun.com>
Date: Thu, 9 Nov 2023 09:18:45 +0800
Subject: [PATCH 10/10] =?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=8F=9C=E5=8D=95=E5=AF=BC=E8=88=AA=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-menu-button/s-menu-button.vue           | 26 +++++++------------
 2 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/sheep/components/s-block-item/s-block-item.vue b/sheep/components/s-block-item/s-block-item.vue
index 60e7280c..3d19d856 100644
--- a/sheep/components/s-block-item/s-block-item.vue
+++ b/sheep/components/s-block-item/s-block-item.vue
@@ -5,7 +5,7 @@
     <!-- 基础组件：公告栏 -->
     <s-notice-block v-if="type === 'NoticeBar'" :data="data" />
     <!-- 基础组件：菜单导航 -->
-    <s-menu-button v-if="type === 'menuButton'" :data="data" :styles="styles" />
+    <s-menu-button v-if="type === 'MenuSwiper'" :data="data" :styles="styles" />
     <!-- 基础组件：列表导航 -->
     <s-menu-list v-if="type === 'MenuList'" :data="data" />
     <!-- 基础组件：宫格导航 -->
diff --git a/sheep/components/s-menu-button/s-menu-button.vue b/sheep/components/s-menu-button/s-menu-button.vue
index 5bf52c3a..50886d0e 100644
--- a/sheep/components/s-menu-button/s-menu-button.vue
+++ b/sheep/components/s-menu-button/s-menu-button.vue
@@ -21,12 +21,12 @@
         :class="{ cur: state.cur == index }"
       >
         <!-- 宫格 -->
-        <view class="grid-wrap" :col="data.rowNum">
+        <view class="grid-wrap">
           <view
             v-for="(item, index) in arr"
             :key="index"
             class="grid-item ss-flex ss-flex-col ss-col-center ss-row-center"
-            :style="[{ width: clWidth + 'px', height: '200rpx' }]"
+            :style="[{ width: `${100 * (1 / data.column)}%`, height: '200rpx' }]"
             hover-class="ss-hover-btn"
             @tap="sheep.$router.go(item.url)"
           >
@@ -34,12 +34,12 @@
               <view
                 v-if="item.badge.show"
                 class="tag-box"
-                :style="[{ background: item.badge.bgColor, color: item.badge.color }]"
+                :style="[{ background: item.badge.bgColor, color: item.badge.textColor }]"
               >
                 {{ item.badge.text }}
               </view>
               <image
-                v-if="item.src"
+                v-if="item.iconUrl"
                 class="menu-icon"
                 :style="[
                   {
@@ -47,15 +47,15 @@
                     height: props.iconSize + 'rpx',
                   },
                 ]"
-                :src="sheep.$url.cdn(item.src)"
+                :src="sheep.$url.cdn(item.iconUrl)"
                 mode="aspectFill"
               ></image>
               <view
-                v-if="data.layout == 1"
+                v-if="data.layout === 'iconText'"
                 class="menu-title"
-                :style="[{ color: item.title.color }]"
+                :style="[{ color: item.titleColor }]"
               >
-                {{ item.title.text }}
+                {{ item.title }}
               </view>
             </view>
           </view>
@@ -206,15 +206,9 @@
   });
 
   // 生成数据
-  const menuList = computed(() => splitData(props.data.list, props.data.row * props.data.col));
-  const swiperHeight = computed(() => props.data.row * (props.data.layout == 1 ? 200 : 180));
+  const menuList = computed(() => splitData(props.data.list, props.data.row * props.data.column));
+  const swiperHeight = computed(() => props.data.row * (props.data.layout === 'iconText' ? 200 : 180));
   const windowWidth = sheep.$platform.device.windowWidth;
-  const clWidth = computed(
-    () =>
-      (windowWidth -
-        (props.styles.marginLeft + props.styles.marginRight + props.styles.padding * 2)) /
-      props.data.col,
-  );
 
   // current 改变时会触发 change 事件
   const swiperChange = (e) => {