From ac3fc3be76c0ca72177229f481768d611714fa0d Mon Sep 17 00:00:00 2001
From: Mr.Shi <1878285526@qq.com>
Date: 星期五, 01 九月 2023 11:53:46 +0800
Subject: [PATCH] 小程序
---
minipro_standard/pages.json | 49 ++++++++++++++++++++++++-------------------------
1 files changed, 24 insertions(+), 25 deletions(-)
diff --git a/minipro_standard/pages.json b/minipro_standard/pages.json
index 3670c91..58b5fa3 100644
--- a/minipro_standard/pages.json
+++ b/minipro_standard/pages.json
@@ -127,34 +127,13 @@
}
},
{
-<<<<<<< HEAD
"path": "pages/newTransfer/newTransfer",
"style": {
"navigationBarTitleText": "鏂板缓杞簱",
"enablePullDownRefresh": false
}
- },
- {
- "path": "pages/manualFeed/manualFeed",
- "style": {
- "navigationBarTitleText": "鎵嬪姩鎶曟枡",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/OrderDetail/OrderDetail",
- "style": {
- "navigationBarTitleText": "宸ュ崟璇︽儏",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/workOrderReporting/workOrderReporting",
- "style": {
- "navigationBarTitleText": "宸ュ崟鎶ュ伐",
- "enablePullDownRefresh": false
- }
-=======
+ },
+ {
"path": "pages/manualFeed/manualFeed",
"style": {
"navigationBarTitleText": "鎵嬪姩鎶曟枡",
@@ -174,7 +153,27 @@
"navigationBarTitleText": "宸ュ崟鎶ュ伐",
"enablePullDownRefresh": false
}
->>>>>>> a52f13d719ee9cd53f129f4c59dcad783977fce9
+ },
+ {
+ "path": "pages/manualFeed/manualFeed",
+ "style": {
+ "navigationBarTitleText": "鎵嬪姩鎶曟枡",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path": "pages/OrderDetail/OrderDetail",
+ "style": {
+ "navigationBarTitleText": "宸ュ崟璇︽儏",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path": "pages/workOrderReporting/workOrderReporting",
+ "style": {
+ "navigationBarTitleText": "宸ュ崟鎶ュ伐",
+ "enablePullDownRefresh": false
+ }
},
{
"path": "pages/transferList/transferList",
@@ -278,4 +277,4 @@
]
},
"uniIdRouter": {}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.3