From 5027240f2bbc9a7f74b8cc661c265eb9d52eb43a Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期四, 19 六月 2025 09:16:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
pages.json | 338 ++++++++++++++++++++++++++++++++++---------------------
1 files changed, 207 insertions(+), 131 deletions(-)
diff --git a/pages.json b/pages.json
index ec6de87..aae66b9 100644
--- a/pages.json
+++ b/pages.json
@@ -2,18 +2,20 @@
"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": [
// 绗竴涓氨鏄椤�
{
@@ -59,7 +61,8 @@
"u-toast": "view"
}
}
- }, {
+ },
+ {
"path": "pages/tabbar/category/category",
"style": {
"navigationBarTitleText": "鍒嗙被",
@@ -171,7 +174,8 @@
"u-back-top": "view"
}
}
- }, {
+ },
+ {
"path": "pages/tabbar/user/my",
"style": {
"navigationBarTextStyle": "white",
@@ -184,12 +188,9 @@
}
}
},
-
{
"path": "pages/tabbar/home/web-view",
- "style": {
-
- }
+ "style": {}
},
{
"path": "pages/tabbar/special/special",
@@ -217,13 +218,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"
+ }
}
},
{
@@ -241,10 +277,8 @@
"u-loading": "view",
"u-navbar": "view"
}
-
}
},
-
{
"path": "pages/customerManager/customerManager",
"style": {
@@ -285,21 +319,23 @@
}
}
],
- "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": {
@@ -308,7 +344,8 @@
"u-icon": "view"
}
}
- }, {
+ },
+ {
"path": "myTracks",
"style": {
"navigationBarTitleText": "鎴戠殑瓒宠抗",
@@ -323,7 +360,8 @@
"u-checkbox": "view"
}
}
- }, {
+ },
+ {
"path": "myCollect",
"style": {
"navigationBarTitleText": "鏀惰棌",
@@ -429,43 +467,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"
+ }
}
},
{
@@ -507,7 +544,6 @@
"navigationBarTitleText": "鍔熻兘浠嬬粛"
}
},
-
{
"path": "set/securityCenter/fingerLogin",
"style": {
@@ -520,35 +556,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": {}
-
}
},
{
@@ -557,7 +584,6 @@
"navigationStyle": "custom", // 闅愯棌绯荤粺瀵艰埅鏍�
"enablePullDownRefresh": true,
"app-plus": {}
-
}
},
{
@@ -576,7 +602,6 @@
"navigationBarTitleText": "瀹夊叏涓績"
}
},
-
{
"path": "set/editionIntro",
"style": {
@@ -606,12 +631,14 @@
"app-plus": {
"titleNView": {
"padding-right": "12",
- "buttons": [{
- "text": "淇濆瓨",
- "fontSize": "16",
- "width": "auto",
- "color": "#FFFFFF"
- }]
+ "buttons": [
+ {
+ "text": "淇濆瓨",
+ "fontSize": "16",
+ "width": "auto",
+ "color": "#FFFFFF"
+ }
+ ]
}
},
"componentPlaceholder": {
@@ -623,7 +650,8 @@
"u-picker": "view"
}
}
- }, {
+ },
+ {
"path": "help/tips",
"style": {
"navigationBarTitleText": "",
@@ -631,7 +659,8 @@
"u-parse": "view"
}
}
- }, {
+ },
+ {
"path": "point/myPoint",
"style": {
"navigationBarTitleText": "鎴戠殑绉垎",
@@ -670,7 +699,8 @@
"style": {
"navigationBarTitleText": "璁㈠崟璺熻釜"
}
- }, {
+ },
+ {
"path": "activity/detail",
"style": {
"navigationBarTitleText": "娲诲姩璇︽儏",
@@ -688,7 +718,8 @@
"u-image": "view"
}
}
- }, {
+ },
+ {
"path": "activity/myActivity",
"style": {
"navigationBarTitleText": "鎴戠殑娲诲姩",
@@ -706,7 +737,8 @@
"u-image": "view"
}
}
- }, {
+ },
+ {
"path": "activity/reportActivity",
"style": {
"navigationBarTitleText": "娲诲姩",
@@ -725,7 +757,8 @@
"u-loadmore": "view"
}
}
- }, {
+ },
+ {
"path": "myCollect/myCollect",
"style": {
"navigationBarTitleText": "鎴戠殑鏀惰棌",
@@ -742,37 +775,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": "",
@@ -911,44 +942,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",
+ "path": "home-page-edit",
+ "style": {
+ "navigationBarTitleText": "涓婚〉淇℃伅淇敼"
+ }
+ },
+ {
+ "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": "",
@@ -965,7 +1011,6 @@
}
}
},
-
{
"path": "entry/seller/index",
"style": {
@@ -1053,12 +1098,11 @@
}
}
]
-
},
-
{
"root": "pages/promotion",
- "pages": [{
+ "pages": [
+ {
"path": "seckill",
"style": {
"navigationBarTitleText": "闄愭椂鎶㈣喘",
@@ -1071,7 +1115,6 @@
}
}
},
-
{
"path": "joinGroup",
"style": {
@@ -1083,28 +1126,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": "鐮嶄环璁板綍",
@@ -1113,28 +1157,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": "鎴戠殑浼樻儬鍒�",
@@ -1159,7 +1201,6 @@
"navigationBarTitleText": "浼樻儬鍒�"
}
},
-
{
"path": "coupon/couponCenter",
"style": {
@@ -1176,7 +1217,6 @@
"navigationBarTitleText": "鏀粯璁㈠崟",
"app-plus": {
"popGesture": "none" //绂佹渚ф粦閫�鍑�
-
}
}
},
@@ -1196,18 +1236,15 @@
"path": "payment/shareOrderGoods",
"style": {
"navigationBarTitleText": "",
- "app-plus": {
-
- }
+ "app-plus": {}
}
}
-
]
-
},
{
"root": "pages/order",
- "pages": [{
+ "pages": [
+ {
"path": "complain/complain",
"style": {
"navigationBarTitleText": "璁㈠崟鍟嗗搧鎶曡瘔"
@@ -1217,6 +1254,17 @@
"path": "complain/complainInfo",
"style": {
"navigationBarTitleText": "鎶曡瘔璇︽儏"
+ }
+ },
+ {
+ "path": "invoice/setInvoice",
+ "style": {
+ "navigationBarTitleText": "",
+ "navigationStyle": "custom",
+ "componentPlaceholder": {
+ "u-popup": "view",
+ "u-input": "view"
+ }
}
},
{
@@ -1277,7 +1325,6 @@
"navigationBarTitleText": "璇勪环璇︽儏"
}
},
-
{
"path": "evaluate/releaseEvaluate",
"style": {
@@ -1297,7 +1344,6 @@
}
}
},
-
{
"path": "afterSales/applyProgress",
"style": {
@@ -1318,13 +1364,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)"
+ }
+ ]
}
}
}
@@ -1362,10 +1410,38 @@
{
"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": {
@@ -1378,7 +1454,6 @@
"app-plus": {
// 鍏ㄥ眬鍏抽棴鍥炲脊鍔熻兘
"bounce": "none"
-
}
},
"tabBar": {
@@ -1387,7 +1462,8 @@
"selectedColor": "#ff573e",
"borderStyle": "black",
"backgroundColor": "#ffffff",
- "list": [{
+ "list": [
+ {
"pagePath": "pages/tabbar/index/home",
"iconPath": "static/tabbar/home.png",
"selectedIconPath": "static/tabbar/home-s.png",
--
Gitblit v1.8.0