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 |  184 +++++++++++++++++++++++----------------------
 1 files changed, 93 insertions(+), 91 deletions(-)

diff --git a/minipro_standard/pages.json b/minipro_standard/pages.json
index bd55d0e..3670c91 100644
--- a/minipro_standard/pages.json
+++ b/minipro_standard/pages.json
@@ -1,6 +1,5 @@
 {
-	"pages": [
-		{
+	"pages": [{
 			"path": "pages/workbench/workbench",
 			"style": {
 				"navigationBarTitleText": "宸ヤ綔鍙�",
@@ -53,85 +52,67 @@
 				"enablePullDownRefresh": false
 			}
 
+		}, {
+			"path": "pages/plannedProgress/plannedProgress",
+			"style": {
+				"navigationBarTitleText": "璁″垝杩涘害",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/planDetails/planDetails",
+			"style": {
+				"navigationBarTitleText": "璁″垝璇︽儏",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/plannedDistribution/plannedDistribution",
+			"style": {
+				"navigationBarTitleText": "璁″垝鍒嗛厤",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/allocation/allocation",
+			"style": {
+				"navigationBarTitleText": "閫夋嫨",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/inspectComplete/inspectComplete",
+			"style": {
+				"navigationBarTitleText": "瀹屽伐妫�",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/selectWorkOrder/selectWorkOrder",
+			"style": {
+				"navigationBarTitleText": "閫夋嫨宸ュ崟",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/inspectPatrol/inspectPatrol",
+			"style": {
+				"navigationBarTitleText": "宸℃",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/linePatrol/linePatrol",
+			"style": {
+				"navigationBarTitleText": "宸$嚎",
+				"enablePullDownRefresh": false
+			}
+
 		}
-	    ,{
-            "path" : "pages/plannedProgress/plannedProgress",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "璁″垝杩涘害",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/planDetails/planDetails",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "璁″垝璇︽儏",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/plannedDistribution/plannedDistribution",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "璁″垝鍒嗛厤",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/allocation/allocation",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "閫夋嫨",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/inspectComplete/inspectComplete",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "瀹屽伐妫�",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/selectWorkOrder/selectWorkOrder",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "閫夋嫨宸ュ崟",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/inspectPatrol/inspectPatrol",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "宸℃",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/linePatrol/linePatrol",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "宸$嚎",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-    ],
-	"subPackages": [
-		{
+	],
+	"subPackages": [{
 			"root": "pages_adjust",
-			"pages": [
-				{
+			"pages": [{
 					"path": "pages/newOutbound/newOutbound",
 					"style": {
 						"navigationBarTitleText": "鏂板缓鍑哄簱",
@@ -146,6 +127,7 @@
 					}
 				},
 				{
+<<<<<<< HEAD
 					"path": "pages/newTransfer/newTransfer",
 					"style": {
 						"navigationBarTitleText": "鏂板缓杞簱",
@@ -172,6 +154,27 @@
 						"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
+					}
+>>>>>>> a52f13d719ee9cd53f129f4c59dcad783977fce9
 				},
 				{
 					"path": "pages/transferList/transferList",
@@ -226,20 +229,19 @@
 		},
 		{
 			"root": "pages_inspect",
-			"pages": [
-				{
-				    "path": "pages/InspectionRecords/InspectionRecords",
-				    "style": {
-				        "navigationBarTitleText": "妫�楠岃褰�",
-				        "enablePullDownRefresh": false
-				    }
+			"pages": [{
+					"path": "pages/InspectionRecords/InspectionRecords",
+					"style": {
+						"navigationBarTitleText": "妫�楠岃褰�",
+						"enablePullDownRefresh": false
+					}
 				},
 				{
-				    "path": "pages/InspectionDetails/InspectionDetails",
-				    "style": {
-				        "navigationBarTitleText": "妫�楠岃鎯�",
-				        "enablePullDownRefresh": false
-				    }
+					"path": "pages/InspectionDetails/InspectionDetails",
+					"style": {
+						"navigationBarTitleText": "妫�楠岃鎯�",
+						"enablePullDownRefresh": false
+					}
 				}
 			]
 		}

--
Gitblit v1.9.3