From 682182cf67a5aa9fed34335fea22d4673f30f10c Mon Sep 17 00:00:00 2001
From: Mr.Shi <1878285526@qq.com>
Date: 星期一, 04 九月 2023 11:59:44 +0800
Subject: [PATCH] 小程序
---
minipro_standard/pages.json | 42 +++++++++++++++++-------------------------
1 files changed, 17 insertions(+), 25 deletions(-)
diff --git a/minipro_standard/pages.json b/minipro_standard/pages.json
index 3670c91..5fa16be 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,6 @@
"navigationBarTitleText": "宸ュ崟鎶ュ伐",
"enablePullDownRefresh": false
}
->>>>>>> a52f13d719ee9cd53f129f4c59dcad783977fce9
},
{
"path": "pages/transferList/transferList",
@@ -222,6 +200,20 @@
"path": "pages/InventoryQuery/InventoryQuery",
"style": {
"navigationBarTitleText": "搴撳瓨閲忔煡璇�",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path": "pages/reportingForWork/reportingForWork",
+ "style": {
+ "navigationBarTitleText": "涓�閿姤宸�",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path": "pages/processPlan/processPlan",
+ "style": {
+ "navigationBarTitleText": "閫夋嫨宸ュ簭璁″垝",
"enablePullDownRefresh": false
}
}
@@ -278,4 +270,4 @@
]
},
"uniIdRouter": {}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.3