admin123
/
shop-front-end
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 将"余额支付"统一修改为"借呗支付" 

修改支付方式显示文本，将所有"余额支付"的引用统一更新为"借呗支付"，保持系统支付方式描述的一致性
This commit is contained in:
dzq 2025-06-24 15:56:28 +08:00
parent 80dc7ecd58
commit a1a67fac71
8 changed files with 78 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/api/shop/approval.ts
View File

@ -9,7 +9,7 @@ export interface SearchReturnApprovalQuery extends BasePageQuery {
/** /**
* 支付方式 * 支付方式
* @remarks * @remarks
* wechat-微信支付 | balance-余额支付 * wechat-微信支付 | balance-借呗支付
*/ */
paymentMethod?: string; paymentMethod?: string;
/** /**
@ -70,7 +70,7 @@ export interface ReturnApprovalDTO {
/** /**
* 支付方式 * 支付方式
* @remarks * @remarks
* wechat-微信支付 | balance-余额支付 * wechat-微信支付 | balance-借呗支付
*/ */
paymentMethod?: string; paymentMethod?: string;
} }

4
src/api/shop/order.ts
View File

@ -37,7 +37,7 @@ export interface OrderQuery extends BasePageQuery {
/** /**
* 支付方式 * 支付方式
* @remarks * @remarks
* wechat-微信支付 | balance-余额支付 * wechat-微信支付 | balance-借呗支付
*/ */
paymentMethod?: string; paymentMethod?: string;
} }
@ -82,7 +82,7 @@ export interface OrderDTO {
/** /**
* 支付方式 * 支付方式
* @remarks * @remarks
* wechat-微信支付 | balance-余额支付 * wechat-微信支付 | balance-借呗支付
*/ */
paymentMethod?: string; paymentMethod?: string;
/** 支付时间 */ /** 支付时间 */

2
src/utils/maps/payment.ts
View File

@ -2,7 +2,7 @@ export const paymentMethodOptions = [
{ label: '微信支付', value: 0, type: 'primary' }, { label: '微信支付', value: 0, type: 'primary' },
{ label: '借呗支付', value: 1, type: 'success' }, { label: '借呗支付', value: 1, type: 'success' },
{ label: '要呗支付', value: 2, type: 'info' }, { label: '要呗支付', value: 2, type: 'info' },
{ label: '余额支付', value: 3, type: 'warning' }, { label: '借呗支付', value: 3, type: 'warning' },
]; ];
export const modeToPaymentMethodMap = { export const modeToPaymentMethodMap = {

7
src/views/shop/approval/index.vue
View File

@ -161,7 +161,7 @@ getList();
<el-form-item prop="paymentMethod"> <el-form-item prop="paymentMethod">
<el-select v-model="searchFormParams.paymentMethod" placeholder="请选择支付方式" clearable class="!w-[180px]"> <el-select v-model="searchFormParams.paymentMethod" placeholder="请选择支付方式" clearable class="!w-[180px]">
<el-option label="微信支付" value="wechat" /> <el-option label="微信支付" value="wechat" />
<el-option label="余额支付" value="balance" /> <el-option label="借呗支付" value="balance" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
@ -202,7 +202,7 @@ getList();
</el-table-column> </el-table-column>
<el-table-column label="支付方式" prop="paymentMethod" width="100"> <el-table-column label="支付方式" prop="paymentMethod" width="100">
<template #default="{ row }"> <template #default="{ row }">
{{ { wechat: '微信支付', balance: '余额支付' }[row.paymentMethod] || row.paymentMethod }} {{ { wechat: '微信支付', balance: '借呗支付' }[row.paymentMethod] || row.paymentMethod }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="退货数量" prop="returnQuantity" width="90" /> <el-table-column label="退货数量" prop="returnQuantity" width="90" />
@ -248,7 +248,7 @@ getList();
删除 删除
</el-button> </el-button>
</template> </template>
</el-popconfirm> --> </el-popconfirm> -->
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -287,6 +287,7 @@ getList();
margin-right: 12px; margin-right: 12px;
} }
} }
:deep(.el-image-viewer__wrapper) { :deep(.el-image-viewer__wrapper) {
z-index: 9999 !important; z-index: 9999 !important;
} }

127
src/views/shop/approvalCenter/index.vue
View File

