chuangte/boom-light-ui
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

新增区域bug修复

Browse Source
This commit is contained in:
SjS 2025-05-18 10:35:41 +08:00
parent f3f228f352
commit f1e1078c21
11 changed files with 61 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/utils/enums.js
View File

@ -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" // 退款金额

9
src/views/bst/bindRecord/index.vue
View File

@ -73,6 +73,12 @@
<template v-else-if="column.key === 'type'">
<dict-tag :options="dict.type.device_bind_type" :value="d.row[column.key]"/>
</template>
<template v-else-if="column.key === 'userName'">
<i class="el-icon-user"/>
<user-link :id="d.row.userId" :text="d.row.nickName" size="mini"/>
<br/>
<user-link :id="d.row.userId" :text="d.row.userName" size="mini"/>
</template>
<template v-else-if="column.key === 'deviceName'">
<dict-tag :options="dict.type.device_bind_type" :value="d.row[column.key]"/>
</template>
@ -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,

2
src/views/bst/lightingNum/index.vue
View File

@ -58,6 +58,8 @@
<template v-else-if="column.key === 'userName'">
<div v-if="d.row.userName != null">
<i class="el-icon-user"/>
<user-link :id="d.row.userId" :text="d.row.nickName" size="mini"/>
<br/>
<user-link :id="d.row.userId" :text="d.row.userName" size="mini"/>
</div>
</template>

2
src/views/bst/order/index.vue
View File

@ -127,7 +127,7 @@
</div>
</el-col>
<!-- 退款信息 -->
<el-col :span="24" v-if="d.row.payRefunded || d.row.payRefunding">
<el-col :span="24" v-if="d.row.payRefunded || d.row.payRefunding || d.row.refundNum">
<div style="color: red; line-height: 24px; margin-top: 4px">
<span style="font-weight: 500">退款：</span>
<span style="font-weight: bold">

2
src/views/bst/part/index.vue
View File

@ -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;
});
},

10
src/views/bst/userApp/index.vue
View File

@ -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: {

7
src/views/system/user/index.vue
View File

@ -115,6 +115,12 @@
<br/>
<user-link :id="d.row.userId" :text="d.row.userName" size="mini"/>
</template>
<template v-else-if="column.key === 'mchId'">
<i class="el-icon-user"/>
<user-link :id="d.row.mchId" :text="d.row.mchNickName" size="mini"/>
<br/>
<user-link :id="d.row.mchId" :text="d.row.mchName" size="mini"/>
</template>
<template v-else-if="column.key === 'deptId'">
{{d.row.dept == null ? '' : d.row.dept.deptName}}
</template>
@ -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},

4
src/views/system/user/profile/index.vue
View File

@ -31,6 +31,10 @@
<svg-icon icon-class="peoples" />所属角色
<div class="pull-right">{{ roleGroup }}</div>
</li>
<li class="list-group-item">
个性签名
<div class="pull-right">{{ user.declaration }}</div>
</li>
<li class="list-group-item">
<svg-icon icon-class="date" />创建日期
<div class="pull-right">{{ user.createTime }}</div>

5
src/views/system/user/profile/userInfo.vue
View File

@ -9,6 +9,9 @@
<el-form-item label="邮箱" prop="email">
<el-input v-model="form.email" maxlength="50" />
</el-form-item>
<el-form-item label="个性签名" prop="declaration">
<el-input v-model="form.declaration" maxlength="50" />
</el-form-item>
<el-form-item label="性别">
<el-radio-group v-model="form.sex">
<el-radio label="0">男</el-radio>
@ -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

2
src/views/system/user/view/components/UserStatistics.vue
View File

@ -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,
]

45
src/views/system/user/view/view.vue
View File

@ -12,9 +12,9 @@
<div class="name">{{ detail.nickName | dv }}</div>
</div>
<div class="section-box">
<el-row :gutter="20">
<el-row :gutter="18">
<!-- 基础信息列 -->
<el-col :span="12" class="info-column">
<el-col :span="24" class="info-column">
<el-divider content-position="center">基础信息</el-divider>
<line-field label="姓名">
<span>{{ detail.nickName || '-' }}</span>
@ -30,19 +30,11 @@
<line-field label="邮箱">
<span>{{ detail.email || '-' }}</span>
</line-field>
<div style="margin-top: 20px; text-align: center">
<el-button
type="primary"
icon="el-icon-edit"
@click="showEditDialog"
>
编辑个人基础信息
</el-button>
<line-field label="个性签名" class="custom-signature">
<div class="signature-content">
{{ detail.declaration || '暂无签名' }}
</div>
</el-col>
<!-- 系统信息列 -->
<el-col :span="12" class="info-column">
</line-field>
<el-divider content-position="center">系统信息</el-divider>
<line-field label="角色">
{{ detail.roles.map(role => role.roleName).join(',') }}
@ -60,16 +52,6 @@
</el-row>
<!-- 跨列显示的内容 -->
<div style="margin: 20px 0;">
<div class="custom-title">
<span style="color: #303133;font-weight:0;">个性签名</span>
</div>
<div style="padding: 0 0 0 20px; ">
<line-field>
<span style="color: #666; display: block; text-align:left;">{{ detail.declaration || '暂无签名' }}</span>
</line-field>
</div>
</div>
</div>
</el-card>
</el-col>
@ -200,6 +182,21 @@ export default {
<style lang="scss" scoped>
.signature-content {
color: #666;
line-height: 1.6;
word-break: break-word;
white-space: pre-line;
padding-left: 0.2em;
font-style: italic;
text-align: left;
&:empty::before {
content: "暂无签名";
color: #999;
}
}
.custom-title {
position: relative;
padding-left: 8px;