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 | 409 ++++++++++++++++++++++++++++++++++------------------------
1 files changed, 239 insertions(+), 170 deletions(-)
diff --git a/pages.json b/pages.json
index 2a77e9f..608c6c0 100644
--- a/pages.json
+++ b/pages.json
@@ -2,20 +2,21 @@
"easycom": {
"autoscan": true,
"custom": {
- "^u-(.*)": "@/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": {
- "pages/tabbar/index/home": // 椤甸潰璺緞
- // 椤甸潰鐨勯涓嬭浇閰嶇疆
- {
- "network": "all", // all(涓嶉檺缃戠粶) wifi(浠厀ifi涓嬮涓嬭浇)
- "packages": ["uview-components"] // 棰勪笅杞藉垎鍖呯殑 root 鎴� name銆俖_APP__ 琛ㄧず涓诲寘
- }
- },
+ // "preloadRule": {
+ // "pages/tabbar/index/home": // 椤甸潰璺緞
+ // // 椤甸潰鐨勯涓嬭浇閰嶇疆
+ // {
+ // "network": "all", // all(涓嶉檺缃戠粶) wifi(浠厀ifi涓嬮涓嬭浇)
+ // "packages": [
+ // "components/uview-components"
+ // ] // 棰勪笅杞藉垎鍖呯殑 root 鎴� name銆俖_APP__ 琛ㄧず涓诲寘
+ // }
+ // },
"pages": [
-
// 绗竴涓氨鏄椤�
{
"path": "pages/tabbar/index/home",
@@ -23,13 +24,6 @@
// "navigationBarTitleText" : "瑙嗛",
"enablePullDownRefresh": false,
"navigationStyle": "custom" // 闅愯棌椤堕儴瀵艰埅鏍�
- }
- },
- {
- "path" : "pages/tabbar/index/home1",
- "style" :
- {
- "navigationBarTitleText" : ""
}
},
{
@@ -67,13 +61,16 @@
"u-toast": "view"
}
}
- }, {
- "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": {
@@ -179,7 +176,8 @@
"u-back-top": "view"
}
}
- }, {
+ },
+ {
"path": "pages/tabbar/user/my",
"style": {
"navigationBarTextStyle": "white",
@@ -192,12 +190,9 @@
}
}
},
-
{
"path": "pages/tabbar/home/web-view",
- "style": {
-
- }
+ "style": {}
},
{
"path": "pages/tabbar/special/special",
@@ -225,13 +220,48 @@
"path": "pages/goods-manager/goodsList/goodsList",
"style": {
"enablePullDownRefresh": true,
- "navigationBarTitleText": "鍟嗗搧鍒楄〃"
+ "navigationBarTitleText": "鍟嗗搧鍒楄〃",
+ "componentPlaceholder": {
+ "u-icon": "view",
+ "u-button": "view",
+ "u-form": "view",
+ "u-form-item": "view",
+ "u-input": "view",
+ "u-popup": "view",
+ "u-search": "view"
+ }
}
},
{
"path": "pages/goods-manager/addGoods/addGoods",
"style": {
- "navigationBarTitleText": ""
+ "enablePullDownRefresh": true,
+ "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-upload": "view"
+ }
+ }
+ },
+ {
+ "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"
+ }
}
},
{
@@ -247,31 +277,31 @@
"u-popup": "view",
"u-search": "view",
"u-loading": "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-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": {
@@ -288,26 +318,30 @@
"u-loading": "view",
"u-checkbox": "view",
"u-checkbox-group": "view",
- "u-navbar": "view"
+ "u-navbar": "view",
+ "u-loadmore":"view",
+ "u-switch": "view"
}
}
}
],
- "subPackages": [{
- "root": "uview-components", // 蹇呴』涓巔reloadRule涓殑鍚嶇О瀹屽叏涓�鑷�
- "name": "uview-components",
- "pages": [{
- "path": "pages/empty-page/empty-page",
- "style": {
- "navigationBarTitleText": "",
- "disableScroll": true
- }
- }]
- },
+ "subPackages": [
+ // {
+ // "root": "components/uview-components", // 蹇呴』涓巔reloadRule涓殑鍚嶇О瀹屽叏涓�鑷�
+ // "name": "uview-components",
+ // "pages": [
+ // {
+ // "path": "pages/empty-page/empty-page",
+ // "style": {
+ // "navigationBarTitleText": "",
+ // "disableScroll": true
+ // }
+ // }
+ // ]
+ // },
{
"root": "pages/mine",
"pages": [
-
{
"path": "signIn",
"style": {
@@ -316,7 +350,8 @@
"u-icon": "view"
}
}
- }, {
+ },
+ {
"path": "myTracks",
"style": {
"navigationBarTitleText": "鎴戠殑瓒宠抗",
@@ -331,7 +366,8 @@
"u-checkbox": "view"
}
}
- }, {
+ },
+ {
"path": "myCollect",
"style": {
"navigationBarTitleText": "鏀惰棌",
@@ -437,43 +473,42 @@
"path": "deposit/index",
"style": {
"navigationStyle": "custom"
-
}
},
{
"path": "deposit/operation",
"style": {
"navigationStyle": "custom"
-
}
},
{
"path": "deposit/recharge",
"style": {
"navigationBarTitleText": "鍏呭�奸噾棰�"
-
}
},
{
"path": "deposit/withdrawal",
"style": {
"navigationBarTitleText": "鎻愮幇閲戦"
-
}
},
-
{
"path": "deposit/info",
"style": {
"navigationBarTitleText": "棰勫瓨娆捐鎯�"
-
}
},
{
"path": "address/address",
"style": {
"enablePullDownRefresh": true,
- "navigationBarTitleText": "鍦板潃绠＄悊"
+ "navigationBarTitleText": "鍦板潃绠＄悊",
+ "componentPlaceholder": {
+ "u-empty": "view",
+ "u-icon": "view",
+ "u-action-sheet": "view"
+ }
}
},
{
@@ -515,7 +550,6 @@
"navigationBarTitleText": "鍔熻兘浠嬬粛"
}
},
-
{
"path": "set/securityCenter/fingerLogin",
"style": {
@@ -528,35 +562,26 @@
"navigationBarTitleText": "闈㈠鐧诲綍"
}
},
-
-
{
"path": "set/securityCenter/editPassword",
"style": {
"navigationBarTitleText": "淇敼瀵嗙爜",
- "app-plus": {
-
- }
+ "app-plus": {}
}
},
-
{
"path": "set/securityCenter/bindMobile",
"style": {
"navigationBarTitleText": "缁戝畾鎵嬫満鍙�",
- "app-plus": {
-
- }
+ "app-plus": {}
}
},
-
{
"path": "im/list",
"style": {
"navigationStyle": "custom", // 闅愯棌绯荤粺瀵艰埅鏍�
"enablePullDownRefresh": true,
"app-plus": {}
-
}
},
{
@@ -565,7 +590,6 @@
"navigationStyle": "custom", // 闅愯棌绯荤粺瀵艰埅鏍�
"enablePullDownRefresh": true,
"app-plus": {}
-
}
},
{
@@ -584,7 +608,6 @@
"navigationBarTitleText": "瀹夊叏涓績"
}
},
-
{
"path": "set/editionIntro",
"style": {
@@ -614,12 +637,14 @@
"app-plus": {
"titleNView": {
"padding-right": "12",
- "buttons": [{
- "text": "淇濆瓨",
- "fontSize": "16",
- "width": "auto",
- "color": "#FFFFFF"
- }]
+ "buttons": [
+ {
+ "text": "淇濆瓨",
+ "fontSize": "16",
+ "width": "auto",
+ "color": "#FFFFFF"
+ }
+ ]
}
},
"componentPlaceholder": {
@@ -631,7 +656,8 @@
"u-picker": "view"
}
}
- }, {
+ },
+ {
"path": "help/tips",
"style": {
"navigationBarTitleText": "",
@@ -639,7 +665,8 @@
"u-parse": "view"
}
}
- }, {
+ },
+ {
"path": "point/myPoint",
"style": {
"navigationBarTitleText": "鎴戠殑绉垎",
@@ -678,7 +705,8 @@
"style": {
"navigationBarTitleText": "璁㈠崟璺熻釜"
}
- }, {
+ },
+ {
"path": "activity/detail",
"style": {
"navigationBarTitleText": "娲诲姩璇︽儏",
@@ -696,7 +724,8 @@
"u-image": "view"
}
}
- }, {
+ },
+ {
"path": "activity/myActivity",
"style": {
"navigationBarTitleText": "鎴戠殑娲诲姩",
@@ -714,7 +743,8 @@
"u-image": "view"
}
}
- }, {
+ },
+ {
"path": "activity/reportActivity",
"style": {
"navigationBarTitleText": "娲诲姩",
@@ -733,7 +763,8 @@
"u-loadmore": "view"
}
}
- }, {
+ },
+ {
"path": "myCollect/myCollect",
"style": {
"navigationBarTitleText": "鎴戠殑鏀惰棌",
@@ -750,37 +781,35 @@
"u-navbar": "view",
"u-image": "view",
"u-loadmore": "view"
-
}
-
}
}
-
]
-
},
-
-
{
"root": "pages/product",
- "pages": [{
+ "pages": [
+ {
"path": "shopPage",
"style": {
"navigationBarTitleText": "",
"navigationStyle": "custom"
}
- }, {
+ },
+ {
"path": "shopList",
"style": {
"navigationBarTitleText": "",
"navigationStyle": "custom"
}
- }, {
+ },
+ {
"path": "licencePhoto",
"style": {
"navigationBarTitleText": "钀ヤ笟鎵х収"
}
- }, {
+ },
+ {
"path": "shopPageGoods",
"style": {
"navigationBarTitleText": "",
@@ -919,51 +948,59 @@
}
}
}
-
]
-
},
{
"root": "pages/floor",
- "pages": [{
- "path": "empty"
- }]
-
+ "pages": [
+ {
+ "path": "empty"
+ }
+ ]
},
{
"root": "pages/video",
- "pages": [{
+ "pages": [
+ {
"path": "home-page",
"style": {
"navigationBarTitleText": "TA鐨勪富椤�"
}
},
{
- "path" : "video-play",
- "style" :
- {
- "navigationBarTitleText" : ""
+ "path": "video-play",
+ "style": {
+ "navigationBarTitleText": ""
}
},
{
- "path" : "home-page-edit",
- "style" :
- {
- "navigationBarTitleText" : "涓婚〉淇℃伅淇敼"
+ "path": "home-page-edit",
+ "style": {
+ "navigationBarTitleText": "涓婚〉淇℃伅淇敼"
}
},
{
- "path" : "video-edit",
+ "path": "video-edit",
+ "style": {
+ "navigationBarTitleText": "瑙嗛缂栬緫"
+ }
+ },
+ {
+ "path" : "video-goods-detail",
"style" :
{
- "navigationBarTitleText" : "瑙嗛缂栬緫"
+ "navigationBarTitleText" : "瑙嗛鎺ㄨ崘鍟嗗搧",
+ "componentPlaceholder": {
+ "u-button": "view"
+ }
}
}
]
},
{
"root": "pages/passport",
- "pages": [{
+ "pages": [
+ {
"path": "login",
"style": {
"navigationBarTitleText": "",
@@ -980,7 +1017,6 @@
}
}
},
-
{
"path": "entry/seller/index",
"style": {
@@ -1068,12 +1104,11 @@
}
}
]
-
},
-
{
"root": "pages/promotion",
- "pages": [{
+ "pages": [
+ {
"path": "seckill",
"style": {
"navigationBarTitleText": "闄愭椂鎶㈣喘",
@@ -1086,7 +1121,6 @@
}
}
},
-
{
"path": "joinGroup",
"style": {
@@ -1098,28 +1132,29 @@
"bounce": "none"
}
}
- }, {
+ },
+ {
"path": "lives",
"style": {
"navigationStyle": "custom",
"navigationBarTextStyle": "black"
-
}
- }, {
+ },
+ {
"path": "bargain/list",
"style": {
"navigationStyle": "custom",
"navigationBarTextStyle": "white"
-
}
- }, {
+ },
+ {
"path": "bargain/detail",
"style": {
"navigationStyle": "custom",
"navigationBarTextStyle": "white"
-
}
- }, {
+ },
+ {
"path": "bargain/log",
"style": {
"navigationBarTitleText": "鐮嶄环璁板綍",
@@ -1128,28 +1163,26 @@
"u-empty": "view"
}
}
- }, {
+ },
+ {
"path": "point/detail",
"style": {
"navigationStyle": "custom",
"navigationBarTextStyle": "white"
-
}
- }, {
+ },
+ {
"path": "point/pointList",
"style": {
"navigationBarTitleText": "绉垎鍟嗗煄"
-
-
}
}
-
]
-
},
{
"root": "pages/cart",
- "pages": [{
+ "pages": [
+ {
"path": "coupon/myCoupon",
"style": {
"navigationBarTitleText": "鎴戠殑浼樻儬鍒�",
@@ -1174,7 +1207,6 @@
"navigationBarTitleText": "浼樻儬鍒�"
}
},
-
{
"path": "coupon/couponCenter",
"style": {
@@ -1191,7 +1223,6 @@
"navigationBarTitleText": "鏀粯璁㈠崟",
"app-plus": {
"popGesture": "none" //绂佹渚ф粦閫�鍑�
-
}
}
},
@@ -1211,18 +1242,15 @@
"path": "payment/shareOrderGoods",
"style": {
"navigationBarTitleText": "",
- "app-plus": {
-
- }
+ "app-plus": {}
}
}
-
]
-
},
{
"root": "pages/order",
- "pages": [{
+ "pages": [
+ {
"path": "complain/complain",
"style": {
"navigationBarTitleText": "璁㈠崟鍟嗗搧鎶曡瘔"
@@ -1232,6 +1260,17 @@
"path": "complain/complainInfo",
"style": {
"navigationBarTitleText": "鎶曡瘔璇︽儏"
+ }
+ },
+ {
+ "path": "invoice/setInvoice",
+ "style": {
+ "navigationBarTitleText": "",
+ "navigationStyle": "custom",
+ "componentPlaceholder": {
+ "u-popup": "view",
+ "u-input": "view"
+ }
}
},
{
@@ -1292,7 +1331,6 @@
"navigationBarTitleText": "璇勪环璇︽儏"
}
},
-
{
"path": "evaluate/releaseEvaluate",
"style": {
@@ -1312,7 +1350,6 @@
}
}
},
-
{
"path": "afterSales/applyProgress",
"style": {
@@ -1333,13 +1370,15 @@
"bounce": "none",
"titleNView": {
"titleColor": "#FFFFFF",
- "buttons": [{
- "text": "瀹屾垚",
- "fontSize": "14",
- "color": "#FFFFFF",
- "width": "36px"
- // "background": "rgba(0,0,0,0)"
- }]
+ "buttons": [
+ {
+ "text": "瀹屾垚",
+ "fontSize": "14",
+ "color": "#FFFFFF",
+ "width": "36px"
+ // "background": "rgba(0,0,0,0)"
+ }
+ ]
}
}
}
@@ -1377,11 +1416,40 @@
{
"path": "fillorder",
"style": {
- "navigationBarTitleText": "濉啓璁㈠崟"
+ "navigationBarTitleText": "濉啓璁㈠崟",
+ "componentPlaceholder": {
+ "u-image": "view",
+ "u-row": "view",
+ "u-col": "view",
+ "u-input": "view",
+ "u-icon": "view",
+ "u-select": "view",
+ "u-notice-bar": "view"
+ }
}
}
]
+ },
+ {
+ "root": "pages/health",
+ "pages": [{
+ "path": "healthVideo",
+ "style": {
+ "navigationBarTitleText": "澶у仴搴�"
+ }
+ }]
}
+ // ,
+ // {
+ // "root": "pages/commodity-square",
+ // "pages": [{
+ // "path" : "commoditySquare",
+ // "style" :
+ // {
+ // "navigationBarTitleText" : "鍟嗗搧骞垮満"
+ // }
+ // }]
+ // }
],
"globalStyle": {
"navigationBarTextStyle": "black",
@@ -1393,7 +1461,6 @@
"app-plus": {
// 鍏ㄥ眬鍏抽棴鍥炲脊鍔熻兘
"bounce": "none"
-
}
},
"tabBar": {
@@ -1402,14 +1469,16 @@
"selectedColor": "#ff573e",
"borderStyle": "black",
"backgroundColor": "#ffffff",
- "list": [{
- "pagePath": "pages/tabbar/index/home1",
+ "list": [
+ {
+ "pagePath": "pages/tabbar/index/home",
"iconPath": "static/tabbar/home.png",
"selectedIconPath": "static/tabbar/home-s.png",
"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