From bb086627477351918c63d0daae2f8ee7b6a1315d Mon Sep 17 00:00:00 2001
From: Mr.Shi <1878285526@qq.com>
Date: 星期一, 28 八月 2023 11:49:45 +0800
Subject: [PATCH] 小程序
---
minipro_standard/pages.json | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/minipro_standard/pages.json b/minipro_standard/pages.json
index d4a9941..5c6f7ad 100644
--- a/minipro_standard/pages.json
+++ b/minipro_standard/pages.json
@@ -74,14 +74,18 @@
"navigationBarTitleText": "uni-app",
"navigationBarBackgroundColor": "#ffffff",
"backgroundColor": "#ffffff"
+<<<<<<< HEAD
+=======
+
+
+>>>>>>> 9e4d7b06a15aabe0141a991fe9358802a0590378
},
"tabBar": {
"color": "#666666",
"selectedColor": "#222222",
"borderStyle": "black",
"backgroundColor": "#fff",
- "list": [
- {
+ "list": [{
"pagePath": "pages/index/index",
"iconPath": "static/nav_daiban@2x.png",
"selectedIconPath": "static/nav_daiban_sel@2x.png",
--
Gitblit v1.9.3