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 | 114 +++++++++++++++++++++++++++++++++++----------------------
1 files changed, 70 insertions(+), 44 deletions(-)
diff --git a/pages.json b/pages.json
index ea4a9f3..608c6c0 100644
--- a/pages.json
+++ b/pages.json
@@ -2,8 +2,8 @@
"easycom": {
"autoscan": true,
"custom": {
- "^u-(.*)": "@/components/uview-components/uview-ui/components/u-$1/u-$1.vue", //uview,
- "^uni-(.*)": "@/uni_modules/uni-$1/components/uni-$1/uni-$1.vue" // uniapp缁勪欢
+ "^u-(.*)": "@/components/uview-components/uview-ui/components/u-$1/u-$1.vue" //uview,
+ // "^uni-(.*)": "@/uni_modules/uni-$1/components/uni-$1/uni-$1.vue" // uniapp缁勪欢
}
},
// "preloadRule": {
@@ -26,12 +26,6 @@
"navigationStyle": "custom" // 闅愯棌椤堕儴瀵艰埅鏍�
}
},
- // {
- // "path": "pages/tabbar/index/home1",
- // "style": {
- // "navigationBarTitleText": ""
- // }
- // },
{
"path": "pages/tabbar/home/index",
"style": {
@@ -69,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": {
@@ -138,16 +134,6 @@
}
}
},
- // {
- // "path": "components/popups/popups",
- // "style": {
- // "navigationBarTitleText": "",
- // "navigationStyle": "custom",
- // "componentPlaceholder": {
- // "u-icon": "view"
- // }
- // }
- // },
{
"path": "components/m-buy/goods",
"style": {
@@ -264,6 +250,21 @@
}
},
{
+ "path": "pages/goods-manager/updateSkus/updateSkus",
+ "style": {
+ "enablePullDownRefresh": true,
+ "navigationBarTitleText": "璋冩暣搴撳瓨",
+ "componentPlaceholder": {
+ "u-icon": "view",
+ "u-button": "view",
+ "u-form": "view",
+ "u-form-item": "view",
+ "u-input": "view",
+ "u-popup": "view"
+ }
+ }
+ },
+ {
"path": "pages/userPermissions/userPermissions",
"style": {
"navigationBarTitleText": "鐢ㄦ埛鏉冮檺",
@@ -276,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": {
@@ -315,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"
}
}
}
@@ -1424,7 +1429,27 @@
}
}
]
+ },
+ {
+ "root": "pages/health",
+ "pages": [{
+ "path": "healthVideo",
+ "style": {
+ "navigationBarTitleText": "澶у仴搴�"
+ }
+ }]
}
+ // ,
+ // {
+ // "root": "pages/commodity-square",
+ // "pages": [{
+ // "path" : "commoditySquare",
+ // "style" :
+ // {
+ // "navigationBarTitleText" : "鍟嗗搧骞垮満"
+ // }
+ // }]
+ // }
],
"globalStyle": {
"navigationBarTextStyle": "black",
@@ -1452,7 +1477,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