diff --git a/postcss.config.js b/postcss.config.js index 1fbbd19..cfecbaa 100644 --- a/postcss.config.js +++ b/postcss.config.js @@ -34,7 +34,7 @@ const baseViewportOpts = { selectorBlackList: ['.ignore', 'keep-px'], // 下面配置表示属性值包含 '1px solid' 的内容不会转换 valueBlackList: ['1px solid'], - // exclude: [/node_modules/], // 忽略某些文件夹下的文件或特定文件 + exclude: [/src/], // 忽略某些文件夹下的文件或特定文件 // include: [/src/], // 如果设置了include,那将只有匹配到的文件才会被转换 mobileUnit: 'vw', // 指定需要转换成的视口单位,建议使用 vw rootContainingBlockSelectorList: ['van-popup--bottom'], // 指定包含块是根包含块的选择器,这种选择器的定位通常是 `fixed`,但是选择器内没有 `position: fixed` diff --git a/src/router/daxpay.ts b/src/router/daxpay.ts index f0e4a6a..6ec01dc 100644 --- a/src/router/daxpay.ts +++ b/src/router/daxpay.ts @@ -3,17 +3,17 @@ import type { RouteRecordRaw } from 'vue-router' const Layout = () => import('@/layout/index.vue') /** - * 支付模块路由 + * 支付H5模块路由 */ -export const DaxPayRoute: RouteRecordRaw = { - path: '/daxpay', - name: 'daxpay', +export const DaxPayH5Route: RouteRecordRaw = { + path: '/h5', + name: 'h5', component: Layout, children: [ { path: '/auth/alipay/:appId/:channel/:queryCode/:aliAppId', name: 'AlipayAuth', - component: () => import('@/views/daxpay/auth/alipay/AlipayAuth.vue'), + component: () => import('@/views/daxpay/h5/auth/alipay/AlipayAuth.vue'), meta: { title: '支付宝信息获取', }, @@ -21,23 +21,40 @@ export const DaxPayRoute: RouteRecordRaw = { { path: '/auth/wechat/:appId/:channel/:queryCode', name: 'WechatAuth', - component: () => import('@/views/daxpay/auth/wechat/WechatAuth.vue'), + component: () => import('@/views/daxpay/h5/auth/wechat/WechatAuth.vue'), meta: { title: '微信信息获取', }, }, { path: '/cashier/:orderNo', - name: 'CashierCode', - component: () => import('@/views/daxpay/cashier/Cashier.vue'), + name: 'Cashier', + component: () => import('@/views/daxpay/h5/cashier/Cashier.vue'), meta: { title: '收银台', }, }, + + { + path: '/alipay/cashier/code/:orderNo', + name: 'AlipayCashierCode', + component: () => import('@/views/daxpay/h5/code/alipay/AlipayCashierCode.vue'), + meta: { + title: '支付宝收银台', + }, + }, + { + path: '/wechat/cashier/code/:orderNo', + name: 'WechatCashierCode', + component: () => import('@/views/daxpay/h5/code/wechat/WechatCashierCode.vue'), + meta: { + title: '微信收银台', + }, + }, { path: '/aggregate/:orderNo', name: 'CheckAggregate', - component: () => import('@/views/daxpay/aggregate/Aggregate.vue'), + component: () => import('@/views/daxpay/h5/aggregate/Aggregate.vue'), meta: { title: '聚合收银台', }, @@ -45,7 +62,7 @@ export const DaxPayRoute: RouteRecordRaw = { { path: '/aggregate/alipay/:orderNo', name: 'AliCheckout', - component: () => import('@/views/daxpay/aggregate/alipay/AlipayAggregate.vue'), + component: () => import('@/views/daxpay/h5/aggregate/alipay/AlipayAggregate.vue'), meta: { title: '支付宝收银台', }, @@ -53,7 +70,7 @@ export const DaxPayRoute: RouteRecordRaw = { { path: '/aggregate/wechat/:orderNo', name: 'WechatCheckout', - component: () => import('@/views/daxpay/aggregate/wechat/WechatAggregate.vue'), + component: () => import('@/views/daxpay/h5/aggregate/wechat/WechatAggregate.vue'), meta: { title: '微信收银台', }, @@ -61,7 +78,7 @@ export const DaxPayRoute: RouteRecordRaw = { { path: '/paySuccess/:orderNo', name: 'PaySuccess', - component: () => import('@/views/daxpay/result/PaySuccess.vue'), + component: () => import('@/views/daxpay/h5/result/PaySuccess.vue'), meta: { title: '支付成功页面', }, @@ -69,10 +86,44 @@ export const DaxPayRoute: RouteRecordRaw = { { path: '/payFail', name: 'payFail', - component: () => import('@/views/daxpay/result/PayFail.vue'), + component: () => import('@/views/daxpay/h5/result/PayFail.vue'), meta: { title: '支付失败页面', }, }, ], } +/** + * pc页面 + */ +export const DaxPayPcRoute: RouteRecordRaw = { + path: '/pc', + name: 'pc', + children: [ + { + path: '/pc/cashier/:orderNo', + name: 'PcCashier', + component: () => import('@/views/daxpay/pc/cashier/Cashier.vue'), + meta: { + title: '收银台', + }, + }, + { + path: '/pc/paySuccess/:orderNo', + name: 'PcPaySuccess', + component: () => import('@/views/daxpay/pc/result/PaySuccess.vue'), + meta: { + title: '支付成功页面', + }, + }, + { + path: '/pc/payFail', + name: 'PcPayFail', + component: () => import('@/views/daxpay/pc/result/PayFail.vue'), + meta: { + title: '支付失败页面', + }, + }, + + ], +} diff --git a/src/router/index.ts b/src/router/index.ts index 79d8c66..67b9701 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -5,11 +5,12 @@ import { BusinessRoute, ErrorPageRoute, routeModuleList } from '@/router/base' import { useRouteStoreWidthOut } from '@/store/modules/route' // 菜单 -import { DaxPayRoute } from '@/router/daxpay' +import { DaxPayH5Route, DaxPayPcRoute } from '@/router/daxpay' // 普通路由 export const constantRouter: RouteRecordRaw[] = [ - DaxPayRoute, + DaxPayH5Route, + DaxPayPcRoute, ErrorPageRoute, BusinessRoute, ] diff --git a/src/views/daxpay/aggregate/Aggregate.api.ts b/src/views/daxpay/h5/aggregate/Aggregate.api.ts similarity index 99% rename from src/views/daxpay/aggregate/Aggregate.api.ts rename to src/views/daxpay/h5/aggregate/Aggregate.api.ts index c053ff4..bf41c50 100644 --- a/src/views/daxpay/aggregate/Aggregate.api.ts +++ b/src/views/daxpay/h5/aggregate/Aggregate.api.ts @@ -1,7 +1,7 @@ import type { AuthResult } from '../auth/ChannelAuth.api' import { http } from '@/utils/http/axios' import type { Result } from '#/axios' -import type { GatewayOrder, GatewayPayConfig } from '@/views/daxpay/cashier/Cashier.api' +import type { GatewayOrder, GatewayPayConfig } from '@/views/daxpay/h5/cashier/Cashier.api' /** * 获取聚合支付相关订单和配置信息 diff --git a/src/views/daxpay/aggregate/Aggregate.vue b/src/views/daxpay/h5/aggregate/Aggregate.vue similarity index 100% rename from src/views/daxpay/aggregate/Aggregate.vue rename to src/views/daxpay/h5/aggregate/Aggregate.vue diff --git a/src/views/daxpay/aggregate/alipay/AlipayAggregate.vue b/src/views/daxpay/h5/aggregate/alipay/AlipayAggregate.vue similarity index 98% rename from src/views/daxpay/aggregate/alipay/AlipayAggregate.vue rename to src/views/daxpay/h5/aggregate/alipay/AlipayAggregate.vue index e452623..619922c 100644 --- a/src/views/daxpay/aggregate/alipay/AlipayAggregate.vue +++ b/src/views/daxpay/h5/aggregate/alipay/AlipayAggregate.vue @@ -43,8 +43,8 @@ import { ref } from 'vue' import type { AggregateOrderAndConfig, AggregatePayParam, -} from '@/views/daxpay/aggregate/Aggregate.api' -import { aggregatePay, getAggregateConfig } from '@/views/daxpay/aggregate/Aggregate.api' +} from '@/views/daxpay/h5/aggregate/Aggregate.api' +import { aggregatePay, getAggregateConfig } from '@/views/daxpay/h5/aggregate/Aggregate.api' import { AggregateEnum, GatewayCallTypeEnum } from '@/enums/daxpay/DaxPayEnum' diff --git a/src/views/daxpay/aggregate/wechat/WechatAggregate.vue b/src/views/daxpay/h5/aggregate/wechat/WechatAggregate.vue similarity index 98% rename from src/views/daxpay/aggregate/wechat/WechatAggregate.vue rename to src/views/daxpay/h5/aggregate/wechat/WechatAggregate.vue index 2680ad2..b5b8eea 100644 --- a/src/views/daxpay/aggregate/wechat/WechatAggregate.vue +++ b/src/views/daxpay/h5/aggregate/wechat/WechatAggregate.vue @@ -38,7 +38,6 @@ + + diff --git a/src/views/daxpay/h5/code/alipay/AlipayCashierCode.vue b/src/views/daxpay/h5/code/alipay/AlipayCashierCode.vue new file mode 100644 index 0000000..46e41ff --- /dev/null +++ b/src/views/daxpay/h5/code/alipay/AlipayCashierCode.vue @@ -0,0 +1,165 @@ + + + + + diff --git a/src/views/daxpay/h5/code/wechat/WechatCashierCode.vue b/src/views/daxpay/h5/code/wechat/WechatCashierCode.vue new file mode 100644 index 0000000..430a8a3 --- /dev/null +++ b/src/views/daxpay/h5/code/wechat/WechatCashierCode.vue @@ -0,0 +1,231 @@ + + + + + diff --git a/src/views/daxpay/result/PayFail.vue b/src/views/daxpay/h5/result/PayFail.vue similarity index 100% rename from src/views/daxpay/result/PayFail.vue rename to src/views/daxpay/h5/result/PayFail.vue diff --git a/src/views/daxpay/result/PaySuccess.vue b/src/views/daxpay/h5/result/PaySuccess.vue similarity index 90% rename from src/views/daxpay/result/PaySuccess.vue rename to src/views/daxpay/h5/result/PaySuccess.vue index 4454e9b..cc13187 100644 --- a/src/views/daxpay/result/PaySuccess.vue +++ b/src/views/daxpay/h5/result/PaySuccess.vue @@ -1,8 +1,8 @@