From 552238172036acf08ccf36134282a06b5e21b936 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期五, 22 五月 2026 18:07:49 +0800
Subject: [PATCH] 代码生成
---
small-program/unpackage/dist/dev/mp-weixin/shop/pages/store-home/store-home.json | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/small-program/unpackage/dist/dev/mp-weixin/shop/pages/store-home/store-home.json b/small-program/unpackage/dist/dev/mp-weixin/shop/pages/store-home/store-home.json
index 734faa3..41c8521 100644
--- a/small-program/unpackage/dist/dev/mp-weixin/shop/pages/store-home/store-home.json
+++ b/small-program/unpackage/dist/dev/mp-weixin/shop/pages/store-home/store-home.json
@@ -1,11 +1,8 @@
{
"navigationBarTitleText": "闂ㄥ簵棣栭〉",
-<<<<<<< HEAD
"navigationStyle": "custom",
"usingComponents": {
+ "u-icon": "/node-modules/uview-ui/components/u-icon/u-icon",
"custom-tabbar": "/components/custom-tabbar/custom-tabbar"
}
-=======
- "navigationStyle": "custom"
->>>>>>> 50573d8f1149d7020c38afb695116cb2953a3d43
}
\ No newline at end of file
--
Gitblit v1.9.3