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

chore: 暂时保存

Browse Source
This commit is contained in:
ZF Sun
2026-01-05 11:22:38 +08:00
parent b24f77be1a
commit be51b30fb4
48 changed files with 381 additions and 355 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
.local.config.js Normal file
View File

@@ -0,0 +1,39 @@
// 本地调试配置示例文件
// 复制此文件并重命名为 local.config.js 以使用自定义本地配置
const localDevConfig = ({
'460': { // 制氧设备平台
uniacid: 460,
domain: 'https://xcx30.5g-quickapp.com/',
},
'2285': { // 数码喷墨墨水
uniacid: 2285,
domain: 'https://xcx.aigc-quickapp.com/',
},
'2811': { // POCT检测分析平台
uniacid: 2811,
domain: 'https://xcx.aigc-quickapp.com/',
},
'2724': { // 生物菌肥
uniacid: 2724,
domain: 'https://xcx.aigc-quickapp.com/',
},
'2505': { // 煤矿钻机
uniacid: 2505,
domain: 'https://xcx.aigc-quickapp.com/',
},
'2777': { // 养老服务
uniacid: 2777,
domain: 'https://xcx.aigc-quickapp.com/',
},
'1': { // 开发平台
uniacid: 1,
domain: 'https://dev.aigc-quickapp.com',
},
'1-test': { // 测试平台
uniacid: 1,
domain: 'https://test.aigc-quickapp.com',
},
})['2285']; // 选择要使用的环境配置
export default localDevConfig;

86
common/js/util.js
View File

@@ -62,7 +62,93 @@ export const adaptSubpackageUrl = (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'
}

2
components-diy/diy-category.vue
View File

@@ -462,7 +462,7 @@ export default {
cart_ids: this.cartIds.toString()
},
success: () => {
this.$util.redirectTo('/pages_order/payment');
this.$util.redirectTo('/pages_order/base/payment');
this.isSub = false;
}
});

393
components-diy/diy-group.vue
View File

