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

revert: 所有代码与custom/common分支同

Browse Source
This commit is contained in:
ZF Sun
2026-01-05 15:56:49 +08:00
parent 8ef6975ee1
commit 60a0e5133e
219 changed files with 14860 additions and 15585 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
common/js/config-external.js
View File

@@ -110,7 +110,8 @@ class ConfigExternal {
try {
// 动态加载主题配置
const themeData = require(`@/common/js/style_color.js`)[theme];
const themeData = require(`@/common/js/style_color.js`)['default'][theme];
console.log('sync themeData => ', themeData);
this.loadedConfigs[`theme_${theme}`] = themeData;
return themeData;
} catch (error) {
@@ -136,7 +137,8 @@ class ConfigExternal {
this.loadPromises[`theme_${theme}`] = new Promise((resolve, reject) => {
try {
// 动态加载主题配置
const themeData = require(`@/common/js/style_color.js`)[theme];
const themeData = require(`@/common/js/style_color.js`)['default'][theme];
console.log('async themeData => ', themeData);
this.loadedConfigs[`theme_${theme}`] = themeData;
resolve(themeData);
} catch (error) {

5
common/js/diy.js
View File

@@ -111,8 +111,9 @@ export default {
}
},
async onShow() {
await this.init();
onShow() {
this.init();
},
onHide() {
if (this.storeTimeOut) {

2
common/js/goods_detail_base.js
View File

@@ -1,5 +1,5 @@
// 商品详情业务
import htmlParser from '@/common/js/html-parser.js';
import htmlParser from '@/common/js/html-parser';
export default {
data() {

103
common/js/util.js
View File

@@ -35,7 +35,7 @@ export const adaptSubpackageUrl = (url) => {
'/pages/goods/': '/pages_goods/',
'/pages/contact/': '/pages_tool/contact/',
'/pages/member/': '/pages_tool/member/',
'/pages/vr': '/pages_tool/vr/',
'/pages/vr': '/pages_tool/vr/'
};
// 构建正则表达式
@@ -58,106 +58,7 @@ export const adaptSubpackageUrl = (url) => {
});
}
const currentUrl = replacePrefix(url);
// 分包子包导致的路径变化，需要根据前后关系修复
const subPackagesMap = {
// pages_order 基础功能子包
'/pages_order/list': '/pages_order/base/list',
'/pages_order/payment': '/pages_order/base/payment',
// pages_order 详情功能子包
'/pages_order/detail': '/pages_order/detail/detail',
'/pages_order/detail_local_delivery': '/pages_order/detail/detail_local_delivery',
'/pages_order/detail_pickup': '/pages_order/detail/detail_pickup',
'/pages_order/detail_point': '/pages_order/detail/detail_point',
// pages_promotion/fenxiao/core 基础功能子包
'/pages_promotion/fenxiao/core/index': '/pages_promotion/fenxiao/core/base/index',
'/pages_promotion/fenxiao/core/apply': '/pages_promotion/fenxiao/core/base/apply',
'/pages_promotion/fenxiao/core/level': '/pages_promotion/fenxiao/core/base/level',
// pages_promotion/fenxiao/core 推广功能子包
'/pages_promotion/fenxiao/core/promote': '/pages_promotion/fenxiao/core/promote/promote',
'/pages_promotion/fenxiao/core/promote_code': '/pages_promotion/fenxiao/core/promote/promote_code',
'/pages_promotion/fenxiao/core/goods_list': '/pages_promotion/fenxiao/core/promote/goods_list',
// pages_promotion/point 基础功能子包
'/pages_promotion/point/list': '/pages_promotion/point/base/list',
'/pages_promotion/point/goods_list': '/pages_promotion/point/base/goods_list',
// pages_promotion/point 详情功能子包
'/pages_promotion/point/detail': '/pages_promotion/point/detail/detail',
'/pages_promotion/point/order_list': '/pages_promotion/point/detail/order_list',
'/pages_promotion/point/payment': '/pages_promotion/point/detail/payment',
'/pages_promotion/point/result': '/pages_promotion/point/detail/result',
// basic子包
'/pages_tool/member/index': '/pages_tool/member/basic/index',
'/pages_tool/member/info': '/pages_tool/member/basic/info',
'/pages_tool/member/info_edit': '/pages_tool/member/basic/info_edit',
'/pages_tool/member/account': '/pages_tool/member/basic/account',
'/pages_tool/member/account_edit': '/pages_tool/member/basic/account_edit',
'/pages_tool/member/modify_face': '/pages_tool/member/basic/modify_face',
// address子包
'/pages_tool/member/address': '/pages_tool/member/address/address',
'/pages_tool/member/address_edit': '/pages_tool/member/address/address_edit',
// finance子包 - 基础账户和积分相关
'/pages_tool/member/balance': '/pages_tool/member/finance/account/balance',
'/pages_tool/member/balance_detail': '/pages_tool/member/finance/account/balance_detail',
'/pages_tool/member/point': '/pages_tool/member/finance/account/point',
'/pages_tool/member/point_detail': '/pages_tool/member/finance/account/point_detail',
'/pages_tool/member/pay_password': '/pages_tool/member/finance/account/pay_password',
// finance子包 - 提现和储值卡相关
'/pages_tool/member/card': '/pages_tool/member/finance/transaction/card',
'/pages_tool/member/card_buy': '/pages_tool/member/finance/transaction/card_buy',
'/pages_tool/member/card_agreement': '/pages_tool/member/finance/transaction/card_agreement',
'/pages_tool/member/apply_withdrawal': '/pages_tool/member/finance/transaction/apply_withdrawal',
'/pages_tool/member/withdrawal': '/pages_tool/member/finance/transaction/withdrawal',
'/pages_tool/member/withdrawal_detail': '/pages_tool/member/finance/transaction/withdrawal_detail',
// finance子包路径映射（从旧的finance子包路径到新的account和transaction子子包路径）
'/pages_tool/member/finance/balance': '/pages_tool/member/finance/account/balance',
'/pages_tool/member/finance/balance_detail': '/pages_tool/member/finance/account/balance_detail',
'/pages_tool/member/finance/point': '/pages_tool/member/finance/account/point',
'/pages_tool/member/finance/point_detail': '/pages_tool/member/finance/account/point_detail',
'/pages_tool/member/finance/pay_password': '/pages_tool/member/finance/account/pay_password',
'/pages_tool/member/finance/card': '/pages_tool/member/finance/transaction/card',
'/pages_tool/member/finance/card_buy': '/pages_tool/member/finance/transaction/card_buy',
'/pages_tool/member/finance/card_agreement': '/pages_tool/member/finance/transaction/card_agreement',
'/pages_tool/member/finance/apply_withdrawal': '/pages_tool/member/finance/transaction/apply_withdrawal',
'/pages_tool/member/finance/withdrawal': '/pages_tool/member/finance/transaction/withdrawal',
'/pages_tool/member/finance/withdrawal_detail': '/pages_tool/member/finance/transaction/withdrawal_detail',
// rights子包
'/pages_tool/member/coupon': '/pages_tool/member/rights/coupon',
'/pages_tool/member/level': '/pages_tool/member/rights/level',
'/pages_tool/member/level_growth_rules': '/pages_tool/member/rights/level_growth_rules',
'/pages_tool/member/invite_friends': '/pages_tool/member/rights/invite_friends',
// other子包
'/pages_tool/member/signin': '/pages_tool/member/other/signin',
'/pages_tool/member/collection': '/pages_tool/member/other/collection',
'/pages_tool/member/footprint': '/pages_tool/member/other/footprint',
'/pages_tool/member/assets': '/pages_tool/member/other/assets',
'/pages_tool/member/cancellation': '/pages_tool/member/other/cancellation',
'/pages_tool/member/cancelstatus': '/pages_tool/member/other/cancelstatus',
'/pages_tool/member/cancelsuccess': '/pages_tool/member/other/cancelsuccess',
'/pages_tool/member/cancelrefuse': '/pages_tool/member/other/cancelrefuse',
'/pages_tool/member/contact': '/pages_tool/member/other/contact'
}
// 修复url
if (subPackagesMap[currentUrl]) {
return subPackagesMap[currentUrl];
}
return currentUrl;
return replacePrefix(url);
}
/**