修复冲突

Signed-off-by: Bluemark <kongdy@bluemark.cn>
2023-12-13 01:56:36 +00:00
parent cf2c782c0e 25a82c1812
commit 7c2ab0b7ad
24 changed files with 1231 additions and 1147 deletions
@@ -1,4 +1,5 @@
 <template>
+
 	<s-layout title="我的" tabbar="/pages/index/user" navbar="custom" :bgStyle="template.page"
 		:navbarStyle="template.style?.navbar" onShareAppMessage>
 		<s-block v-for="(item, index) in template.components" :key="index" :styles="item.property.style">