diff --git a/src/api/ums/member.js b/src/api/ums/member.js
index bfa2bf8..34d750d 100644
--- a/src/api/ums/member.js
+++ b/src/api/ums/member.js
@@ -169,3 +169,13 @@ export function getUserBlackList(params) {
params
});
}
+
+// 余额变更记录列表
+export function getUserBalanceList(data) {
+ return request({
+ url: `/ums/account/change/record/list`,
+ method: 'post',
+ data: data
+ });
+}
+
diff --git a/src/store/modules/mall.ts b/src/store/modules/mall.ts
index 69854b1..822c6e4 100644
--- a/src/store/modules/mall.ts
+++ b/src/store/modules/mall.ts
@@ -13,8 +13,10 @@ export const useMallStore = defineStore('mall', () => {
if (!force && state.value.productCategories.length > 0) {
return Promise.resolve();
}
- return listPmsProductCategory({}).then((res: any) => {
- state.value.productCategories = res;
+ // 无全量枚举接口，暂用分页接口代替
+ return listPmsProductCategory({ current: 1, size: 99999 }).then((res: any) => {
+ const { records } = res.data || {};
+ state.value.productCategories = records || [];
});
};
const loadAreaSelect = async (force: any = false) => {
diff --git a/src/views/components/ProductCategorySelect.vue b/src/views/components/ProductCategorySelect.vue
index 213ed98..22f1bbf 100644
--- a/src/views/components/ProductCategorySelect.vue
+++ b/src/views/components/ProductCategorySelect.vue
@@ -35,7 +35,7 @@ export default {
if (!this.productCategories || this.productCategories.length === 0) {
return [];
}
- this.recurs(this.productCategories);
+ this.recurs(this.productCategories || []);
return this.productCategories;
}
},
diff --git a/src/views/oms/aftersale/index.vue b/src/views/oms/aftersale/index.vue
index 6f5fc5a..8a764a4 100644
--- a/src/views/oms/aftersale/index.vue
+++ b/src/views/oms/aftersale/index.vue
@@ -79,8 +79,10 @@
{{ scope.row.orderSn }}
- 详情
- 日志
+ 详情
+
+ 日志
{
this.logObj.logList = response;
diff --git a/src/views/ums/member/index.vue b/src/views/ums/member/index.vue
index 1dfcc4f..d9c5f0f 100644
--- a/src/views/ums/member/index.vue
+++ b/src/views/ums/member/index.vue
@@ -110,7 +110,7 @@
充值消费记录
开通代理
编辑
- 余额变更记录
+ 余额变更记录
开通易生支付
登录记录
操作日志
@@ -180,6 +180,36 @@
+
+
+
+
+
+ {{ userBalanceInfo.record.nickname }}
+
+
+
+
+ {{ userBalanceInfo.record.phone }}
+
+
+
+
+
+
+
+
+
@@ -353,7 +383,8 @@ import {
getUserFriendsList,
getUserFocusList,
getUserFansList,
- getUserBlackList
+ getUserBlackList,
+ getUserBalanceList
} from '@/api/ums/member';
import dateUtil from '@/utils/DateUtil';
import { useUserStore } from '@/store/modules/user';
@@ -439,11 +470,6 @@ export default {
},
title: '会员账户信息'
},
- // 会员登录信息信息
- userLoginInfo: {
- total: 0,
- data: []
- },
userAccountEditModal: {
open: false,
data: {}
@@ -460,6 +486,11 @@ export default {
/* email: [{ type: 'email', message: '请输入正确的邮箱地址', trigger: ['blur', 'change'] }],*/
phone: [{ required: true, pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: '请输入正确的手机号码', trigger: 'blur' }]
},
+ // 会员登录信息信息
+ userLoginInfo: {
+ total: 0,
+ data: []
+ },
userLoginInfoModalVisible: false,
userLoginInfoTableLoading: false,
// 会员粉丝、关注、好友数据
@@ -481,7 +512,21 @@ export default {
open: false,
data: {}
},
- blackListTableLoading: false
+ blackListTableLoading: false,
+
+ // 会员余额变更记录
+ userBalanceInfo: {
+ total: 0,
+ data: [],
+ record: {}
+ },
+ userBalanceInfoModalVisible: false,
+ userBalanceInfoTableLoading: false,
+ // 余额弹框分页
+ userBalanceParams: {
+ current: 1,
+ size: 10
+ }
};
},
created() {
@@ -716,6 +761,33 @@ export default {
data: {}
};
},
+
+ // 展示用户账户变动记录
+ showUserBalanceInfoModal(record, isFirst) {
+ const { id } = this.userBalanceInfo.record || {};
+ const reqParams = {
+ ...this.userBalanceParams,
+ memberId: record.id ? record.id : id
+ };
+ this.userBalanceInfoTableLoading = true;
+ getUserBalanceList(reqParams)
+ .then((response) => {
+ const { records = [], total = 0 } = response.data || {};
+ if (isFirst) {
+ this.userBalanceInfoModalVisible = true;
+ }
+ this.userBalanceInfo = {
+ total: total,
+ data: records || [],
+ record: record
+ };
+ this.userBalanceInfoTableLoading = false;
+ })
+ .catch(() => {
+ this.userBalanceInfoTableLoading = false;
+ });
+ },
+
// 展示登录详情弹框
showUserLoginInfoModal(record, isFirst) {
const { id } = this.userLoginInfo.record || {};