From fe97f78b9a343ee9fa45a3531d03d73dcd1df31b Mon Sep 17 00:00:00 2001
From: qx <1084500556@qq.com>
Date: 星期三, 06 八月 2025 10:15:12 +0800
Subject: [PATCH] :测试提交“
---
pages.json | 32 ++++++++++++++++++++++++++++++++
1 files changed, 32 insertions(+), 0 deletions(-)
diff --git a/pages.json b/pages.json
index 0af4775..ca1097e 100644
--- a/pages.json
+++ b/pages.json
@@ -1,10 +1,17 @@
{
"lazyCodeLoading": "requiredComponents",
+<<<<<<< HEAD
+ "easycom": {
+ "^u-(.*)": "uview-ui/components/u-$1/u-$1.vue"
+ },
+ "pages": [{
+=======
"easycom": {
"^u-(.*)": "@/uni_modules/uview-ui/components/u-$1/u-$1.vue"
},
"pages": [
{
+>>>>>>> master
"path": "pages/index",
"style": {
"navigationBarTitleText": "棣栭〉"
@@ -13,7 +20,11 @@
{
"path": "pages/fg/fg",
"style": {
+<<<<<<< HEAD
+ "navigationBarTitleText": "闄㈠尯淇℃伅",
+=======
"navigationBarTitleText": "闄㈠尯",
+>>>>>>> master
"enablePullDownRefresh": false
}
@@ -29,6 +40,14 @@
"navigationBarTitleText": "鎴戠殑"
}
}, {
+<<<<<<< HEAD
+=======
+ "path": "pages/mine/erweima",
+ "style": {
+ "navigationBarTitleText": "鎴戠殑"
+ }
+ },{
+>>>>>>> master
"path": "pages/cart/cart",
"style": {
"navigationBarTitleText": "棰勭害鍋ュ悍"
@@ -104,6 +123,15 @@
}
},
{
+<<<<<<< HEAD
+ "path": "ReportBaogao/ReportBaogao",
+ "style": {
+ "navigationBarTitleText": "棰勮鎶ュ憡"
+ }
+ },
+ {
+=======
+>>>>>>> master
"path": "payResult/payResult",
"style": {
"navigationBarTitleText": "浠樻缁撴灉",
@@ -218,6 +246,10 @@
"enablePullDownRefresh": false
}
},
+<<<<<<< HEAD
+
+=======
+>>>>>>> master
{
"path": "goHosp/goHosp",
"style": {
--
Gitblit v1.8.0