From f1e1078c210ee59aee1d36726a19c1876a97952e Mon Sep 17 00:00:00 2001 From: SjS Date: Sun, 18 May 2025 10:35:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8C=BA=E5=9F=9Fbug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/enums.js | 2 +- src/views/bst/bindRecord/index.vue | 9 +++- src/views/bst/lightingNum/index.vue | 2 + src/views/bst/order/index.vue | 2 +- src/views/bst/part/index.vue | 2 +- src/views/bst/userApp/index.vue | 10 ++++ src/views/system/user/index.vue | 7 +++ src/views/system/user/profile/index.vue | 4 ++ src/views/system/user/profile/userInfo.vue | 5 +- .../user/view/components/UserStatistics.vue | 2 +- src/views/system/user/view/view.vue | 47 +++++++++---------- 11 files changed, 61 insertions(+), 31 deletions(-) diff --git a/src/utils/enums.js b/src/utils/enums.js index ead05fe..0345ba7 100644 --- a/src/utils/enums.js +++ b/src/utils/enums.js @@ -241,7 +241,7 @@ export const StatKeys = { STORE_COUNT: "store_count", // 型号数量 - LIGHTING_NUM_COUNT :"lighting_num_count", // 爆灯次数 + CURRENT_LIGHTING_NUM_COUNT :"CURRENT_LIGHTING_NUM_COUNT", // 爆灯次数 USER_RECHARGE_AMOUNT : "user_recharge_amount", // 充值金额 USER_REFUND_AMOUNT :"user_refund_amount" // 退款金额 diff --git a/src/views/bst/bindRecord/index.vue b/src/views/bst/bindRecord/index.vue index 5980c67..8949cd0 100644 --- a/src/views/bst/bindRecord/index.vue +++ b/src/views/bst/bindRecord/index.vue @@ -73,6 +73,12 @@ + @@ -137,6 +143,7 @@ import { listBindRecord, getBindRecord, delBindRecord, addBindRecord, updateBindRecord } from "@/api/bst/bindRecord"; import { $showColumns } from '@/utils/mixins'; import FormCol from "@/components/FormCol/index.vue"; +import UserLink from "@/views/system/user/UserLink.vue"; // 默认排序字段 const defaultSort = { @@ -154,7 +161,7 @@ export default { default: () => ({}) } }, - components: {FormCol}, + components: {UserLink, FormCol}, data() { return { span: 24, diff --git a/src/views/bst/lightingNum/index.vue b/src/views/bst/lightingNum/index.vue index 0b03997..9411d99 100644 --- a/src/views/bst/lightingNum/index.vue +++ b/src/views/bst/lightingNum/index.vue @@ -58,6 +58,8 @@ diff --git a/src/views/bst/order/index.vue b/src/views/bst/order/index.vue index 649d515..8a6a795 100644 --- a/src/views/bst/order/index.vue +++ b/src/views/bst/order/index.vue @@ -127,7 +127,7 @@ - +
退款： diff --git a/src/views/bst/part/index.vue b/src/views/bst/part/index.vue index fe816ba..f05cc6c 100644 --- a/src/views/bst/part/index.vue +++ b/src/views/bst/part/index.vue @@ -267,6 +267,7 @@ export default { storeId: storeId, }).then(res => { this.parentOptions = this.handleTree(res.data, "partId", "parentId", "children"); + console.log(this.parentOptions) }); }, // 店铺选择变化处理 @@ -305,7 +306,6 @@ export default { this.loading = true; listPart(this.queryParams).then(response => { this.partList = response.data.rows || response.data; - this.total = response.data.total || response.total; this.loading = false; }); }, diff --git a/src/views/bst/userApp/index.vue b/src/views/bst/userApp/index.vue index 9917893..f7e1df5 100644 --- a/src/views/bst/userApp/index.vue +++ b/src/views/bst/userApp/index.vue @@ -153,6 +153,12 @@ const defaultSort = { export default { name: "UserApp", mixins: [$showColumns], + props: { + query: { + type: Object, + default: () => ({}) + } + }, components: {UserLink, FormCol}, data() { return { @@ -217,6 +223,10 @@ export default { }; }, created() { + this.queryParams = { + ...this.queryParams, + ...this.query + } this.getList(); }, methods: { diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index 5f0a148..afae883 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -115,6 +115,12 @@
+ @@ -304,6 +310,7 @@ export default { {key: 'nickName', visible: true, label: '姓名', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, //{key: 'userName', visible: true, label: '账号', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, {key: 'roles', visible: true, label: '角色', minWidth: null, sortable: true, overflow: false, align: 'center', width: '100'}, + {key: 'mchId', visible: true, label: '所属商户', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, {key: 'lightingNum', visible: true, label: '爆灯次数', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, {key: 'isReal', visible: true, label: '实名状态', minWidth: null, sortable: true, overflow: false, align: 'center', width: "100"}, {key: 'deptName', visible: true, label: '归属部门', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, diff --git a/src/views/system/user/profile/index.vue b/src/views/system/user/profile/index.vue index 4d2622e..767667c 100644 --- a/src/views/system/user/profile/index.vue +++ b/src/views/system/user/profile/index.vue @@ -31,6 +31,10 @@ 所属角色
{{ roleGroup }}
+
  • + 个性签名 +
    {{ user.declaration }}
    +
  • 创建日期
    {{ user.createTime }}
    diff --git a/src/views/system/user/profile/userInfo.vue b/src/views/system/user/profile/userInfo.vue index 7254b93..c451a09 100644 --- a/src/views/system/user/profile/userInfo.vue +++ b/src/views/system/user/profile/userInfo.vue @@ -9,6 +9,9 @@ + + + 男 @@ -62,7 +65,7 @@ export default { user: { handler(user) { if (user) { - this.form = { nickName: user.nickName, phonenumber: user.phonenumber, email: user.email, sex: user.sex }; + this.form = { nickName: user.nickName, phonenumber: user.phonenumber,declaration: user.declaration, email: user.email, sex: user.sex }; } }, immediate: true diff --git a/src/views/system/user/view/components/UserStatistics.vue b/src/views/system/user/view/components/UserStatistics.vue index aa1ce8e..ed108d4 100644 --- a/src/views/system/user/view/components/UserStatistics.vue +++ b/src/views/system/user/view/components/UserStatistics.vue @@ -99,7 +99,7 @@ export default { StatKeys.DEVICE_STATUS_COUNT, StatKeys.DEVICE_ONLINE_STATUS_COUNT, StatKeys.STORE_COUNT, - StatKeys.LIGHTING_NUM_COUNT, + StatKeys.CURRENT_LIGHTING_NUM_COUNT, StatKeys.USER_REFUND_AMOUNT, StatKeys.USER_RECHARGE_AMOUNT, ] diff --git a/src/views/system/user/view/view.vue b/src/views/system/user/view/view.vue index 6b3e04d..8b09966 100644 --- a/src/views/system/user/view/view.vue +++ b/src/views/system/user/view/view.vue @@ -12,9 +12,9 @@
    {{ detail.nickName | dv }}
    • - + - + 基础信息 {{ detail.nickName || '-' }} @@ -30,19 +30,11 @@ {{ detail.email || '-' }} -
    - - 编辑个人基础信息 - -
    -     - - - + +
    + {{ detail.declaration || '暂无签名' }} +
    +     系统信息 {{ detail.roles.map(role => role.roleName).join(',') }} @@ -60,16 +52,6 @@     -
    -
    - 个性签名 -
    -
    - - {{ detail.declaration || '暂无签名' }} - -
    -
    @@ -200,6 +182,21 @@ export default {