Commit 0e978c59 by ‘巴博尔’

修改bug

parent d1accf94
...@@ -351,7 +351,8 @@ export default { ...@@ -351,7 +351,8 @@ export default {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
&-item { &-item {
flex: 0 0 20%; // flex: 0 0 20%;
width: 20%;
padding: 10px 20px; padding: 10px 20px;
box-shadow: 0 0 10px 4px #e9e5e5; box-shadow: 0 0 10px 4px #e9e5e5;
border-radius: 10px; border-radius: 10px;
......
...@@ -100,7 +100,7 @@ ...@@ -100,7 +100,7 @@
key="title" key="title"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
/> />
<el-table-column label="商品类别" align="center" prop="categoryId" /> <el-table-column label="商品类别" align="center" prop="categoryName" />
<el-table-column label="标签" align="center" prop="list" key="list"> <el-table-column label="标签" align="center" prop="list" key="list">
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<i class="el el-tag" v-for="(item, index) in row.list" :key="index">{{ <i class="el el-tag" v-for="(item, index) in row.list" :key="index">{{
......
...@@ -122,13 +122,13 @@ ...@@ -122,13 +122,13 @@
<el-table-column <el-table-column
label="收藏数" label="收藏数"
align="center" align="center"
prop="appreciateNum" prop="collectNum"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
/> />
<el-table-column <el-table-column
label="点赞数" label="点赞数"
align="center" align="center"
prop="collectNum" prop="appreciateNum"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
/> />
<el-table-column <el-table-column
......
...@@ -678,12 +678,12 @@ export default { ...@@ -678,12 +678,12 @@ export default {
watch: { watch: {
// 根据名称筛选部门树 // 根据名称筛选部门树
deptName(val) { deptName(val) {
this.$refs.tree.filter(val); // this.$refs.tree.filter(val);
}, },
}, },
created() { created() {
this.getList(); this.getList();
this.getDeptTree(); // this.getDeptTree();
this.getConfigKey("sys.user.initPassword").then((response) => { this.getConfigKey("sys.user.initPassword").then((response) => {
this.initPassword = response.msg; this.initPassword = response.msg;
}); });
......
...@@ -354,7 +354,8 @@ export default { ...@@ -354,7 +354,8 @@ export default {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
&-item { &-item {
flex: 0 0 20%; // flex: 0 0 20%;
width: 20%;
padding: 10px 20px; padding: 10px 20px;
box-shadow: 0 0 10px 4px #e9e5e5; box-shadow: 0 0 10px 4px #e9e5e5;
border-radius: 10px; border-radius: 10px;
......
...@@ -780,15 +780,15 @@ export default { ...@@ -780,15 +780,15 @@ export default {
watch: { watch: {
// 根据名称筛选部门树 // 根据名称筛选部门树
deptName(val) { deptName(val) {
this.$refs.tree.filter(val); // this.$refs.tree.filter(val);
}, },
}, },
created() { created() {
this.getList(); this.getList();
this.getDeptTree(); // this.getDeptTree();
this.getConfigKey("sys.user.initPassword").then((response) => { // this.getConfigKey("sys.user.initPassword").then((response) => {
this.initPassword = response.msg; // this.initPassword = response.msg;
}); // });
}, },
methods: { methods: {
changeStatus(e, row) { changeStatus(e, row) {
......
...@@ -751,15 +751,15 @@ export default { ...@@ -751,15 +751,15 @@ export default {
watch: { watch: {
// 根据名称筛选部门树 // 根据名称筛选部门树
deptName(val) { deptName(val) {
this.$refs.tree.filter(val); // this.$refs.tree.filter(val);
}, },
}, },
created() { created() {
this.getList(); this.getList();
this.getDeptTree(); // this.getDeptTree();
this.getConfigKey("sys.user.initPassword").then((response) => { // this.getConfigKey("sys.user.initPassword").then((response) => {
this.initPassword = response.msg; // this.initPassword = response.msg;
}); // });
}, },
methods: { methods: {
changeStatus(e, row) { changeStatus(e, row) {
......
...@@ -691,15 +691,15 @@ export default { ...@@ -691,15 +691,15 @@ export default {
watch: { watch: {
// 根据名称筛选部门树 // 根据名称筛选部门树
deptName(val) { deptName(val) {
this.$refs.tree.filter(val); // this.$refs.tree.filter(val);
}, },
}, },
created() { created() {
this.getList(); this.getList();
this.getDeptTree(); // this.getDeptTree();
this.getConfigKey("sys.user.initPassword").then((response) => { // this.getConfigKey("sys.user.initPassword").then((response) => {
this.initPassword = response.msg; // this.initPassword = response.msg;
}); // });
}, },
methods: { methods: {
/** 查询用户列表 */ /** 查询用户列表 */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment