From 5fc7b0755d658b70c33c18b0531acb6e0ad28b17 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期二, 03 六月 2025 09:39:13 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-jdhj-uniapp

---
 pages.json |   54 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 52 insertions(+), 2 deletions(-)

diff --git a/pages.json b/pages.json
index 5232a5f..965bd72 100644
--- a/pages.json
+++ b/pages.json
@@ -565,6 +565,26 @@
         "enablePullDownRefresh": false
       }
     },
+    // 鏍哥褰曞叆
+    {
+      "path": "pages/wareHouse/nuclearScale/index",
+      "style": {
+        "navigationStyle": "custom",
+        "navigationBarTitleText": "",
+        // "navigationBarBackgroundColor": "#CEE3FE",
+        "enablePullDownRefresh": false
+      }
+    },
+    // 鏍哥鍗曞彿
+    {
+      "path": "pages/wareHouse/nuclearScale/nuclearScaleList",
+      "style": {
+        "navigationStyle": "custom",
+        "navigationBarTitleText": "",
+        // "navigationBarBackgroundColor": "#CEE3FE",
+        "enablePullDownRefresh": false
+      }
+    },
     {
       "path": "pages/product/tailHandle/index",
       "style": {
@@ -680,6 +700,7 @@
       }
     },
     // 鐢熶骇鐩稿叧
+    // 鎶ュ伐
     {
       "path": "pages/product/report/index",
       "style": {
@@ -689,16 +710,45 @@
           "titleNView": {
             "buttons": [
               {
-                "text": "娓呯┖",
+                "text": "鎻愪氦",
                 "type": "none",
                 "color": "#ffffff",
-                "fontSize": "14px"
+                "fontSize": "14px",
+                "marginRight": "10px"
               }
             ]
           }
         }
       }
     },
+    // 杞﹂棿璁㈠崟鍒楄〃
+    {
+      "path": "pages/product/report/orderList",
+      "style": {
+        "navigationStyle": "custom",
+        "navigationBarTextStyle": "white",
+        "navigationBarBackgroundColor": "#3281FF"
+      }
+    },
+    // 鍙栨秷鎶ュ伐
+    {
+      "path": "pages/product/cancelReport/index",
+      "style": {
+        "navigationStyle": "custom",
+        "navigationBarTitleText": "",
+        // "navigationBarBackgroundColor": "#3281FF"
+        "enablePullDownRefresh": false
+      }
+    },
+    // 鐩樼偣鎶ュ憡鍙�
+    {
+      "path": "pages/wareHouse/inventory/orderList",
+      "style": {
+        "navigationStyle": "custom",
+        "navigationBarTextStyle": "white",
+        "navigationBarBackgroundColor": "#3281FF"
+      }
+    },
     // 鏃ユ姤鐩稿叧
     {
       "path": "pages/daily/common/work-order-list",

--
Gitblit v1.9.3