Commit 8c2dce9f by LJM

bug

parent 274592aa
Showing with 37 additions and 19 deletions
...@@ -157,7 +157,7 @@ ...@@ -157,7 +157,7 @@
<span class="icon iconfont iconuser"></span> <span class="icon iconfont iconuser"></span>
</div> </div>
</div> </div>
<!--修改库存弹窗--> <!--修改密码弹窗-->
<el-dialog title="修改密码" :visible.sync="dialogVisible" width="500px" class="demo-ruleForm"> <el-dialog title="修改密码" :visible.sync="dialogVisible" width="500px" class="demo-ruleForm">
<el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px"> <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px">
<el-form-item label="原始密码" prop="old_password"> <el-form-item label="原始密码" prop="old_password">
...@@ -220,7 +220,22 @@ ...@@ -220,7 +220,22 @@
<span class="el-badge-num" v-if="scope.row.msg_status == 0"></span> <span class="el-badge-num" v-if="scope.row.msg_status == 0"></span>
<span style="margin-right: 4px;">{{ JSON.parse(scope.row.msg_data).date }}</span> <span style="margin-right: 4px;">{{ JSON.parse(scope.row.msg_data).date }}</span>
<span style="margin-right: 4px;">{{ JSON.parse(scope.row.msg_data).title }}</span> <span style="margin-right: 4px;">{{ JSON.parse(scope.row.msg_data).title }}</span>
<a class="alink" target="_blank" :href="JSON.parse(scope.row.msg_data).link">{{ JSON.parse(scope.row.msg_data).title_suffix }}</a>
<template v-if="JSON.parse(scope.row.msg_data).cate_id == 6">
<a style="color: #409EFF" target="_blank" :href="JSON.parse(scope.row.msg_data).link">{{ JSON.parse(scope.row.msg_data).title_suffix }}</a>
</template>
<template v-else-if="JSON.parse(scope.row.msg_data).cate_id == 7">
<a style="color: #1969F9" target="_blank" :href="JSON.parse(scope.row.msg_data).link">{{ JSON.parse(scope.row.msg_data).title_suffix }}</a>
</template>
<template v-else-if="JSON.parse(scope.row.msg_data).cate_id == 8">
<a style="color: #FF870E" target="_blank" :href="JSON.parse(scope.row.msg_data).link">{{ JSON.parse(scope.row.msg_data).title_suffix }}</a>
</template>
<template v-else-if="JSON.parse(scope.row.msg_data).cate_id == 9">
<a style="color: #FF0000" target="_blank" :href="JSON.parse(scope.row.msg_data).link">{{ JSON.parse(scope.row.msg_data).title_suffix }}</a>
</template>
<template v-else>
<a style="color: #409EFF" target="_blank" :href="JSON.parse(scope.row.msg_data).link">{{ JSON.parse(scope.row.msg_data).title_suffix }}</a>
</template>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -298,6 +313,19 @@ export default { ...@@ -298,6 +313,19 @@ export default {
total: 0, total: 0,
limit: 10, limit: 10,
page: 1, page: 1,
color_arr: [{
name: '询价',
value: '#409EFF'
}, {
name: '成单',
value: '#1969F9'
}, {
name: '退货',
value: '#FF870E'
}, {
name: '上架有效期',
value: '#FF0000'
}],
ruleForm: { ruleForm: {
old_password: '', old_password: '',
password: '', password: '',
...@@ -409,31 +437,20 @@ export default { ...@@ -409,31 +437,20 @@ export default {
this.msg_id = res.data.list[0].id;//存储最新id this.msg_id = res.data.list[0].id;//存储最新id
let has_more = data.has_more;//判断是否出现更多,样式有区别 let has_more = data.has_more;//判断是否出现更多,样式有区别
let html = ''; let html = '';
let color_arr = [{
name: '询价',
value: '#409EFF'
}, {
name: '成单',
value: '#1969F9'
}, {
name: '退货',
value: '#FF870E'
}, {
name: '上架有效期',
value: '#FF0000'
}];
let cate_id = data.cate_id; let cate_id = data.cate_id;
let colorStyle = ''; let colorStyle = '';
//定义颜色提醒 //定义颜色提醒
if (cate_id) { if (cate_id) {
if (cate_id == 6) { if (cate_id == 6) {
colorStyle = 'color:' + color_arr[0].value; colorStyle = 'color:' + this.color_arr[0].value;
} else if (cate_id == 7) { } else if (cate_id == 7) {
colorStyle = 'color:' + color_arr[1].value; colorStyle = 'color:' + this.color_arr[1].value;
} else if (cate_id == 8) { } else if (cate_id == 8) {
colorStyle = 'color:' + color_arr[2].value; colorStyle = 'color:' + this.color_arr[2].value;
} else if (cate_id == 9) { } else if (cate_id == 9) {
colorStyle = 'color:' + color_arr[3].value; colorStyle = 'color:' + this.color_arr[3].value;
} else {
colorStyle = 'color:' + this.color_arr[0].value;
} }
} }
if (has_more) { if (has_more) {
...@@ -646,6 +663,7 @@ export default { ...@@ -646,6 +663,7 @@ export default {
} else if (this.activeName == 'shelfLife') { } else if (this.activeName == 'shelfLife') {
this.msg_category_id = 9; this.msg_category_id = 9;
} }
this.page = 1;
this.getNotReadCount(); this.getNotReadCount();
this.getNews(); this.getNews();
}, },
......
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 sign in to comment