From e50f021ddf73b80f5a1273b8b01e7dd4344a4cdc Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期二, 24 六月 2025 14:17:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
pages.json | 106 ++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 84 insertions(+), 22 deletions(-)
diff --git a/pages.json b/pages.json
index e6543f3..68e223e 100644
--- a/pages.json
+++ b/pages.json
@@ -63,12 +63,14 @@
}
},
{
- "path": "pages/tabbar/category/category",
+ // "path": "pages/tabbar/category/category",
+ "path": "pages/commodity-square/commoditySquare",
+
"style": {
- "navigationBarTitleText": "鍒嗙被",
- "navigationStyle": "custom", // 闅愯棌绯荤粺瀵艰埅鏍�
+ "navigationBarTitleText": "鍟嗗搧骞垮満",
+ // "navigationStyle": "custom", // 闅愯棌绯荤粺瀵艰埅鏍�
"navigationBarTextStyle": "black",
- "disableScroll": true,
+ // "disableScroll": true,
"bounce": "none",
"scrollIndicator": "none",
"componentPlaceholder": {
@@ -132,16 +134,6 @@
}
}
},
- // {
- // "path": "components/popups/popups",
- // "style": {
- // "navigationBarTitleText": "",
- // "navigationStyle": "custom",
- // "componentPlaceholder": {
- // "u-icon": "view"
- // }
- // }
- // },
{
"path": "components/m-buy/goods",
"style": {
@@ -285,14 +277,15 @@
"u-popup": "view",
"u-search": "view",
"u-loading": "view",
- "u-navbar": "view"
+ "u-navbar": "view",
+ "u-loadmore":"view"
}
}
},
{
- "path": "pages/customerManager/customerManager",
+ "path": "pages/news/news",
"style": {
- "navigationBarTitleText": "瀹㈡埛绠＄悊",
+ "navigationBarTitleText": "鏂伴椈",
"componentPlaceholder": {
"u-icon": "view",
"u-button": "view",
@@ -302,12 +295,49 @@
"u-popup": "view",
"u-search": "view",
"u-loading": "view",
- "u-checkbox": "view",
- "u-checkbox-group": "view",
- "u-navbar": "view"
+ "u-navbar": "view",
+ "u-loadmore":"view"
}
}
},
+ {
+ "path": "pages/news/detail",
+ "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-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",
+ // "u-loadmore":"view"
+ // }
+ // }
+ // },
{
"path": "pages/userPermissions/addStoreMember",
"style": {
@@ -324,7 +354,9 @@
"u-loading": "view",
"u-checkbox": "view",
"u-checkbox-group": "view",
- "u-navbar": "view"
+ "u-navbar": "view",
+ "u-loadmore":"view",
+ "u-switch": "view"
}
}
}
@@ -1433,7 +1465,36 @@
}
}
]
+ },
+ {
+ "root": "pages/health",
+ "pages": [{
+ "path": "healthVideo",
+ "style": {
+ "navigationBarTitleText": "澶у仴搴�"
+ }
+ }]
+ },
+ {
+ "root": "pages/kitchen",
+ "pages": [{
+ "path": "KitchenVideo",
+ "style": {
+ "navigationBarTitleText": "鍘ㄧ"
+ }
+ }]
}
+ // ,
+ // {
+ // "root": "pages/commodity-square",
+ // "pages": [{
+ // "path" : "commoditySquare",
+ // "style" :
+ // {
+ // "navigationBarTitleText" : "鍟嗗搧骞垮満"
+ // }
+ // }]
+ // }
],
"globalStyle": {
"navigationBarTextStyle": "black",
@@ -1461,7 +1522,8 @@
"text": "棣栭〉"
},
{
- "pagePath": "pages/tabbar/category/category",
+ // "pagePath": "pages/tabbar/category/category",
+ "pagePath": "pages/commodity-square/commoditySquare",
"iconPath": "static/tabbar/category.png",
"selectedIconPath": "static/tabbar/category-s.png",
"text": "鍟嗗煄"
--
Gitblit v1.8.0