Uniapp/lucky_shop
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge remote-tracking branch 'origin/dev/1.0' into yuanlaide2

Browse Source 
# Conflicts:
#	.local.config.js
This commit is contained in:
jinhhanhan
2026-07-16 16:17:26 +08:00
parent 660ab27377 165edc38ee
commit a27ae6cba0
48 changed files with 5248 additions and 1014 deletions
Download Patch File Download Diff File Expand all files Collapse all files

247
pages.json
View File

@@ -4,6 +4,7 @@
"path": "pages/index/index",
"style": {
// "navigationStyle": "custom",
"navigationBarTitleText": "",
"enablePullDownRefresh": true,
"componentPlaceholder": {
"diy-article": "view",
@@ -66,6 +67,7 @@
{
"path": "pages/empty/index",
"style": {
"navigationBarTitleText": "",
"enablePullDownRefresh": true
}
}
@@ -351,6 +353,7 @@
{
"path": "payment",
"style": {
"navigationBarTitleText": "",
"navigationStyle": "custom"
}
},
@@ -360,6 +363,7 @@
// #ifdef APP-PLUS
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": "",
"componentPlaceholder": {
"diy-article": "view",
"diy-audio": "view",
@@ -422,24 +426,27 @@
"path": "detail",
"style": {
// #ifdef APP-PLUS
"navigationStyle": "custom"
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": ""
}
},
{
"path": "detail_local_delivery",
"style": {
// #ifdef APP-PLUS
"navigationStyle": "custom"
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": ""
}
},
{
"path": "detail_pickup",
"style": {
// #ifdef APP-PLUS
"navigationStyle": "custom"
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": ""
}
},
//积分订单详情
@@ -447,8 +454,9 @@
"path": "detail_point",
"style": {
// #ifdef APP-PLUS
"navigationStyle": "custom"
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": ""
}
}
]
@@ -461,7 +469,10 @@
{
"path": "point/list",
"style": {
// #ifdef APP-PLUS
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": "",
"componentPlaceholder": {
"diy-article": "view",
"diy-audio": "view",
@@ -526,6 +537,7 @@
// #ifdef APP-PLUS
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": "",
"componentPlaceholder": {
"diy-article": "view",
"diy-audio": "view",
@@ -588,36 +600,42 @@
"path": "point/detail",
"style": {
// #ifdef APP-PLUS
"navigationStyle": "custom"
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": ""
}
},
{
"path": "point/payment",
"style": {
"navigationStyle": "custom"
// #ifdef APP-PLUS
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": ""
}
},
{
"path": "point/order_list",
"style": {
// #ifdef APP-PLUS
"navigationStyle": "custom"
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": ""
}
},
{
"path": "point/result",
"style": {
// #ifdef APP-PLUS
"navigationStyle": "custom"
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": ""
}
},
//****************** 商户 ******************
{
"path": "merch/merchcategory",
"style": {
"style": {
// #ifdef APP-PLUS
"navigationStyle": "custom",
// #endif
@@ -752,6 +770,7 @@
// #ifdef APP-PLUS
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": "",
"componentPlaceholder": {
"diy-article": "view",
"diy-audio": "view",
@@ -814,16 +833,18 @@
"path": "fenxiao/promote",
"style": {
// #ifdef APP-PLUS
"navigationStyle": "custom"
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": ""
}
},
{
"path": "fenxiao/apply",
"style": {
// #ifdef APP-PLUS
"navigationStyle": "custom"
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": ""
}
},
{
@@ -832,6 +853,7 @@
// #ifdef APP-PLUS
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": "",
"componentPlaceholder": {
"diy-article": "view",
"diy-audio": "view",
@@ -894,47 +916,53 @@
"path": "fenxiao/relation",
"style": {
// #ifdef APP-PLUS
"navigationStyle": "custom"
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": ""
}
},
{
"path": "fenxiao/order_detail",
"style": {
// #ifdef APP-PLUS
"navigationStyle": "custom"
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": ""
}
},
{
"path": "fenxiao/team",
"style": {
// #ifdef APP-PLUS
"navigationStyle": "custom"
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": ""
}
},
{
"path": "fenxiao/withdraw_apply",
"style": {
// #ifdef APP-PLUS
"navigationStyle": "custom"
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": ""
}
},
{
"path": "fenxiao/withdraw_list",
"style": {
// #ifdef APP-PLUS
"navigationStyle": "custom"
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": ""
}
},
{
"path": "fenxiao/withdrawal_detail",
"style": {
"navigationBarTitleText": ""
// #ifdef APP-PLUS
"navigationStyle": "custom"
,"navigationStyle": "custom"
// #endif
}
},
@@ -942,16 +970,18 @@
"path": "fenxiao/promote_code",
"style": {
// #ifdef APP-PLUS
"navigationStyle": "custom"
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": ""
}
},
{
"path": "fenxiao/level",
"style": {
// #ifdef APP-PLUS
"navigationStyle": "custom"
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": ""
}
},
{
@@ -960,6 +990,7 @@
// #ifdef APP-PLUS
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": "",
"componentPlaceholder": {
"diy-article": "view",
"diy-audio": "view",
@@ -1022,8 +1053,9 @@
"path": "fenxiao/bill",
"style": {
// #ifdef APP-PLUS
"navigationStyle": "custom"
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": ""
}
},
{
@@ -1134,16 +1166,18 @@
"path": "webview/webview",
"style": {
// #ifdef APP-PLUS
"navigationStyle": "custom"
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": ""
}
},
{
"path": "index/diy",
"style": {
// #ifdef MP-WEIXIN
// "navigationStyle": "custom",
// #ifdef APP-PLUS
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": "",
"enablePullDownRefresh": true,
"componentPlaceholder": {
"diy-article": "view",
@@ -1210,6 +1244,8 @@
// #ifdef APP-PLUS
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": "",
"enablePullDownRefresh": true,
"componentPlaceholder": {
"diy-article": "view",
"diy-audio": "view",
@@ -1272,54 +1308,63 @@
"path": "member/modify_face",
"style": {
// #ifdef APP-PLUS
"navigationStyle": "custom"
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": ""
}
},
{
"path": "member/account",
"style": {
// #ifdef APP-PLUS
"navigationStyle": "custom"
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": ""
}
},
{
"path": "member/account_edit",
"style": {
// #ifdef APP-PLUS
"navigationStyle": "custom"
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": ""
}
},
{
"path": "member/apply_withdrawal",
"style": {
// #ifdef APP-PLUS
"navigationStyle": "custom"
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": ""
}
},
{
"path": "member/balance",
"style": {
"navigationStyle": "custom"
// #ifdef APP-PLUS
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": ""
}
},
{
"path": "member/balance_detail",
"style": {
// #ifdef APP-PLUS
"navigationStyle": "custom"
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": ""
}
},
{
"path": "member/collection",
"style": {
// #ifdef APP-PLUS
"navigationStyle": "custom"
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": ""
}
},
{
@@ -1328,13 +1373,17 @@
// #ifdef APP-PLUS
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": "",
"disableScroll": true
}
},
{
"path": "member/contact",
"style": {
// #ifdef APP-PLUS
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": "",
"enablePullDownRefresh": true
}
},
@@ -1342,142 +1391,162 @@
"path": "member/footprint",
"style": {
// #ifdef APP-PLUS
"navigationStyle": "custom"
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": ""
}
},
{
"path": "member/level",
"style": {
// #ifdef APP-PLUS
"navigationStyle": "custom"
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": ""
}
},
{
"path": "member/card",
"style": {
// #ifdef APP-PLUS
"navigationStyle": "custom"
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": ""
}
},
{
"path": "member/card_buy",
"style": {
// #ifdef APP-PLUS
"navigationStyle": "custom"
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": ""
}
},
{
"path": "member/card_agreement",
"style": {
// #ifdef APP-PLUS
"navigationStyle": "custom"
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": ""
}
},
{
"path": "member/level_growth_rules",
"style": {
// #ifdef APP-PLUS
"navigationStyle": "custom"
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": ""
}
},
{
"path": "member/point",
"style": {
"navigationStyle": "custom"
// #ifdef APP-PLUS
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": ""
}
},
{
"path": "member/point_detail",
"style": {
// #ifdef APP-PLUS
"navigationStyle": "custom"
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": ""
}
},
{
"path": "member/withdrawal",
"style": {
// #ifdef APP-PLUS
"navigationStyle": "custom"
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": ""
}
},
{
"path": "member/withdrawal_detail",
"style": {
// #ifdef APP-PLUS
"navigationStyle": "custom"
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": ""
}
},
{
"path": "member/address",
"style": {
// #ifdef APP-PLUS
"navigationStyle": "custom"
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": ""
}
},
{
"path": "member/address_edit",
"style": {
// #ifdef APP-PLUS
"navigationStyle": "custom"
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": ""
}
},
{
"path": "member/pay_password",
"style": {
// #ifdef APP-PLUS
"navigationStyle": "custom"
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": ""
}
},
{
"path": "member/cancellation",
"style": {
// #ifdef APP-PLUS
"navigationStyle": "custom"
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": ""
}
},
{
"path": "member/assets",
"style": {
// #ifdef APP-PLUS
"navigationStyle": "custom"
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": ""
}
},
{
"path": "member/cancelstatus",
"style": {
// #ifdef APP-PLUS
"navigationStyle": "custom"
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": ""
}
},
{
"path": "member/cancelsuccess",
"style": {
// #ifdef APP-PLUS
"navigationStyle": "custom"
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": ""
}
},
{
"path": "member/cancelrefuse",
"style": {
// #ifdef APP-PLUS
"navigationStyle": "custom"
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": ""
}
},
{
@@ -1493,8 +1562,9 @@
"path": "member/info_edit",
"style": {
// #ifdef APP-PLUS
"navigationStyle": "custom"
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": ""
}
},
//******************登录模块******************
@@ -1502,8 +1572,9 @@
"path": "login/find",
"style": {
// #ifdef APP-PLUS
"navigationStyle": "custom"
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": ""
}
},
//******************商品模块******************
@@ -1513,6 +1584,7 @@
// #ifdef APP-PLUS
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": "",
"componentPlaceholder": {
"diy-article": "view",
"diy-audio": "view",
@@ -1575,16 +1647,18 @@
"path": "goods/coupon_receive",
"style": {
// #ifdef APP-PLUS
"navigationStyle": "custom"
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": ""
}
},
{
"path": "goods/evaluate",
"style": {
// #ifdef APP-PLUS
"navigationStyle": "custom"
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": ""
}
},
{
@@ -1593,6 +1667,7 @@
// #ifdef APP-PLUS
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": "",
"componentPlaceholder": {
"diy-article": "view",
"diy-audio": "view",
@@ -1657,6 +1732,7 @@
// #ifdef APP-PLUS
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": "",
"componentPlaceholder": {
"diy-article": "view",
"diy-audio": "view",
@@ -1719,8 +1795,9 @@
"path": "goods/not_exist",
"style": {
// #ifdef APP-PLUS
"navigationStyle": "custom"
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": ""
}
},
//******************CMS模块（6）******************
@@ -1728,16 +1805,18 @@
"path": "help/list",
"style": {
// #ifdef APP-PLUS
"navigationStyle": "custom"
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": ""
}
},
{
"path": "help/detail",
"style": {
// #ifdef APP-PLUS
"navigationStyle": "custom"
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": ""
}
},
{
@@ -1746,6 +1825,7 @@
// #ifdef APP-PLUS
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": "",
"componentPlaceholder": {
"diy-article": "view",
"diy-audio": "view",
@@ -1808,8 +1888,9 @@
"path": "notice/detail",
"style": {
// #ifdef APP-PLUS
"navigationStyle": "custom"
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": ""
}
},
{
@@ -1818,6 +1899,7 @@
// #ifdef APP-PLUS
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": "",
"componentPlaceholder": {
"diy-article": "view",
"diy-audio": "view",
@@ -1880,8 +1962,9 @@
"path": "article/detail",
"style": {
// #ifdef APP-PLUS
"navigationStyle": "custom"
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": ""
}
},
//******************会员充值（4）******************
@@ -1891,6 +1974,7 @@
// #ifdef APP-PLUS
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": "",
"disableScroll": false
}
},
@@ -1898,8 +1982,9 @@
"path": "recharge/order_list",
"style": {
// #ifdef APP-PLUS
"navigationStyle": "custom"
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": ""
}
},
//******************邀请******************
@@ -1907,8 +1992,9 @@
"path": "member/invite_friends",
"style": {
// #ifdef APP-PLUS
"navigationStyle": "custom"
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": ""
}
},
//******************支付模块（2）******************
@@ -1916,40 +2002,45 @@
"path": "pay/index",
"style": {
// #ifdef APP-PLUS
"navigationStyle": "custom"
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": ""
}
},
{
"path": "pay/wx_pay",
"style": {
// #ifdef APP-PLUS
"navigationStyle": "custom"
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": ""
}
},
{
"path": "pay/result",
"style": {
// #ifdef APP-PLUS
"navigationStyle": "custom"
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": ""
}
},
{
"path": "pay/cashier",
"style": {
// #ifdef APP-PLUS
"navigationStyle": "custom"
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": ""
}
},
{
"path": "storeclose/storeclose",
"style": {
// #ifdef APP-PLUS
"navigationStyle": "custom"
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": ""
}
},
//******************订单模块（2）******************
@@ -1957,56 +2048,63 @@
"path": "order/logistics",
"style": {
// #ifdef APP-PLUS
"navigationStyle": "custom"
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": ""
}
},
{
"path": "order/evaluate",
"style": {
// #ifdef APP-PLUS
"navigationStyle": "custom"
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": ""
}
},
{
"path": "order/refund",
"style": {
// #ifdef APP-PLUS
"navigationStyle": "custom"
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": ""
}
},
{
"path": "order/refund_goods_select",
"style": {
// #ifdef APP-PLUS
"navigationStyle": "custom"
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": ""
}
},
{
"path": "order/refund_type_select",
"style": {
// #ifdef APP-PLUS
"navigationStyle": "custom"
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": ""
}
},
{
"path": "order/refund_batch",
"style": {
// #ifdef APP-PLUS
"navigationStyle": "custom"
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": ""
}
},
{
"path": "order/refund_detail",
"style": {
// #ifdef APP-PLUS
"navigationStyle": "custom"
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": ""
}
},
{
@@ -2022,8 +2120,9 @@
"path": "order/detail_virtual",
"style": {
// #ifdef APP-PLUS
"navigationStyle": "custom"
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": ""
}
},
//******************登录模块（3）******************
@@ -2040,8 +2139,9 @@
"path": "form/form",
"style": {
// #ifdef APP-PLUS
"navigationStyle": "custom"
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": ""
}
},
{
@@ -2050,6 +2150,7 @@
// #ifdef APP-PLUS
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": "",
"componentPlaceholder": {
"diy-article": "view",
"diy-audio": "view",