From c9928dd4f6d25e2339ea1400f59ec58674a927a7 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期四, 19 六月 2025 20:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
pages.json | 46 +++++++++++++++++++++++++---------------------
1 files changed, 25 insertions(+), 21 deletions(-)
diff --git a/pages.json b/pages.json
index e738c2e..608c6c0 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"
}
}
}
--
Gitblit v1.8.0