@@ -1,261 +1,14 @@
<template>
<view data-component-name="diy-group" class="diy-group">
<view v-for="(item, index) in diyDataArray" :key="index" :style="item.pageStyle">
<view v-if="addonIsExist.store && item.componentName == 'StoreShow'">
<!-- 门店展示 -->
<diy-store :value="item"></diy-store>
</view>
<template v-if="item.componentName == 'Kefu'">
<!-- 客服按钮 -->
<diy-kefu :value="item"></diy-kefu>
</template>
<template v-if="item.componentName == 'Form'">
<!-- 表单组件 -->
<diy-form :value="item"></diy-form>
</template>
<template v-if="addonIsExist.store && item.componentName == 'StoreLabel'">
<!-- 门店标签 -->
<diy-store-label :value="item"></diy-store-label>
</template>
<template v-if="item.componentName == 'Picture'">
<!-- 单图组组件 -->
<diy-picture :value="item"></diy-picture>
</template>
<template v-if="item.componentName == 'Listmenu'">
<!-- 列表按钮组件 -->
<diy-listmenu :value="item"></diy-listmenu>
</template>
<template v-if="item.componentName == 'Text'">
<!-- 文本 -->
<diy-text :value="item"></diy-text>
</template>
<template v-if="item.componentName == 'Notice'">
<!-- 公告 -->
<diy-notice :value="item"></diy-notice>
</template>
<template v-if="item.componentName == 'GraphicNav'">
<!-- 图文导航 -->
<diy-graphic-nav :value="item"></diy-graphic-nav>
</template>
<template v-if="item.componentName == 'ImageAds'">
<!-- 图片广告 -->
<diy-img-ads :value="item"></diy-img-ads>
</template>
<template v-if="item.componentName == 'Search'">
<!-- 搜索 -->
<diy-search :value="item" :topNavColor="topNavColor" :global="diyGlobalData.global"
:haveTopCategory="haveTopCategory" :followOfficialAccount="followOfficialAccount"></diy-search>
</template>
<template v-if="item.componentName == 'RichText'">
<!-- 富文本 -->
<diy-rich-text :value="item"></diy-rich-text>
</template>
<template v-if="item.componentName == 'HorzLine'">
<!-- 辅助线 -->
<diy-horz-line :value="item"></diy-horz-line>
</template>
<template v-if="item.componentName == 'HorzBlank'">
<!-- 辅助空白 -->
<diy-horz-blank :value="item"></diy-horz-blank>
</template>
<template v-if="item.componentName == 'Coupon' && addonIsExist.coupon">
<!-- 优惠券 -->
<diy-coupon :value="item"></diy-coupon>
</template>
<template v-if="item.componentName == 'GoodsList'">
<!-- 商品列表 -->
<diy-goods-list :value="item"></diy-goods-list>
</template>
<template v-if="item.componentName == 'ManyGoodsList'">
<!-- 多商品组 -->
<diy-many-goods-list :value="item" :global="diyGlobalData.global"
:scrollTop="scrollTop"></diy-many-goods-list>
</template>
<template v-if="item.componentName == 'RubikCube'">
<!-- 魔方、橱窗 -->
<diy-rubik-cube :value="item"></diy-rubik-cube>
</template>
<template v-if="item.componentName == 'Video'">
<!-- 视频 -->
<diy-video :value="item"></diy-video>
</template>
<template v-if="item.componentName == 'Seckill' && addonIsExist.seckill">
<!-- 秒杀 -->
<diy-seckill :value="item"></diy-seckill>
</template>
<template v-if="item.componentName == 'Pintuan' && addonIsExist.pintuan">
<!-- 拼团 -->
<diy-pintuan :value="item"></diy-pintuan>
</template>
<template v-if="item.componentName == 'Groupbuy' && addonIsExist.groupbuy">
<!-- 团购 -->
<diy-groupbuy :value="item"></diy-groupbuy>
</template>
<!-- 拼团返利 -->
<template v-if="item.componentName == 'Pinfan' && addonIsExist.pinfan">
<diy-pinfan :value="item"></diy-pinfan>
</template>
<template v-if="item.componentName == 'Bargain' && addonIsExist.bargain">
<!-- 砍价 -->
<diy-bargain :value="item"></diy-bargain>
</template>
<template v-if="item.componentName == 'Presale' && addonIsExist.bargain">
<!-- 预售 -->
<diy-presale :value="item"></diy-presale>
</template>
<template v-if="item.componentName == 'Notes' && addonIsExist.notes">
<!-- 店铺笔记 -->
<diy-notes :value="item"></diy-notes>
</template>
<template v-if="item.componentName == 'FloatBtn'">
<!-- 浮动按钮 -->
<diy-float-btn :value="item"></diy-float-btn>
</template>
<template v-if="item.componentName == 'LiveInfo'">
<!-- 小程序直播 -->
<!-- #ifdef MP-WEIXIN -->
<diy-live :value="item"></diy-live>
<!-- #endif -->
</template>
<template v-if="item.componentName == 'FenxiaoGoodsList'">
<!-- 分销商品 -->
<diy-fenxiao-goods-list :value="item"></diy-fenxiao-goods-list>
</template>
<template v-if="item.componentName == 'GoodsRecommend'">
<!-- 商品推荐 -->
<diy-goods-recommend :value="item"></diy-goods-recommend>
</template>
<template v-if="item.componentName == 'GoodsBrand'">
<!-- 商品品牌 -->
<diy-goods-brand :value="item"></diy-goods-brand>
</template>
<template v-if="item.componentName == 'Article'">
<!-- 文章 -->
<diy-article :value="item"></diy-article>
</template>
<template v-if="item.componentName == 'MerchList'">
<!-- 商户列表 -->
<diy-merch-list :value="item"></diy-merch-list>
</template>
<template v-if="item.componentName == 'MemberInfo'">
<!-- 自定义会员中心——会员信息 -->
<diy-member-info ref="diyMemberIndex" :value="item" :global="diyGlobalData.global"></diy-member-info>
</template>
<template v-if="item.componentName == 'MemberMyOrder'">
<!-- 自定义会员中心——我的订单 -->
<diy-member-my-order ref="diyMemberMyOrder" :value="item"></diy-member-my-order>
</template>
<template v-if="item.componentName == 'QuickNav'">
<!-- 快捷导航 -->
<diy-quick-nav :value="item"></diy-quick-nav>
</template>
<template v-if="item.componentName == 'PaymentQrcode'">
<!-- 付款码 -->
<diy-payment-qrcode :value="item"></diy-payment-qrcode>
</template>
<template v-if="item.componentName == 'HotArea'">
<!-- 热区 -->
<diy-hot-area :value="item"></diy-hot-area>
</template>
<template v-if="item.componentName == 'FollowOfficialAccount'">
<!-- 关注公众号 -->
<diy-follow-official-account :value="item"></diy-follow-official-account>
</template>
<template v-if="item.componentName == 'Map'">
<!-- 地图组件 -->
<diy-map :value="item"></diy-map>
</template>
<template v-if="item.componentName == 'Audio'">
<!-- 音频 -->
<diy-audio :value="item"></diy-audio>
</template>
<template v-if="item.componentName == 'ImageNav'">
<!-- 图片导航 -->
<diy-image-nav :value="item"></diy-image-nav>
</template>
<template v-if="item.componentName == 'Digit'">
<!-- 数字 -->
<diy-digit :value="item"></diy-digit>
</template>
<template v-if="item.componentName == 'VideoList'">
<!-- 视频列表 -->
<diy-video-list :value="item"></diy-video-list>
</template>
<template v-if="item.componentName == 'BottomNav'">
<!-- 底部导航 -->
<diy-bottom-nav :value="item"></diy-bottom-nav>
</template>
<template v-if="item.componentName == 'CategoryItem'">
<!-- 分类项 -->
<diy-category-item :value="item"></diy-category-item>
</template>
<template v-if="item.componentName == 'Category'">
<!-- 分类 -->
<diy-category :value="item"></diy-category>
</template>
<template v-if="item.componentName == 'Icon'">
<!-- 图标 -->
<diy-icon :value="item"></diy-icon>
</template>
<template v-if="item.componentName == 'Group'">
<!-- 组件组 -->
<diy-group :diyData="item"></diy-group>
</template>
<!-- 动态组件加载 -->
<component
:is="getComponent(item.componentName)"
v-if="shouldShowComponent(item)"
:value="item"
v-bind="getComponentProps(item)"
></component>
<!-- 自定义扩展组件 -->
<diy-comp-extend :value="item"></diy-comp-extend>
</view>
@@ -265,9 +18,14 @@
<script>
// 组件组展示
import DiyMinx from './minx.js'
import diyCompExtend from './diy-comp-extend.vue'
export default {
name: 'DiyGroup',
mixins: [DiyMinx],
components: {
diyCompExtend
},
props: {
diyData: {
type: Object,
@@ -286,10 +44,61 @@ export default {
default: () => ({})
},
},
mixins: [DiyMinx],
data() {
return {
diyGlobalData: null
diyGlobalData: null,
// 动态组件映射
componentMap: {
StoreShow: () => import('./diy-store.vue'),
Kefu: () => import('./diy-kefu.vue'),
Form: () => import('./diy-form.vue'),
StoreLabel: () => import('./diy-store-label.vue'),
Picture: () => import('./diy-picture.vue'),
Listmenu: () => import('./diy-listmenu.vue'),
Text: () => import('./diy-text.vue'),
Notice: () => import('./diy-notice.vue'),
GraphicNav: () => import('./diy-graphic-nav.vue'),
ImageAds: () => import('./diy-img-ads.vue'),
Search: () => import('./diy-search.vue'),
RichText: () => import('./diy-rich-text.vue'),
HorzLine: () => import('./diy-horz-line.vue'),
HorzBlank: () => import('./diy-horz-blank.vue'),
Coupon: () => import('./diy-coupon.vue'),
GoodsList: () => import('./diy-goods-list.vue'),
ManyGoodsList: () => import('./diy-many-goods-list.vue'),
RubikCube: () => import('./diy-rubik-cube.vue'),
Video: () => import('./diy-video.vue'),
Seckill: () => import('./diy-seckill.vue'),
Pintuan: () => import('./diy-pintuan.vue'),
Groupbuy: () => import('./diy-groupbuy.vue'),
Pinfan: () => import('./diy-pinfan.vue'),
Bargain: () => import('./diy-bargain.vue'),
Presale: () => import('./diy-presale.vue'),
Notes: () => import('./diy-notes.vue'),
FloatBtn: () => import('./diy-float-btn.vue'),
LiveInfo: () => import('./diy-live.vue'),
FenxiaoGoodsList: () => import('./diy-fenxiao-goods-list.vue'),
GoodsRecommend: () => import('./diy-goods-recommend.vue'),
GoodsBrand: () => import('./diy-goods-brand.vue'),
Article: () => import('./diy-article.vue'),
MerchList: () => import('./diy-merch-list.vue'),
MemberInfo: () => import('./diy-member-info.vue'),
MemberMyOrder: () => import('./diy-member-my-order.vue'),
QuickNav: () => import('./diy-quick-nav.vue'),
PaymentQrcode: () => import('./diy-payment-qrcode.vue'),
HotArea: () => import('./diy-hot-area.vue'),
FollowOfficialAccount: () => import('./diy-follow-official-account.vue'),
Map: () => import('./diy-map.vue'),
Audio: () => import('./diy-audio.vue'),
ImageNav: () => import('./diy-image-nav.vue'),
Digit: () => import('./diy-digit.vue'),
VideoList: () => import('./diy-video-list.vue'),
BottomNav: () => import('./diy-bottom-nav.vue'),
CategoryItem: () => import('./diy-category-item.vue'),
Category: () => import('./diy-category.vue'),
Icon: () => import('./diy-icon.vue'),
Group: () => import('./diy-group.vue')
}
};
},
created() {
@@ -371,7 +180,75 @@ export default {
return data;
}
},
methods: {}
methods: {
// 获取组件
getComponent(componentName) {
return this.componentMap[componentName] || null;
},
// 判断组件是否应该显示
shouldShowComponent(item) {
// 检查是否有对应的组件映射
if (!this.componentMap[item.componentName]) {
return false;
}
// 根据组件名称和附加组件状态进行判断
const addonChecks = {
StoreShow: 'store',
StoreLabel: 'store',
Coupon: 'coupon',
Seckill: 'seckill',
Pintuan: 'pintuan',
Groupbuy: 'groupbuy',
Pinfan: 'pinfan',
Bargain: 'bargain',
Presale: 'bargain',
Notes: 'notes'
};
const addonName = addonChecks[item.componentName];
if (addonName) {
return this.addonIsExist[addonName];
}
// 小程序直播组件特殊处理
if (item.componentName === 'LiveInfo') {
// #ifdef MP-WEIXIN
return true;
// #endif
// #ifndef MP-WEIXIN
return false;
// #endif
}
return true;
},
// 获取组件属性
getComponentProps(item) {
const props = {};
// 为特定组件添加额外属性
switch (item.componentName) {
case 'Search':
props.topNavColor = this.topNavColor;
props.global = this.diyGlobalData.global;
props.haveTopCategory = this.haveTopCategory;
props.followOfficialAccount = this.followOfficialAccount;
break;
case 'ManyGoodsList':
props.global = this.diyGlobalData.global;
props.scrollTop = this.scrollTop;
break;
case 'MemberInfo':
props.global = this.diyGlobalData.global;
break;
}
return props;
}
}
};
</script>

8
components-diy/diy-member-my-order.vue
View File

@@ -2,7 +2,7 @@
<view data-component-name="diy-member-my-order" class="common-wrap" :style="warpCss">
<view class="order-wrap">
<view class="status-wrap">
<view class="item-wrap" @click="redirect('/pages_order/list?status=waitpay')"
<view class="item-wrap" @click="redirect('/pages_order/base/list?status=waitpay')"
style="margin-right: 10rpx;">
<view class="icon-block">
<template v-if="value.style == 3">
@@ -21,7 +21,7 @@
</view>
<view class="title">{{ $lang('waitpay') }}</view>
</view>
<view class="item-wrap" @click="redirect('/pages_order/list?status=waitsend')"
<view class="item-wrap" @click="redirect('/pages_order/base/list?status=waitsend')"
style="margin-right: 10rpx;">
<view class="icon-block">
<template v-if="value.style == 3">
@@ -40,7 +40,7 @@
</view>
<view class="title">{{ $lang('waitsend') }}</view>
</view>
<view class="item-wrap" @click="redirect('/pages_order/list?status=waitconfirm')"
<view class="item-wrap" @click="redirect('/pages_order/base/list?status=waitconfirm')"
style="margin-right: 10rpx;">
<view class="icon-block">
<template v-if="value.style == 3">
@@ -59,7 +59,7 @@
</view>
<view class="title">{{ $lang('waitconfirm') }}</view>
</view>
<view class="item-wrap" @click="redirect('/pages_order/list?status=waitrate')"
<view class="item-wrap" @click="redirect('/pages_order/base/list?status=waitrate')"
style="margin-right: 10rpx;">
<view class="icon-block">
<template v-if="value.style == 3">

2
components/common-payment/payment.js
View File

@@ -922,7 +922,7 @@ export default {
payClose() {
// 更新购物车数量
this.$store.dispatch('getCartNumber');
this.$util.redirectTo('/pages_order/detail', {
this.$util.redirectTo('/pages_order/detail/detail', {
order_id: this.$refs.choosePaymentPopup.payInfo.order_id
}, 'redirectTo');
},

2
components/ns-goods-sku/ns-goods-sku.vue
View File

@@ -1109,7 +1109,7 @@
key: 'orderCreateData',
data: data,
success: () => {
this.$util.redirectTo('/pages_order/payment');
this.$util.redirectTo('/pages_order/base/payment');
this.btnSwitch = false;
}
});

80
pages.json
View File

@@ -58,8 +58,8 @@
]
},
{
//******************订单模块分包******************
"root": "pages_order",
//******************订单模块-基础功能子分包******************
"root": "pages_order/base",
"pages": [
{
"path": "payment",
@@ -74,7 +74,13 @@
"navigationStyle": "custom"
// #endif
}
},
}
]
},
{
//******************订单模块-详情功能子分包******************
"root": "pages_order/detail",
"pages": [
{
"path": "detail",
"style": {
@@ -111,8 +117,8 @@
]
},
{
//******************积分模块分包******************
"root": "pages_promotion/point",
//******************积分模块-基础功能子分包******************
"root": "pages_promotion/point/base",
"pages": [
{
"path": "list",
@@ -127,7 +133,13 @@
"navigationStyle": "custom"
// #endif
}
},
}
]
},
{
//******************积分模块-详情功能子分包******************
"root": "pages_promotion/point/detail",
"pages": [
{
"path": "detail",
"style": {
@@ -185,8 +197,8 @@
]
},
{
//******************分销核心模块分包******************
"root": "pages_promotion/fenxiao/core",
//******************分销核心模块-基础功能子包******************
"root": "pages_promotion/fenxiao/core/base",
"pages": [
{
"path": "index",
@@ -196,14 +208,6 @@
// #endif
}
},
{
"path": "promote",
"style": {
// #ifdef APP-PLUS
"navigationStyle": "custom"
// #endif
}
},
{
"path": "apply",
"style": {
@@ -213,7 +217,21 @@
}
},
{
"path": "promote_code",
"path": "level",
"style": {
// #ifdef APP-PLUS
"navigationStyle": "custom"
// #endif
}
}
]
},
{
//******************分销核心模块-推广功能子包******************
"root": "pages_promotion/fenxiao/core/promote",
"pages": [
{
"path": "promote",
"style": {
// #ifdef APP-PLUS
"navigationStyle": "custom"
@@ -221,7 +239,7 @@
}
},
{
"path": "level",
"path": "promote_code",
"style": {
// #ifdef APP-PLUS
"navigationStyle": "custom"
@@ -423,8 +441,8 @@
]
},
{
//******************会员模块-资金管理子分包******************
"root": "pages_tool/member/finance",
//******************会员模块-资金管理-账户基础子分包******************
"root": "pages_tool/member/finance/account",
"pages": [
{
"path": "balance",
@@ -454,6 +472,20 @@
// #endif
}
},
{
"path": "pay_password",
"style": {
// #ifdef APP-PLUS
"navigationStyle": "custom"
// #endif
}
}
]
},
{
//******************会员模块-资金管理-交易功能子分包******************
"root": "pages_tool/member/finance/transaction",
"pages": [
{
"path": "apply_withdrawal",
"style": {
@@ -478,14 +510,6 @@
// #endif
}
},
{
"path": "pay_password",
"style": {
// #ifdef APP-PLUS
"navigationStyle": "custom"
// #endif
}
},
{
"path": "card",
"style": {

2
pages_goods/public/js/cart.js
View File

@@ -367,7 +367,7 @@ export default {
cart_ids: cart_ids.toString()
},
success: () => {
this.$util.redirectTo('/pages_order/payment');
this.$util.redirectTo('/pages_order/base/payment');
this.isSub = false;
}
});

12
pages_order/list.vue → pages_order/base/list.vue
View File

@@ -165,7 +165,7 @@
</template>
<script>
import orderMethod from './public/js/orderMethod.js';
import orderMethod from '../public/js/orderMethod.js';
export default {
components: {
@@ -214,7 +214,7 @@ export default {
if (this.$refs.mescroll) this.$refs.mescroll.refresh();
} else {
this.$nextTick(() => {
this.$refs.login.open('/pages_order/list?status=' + this.orderStatus);
this.$refs.login.open('/pages_order/base/list?status=' + this.orderStatus);
})
}
},
@@ -367,13 +367,13 @@ export default {
switch (parseInt(data.order_type)) {
case 2:
// 自提订单
this.$util.redirectTo('/pages_order/detail_pickup', {
this.$util.redirectTo('/pages_order/detail/detail_pickup', {
order_id: data.order_id
});
break;
case 3:
// 本地配送订单
this.$util.redirectTo('/pages_order/detail_local_delivery', {
this.$util.redirectTo('/pages_order/detail/detail_local_delivery', {
order_id: data.order_id
});
break;
@@ -384,7 +384,7 @@ export default {
});
break;
default:
this.$util.redirectTo('/pages_order/detail', {
this.$util.redirectTo('/pages_order/detail/detail', {
order_id: data.order_id
});
break;
@@ -462,7 +462,7 @@ export default {
</script>
<style lang="scss">
@import './public/css/list.scss';
@import '../public/css/list.scss';
</style>
<style lang="scss" scoped>

0
pages_order/payment.vue → pages_order/base/payment.vue
View File

8
pages_order/detail.vue → pages_order/detail/detail.vue
View File

@@ -633,7 +633,7 @@
</template>
<script>
import orderMethod from './public/js/orderMethod.js';
import orderMethod from '../public/js/orderMethod.js';
export default {
components: {
@@ -679,7 +679,7 @@ export default {
this.getOrderData();
} else {
this.$util.redirectTo('/pages_tool/login/login', {
back: '/pages_order/detail?order_id=' + this.orderId + '&merchant_trade_no=' + this.merchantTradeNo
back: '/pages_order/detail/detail?order_id=' + this.orderId + '&merchant_trade_no=' + this.merchantTradeNo
});
}
},
@@ -746,7 +746,7 @@ export default {
title: '未获取到订单信息！'
});
setTimeout(() => {
this.$util.redirectTo('/pages_order/list');
this.$util.redirectTo('/pages_order/base/list');
}, 1500);
}
},
@@ -837,7 +837,7 @@ export default {
</script>
<style lang="scss">
@import './public/css/detail.scss';
@import '../public/css/detail.scss';
</style>
<style scoped>
.pickup-code-info .code img:nth-child(1) {

2
pages_order/detail_local_delivery.vue → pages_order/detail/detail_local_delivery.vue
View File

@@ -14,7 +14,7 @@ export default {
},
onLoad(option) {
if (option.order_id) {
this.$util.redirectTo('/pages_order/detail', {order_id: option.order_id}, 'redirectTo');
this.$util.redirectTo('/pages_order/detail/detail', {order_id: option.order_id}, 'redirectTo');
}
}
};

2
pages_order/detail_pickup.vue → pages_order/detail/detail_pickup.vue
View File

@@ -14,7 +14,7 @@ export default {
},
onLoad(option) {
if (option.order_id) {
this.$util.redirectTo('/pages_order/detail', {order_id: option.order_id}, 'redirectTo');
this.$util.redirectTo('/pages_order/detail/detail', {order_id: option.order_id}, 'redirectTo');
}
}
};

6
pages_order/detail_point.vue → pages_order/detail/detail_point.vue
View File

@@ -170,7 +170,7 @@ export default {
this.getOrderData();
} else {
this.$util.redirectTo('/pages_tool/login/login', {
back: '/pages_order/detail_point?order_id=' + this.orderId
back: '/pages_order/detail/detail_point?order_id=' + this.orderId
});
}
},
@@ -211,7 +211,7 @@ export default {
title: '未获取到订单信息！'
});
setTimeout(() => {
this.$util.redirectTo('/pages_order/list');
this.$util.redirectTo('/pages_order/base/list');
}, 1500);
}
},
@@ -301,7 +301,7 @@ export default {
</script>
<style lang="scss">
@import './public/css/detail.scss';
@import '../public/css/detail.scss';
</style>
<style scoped>
/deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {

4
pages_promotion/fenxiao/core/apply.vue → pages_promotion/fenxiao/core/base/apply.vue
View File

@@ -152,8 +152,8 @@
</template>
<script>
import validate from 'common/js/validate.js';
import fenxiaoWords from 'common/js/fenxiao-words.js';
import validate from '@/common/js/validate.js';
import fenxiaoWords from '@/common/js/fenxiao-words.js';
import htmlParser from '@/common/js/html-parser.js';
export default {
components: {

5
pages_promotion/fenxiao/core/index.vue → pages_promotion/fenxiao/core/base/index.vue
View File

@@ -597,10 +597,9 @@ export default {
};
</script>
<style lang="scss">
@import '../public/css/index.scss';
</style>
<style scoped lang="scss">
@import '@/pages_promotion/fenxiao/public/css/index.scss';
/deep/ .uni-popup__wrapper {
height: auto;
}

2
pages_promotion/fenxiao/core/level.vue → pages_promotion/fenxiao/core/base/level.vue
View File

@@ -306,7 +306,7 @@ export default {
</script>
<style lang="scss">
@import '../public/css/level.scss';
@import '@/pages_promotion/fenxiao/public/css/level.scss';
</style>
<style scoped lang="scss">
/deep/ .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {

4
pages_promotion/fenxiao/core/goods_list.vue → pages_promotion/fenxiao/core/promote/goods_list.vue
View File

@@ -133,8 +133,8 @@
<script>
import list from '../public/js/goods_list.js';
import fenxiaoWords from 'common/js/fenxiao-words.js';
import list from '@/pages_promotion/fenxiao/public/js/goods_list.js';
import fenxiaoWords from '@/common/js/fenxiao-words.js';
export default {
components: {

0
pages_promotion/fenxiao/core/promote.vue → pages_promotion/fenxiao/core/promote/promote.vue
View File

0
pages_promotion/fenxiao/core/promote_code.vue → pages_promotion/fenxiao/core/promote/promote_code.vue
View File

0
pages_promotion/point/goods_list.vue → pages_promotion/point/base/goods_list.vue
View File

2
pages_promotion/point/list.vue → pages_promotion/point/base/list.vue
View File

@@ -607,7 +607,7 @@ export default {
</script>
<style lang="scss">
@import './public/css/list.scss';
@import '@/pages_promotion/point/public/css/list.scss';
</style>
<style>
.ns-adv>>>image {

0
pages_promotion/point/detail.vue → pages_promotion/point/detail/detail.vue
View File

8
pages_promotion/point/order_list.vue → pages_promotion/point/detail/order_list.vue
View File

@@ -231,17 +231,17 @@ export default {
if (item.type == 1 && item.relate_order_id) {
switch (item.delivery_type) {
case 'store':
this.$util.redirectTo('/pages_order/detail_pickup', {
this.$util.redirectTo('/pages_order/detail/detail_pickup', {
order_id: item.relate_order_id
});
break;
case 'local':
this.$util.redirectTo('/pages_order/detail_local_delivery', {
this.$util.redirectTo('/pages_order/detail/detail_local_delivery', {
order_id: item.relate_order_id
});
break;
case 'express':
this.$util.redirectTo('/pages_order/detail', {
this.$util.redirectTo('/pages_order/detail/detail', {
order_id: item.relate_order_id
});
break;
@@ -251,7 +251,7 @@ export default {
});
}
} else {
this.$util.redirectTo('/pages_order/detail_point', {
this.$util.redirectTo('/pages_order/detail/detail_point', {
order_id: item.order_id
});
}

2
pages_promotion/point/payment.vue → pages_promotion/point/detail/payment.vue
View File

@@ -313,7 +313,7 @@
</template>
<script>
import payment from './public/js/payment.js';
import payment from '@/pages_promotion/point/public/js/payment.js';
export default {

0
pages_promotion/point/result.vue → pages_promotion/point/detail/result.vue
View File

2
pages_tool/member/finance/balance.vue → pages_tool/member/finance/account/balance.vue
View File

@@ -190,5 +190,5 @@ export default {
</script>
<style lang="scss">
@import '../public/css/balance.scss';
@import '@/pages_tool/member/public/css/balance.scss';
</style>

4
pages_tool/member/finance/balance_detail.vue → pages_tool/member/finance/account/balance_detail.vue
View File

@@ -200,11 +200,11 @@ export default {
},
toFromDetail(item) {
if (item.from_type == 'order' && !isNaN(parseInt(item.type_tag))) {
this.$util.redirectTo('/pages_order/detail', {
this.$util.redirectTo('/pages_order/detail/detail', {
order_id: item.type_tag
});
} else if (item.from_type == 'refund' && parseInt(item.type_tag) != 0) {
this.$util.redirectTo('/pages_order/detail', {
this.$util.redirectTo('/pages_order/detail/detail', {
order_id: item.type_tag
});
}

0
pages_tool/member/finance/pay_password.vue → pages_tool/member/finance/account/pay_password.vue
View File

2
pages_tool/member/finance/point.vue → pages_tool/member/finance/account/point.vue
View File

@@ -161,5 +161,5 @@ export default {
</script>
<style lang="scss">
@import '../public/css/point.scss';
@import '@/pages_tool/member/public/css/point.scss';
</style>

14
pages_tool/member/finance/point_detail.vue → pages_tool/member/finance/account/point_detail.vue
View File

@@ -161,22 +161,22 @@ export default {
if (data.type == 1 && data.relate_order_id) {
switch (data.delivery_type) {
case 'store':
this.$util.redirectTo('/pages_order/detail_pickup', {
this.$util.redirectTo('/pages_order/detail/detail_pickup', {
order_id: data.relate_order_id
});
break;
case 'local':
this.$util.redirectTo('/pages_order/detail_local_delivery', {
this.$util.redirectTo('/pages_order/detail/detail_local_delivery', {
order_id: data.relate_order_id
});
break;
default:
this.$util.redirectTo('/pages_order/detail', {
this.$util.redirectTo('/pages_order/detail/detail', {
order_id: data.relate_order_id
});
}
} else {
this.$util.redirectTo('/pages_order/detail_point', {
this.$util.redirectTo('/pages_order/detail/detail_point', {
order_id: data.order_id
});
}
@@ -184,7 +184,7 @@ export default {
}
});
} else if (item.from_type == 'pointcash') {
this.$util.redirectTo('/pages_order/detail', {
this.$util.redirectTo('/pages_order/detail/detail', {
order_id: item.type_tag
});
} else if (item.from_type == 'memberconsume') {
@@ -192,11 +192,11 @@ export default {
// order_id: item.type_tag
// });
} else if (item.from_type == 'pointexchangerefund' && parseInt(item.type_tag) != 0) {
this.$util.redirectTo('/pages_order/detail_point', {
this.$util.redirectTo('/pages_order/detail/detail_point', {
order_id: item.type_tag
});
} else if (item.from_type == 'refund' && parseInt(item.type_tag) != 0) {
this.$util.redirectTo('/pages_order/detail', {
this.$util.redirectTo('/pages_order/detail/detail', {
order_id: item.type_tag
});
}

0
pages_tool/member/finance/apply_withdrawal.vue → pages_tool/member/finance/transaction/apply_withdrawal.vue
View File

2
pages_tool/member/finance/card.vue → pages_tool/member/finance/transaction/card.vue
View File

@@ -195,7 +195,7 @@ export default {
</script>
<style lang="scss">
@import '../public/css/card.scss';
@import '@/pages_tool/member/public/css/card.scss';
.banner-container .image-container .slide-image {
width: calc(100% - 60rpx);

0
pages_tool/member/finance/card_agreement.vue → pages_tool/member/finance/transaction/card_agreement.vue
View File

2
pages_tool/member/finance/card_buy.vue → pages_tool/member/finance/transaction/card_buy.vue
View File

@@ -431,5 +431,5 @@ export default {
</script>
<style lang="scss">
@import '../public/css/card.scss';
@import '@/pages_tool/member/public/css/card.scss';
</style>

0
pages_tool/member/finance/withdrawal.vue → pages_tool/member/finance/transaction/withdrawal.vue
View File

0
pages_tool/member/finance/withdrawal_detail.vue → pages_tool/member/finance/transaction/withdrawal_detail.vue
View File

2
pages_tool/order/detail_virtual.vue
View File

@@ -15,7 +15,7 @@ export default {
},
onLoad(option) {
if (option.order_id) {
this.$util.redirectTo('/pages_order/detail', { order_id: option.order_id }, 'redirectTo');
this.$util.redirectTo('/pages_order/detail/detail', { order_id: option.order_id }, 'redirectTo');
}
}
};

2
pages_tool/order/logistics.vue
View File

@@ -135,7 +135,7 @@ export default {
title: '未获取到订单信息！'
});
setTimeout(() => {
this.$util.redirectTo('/pages_order/list');
this.$util.redirectTo('/pages_order/base/list');
}, 1500);
}
},

6
pages_tool/order/public/js/evaluate.js
View File

@@ -23,7 +23,7 @@ export default {
},
onLoad(options) {
//接收订单号，订单是否是追评等信息
options.order_id ? (this.orderId = options.order_id) : this.$util.redirectTo('/pages_order/list');
options.order_id ? (this.orderId = options.order_id) : this.$util.redirectTo('/pages_order/base/list');
this.isIphoneX = this.$util.uniappIsIPhoneX();
if (!this.storeToken) {
@@ -90,7 +90,7 @@ export default {
title: "未获取到订单数据"
})
setTimeout(() => {
this.$util.redirectTo('/pages_order/list', {}, "redirectTo");
this.$util.redirectTo('/pages_order/base/list', {}, "redirectTo");
}, 1000)
}
if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
@@ -200,7 +200,7 @@ export default {
title: "评价成功"
});
setTimeout(() => {
this.$util.redirectTo('/pages_order/list', {}, "redirectTo");
this.$util.redirectTo('/pages_order/base/list', {}, "redirectTo");
}, 1000);
} else {
this.$util.showToast({

2
pages_tool/order/refund.vue
View File

@@ -175,7 +175,7 @@ export default {
} else {
this.$util.showToast({ title: '未获取到该订单项退款信息' });
setTimeout(() => {
this.$util.redirectTo('/pages_order/list');
this.$util.redirectTo('/pages_order/base/list');
}, 1000);
}
},

2
pages_tool/order/refund_batch.vue
View File

@@ -168,7 +168,7 @@ export default {
} else {
this.$util.showToast({ title: '未获取到该订单项退款信息' });
setTimeout(() => {
this.$util.redirectTo('/pages_order/list');
this.$util.redirectTo('/pages_order/base/list');
}, 1000);
}
},

4
pages_tool/order/refund_detail.vue
View File

@@ -191,7 +191,7 @@ export default {
} else {
this.$util.showToast({ title: '未获取到该订单项退款信息' });
setTimeout(() => {
this.$util.redirectTo('/pages_order/list');
this.$util.redirectTo('/pages_order/base/list');
}, 1000);
}
},
@@ -207,7 +207,7 @@ export default {
if (res.code >= 0) {
this.$util.showToast({ title: '撤销成功' });
setTimeout(() => {
this.$util.redirectTo('/pages_order/list');
this.$util.redirectTo('/pages_order/base/list');
}, 1000);
}
});

2
pages_tool/order/refund_goods_select.vue
View File

@@ -57,7 +57,7 @@ export default {
icon: 'none'
})
setTimeout(() => {
this.$util.redirectTo('/pages_order/list');
this.$util.redirectTo('/pages_order/base/list');
}, 1000)
}
},

2
pages_tool/order/refund_type_select.vue
View File

@@ -83,7 +83,7 @@ export default {
title: '未获取到该订单项退款信息'
});
setTimeout(() => {
this.$util.redirectTo('/pages_order/list');
this.$util.redirectTo('/pages_order/base/list');
}, 1000);
}
},

6
pages_tool/pay/result.vue
View File

@@ -154,11 +154,11 @@ export default {
},
toOrderDetail(id) {
if (this.payInfo.order_type == 2) {
this.$util.redirectTo('/pages_order/detail_pickup', {
this.$util.redirectTo('/pages_order/detail/detail_pickup', {
order_id: id
}, 'redirectTo');
} else if (this.payInfo.order_type == 3) {
this.$util.redirectTo('/pages_order/detail_local_delivery', {
this.$util.redirectTo('/pages_order/detail/detail_local_delivery', {
order_id: id
}, 'redirectTo');
} else if (this.payInfo.order_type == 4) {
@@ -166,7 +166,7 @@ export default {
order_id: id
}, 'redirectTo');
} else {
this.$util.redirectTo('/pages_order/detail', {
this.$util.redirectTo('/pages_order/detail/detail', {
order_id: id
}, 'redirectTo');
}

11
vue.config.js
View File

@@ -1,23 +1,24 @@
module.exports = {
productionSourceMap: false,
configureWebpack: config => {
// 生产环境下开启极限压缩
if (process.env.NODE_ENV === 'production') {
console.log('生产环境下开启极限压缩');
// 确保minimizer数组存在
if (config.optimization && config.optimization.minimizer && Array.isArray(config.optimization.minimizer)) {
// 查找TerserWebpackPlugin实例，而不是依赖索引
const terserPluginIndex = config.optimization.minimizer.findIndex(plugin => {
return plugin.constructor && plugin.constructor.name === 'TerserWebpackPlugin' ||
(plugin.options && plugin.options.terserOptions);
return plugin.constructor && plugin.constructor.name === 'TerserWebpackPlugin' ||
(plugin.options && plugin.options.terserOptions);
});
if (terserPluginIndex !== -1) {
// 确保options对象存在
if (!config.optimization.minimizer[terserPluginIndex].options) {
config.optimization.minimizer[terserPluginIndex].options = {};
}
// 设置terserOptions - 极限压缩配置
config.optimization.minimizer[terserPluginIndex].options.terserOptions = {
compress: {