diff --git a/admin/src/api/qa.js b/admin/src/api/qa.js index bf84351e..2bbb11c4 100644 --- a/admin/src/api/qa.js +++ b/admin/src/api/qa.js @@ -8,22 +8,11 @@ export function login(data) { }) } -// 获取城市列表 -export function getCityList() { - return request({ - url: '/admin/city/getCityList', - method: 'get' - }) -} - // 获取子集列表 -export function getQaList(city_id) { +export function getQaList() { return request({ url: '/admin/qa/getQaList', method: 'get', - params: { - city_id - } }) } // 获取qa详情 diff --git a/admin/src/layout/components/Navbar.vue b/admin/src/layout/components/Navbar.vue index 6c03a6fd..0d669797 100644 --- a/admin/src/layout/components/Navbar.vue +++ b/admin/src/layout/components/Navbar.vue @@ -129,7 +129,7 @@ 关 闭 返 回
- + {{ item.city_name }}
@@ -152,7 +152,7 @@ import Search from '@/components/HeaderSearch' import { color } from 'echarts/lib/export' import sidebar from '@/layout/components/Sidebar/index.vue' import avatar from 'element-ui/packages/avatar' -import { getCityList, getQaList, getQaDetail } from '@/api/qa' +import { getQaList } from '@/api/qa' import clickoutside from 'element-ui/src/utils/clickoutside' export default { directives: { clickoutside }, @@ -189,7 +189,7 @@ export default { imageUrl: false, QaShow: true, os: [], - getCityList: [], + getQaList: [], times: [], form: { oldpwd: '', @@ -213,8 +213,8 @@ export default { }, created() { this.getworkstatus() - getCityList().then(res => { - this.getCityList = res.data + getQaList().then(res => { + this.getQaList = res.data }) }, methods: { @@ -226,18 +226,16 @@ export default { this.drawer = false this.QaShow = true }, - getQaDetail(id) { - getQaDetail(id).then(res => { - this.QaInfo = res.data - if (!this.QaInfo) { - return this.$message({ - message: '暂无QA问题', - type: 'warning', - duration: 1500 - }) - } - this.QaShow = false - }) + getQaDetail(data) { + this.QaInfo = data + if (!this.QaInfo) { + return this.$message({ + message: '暂无QA问题', + type: 'warning', + duration: 1500 + }) + } + this.QaShow = false }, async logout() { await this.$store.dispatch('user/logout') @@ -267,7 +265,7 @@ export default { }) }, startWorks() { - this.$axios.post('/admin/work/startworks', { id: this.id }).then(res => { + this.$axios.post('/admin/admin/editInfo', { is_order: 1 }).then(res => { console.log(res) this.$message({ showClose: true, @@ -279,7 +277,7 @@ export default { }) }, endWorks() { - this.$axios.post('/admin/work/endworks', { id: this.id }).then(res => { + this.$axios.post('/admin/admin/editInfo', { is_order: 0 }).then(res => { console.log(res) this.$message({ showClose: true, diff --git a/admin/src/router/index.js b/admin/src/router/index.js index 459d8b94..e977a038 100644 --- a/admin/src/router/index.js +++ b/admin/src/router/index.js @@ -98,7 +98,7 @@ export const asyncRoutes = [ component: () => import('@/views/onlines/online.vue'), name: 'onlines', meta: { - title: '在线客服列表', + title: '在线客服', roles: ['admin'] } }/*, diff --git a/admin/src/views/log/index.vue b/admin/src/views/log/index.vue index 9cb52bba..4884a621 100644 --- a/admin/src/views/log/index.vue +++ b/admin/src/views/log/index.vue @@ -24,7 +24,7 @@ - + diff --git a/admin/src/views/onlines/online.vue b/admin/src/views/onlines/online.vue index 4ccd7057..706d3006 100644 --- a/admin/src/views/onlines/online.vue +++ b/admin/src/views/onlines/online.vue @@ -2,7 +2,7 @@
- + - + + - + - + + + + @@ -70,7 +75,7 @@ export default { }, methods: { getOnlineList() { - this.listLoading = true // /admin/admin/getOnlineList /admin/shortcutContent/list + this.listLoading = true this.$axios.get('/admin/admin/getOnlineList', { params: this.listQuery }).then(response => { this.list = response.data this.listLoading = false diff --git a/admin/src/views/order/index.vue b/admin/src/views/order/index.vue index 51123557..c7318912 100644 --- a/admin/src/views/order/index.vue +++ b/admin/src/views/order/index.vue @@ -121,7 +121,7 @@ - + diff --git a/admin/src/views/order/product.vue b/admin/src/views/order/product.vue index f6836dfb..c795b2d3 100644 --- a/admin/src/views/order/product.vue +++ b/admin/src/views/order/product.vue @@ -20,7 +20,7 @@ - +