From f7452b9d6295748c9840245d26df6514e8ed2c1d Mon Sep 17 00:00:00 2001
From: zhangyongtian <1181606322@qq.com>
Date: Sun, 08 Sep 2024 15:30:00 +0800
Subject: [PATCH] 合并冲突
---
gz-wxparty/pages/homePage/index.json | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/gz-wxparty/pages/homePage/index.json b/gz-wxparty/pages/homePage/index.json
index ea40d61..420077d 100644
--- a/gz-wxparty/pages/homePage/index.json
+++ b/gz-wxparty/pages/homePage/index.json
@@ -1,6 +1,5 @@
{
- "navigationBarBackgroundColor": "#ffffff",
- "navigationBarTextStyle": "black",
+
"usingComponents": {
"time-format": "../../components/time-format/index"
}
--
Gitblit v1.8.0