From b931fbc50074dab45189c7cd3ec9665f171a0f46 Mon Sep 17 00:00:00 2001 From: puhui999 Date: Mon, 19 Aug 2024 09:59:02 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E3=80=90=E4=BB=A3=E7=A0=81=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E3=80=91MALL:=20=E6=B4=BB=E5=8A=A8=E5=95=86=E5=93=81?= =?UTF-8?q?=E4=BB=B7=E6=A0=BC=E5=B1=95=E7=A4=BA=E5=88=86=E8=BD=AC=E5=85=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mall/product/spu/components/SkuList.vue | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/views/mall/product/spu/components/SkuList.vue b/src/views/mall/product/spu/components/SkuList.vue index 9bbd38e4..9efe70b5 100644 --- a/src/views/mall/product/spu/components/SkuList.vue +++ b/src/views/mall/product/spu/components/SkuList.vue @@ -180,17 +180,17 @@ @@ -211,12 +211,12 @@ @@ -260,17 +260,17 @@ @@ -284,7 +284,7 @@ - + From b9c2d311ba0b70ee76a0c60b9b19507fde09d11d Mon Sep 17 00:00:00 2001 From: puhui999 Date: Mon, 19 Aug 2024 10:50:10 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E3=80=90=E6=96=B0=E5=A2=9E=E3=80=91MALL:?= =?UTF-8?q?=20=E4=BC=9A=E5=91=98=E8=AF=A6=E6=83=85=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=94=AE=E5=90=8E=E7=AE=A1=E7=90=86=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/mall/trade/afterSale/index.vue | 13 ++++++++++--- src/views/member/user/detail/index.vue | 5 ++++- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/views/mall/trade/afterSale/index.vue b/src/views/mall/trade/afterSale/index.vue index 52051c35..2378ad1c 100644 --- a/src/views/mall/trade/afterSale/index.vue +++ b/src/views/mall/trade/afterSale/index.vue @@ -156,7 +156,7 @@ - + @@ -181,6 +181,9 @@ import { cloneDeep } from 'lodash-es' import { fenToYuan } from '@/utils' defineOptions({ name: 'TradeAfterSale' }) +const props = defineProps<{ + userId?: number +}>() const { push } = useRouter() // 路由跳转 @@ -204,7 +207,8 @@ const queryParams = reactive({ spuName: null, createTime: [], way: null, - type: null + type: null, + userId: null }) /** 查询列表 */ const getList = async () => { @@ -215,8 +219,11 @@ const getList = async () => { if (data.status === '0') { delete data.status } + if (props.userId) { + data.userId = props.userId + } // 执行查询 - const res = (await AfterSaleApi.getAfterSalePage(data)) as AfterSaleApi.TradeAfterSaleVO[] + const res = await AfterSaleApi.getAfterSalePage(data) list.value = res.list total.value = res.total } finally { diff --git a/src/views/member/user/detail/index.vue b/src/views/member/user/detail/index.vue index 060568fd..9f404686 100644 --- a/src/views/member/user/detail/index.vue +++ b/src/views/member/user/detail/index.vue @@ -48,7 +48,9 @@ - 售后管理(WIP) + + + @@ -81,6 +83,7 @@ import UserPointList from './UserPointList.vue' import UserSignList from './UserSignList.vue' import UserFavoriteList from './UserFavoriteList.vue' import WalletTransactionList from '@/views/pay/wallet/transaction/WalletTransactionList.vue' +import TradeAfterSale from '@/views/mall/trade/afterSale/index.vue' import { CardTitle } from '@/components/Card/index' import { ElMessage } from 'element-plus' From 231bdd1dd0fcda1410a8b24c19dbe910ada51c3f Mon Sep 17 00:00:00 2001 From: puhui999 Date: Mon, 19 Aug 2024 11:54:29 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E3=80=90=E6=96=B0=E5=A2=9E=E3=80=91MALL:?= =?UTF-8?q?=20=E4=BC=9A=E5=91=98=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BD=99=E9=A2=9D=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../user/components/UserBalanceUpdateForm.vue | 144 ++++++++++++++++++ .../{ => components}/UserLevelUpdateForm.vue | 0 .../{ => components}/UserPointUpdateForm.vue | 15 +- .../member/user/components/balance-list.vue | 14 -- src/views/member/user/index.vue | 12 +- 5 files changed, 160 insertions(+), 25 deletions(-) create mode 100644 src/views/member/user/components/UserBalanceUpdateForm.vue rename src/views/member/user/{ => components}/UserLevelUpdateForm.vue (100%) rename src/views/member/user/{ => components}/UserPointUpdateForm.vue (91%) delete mode 100644 src/views/member/user/components/balance-list.vue diff --git a/src/views/member/user/components/UserBalanceUpdateForm.vue b/src/views/member/user/components/UserBalanceUpdateForm.vue new file mode 100644 index 00000000..c9d9ad50 --- /dev/null +++ b/src/views/member/user/components/UserBalanceUpdateForm.vue @@ -0,0 +1,144 @@ + + diff --git a/src/views/member/user/UserLevelUpdateForm.vue b/src/views/member/user/components/UserLevelUpdateForm.vue similarity index 100% rename from src/views/member/user/UserLevelUpdateForm.vue rename to src/views/member/user/components/UserLevelUpdateForm.vue diff --git a/src/views/member/user/UserPointUpdateForm.vue b/src/views/member/user/components/UserPointUpdateForm.vue similarity index 91% rename from src/views/member/user/UserPointUpdateForm.vue rename to src/views/member/user/components/UserPointUpdateForm.vue index 967ebe03..c277d9bf 100644 --- a/src/views/member/user/UserPointUpdateForm.vue +++ b/src/views/member/user/components/UserPointUpdateForm.vue @@ -1,11 +1,11 @@ - - - - - - diff --git a/src/views/member/user/index.vue b/src/views/member/user/index.vue index 69bf6de3..dc081fa6 100644 --- a/src/views/member/user/index.vue +++ b/src/views/member/user/index.vue @@ -172,7 +172,7 @@ v-if="checkPermi(['member:user:update-balance'])" command="handleUpdateBlance" > - 修改余额(WIP) + 修改余额 @@ -196,6 +196,8 @@ + + @@ -207,8 +209,9 @@ import UserForm from './UserForm.vue' import MemberTagSelect from '@/views/member/tag/components/MemberTagSelect.vue' import MemberLevelSelect from '@/views/member/level/components/MemberLevelSelect.vue' import MemberGroupSelect from '@/views/member/group/components/MemberGroupSelect.vue' -import UserLevelUpdateForm from './UserLevelUpdateForm.vue' -import UserPointUpdateForm from './UserPointUpdateForm.vue' +import UserLevelUpdateForm from './components/UserLevelUpdateForm.vue' +import UserPointUpdateForm from './components/UserPointUpdateForm.vue' +import UserBalanceUpdateForm from './components/UserBalanceUpdateForm.vue' import { CouponSendForm } from '@/views/mall/promotion/coupon/components' import { checkPermi } from '@/utils/permission' @@ -233,6 +236,7 @@ const queryParams = reactive({ const queryFormRef = ref() // 搜索的表单 const updateLevelFormRef = ref() // 修改会员等级表单 const updatePointFormRef = ref() // 修改会员积分表单 +const UpdateBalanceFormRef = ref() // 修改用户余额表单 const selectedIds = ref([]) // 表格的选中 ID 数组 /** 查询列表 */ @@ -299,7 +303,7 @@ const handleCommand = (command: string, row: UserApi.UserVO) => { updatePointFormRef.value.open(row.id) break case 'handleUpdateBlance': - // todo @jason：增加一个【修改余额】 + UpdateBalanceFormRef.value.open(row.id) break default: break From 43ad93cd20592e54344c3dfcad6ce7025a6bcc1b Mon Sep 17 00:00:00 2001 From: puhui999 Date: Mon, 19 Aug 2024 18:04:46 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E3=80=90=E4=BB=A3=E7=A0=81=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E3=80=91MALL:=20=E4=BC=9A=E5=91=98=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=BD=99=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/member/user/components/UserBalanceUpdateForm.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/member/user/components/UserBalanceUpdateForm.vue b/src/views/member/user/components/UserBalanceUpdateForm.vue index c9d9ad50..c18e37e5 100644 --- a/src/views/member/user/components/UserBalanceUpdateForm.vue +++ b/src/views/member/user/components/UserBalanceUpdateForm.vue @@ -110,7 +110,7 @@ const submitForm = async () => { try { await UserApi.updateUserBalance({ id: formData.value.id, - balance: convertToInteger(balanceResult.value) + balance: convertToInteger(formData.value.changeBalance) * formData.value.changeType }) message.success(t('common.updateSuccess'))