From aa30c2659c4f70f285dfe5d1acf54f542b502bd0 Mon Sep 17 00:00:00 2001
From: owen <owen@evolsun.com>
Date: Thu, 11 Jan 2024 11:55:24 +0800
Subject: [PATCH] =?UTF-8?q?=E8=90=A5=E9=94=80=EF=BC=9A=E6=8E=A5=E5=85=A5?=
 =?UTF-8?q?=20APP=20=E8=A3=85=E4=BF=AE=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/page.vue                          | 39 +++++++++----------
 sheep/api/promotion/diy/page.js               | 15 +++++++
 .../s-goods-column/s-goods-column.vue         | 17 ++------
 3 files changed, 37 insertions(+), 34 deletions(-)
 create mode 100644 sheep/api/promotion/diy/page.js

diff --git a/pages/index/page.vue b/pages/index/page.vue
index bd687406..71b2498c 100644
--- a/pages/index/page.vue
+++ b/pages/index/page.vue
@@ -1,35 +1,32 @@
 <!-- 自定义页面：支持装修 -->
 <template>
   <s-layout
-    :title="page.name"
+    :title="state.name"
     navbar="custom"
-    :bgStyle="page.style?.background"
-    :navbarStyle="page.style?.navbar"
+    :bgStyle="state.page"
+    :navbarStyle="state.navigationBar"
     onShareAppMessage
     showLeftButton
   >
-    <s-block v-for="(item, index) in page.list" :key="index" :styles="item.style">
-      <s-block-item :type="item.type" :data="item.data" :styles="item.style" />
+    <s-block v-for="(item, index) in state.components" :key="index" :styles="item.property.style">
+      <s-block-item :type="item.id" :data="item.property" :styles="item.property.style" />
     </s-block>
   </s-layout>
 </template>
 
 <script setup>
-  import { computed, reactive } from 'vue';
-  import sheep from '@/sheep';
+  import { reactive } from 'vue';
   import { onLoad, onPageScroll } from '@dcloudio/uni-app';
+  import DiyPageApi from "@/sheep/api/promotion/diy/page";
 
-  const page = reactive({
+  const state = reactive({
     name: '',
-    list: [],
-    style: {},
+    components: [],
+    navigationBar: {},
+    page: {},
   });
   onLoad(async (options) => {
-    let id;
-
-    if (options.id) {
-      id = options.id;
-    }
+    let id = options.id
 
     // #ifdef MP
     // 小程序预览自定义页面
@@ -39,12 +36,12 @@
     }
     // #endif
 
-    // TODO @疯狂：貌似这里还没接上哈
-    const { error, data } = await sheep.$api.app.page(id);
-    if (error === 0) {
-      page.name = data.name;
-      page.list = data.diypage?.page?.data;
-      page.style = data.diypage?.page?.style;
+    const { code, data } = await DiyPageApi.getDiyPage(id);
+    if (code === 0) {
+      state.name = data.name;
+      state.components = data.property?.components;
+      state.navigationBar = data.property?.navigationBar;
+      state.page = data.property?.page;
     }
   });
 
diff --git a/sheep/api/promotion/diy/page.js b/sheep/api/promotion/diy/page.js
new file mode 100644
index 00000000..f5279295
--- /dev/null
+++ b/sheep/api/promotion/diy/page.js
@@ -0,0 +1,15 @@
+import request from '@/sheep/request';
+
+const DiyPageApi = {
+	getDiyPage: (id) => {
+		return request({
+			url: '/app-api/promotion/diy-page/get',
+			method: 'GET',
+			params: {
+				id
+			}
+		});
+	},
+};
+
+export default DiyPageApi;
diff --git a/sheep/components/s-goods-column/s-goods-column.vue b/sheep/components/s-goods-column/s-goods-column.vue
index 33ffce0c..8939254b 100644
--- a/sheep/components/s-goods-column/s-goods-column.vue
+++ b/sheep/components/s-goods-column/s-goods-column.vue
@@ -307,26 +307,17 @@
       type: [Array, Object],
       default() {
         return {
-          // TODO @疯狂：旧的要不剔除掉，后续都用新的
-          // 商品名称（旧）
-          title: { show: true },
-          // 商品介绍（旧）
-          subtitle: { show: true },
           // 商品价格
           price: { show: true },
-          // 市场价（旧）
-          original_price: { show: true },
-          // 销量（旧）
-          sales: { show: true },
           // 库存
           stock: { show: true },
-          // 商品名称（新）
+          // 商品名称
           name: { show: true },
-          // 商品介绍（新）
+          // 商品介绍
           introduction: { show: true },
-          // 市场价（新）
+          // 市场价
           marketPrice: { show: true },
-          // 销量（新）
+          // 销量
           salesCount: { show: true },
         };
       },