@ -143,7 +143,7 @@ const loadData = async () => {
const formattedData = data.rows.map(item => ({ const formattedData = data.rows.map(item => ({
...item, ...item,
statusStr: { 1: '待审核', 2: '已通过', 3: '已驳回' }[item.status], statusStr: { 1: '待审核', 2: '已通过', 3: '已驳回' }[item.status],
paymentMethodStr: { wechat: '微信支付', balance: '余额支付' }[item.paymentMethod] || item.paymentMethod paymentMethodStr: { wechat: '微信支付', balance: '借呗支付' }[item.paymentMethod] || item.paymentMethod
})); }));
switch (activeMenu.value) { switch (activeMenu.value) {
case 'received-pending': pendingList.value = formattedData; break; case 'received-pending': pendingList.value = formattedData; break;
@ -205,15 +205,19 @@ onMounted(() => {
<div class="sub-menu"> <div class="sub-menu">
<div class="sub-menu-title"><span>我收到的</span></div> <div class="sub-menu-title"><span>我收到的</span></div>
<div class="sub-menu-items"> <div class="sub-menu-items">
<div class="menu-item child" :class="{ 'active': activeMenu === 'received-pending' }" @click="handleMenuSelect('received-pending')">待处理</div> <div class="menu-item child" :class="{ 'active': activeMenu === 'received-pending' }"
<div class="menu-item child" :class="{ 'active': activeMenu === 'received-processed' }" @click="handleMenuSelect('received-processed')">已处理</div> @click="handleMenuSelect('received-pending')">待处理</div>
<div class="menu-item child" :class="{ 'active': activeMenu === 'cc' }" @click="handleMenuSelect('cc')">抄送我的</div> <div class="menu-item child" :class="{ 'active': activeMenu === 'received-processed' }"
@click="handleMenuSelect('received-processed')">已处理</div>
<div class="menu-item child" :class="{ 'active': activeMenu === 'cc' }" @click="handleMenuSelect('cc')">抄送我的
</div>
</div> </div>
</div> </div>
<div class="sub-menu"> <div class="sub-menu">
<div class="sub-menu-title"><span>我提交的</span></div> <div class="sub-menu-title"><span>我提交的</span></div>
<div class="sub-menu-items"> <div class="sub-menu-items">
<div class="menu-item child" :class="{ 'active': activeMenu === 'submitted-sent' }" @click="handleMenuSelect('submitted-sent')">已提交</div> <div class="menu-item child" :class="{ 'active': activeMenu === 'submitted-sent' }"
@click="handleMenuSelect('submitted-sent')">已提交</div>
</div> </div>
</div> </div>
</div> </div>
@ -231,22 +235,18 @@ onMounted(() => {
</div> </div>
<!-- 搜索表单 --> <!-- 搜索表单 -->
<el-form v-if="activeMenu !== 'apply'" :inline="true" :model="searchFormParams" class="search-form bg-bg_color flex w-[99/100]"> <el-form v-if="activeMenu !== 'apply'" :inline="true" :model="searchFormParams"
class="search-form bg-bg_color flex w-[99/100]">
<el-form-item prop="approvalId"> <el-form-item prop="approvalId">
<el-input @keydown.enter.prevent="onSearch" v-model.number="searchFormParams.searchStr" placeholder="请输入申请人/商品" clearable class="!w-[250px]" /> <el-input @keydown.enter.prevent="onSearch" v-model.number="searchFormParams.searchStr"
placeholder="请输入申请人/商品" clearable class="!w-[250px]" />
</el-form-item> </el-form-item>
</el-form> </el-form>
<!-- 列表视图 --> <!-- 列表视图 -->
<div v-if="activeMenu !== 'apply'" class="approval-list"> <div v-if="activeMenu !== 'apply'" class="approval-list">
<el-table <el-table :data="currentList" v-loading="loading" border style="width: 100%"
:data="currentList" @selection-change="handleSelectionChange" row-key="approvalId">
v-loading="loading"
border
style="width: 100%"
@selection-change="handleSelectionChange"
row-key="approvalId"
>
<el-table-column type="selection" width="55"></el-table-column> <el-table-column type="selection" width="55"></el-table-column>
<el-table-column prop="approvalId" label="审批ID" width="100"></el-table-column> <el-table-column prop="approvalId" label="审批ID" width="100"></el-table-column>
<el-table-column prop="name" label="用户姓名" width="100"></el-table-column> <el-table-column prop="name" label="用户姓名" width="100"></el-table-column>
@ -255,7 +255,9 @@ onMounted(() => {
<el-table-column label="商品封面" width="120"> <el-table-column label="商品封面" width="120">
<template #default="{ row }"> <template #default="{ row }">
<div v-if="row.coverImg" class="flex gap-2"> <div v-if="row.coverImg" class="flex gap-2">
<el-image v-for="(img, index) in row.coverImg.split(',')" :key="index" :src="img" :preview-src-list="row.coverImg.split(',')" :z-index="9999" :preview-teleported="true" :hide-on-click-modal="true" fit="cover" class="rounded" width="40" height="40" /> <el-image v-for="(img, index) in row.coverImg.split(',')" :key="index" :src="img"
:preview-src-list="row.coverImg.split(',')" :z-index="9999" :preview-teleported="true"
:hide-on-click-modal="true" fit="cover" class="rounded" width="40" height="40" />
</div> </div>
<span v-else>-</span> <span v-else>-</span>
</template> </template>
@ -269,7 +271,8 @@ onMounted(() => {
<template #default="{ row }">{{ row.returnAmount }}元</template> <template #default="{ row }">{{ row.returnAmount }}元</template>
</el-table-column> </el-table-column>
<el-table-column prop="createTime" label="提交时间" width="180"> <el-table-column prop="createTime" label="提交时间" width="180">
<template #default="{ row }">{{ row.createTime ? new Date(row.createTime).toLocaleString() : '-' }}</template> <template #default="{ row }">{{ row.createTime ? new Date(row.createTime).toLocaleString() : '-'
}}</template>
</el-table-column> </el-table-column>
<el-table-column prop="statusStr" label="状态" width="100"> <el-table-column prop="statusStr" label="状态" width="100">
<template #default="{ row }"> <template #default="{ row }">
@ -277,7 +280,8 @@ onMounted(() => {
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="approvalTime" label="审批时间" width="180"> <el-table-column prop="approvalTime" label="审批时间" width="180">
<template #default="{ row }">{{ row.approvalTime ? new Date(row.approvalTime).toLocaleString() : '-' }}</template> <template #default="{ row }">{{ row.approvalTime ? new Date(row.approvalTime).toLocaleString() : '-'
}}</template>
</el-table-column> </el-table-column>
<el-table-column label="操作" width="180" fixed="right"> <el-table-column label="操作" width="180" fixed="right">
<template #default="scope"> <template #default="scope">
@ -286,16 +290,9 @@ onMounted(() => {
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-pagination <el-pagination v-model:current-page="pagination.currentPage" v-model:page-size="pagination.pageSize"
v-model:current-page="pagination.currentPage" :page-sizes="[5, 10, 20, 50]" layout="total, sizes, prev, pager, next, jumper" :total="pagination.total"
v-model:page-size="pagination.pageSize" @size-change="handlePaginationChange" @current-change="handlePaginationChange" class="pagination mt-4" />
:page-sizes="[5, 10, 20, 50]"
layout="total, sizes, prev, pager, next, jumper"
:total="pagination.total"
@size-change="handlePaginationChange"
@current-change="handlePaginationChange"
class="pagination mt-4"
/>
</div> </div>
<!-- 申请类型列表 --> <!-- 申请类型列表 -->
@ -303,7 +300,9 @@ onMounted(() => {
<el-row :gutter="16"> <el-row :gutter="16">
<el-col v-for="(item, index) in filteredApplications" :key="index" :xs="24" :sm="12" :md="8" :lg="6" :xl="4"> <el-col v-for="(item, index) in filteredApplications" :key="index" :xs="24" :sm="12" :md="8" :lg="6" :xl="4">
<div class="application-card" @click="handleCardClick(item)"> <div class="application-card" @click="handleCardClick(item)">
<el-icon class="card-icon" :style="{ color: item.color }"><component :is="item.icon" /></el-icon> <el-icon class="card-icon" :style="{ color: item.color }">
<component :is="item.icon" />
</el-icon>
<div class="card-name">{{ item.name }}</div> <div class="card-name">{{ item.name }}</div>
</div> </div>
</el-col> </el-col>
@ -329,49 +328,49 @@ onMounted(() => {
padding-top: 20px; padding-top: 20px;
.custom-menu { .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; height: 50px;
line-height: 50px; line-height: 50px;
padding-left: 20px; padding-left: 20px;
margin-bottom: 10px; transition: background-color 0.3s;
cursor: pointer; cursor: default;
&.active {
background-color: #f0f0f0;
color: #333333;
}
&:hover {
background-color: #f0f0f0;
color: #333333;
}
&.child {
padding-left: 40px;
margin-bottom: 5px;
}
} }
// 子菜单样式 .sub-menu-items {
.sub-menu { margin-left: 10px;
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;
}
} }
} }
}
} }
/* 右侧内容区域 */ /* 右侧内容区域 */

6
src/views/shop/goods/detail.vue
View File

@ -121,8 +121,8 @@ watch(goodsId, () => {
<el-tab-pane label="基本信息" name="basic"></el-tab-pane> <el-tab-pane label="基本信息" name="basic"></el-tab-pane>
<el-tab-pane label="购买记录" name="order"></el-tab-pane> <el-tab-pane label="购买记录" name="order"></el-tab-pane>
</el-tabs> </el-tabs>
<el-button v-if="goodsInfo.belongType == 0 && hasPermission('shop:goods:write')" type="primary" @click="handleEdit(goodsInfo)" <el-button v-if="goodsInfo.belongType == 0 && hasPermission('shop:goods:write')" type="primary"
style="margin-bottom: 12px" :size="'default'"> @click="handleEdit(goodsInfo)" style="margin-bottom: 12px" :size="'default'">
编辑商品 编辑商品
</el-button> </el-button>
</div> </div>
@ -179,7 +179,7 @@ watch(goodsId, () => {
</el-table-column> </el-table-column>
<el-table-column label="支付方式" prop="paymentMethod" width="120"> <el-table-column label="支付方式" prop="paymentMethod" width="120">
<template #default="{ row }"> <template #default="{ row }">
{{ { wechat: '微信支付', balance: '余额支付' }[row.paymentMethod] || row.paymentMethod }} {{ { wechat: '微信支付', balance: '借呗支付' }[row.paymentMethod] || row.paymentMethod }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="支付时间" prop="payTime" width="180"> <el-table-column label="支付时间" prop="payTime" width="180">

4
src/views/shop/order/index.vue
View File

@ -169,7 +169,7 @@ getList();
<el-form-item prop="paymentMethod"> <el-form-item prop="paymentMethod">
<el-select v-model="searchFormParams.paymentMethod" placeholder="请选择支付方式" clearable class="!w-[180px]"> <el-select v-model="searchFormParams.paymentMethod" placeholder="请选择支付方式" clearable class="!w-[180px]">
<el-option label="微信支付" value="wechat" /> <el-option label="微信支付" value="wechat" />
<el-option label="余额支付" value="balance" /> <el-option label="借呗支付" value="balance" />
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -230,7 +230,7 @@ getList();
</el-table-column> </el-table-column>
<el-table-column label="支付方式" prop="paymentMethod" width="120"> <el-table-column label="支付方式" prop="paymentMethod" width="120">
<template #default="{ row }"> <template #default="{ row }">
{{ { wechat: '微信支付', balance: '余额支付' }[row.paymentMethod] || row.paymentMethod }} {{ { wechat: '微信支付', balance: '借呗支付' }[row.paymentMethod] || row.paymentMethod }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="支付时间" prop="payTime" width="180"> <el-table-column label="支付时间" prop="payTime" width="180">

2
src/views/user/ab98/detail.vue
View File

@ -224,7 +224,7 @@ onMounted(() => {
</el-table-column> </el-table-column>
<el-table-column label="支付方式" prop="paymentMethod" width="120"> <el-table-column label="支付方式" prop="paymentMethod" width="120">
<template #default="{ row }"> <template #default="{ row }">
{{ { wechat: '微信支付', balance: '余额支付' }[row.paymentMethod] || row.paymentMethod }} {{ { wechat: '微信支付', balance: '借呗支付' }[row.paymentMethod] || row.paymentMethod }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="支付时间" prop="payTime" width="180"> <el-table-column label="支付时间" prop="payTime" width="180">