From 1113721c0e068c57adbc15149cce15563960a7f2 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期三, 18 六月 2025 23:03:25 +0800
Subject: [PATCH] Merge branch 'dev' of http://42.193.1.25:9521/r/lmk-shop-wx into dev
---
pages.json | 105 ++++++++++++++++++++++++++++++++++++----------------
1 files changed, 72 insertions(+), 33 deletions(-)
diff --git a/pages.json b/pages.json
index ba01ce6..e6543f3 100644
--- a/pages.json
+++ b/pages.json
@@ -2,20 +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": [
// 绗竴涓氨鏄椤�
{
@@ -26,12 +26,6 @@
"navigationStyle": "custom" // 闅愯棌椤堕儴瀵艰埅鏍�
}
},
- // {
- // "path": "pages/tabbar/index/home1",
- // "style": {
- // "navigationBarTitleText": ""
- // }
- // },
{
"path": "pages/tabbar/home/index",
"style": {
@@ -138,6 +132,16 @@
}
}
},
+ // {
+ // "path": "components/popups/popups",
+ // "style": {
+ // "navigationBarTitleText": "",
+ // "navigationStyle": "custom",
+ // "componentPlaceholder": {
+ // "u-icon": "view"
+ // }
+ // }
+ // },
{
"path": "components/m-buy/goods",
"style": {
@@ -326,19 +330,19 @@
}
],
"subPackages": [
- {
- "root": "uview-components", // 蹇呴』涓巔reloadRule涓殑鍚嶇О瀹屽叏涓�鑷�
- "name": "uview-components",
- "pages": [
- {
- "path": "pages/empty-page/empty-page",
- "style": {
- "navigationBarTitleText": "",
- "disableScroll": true
- }
- }
- ]
- },
+ // {
+ // "root": "components/uview-components", // 蹇呴』涓巔reloadRule涓殑鍚嶇О瀹屽叏涓�鑷�
+ // "name": "uview-components",
+ // "pages": [
+ // {
+ // "path": "pages/empty-page/empty-page",
+ // "style": {
+ // "navigationBarTitleText": "",
+ // "disableScroll": true
+ // }
+ // }
+ // ]
+ // },
{
"root": "pages/mine",
"pages": [
@@ -503,7 +507,12 @@
"path": "address/address",
"style": {
"enablePullDownRefresh": true,
- "navigationBarTitleText": "鍦板潃绠＄悊"
+ "navigationBarTitleText": "鍦板潃绠＄悊",
+ "componentPlaceholder": {
+ "u-empty": "view",
+ "u-icon": "view",
+ "u-action-sheet": "view"
+ }
}
},
{
@@ -979,6 +988,16 @@
"style": {
"navigationBarTitleText": "瑙嗛缂栬緫"
}
+ },
+ {
+ "path" : "video-goods-detail",
+ "style" :
+ {
+ "navigationBarTitleText" : "瑙嗛鎺ㄨ崘鍟嗗搧",
+ "componentPlaceholder": {
+ "u-button": "view"
+ }
+ }
}
]
},
@@ -1248,6 +1267,17 @@
}
},
{
+ "path": "invoice/setInvoice",
+ "style": {
+ "navigationBarTitleText": "",
+ "navigationStyle": "custom",
+ "componentPlaceholder": {
+ "u-popup": "view",
+ "u-input": "view"
+ }
+ }
+ },
+ {
"path": "complain/complainList",
"style": {
"navigationBarTitleText": "鎶曡瘔鍒楄〃",
@@ -1390,7 +1420,16 @@
{
"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"
+ }
}
}
]
--
Gitblit v1.8.0