From 28167c45044ddb9ceff22b44e48a7ab496b8839a Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期三, 25 六月 2025 10:47:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
pages.json | 55 ++++++++++++++++++++++++++++++++++---------------------
1 files changed, 34 insertions(+), 21 deletions(-)
diff --git a/pages.json b/pages.json
index e738c2e..553798b 100644
--- a/pages.json
+++ b/pages.json
@@ -277,29 +277,31 @@
"u-popup": "view",
"u-search": "view",
"u-loading": "view",
- "u-navbar": "view"
+ "u-navbar": "view",
+ "u-loadmore":"view"
}
}
},
- {
- "path": "pages/customerManager/customerManager",
- "style": {
- "navigationBarTitleText": "瀹㈡埛绠＄悊",
- "componentPlaceholder": {
- "u-icon": "view",
- "u-button": "view",
- "u-form": "view",
- "u-form-item": "view",
- "u-input": "view",
- "u-popup": "view",
- "u-search": "view",
- "u-loading": "view",
- "u-checkbox": "view",
- "u-checkbox-group": "view",
- "u-navbar": "view"
- }
- }
- },
+ // {
+ // "path": "pages/customerManager/customerManager",
+ // "style": {
+ // "navigationBarTitleText": "瀹㈡埛绠＄悊",
+ // "componentPlaceholder": {
+ // "u-icon": "view",
+ // "u-button": "view",
+ // "u-form": "view",
+ // "u-form-item": "view",
+ // "u-input": "view",
+ // "u-popup": "view",
+ // "u-search": "view",
+ // "u-loading": "view",
+ // "u-checkbox": "view",
+ // "u-checkbox-group": "view",
+ // "u-navbar": "view",
+ // "u-loadmore":"view"
+ // }
+ // }
+ // },
{
"path": "pages/userPermissions/addStoreMember",
"style": {
@@ -316,7 +318,9 @@
"u-loading": "view",
"u-checkbox": "view",
"u-checkbox-group": "view",
- "u-navbar": "view"
+ "u-navbar": "view",
+ "u-loadmore":"view",
+ "u-switch": "view"
}
}
}
@@ -1434,6 +1438,15 @@
"navigationBarTitleText": "澶у仴搴�"
}
}]
+ },
+ {
+ "root": "pages/kitchen",
+ "pages": [{
+ "path": "KitchenVideo",
+ "style": {
+ "navigationBarTitleText": "鍘ㄧ"
+ }
+ }]
}
// ,
// {
--
Gitblit v1.8.0