From 0c357e90050d9d461c6ab0d85e1b9c2bac2f6f55 Mon Sep 17 00:00:00 2001
From: zhangwencui <1064582902@qq.com>
Date: 星期一, 19 一月 2026 17:50:36 +0800
Subject: [PATCH] Merge branch 'dev_new' of http://114.132.189.42:9002/r/product-inventory-APP-before into dev_new

---
 src/pages.json |  115 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 111 insertions(+), 4 deletions(-)

diff --git a/src/pages.json b/src/pages.json
index 654c337..53ecfbb 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -268,9 +268,100 @@
       }
     },
     {
-      "path": "pages/cooperativeOffice/collaborativeApproval/index",
+      "path": "pages/cooperativeOffice/collaborativeApproval/index4",
       "style": {
-        "navigationBarTitleText": "瀹℃壒绠$悊",
+        "navigationBarTitleText": "鎶ラ攢绠$悊",
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/cooperativeOffice/collaborativeApproval/index5",
+      "style": {
+        "navigationBarTitleText": "閲囪喘绠$悊",
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/cooperativeOffice/collaborativeApproval/index6",
+      "style": {
+        "navigationBarTitleText": "鎶ヤ环绠$悊",
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/cooperativeOffice/collaborativeApproval/index7",
+      "style": {
+        "navigationBarTitleText": "鍑哄簱绠$悊",
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/managementMeetings/meetingSettings/index",
+      "style": {
+        "navigationBarTitleText": "浼氳璁剧疆",
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/managementMeetings/meetingSettings/detail",
+      "style": {
+        "navigationBarTitleText": "浼氳瀹よ鎯�",
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/managementMeetings/meetingList/index",
+      "style": {
+        "navigationBarTitleText": "浼氳鍒楄〃",
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/managementMeetings/meetApplication/index",
+      "style": {
+        "navigationBarTitleText": "浼氳鐢宠",
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/managementMeetings/meetExamine/index",
+      "style": {
+        "navigationBarTitleText": "浼氳瀹℃壒",
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/managementMeetings/meetExamine/approve",
+      "style": {
+        "navigationBarTitleText": "瀹℃壒",
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/managementMeetings/meetPublish/index",
+      "style": {
+        "navigationBarTitleText": "浼氳鍙戝竷",
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/managementMeetings/meetPublish/approve",
+      "style": {
+        "navigationBarTitleText": "鍙戝竷",
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/managementMeetings/meetSummary/index",
+      "style": {
+        "navigationBarTitleText": "浼氳鎬荤粨",
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/managementMeetings/meetSummary/approve",
+      "style": {
+        "navigationBarTitleText": "鎬荤粨",
         "navigationStyle": "custom"
       }
     },
@@ -313,6 +404,13 @@
       "path": "pages/cooperativeOffice/clientVisit/detail",
       "style": {
         "navigationBarTitleText": "娣诲姞瀹㈡埛鎷滆",
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/cooperativeOffice/noticeManagement/index",
+      "style": {
+        "navigationBarTitleText": "閫氱煡鍏憡",
         "navigationStyle": "custom"
       }
     },
@@ -411,7 +509,9 @@
       "path": "pages/inspectionUpload/index",
       "style": {
         "navigationBarTitleText": "宸℃涓婁紶",
-        "navigationStyle": "custom"
+        "navigationStyle": "custom",
+        "enablePullDownRefresh": true,
+        "backgroundColor": "#f8f8f8"
       }
     },
     {
@@ -443,7 +543,7 @@
       }
     },
     {
-      "path": "pages/productionManagement/productionReporting/index",
+      "path": "pages/productionManagement/productionReport/index",
       "style": {
         "navigationBarTitleText": "鐢熶骇鎶ュ伐",
         "navigationStyle": "custom"
@@ -469,6 +569,13 @@
         "navigationBarTitleText": "鏂板鍏ュ簱",
         "navigationStyle": "custom"
       }
+    },
+    {
+      "path": "pages/inventoryManagement/issueManagement/index",
+      "style": {
+        "navigationBarTitleText": "鑷畾涔夊嚭搴�",
+        "navigationStyle": "custom"
+      }
     }
   ],
   "subPackages": [

--
Gitblit v1.9.3