修复冲突

Signed-off-by: Bluemark <kongdy@bluemark.cn>
2023-12-07 02:01:57 +00:00
parent 16a4fd21b1 2164c91488
commit 6251ffa994
25 changed files with 789 additions and 433 deletions
@@ -3,13 +3,13 @@
    title="我的"
    tabbar="/pages/index/user"
    navbar="custom"
-    :bgStyle="template.style?.background"
+    :bgStyle="template.page"
    :navbarStyle="template.style?.navbar"
    onShareAppMessage
    :showFloatButton="true"
  >
-    <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.property.style">
+      <s-block-item :type="item.id" :data="item.property" :styles="item.property.style" />
    </s-block>
  </s-layout>
 </template>