diff --git a/src/api/shop/approval.ts b/src/api/shop/approval.ts index fa44d47..ec818fd 100644 --- a/src/api/shop/approval.ts +++ b/src/api/shop/approval.ts @@ -9,7 +9,7 @@ export interface SearchReturnApprovalQuery extends BasePageQuery { /** * 支付方式 * @remarks - * wechat-微信支付 | balance-余额支付 + * wechat-微信支付 | balance-借呗支付 */ paymentMethod?: string; /** @@ -70,7 +70,7 @@ export interface ReturnApprovalDTO { /** * 支付方式 * @remarks - * wechat-微信支付 | balance-余额支付 + * wechat-微信支付 | balance-借呗支付 */ paymentMethod?: string; } diff --git a/src/api/shop/order.ts b/src/api/shop/order.ts index de5dc56..8b95aea 100644 --- a/src/api/shop/order.ts +++ b/src/api/shop/order.ts @@ -37,7 +37,7 @@ export interface OrderQuery extends BasePageQuery { /** * 支付方式 * @remarks - * wechat-微信支付 | balance-余额支付 + * wechat-微信支付 | balance-借呗支付 */ paymentMethod?: string; } @@ -82,7 +82,7 @@ export interface OrderDTO { /** * 支付方式 * @remarks - * wechat-微信支付 | balance-余额支付 + * wechat-微信支付 | balance-借呗支付 */ paymentMethod?: string; /** 支付时间 */ diff --git a/src/utils/maps/payment.ts b/src/utils/maps/payment.ts index 3324f57..3fc5537 100644 --- a/src/utils/maps/payment.ts +++ b/src/utils/maps/payment.ts @@ -2,7 +2,7 @@ export const paymentMethodOptions = [ { label: '微信支付', value: 0, type: 'primary' }, { label: '借呗支付', value: 1, type: 'success' }, { label: '要呗支付', value: 2, type: 'info' }, - { label: '余额支付', value: 3, type: 'warning' }, + { label: '借呗支付', value: 3, type: 'warning' }, ]; export const modeToPaymentMethodMap = { diff --git a/src/views/shop/approval/index.vue b/src/views/shop/approval/index.vue index dfe0aa4..513f05d 100644 --- a/src/views/shop/approval/index.vue +++ b/src/views/shop/approval/index.vue @@ -161,7 +161,7 @@ getList(); - + @@ -202,7 +202,7 @@ getList(); @@ -248,7 +248,7 @@ getList(); 删除 - --> + --> @@ -287,6 +287,7 @@ getList(); margin-right: 12px; } } + :deep(.el-image-viewer__wrapper) { z-index: 9999 !important; } diff --git a/src/views/shop/approvalCenter/index.vue b/src/views/shop/approvalCenter/index.vue index de14d40..bf580af 100644 --- a/src/views/shop/approvalCenter/index.vue +++ b/src/views/shop/approvalCenter/index.vue @@ -143,7 +143,7 @@ const loadData = async () => { const formattedData = data.rows.map(item => ({ ...item, statusStr: { 1: '待审核', 2: '已通过', 3: '已驳回' }[item.status], - paymentMethodStr: { wechat: '微信支付', balance: '余额支付' }[item.paymentMethod] || item.paymentMethod + paymentMethodStr: { wechat: '微信支付', balance: '借呗支付' }[item.paymentMethod] || item.paymentMethod })); switch (activeMenu.value) { case 'received-pending': pendingList.value = formattedData; break; @@ -205,15 +205,19 @@ onMounted(() => { @@ -231,22 +235,18 @@ onMounted(() => { - + - +
- + @@ -255,7 +255,9 @@ onMounted(() => { @@ -269,7 +271,8 @@ onMounted(() => { - + - + - +
@@ -303,7 +300,9 @@ onMounted(() => {
- + + +
{{ item.name }}
@@ -329,49 +328,49 @@ onMounted(() => { padding-top: 20px; .custom-menu { - border-right: none; + border-right: none; - // 一级菜单样式 - .menu-item { + // 一级菜单样式 + .menu-item { + height: 50px; + line-height: 50px; + padding-left: 20px; + margin-bottom: 10px; + cursor: pointer; + + &.active { + background-color: #f0f0f0; + color: #333333; + } + + &:hover { + background-color: #f0f0f0; + color: #333333; + } + + &.child { + padding-left: 40px; + margin-bottom: 5px; + } + } + + // 子菜单样式 + .sub-menu { + margin-bottom: 10px; + + .sub-menu-title { height: 50px; line-height: 50px; padding-left: 20px; - margin-bottom: 10px; - cursor: pointer; - - &.active { - background-color: #f0f0f0; - color: #333333; - } - - &:hover { - background-color: #f0f0f0; - color: #333333; - } - - &.child { - padding-left: 40px; - margin-bottom: 5px; - } + transition: background-color 0.3s; + cursor: default; } - // 子菜单样式 - .sub-menu { - margin-bottom: 10px; - - .sub-menu-title { - height: 50px; - line-height: 50px; - padding-left: 20px; - transition: background-color 0.3s; - cursor: default; - } - - .sub-menu-items { - margin-left: 10px; - } + .sub-menu-items { + margin-left: 10px; } } + } } /* 右侧内容区域 */ diff --git a/src/views/shop/goods/detail.vue b/src/views/shop/goods/detail.vue index 19e854f..41d3f1c 100644 --- a/src/views/shop/goods/detail.vue +++ b/src/views/shop/goods/detail.vue @@ -121,8 +121,8 @@ watch(goodsId, () => { - + 编辑商品 @@ -179,7 +179,7 @@ watch(goodsId, () => { diff --git a/src/views/shop/order/index.vue b/src/views/shop/order/index.vue index 161f939..33798e1 100644 --- a/src/views/shop/order/index.vue +++ b/src/views/shop/order/index.vue @@ -169,7 +169,7 @@ getList(); - +
@@ -230,7 +230,7 @@ getList(); diff --git a/src/views/user/ab98/detail.vue b/src/views/user/ab98/detail.vue index a09758a..b4bf671 100644 --- a/src/views/user/ab98/detail.vue +++ b/src/views/user/ab98/detail.vue @@ -224,7 +224,7 @@ onMounted(() => {