From 1aa94fb921d57707aa83009a75708aed4beaee95 Mon Sep 17 00:00:00 2001
From: Mr.Shi <1878285526@qq.com>
Date: 星期五, 01 九月 2023 11:51:57 +0800
Subject: [PATCH] 小程序
---
minipro_standard/pages.json | 29 +++++++++++++++++++++++++++++
1 files changed, 29 insertions(+), 0 deletions(-)
diff --git a/minipro_standard/pages.json b/minipro_standard/pages.json
index 52bd971..3670c91 100644
--- a/minipro_standard/pages.json
+++ b/minipro_standard/pages.json
@@ -127,6 +127,34 @@
}
},
{
+<<<<<<< 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": "鎵嬪姩鎶曟枡",
@@ -146,6 +174,7 @@
"navigationBarTitleText": "宸ュ崟鎶ュ伐",
"enablePullDownRefresh": false
}
+>>>>>>> a52f13d719ee9cd53f129f4c59dcad783977fce9
},
{
"path": "pages/transferList/transferList",
--
Gitblit v1.9.3