diff --git a/src/assets/mp3/jjqz.mp3 b/src/assets/mp3/jjqz.mp3 new file mode 100644 index 0000000..adf4f92 Binary files /dev/null and b/src/assets/mp3/jjqz.mp3 differ diff --git a/src/assets/mp3/lts.mp3 b/src/assets/mp3/lts.mp3 new file mode 100644 index 0000000..bc6c60b Binary files /dev/null and b/src/assets/mp3/lts.mp3 differ diff --git a/src/assets/mp3/tip.mp3 b/src/assets/mp3/spq.mp3 similarity index 100% rename from src/assets/mp3/tip.mp3 rename to src/assets/mp3/spq.mp3 diff --git a/src/assets/mp3/ts.mp3 b/src/assets/mp3/ts.mp3 new file mode 100644 index 0000000..91bc868 Binary files /dev/null and b/src/assets/mp3/ts.mp3 differ diff --git a/src/assets/mp3/xxzx.mp3 b/src/assets/mp3/xxzx.mp3 new file mode 100644 index 0000000..6314aab Binary files /dev/null and b/src/assets/mp3/xxzx.mp3 differ diff --git a/src/assets/mp3/xyhzc.mp3 b/src/assets/mp3/xyhzc.mp3 new file mode 100644 index 0000000..5938bb7 Binary files /dev/null and b/src/assets/mp3/xyhzc.mp3 differ diff --git a/src/router/index.js b/src/router/index.js index d6143e3..addaedb 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -38,6 +38,7 @@ const mainRoutes = { { path: '/allocationList', component: _import('allocation/allocationList'), name: 'allocationList', meta: { title: '配置列表', isTab: true } }, { path: '/financeList', component: _import('finance/financeList'), name: 'financeList', meta: { title: '财务中心', isTab: true } }, { path: '/message', component: _import('message/message'), name: 'message', meta: { title: '消息中心', isTab: true } }, + { path: '/newUserTip', component: _import('newUserTip/newUserTip'), name: 'newUserTip', meta: { title: '新用户注册', isTab: true } }, { path: '/taskConfig', component: _import('taskConfig/taskConfig'), name: 'taskConfig', meta: { title: '任务配置', isTab: true } }, { path: '/bannerList', component: _import('banner/bannerList'), name: 'bannerList', meta: { title: '首页装修', isTab: true } }, { path: '/materialPackage', component: _import('materialPackage/materialPackage'), name: 'materialPackage', meta: { title: '物料包', isTab: true } }, diff --git a/src/views/bl/shipinquan/shipinquan.vue b/src/views/bl/shipinquan/shipinquan.vue index ce6f975..0dd4327 100644 --- a/src/views/bl/shipinquan/shipinquan.vue +++ b/src/views/bl/shipinquan/shipinquan.vue @@ -432,6 +432,17 @@ export default { }); }).catch(() => {}); }, + //更新菜单提示状态 + dataSelectSpq() { + this.$http({ + url: this.$http.adornUrl('/bl/shipinquan/dataSelectSpq'), + method: 'get', + }).then(({ data }) => { + if (data.data >= 0) { + this.$cookie.set('numberSpq', data.data) + } + }) + }, //授权 handleApprove() { if (this.status == "") { @@ -472,6 +483,7 @@ export default { duration: 1500, onClose: () => { this.handleSelect(); + this.dataSelectSpq(); }, }); } else { @@ -572,6 +584,7 @@ export default { duration: 1500, onClose: () => { this.handleSelect(); + this.dataSelectSpq(); }, }); } else { diff --git a/src/views/business/business.vue b/src/views/business/business.vue index d5a08d8..e8a83c5 100644 --- a/src/views/business/business.vue +++ b/src/views/business/business.vue @@ -34,11 +34,12 @@ - + @@ -69,17 +70,22 @@ @@ -92,16 +98,16 @@ - +
拒绝理由： - + style="width: 200px;display: inline-block;text-align: right;position: relative;top: -70px;">{{(tsbt=='回复')?(tsbt+'内容'):(tsbt+'理由')}}： +
取 消 - 确 定 + 确 定
@@ -221,6 +227,7 @@ ], content: '', status: 1, + tsbt:'', helpTakeId: '', indentNumbers: '', complaintId: '', @@ -373,18 +380,19 @@ }) }, //任务拒绝 - refuseClick(rows) { + refuseClick(rows,tip) { + this.tsbt = tip this.status = 2 this.helpTakeId = rows.id this.content = '' this.dialogFormVisible = true }, - refuseto() { + replyto() { if (this.content == '') { this.$notify({ title: '提示', duration: 1800, - message: '请输入拒绝理由', + message: '请输入'+this.status==1?'通过':'拒绝'+'理由', type: 'warning' }); return @@ -410,6 +418,7 @@ this.content = '' this.status = -1 this.dataSelect() + this.dataSelectPy() } }) } else { @@ -424,7 +433,7 @@ }) }, //单条任务通过 - passClicks(row) { + passClicks(row,tip) { this.content = '同意' this.$http({ url: this.$http.adornUrl('message/auditMessage'), @@ -463,47 +472,29 @@ }) }, - //单条投诉通过 - passClicks1(row) { - this.status = 1 - this.content = '同意' + //统计未处理数据量 + dataSelectPy() { this.$http({ - url: this.$http.adornUrl('message/auditMessage'), - method: 'post', + url: this.$http.adornUrl('message/selectMessageCount'), + method: 'get', params: this.$http.adornParams({ - 'ids': row.id, - 'status': 1, - 'auditContent': this.content, + 'state': 7, }) }).then(({ - data - }) => { - if (data.code == 0) { - this.$message({ - message: '操作成功', - type: 'success', - duration: 1500, - onClose: () => { - this.content = '' - this.status = -1 - this.dataSelect() - } - }) - } else { - this.$message({ - message: data.msg, - type: 'error', - duration: 1500, - onClose: () => { - this.content = '' - this.status = -1 - this.dataSelect() - } - }) + data + }) => { + if (data.data >= 0) { + this.$cookie.set('numberDts', data.data) } - }) }, + passClicks1(rows,tip){ + this.tsbt = tip + this.status = 1 + this.helpTakeId = rows.id + this.content = '' + this.dialogFormVisible = true + }, // 添加素材弹框 advertNotice() { this.dialogFormVisible2 = true diff --git a/src/views/business/emergencyHelp.vue b/src/views/business/emergencyHelp.vue index fc1f44f..5383939 100644 --- a/src/views/business/emergencyHelp.vue +++ b/src/views/business/emergencyHelp.vue @@ -127,6 +127,22 @@ } }, methods: { + // 更新紧急求助菜单提示信息 + dataSelectJjqz() { + this.$http({ + url: this.$http.adornUrl('message/selectMessageCount'), + method: 'get', + params: this.$http.adornParams({ + 'state': 9, + }) + }).then(({ + data + }) => { + if (data.data >= 0) { + this.$cookie.set('numberJjqz', data.data) + } + }) + }, // 多选 changeFun(val) { this.checkBoxData = val @@ -244,6 +260,7 @@ duration: 1500, onClose: () => { this.dataSelect() + this.dataSelectJjqz() } }) } else { diff --git a/src/views/main-navbar.vue b/src/views/main-navbar.vue index 1c83946..a3d9171 100644 --- a/src/views/main-navbar.vue +++ b/src/views/main-navbar.vue @@ -8,9 +8,7 @@ -
- 播放 -
+
@@ -72,10 +70,10 @@ diff --git a/src/views/main-sidebar-sub-menu.vue b/src/views/main-sidebar-sub-menu.vue index 247d351..4744be0 100644 --- a/src/views/main-sidebar-sub-menu.vue +++ b/src/views/main-sidebar-sub-menu.vue @@ -28,6 +28,9 @@ {{ menu.name }} + + + @@ -49,6 +52,9 @@ + + + @@ -65,6 +71,8 @@ export default { chatNumFwz:0, chatNumLts:0, chatNumSpq:0, + chatNumXxzx:0, + chatNumXyhzc:0, } }, props: { @@ -100,7 +108,7 @@ export default { //检测菜单下是否有消息 havaMsg(index){ if(index == 311){ - return this.chatNumDrz != 0 || this.chatNumDts != 0 || this.chatNumJjqz != 0 || this.chatNumDsm != 0 || this.chatNumFwz != 0 || this.chatNumLts != 0 || this.chatNumSpq != 0 + return this.chatNumDrz != 0 || this.chatNumDts != 0 || this.chatNumJjqz != 0 || this.chatNumDsm != 0 || this.chatNumFwz != 0 || this.chatNumLts != 0 || this.chatNumSpq != 0 || this.chatNumXxzx != 0 || this.chatNumXyhzc != 0 } return false } @@ -129,7 +137,12 @@ export default { if(this.$cookie.get('numberSpq')){ this.chatNumSpq = this.$cookie.get('numberSpq') } - + if(this.$cookie.get('numberXxzx')){ + this.chatNumXxzx = this.$cookie.get('numberXxzx') + } + if(this.$cookie.get('numberXyhzc')){ + this.chatNumXyhzc = this.$cookie.get('numberXyhzc') + } }, 1000) // this.chatNum2 = setInterval(() => { // this.messageSelect2() diff --git a/src/views/message/message.vue b/src/views/message/message.vue index 34e8708..3da6ef5 100644 --- a/src/views/message/message.vue +++ b/src/views/message/message.vue @@ -1,6 +1,10 @@ - + diff --git a/src/views/newUserTip/newUserTip.vue b/src/views/newUserTip/newUserTip.vue new file mode 100644 index 0000000..7e775d0 --- /dev/null +++ b/src/views/newUserTip/newUserTip.vue @@ -0,0 +1,312 @@ + + + + +