From 45480832726b04ad4873227a5c1872e888044b01 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 28 四月 2026 21:40:53 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/gtzxinglijicun
---
small-program/unpackage/dist/dev/mp-weixin/shop/pages/store-home/store-home.json | 4 ----
1 files changed, 0 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..e193747 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,7 @@
{
"navigationBarTitleText": "闂ㄥ簵棣栭〉",
-<<<<<<< HEAD
"navigationStyle": "custom",
"usingComponents": {
"custom-tabbar": "/components/custom-tabbar/custom-tabbar"
}
-=======
- "navigationStyle": "custom"
->>>>>>> 50573d8f1149d7020c38afb695116cb2953a3d43
}
\ No newline at end of file
--
Gitblit v1.9.3