diff --git a/chenhai-ui/src/api/vet/merchant.js b/chenhai-ui/src/api/vet/merchant.js index cc774f9..d07b8fa 100644 --- a/chenhai-ui/src/api/vet/merchant.js +++ b/chenhai-ui/src/api/vet/merchant.js @@ -42,3 +42,59 @@ export function delMerchant(shopId) { method: 'delete' }) } + +// Post /vet/merchant/audit 审核 +export function audit(shopId) { + return request({ + url: '/vet/merchant/audit/' + shopId, + method: 'post' + }) +} + +///vet/merchant/submitAudit/{shopId}提交审核 +export function submitAudit(shopId) { + return request({ + url: '/vet/merchant/submitAudit/' + shopId, + method: 'post' + }) +} + +// /vet/merchant/publish/{shopId}上架 +export function publish(shopId) { + return request({ + url: '/vet/merchant/publish/' + shopId, + method: 'post' + }) +} + +// /vet/merchant/offline/{shopId}下架 +export function offline(shopId) { + return request({ + url: '/vet/merchant/offline/' + shopId, + method: 'post' + }) +} + +// Get /vet/product/shop/{shopId} 详情 +export function getShop(shopId) { + return request({ + url: '/vet/product/shop/' + shopId, + method: 'get' + }) +} + +// /vet/merchant/resubmitAudit/{shopId}商家重新提交审核 +export function resubmitAudit(shopId) { + return request({ + url: '/vet/merchant/resubmitAudit/' + shopId, + method: 'post' + }) +} + +// /vet/merchant/cancelAudit/{shopId}取消审核 +export function cancelAudit(shopId) { + return request({ + url: '/vet/merchant/cancelAudit/' + shopId, + method: 'post' + }) +} diff --git a/chenhai-ui/src/api/vet/product.js b/chenhai-ui/src/api/vet/product.js index 995030b..45ab517 100644 --- a/chenhai-ui/src/api/vet/product.js +++ b/chenhai-ui/src/api/vet/product.js @@ -42,3 +42,59 @@ export function delProduct(id) { method: 'delete' }) } + +// auditStatus审核状态 auditOpinion审核意见 shopStatus店铺状态 + +// /vet/product/submitAudit/{id}提交审核 +export function submitAuditProduct(id) { + return request({ + url: '/vet/product/submitAudit/' + id, + method: 'post' + }) +} + +// /vet/product/publish/{id}上架 +export function publishProduct(id) { + return request({ + url: '/vet/product/publish/' + id, + method: 'post' + }) +} +// /vet/product/offline/{id}下架 +export function offlineProduct(id) { + return request({ + url: '/vet/product/offline/' + id, + method: 'post' + }) +} +// /vet/product/cancelAudit/{id}取消审核 +export function cancelAuditProduct(id) { + return request({ + url: '/vet/product/cancelAudit/' + id, + method: 'post' + }) +} +// /vet/product/audit/list 管理员查询所有产品信息列表 +export function listAuditProduct(query) { + return request({ + url: '/vet/product/audit/list', + method: 'get', + params: query + }) +} +// /vet/product/batchSubmitAudit/{shopId}批量提交产品审核(按商家) +export function batchSubmitAuditProduct(shopId) { + return request({ + url: '/vet/product/batchSubmitAudit/' + shopId, + method: 'post' + }) +} + +// /vet/product/resubmitAudit/{id}产品重新提交审核 +export function resubmitAuditProduct(id) { + return request({ + url: '/vet/product/resubmitAudit/' + id, + method: 'post' + }) +} + diff --git a/chenhai-ui/src/assets/images/xiaoxi.png b/chenhai-ui/src/assets/images/xiaoxi.png new file mode 100644 index 0000000..b203e49 Binary files /dev/null and b/chenhai-ui/src/assets/images/xiaoxi.png differ diff --git a/chenhai-ui/src/assets/images/zhixiang.png b/chenhai-ui/src/assets/images/zhixiang.png deleted file mode 100644 index f7f1687..0000000 Binary files a/chenhai-ui/src/assets/images/zhixiang.png and /dev/null differ diff --git a/chenhai-ui/src/views/muhu/consultation/index.vue b/chenhai-ui/src/views/muhu/consultation/index.vue index 41b6a4b..0489d57 100644 --- a/chenhai-ui/src/views/muhu/consultation/index.vue +++ b/chenhai-ui/src/views/muhu/consultation/index.vue @@ -9,22 +9,22 @@ @keyup.enter.native="handleQuery" /> - - - - - - + + + + + + + + + + + + + + + + - - - - - - + + + + + + - - - + + + - +
+ +
- + @@ -169,19 +185,49 @@ - - - - + + + + + + + + + + {{ currentDetail.title || '--' }} + + + {{ currentDetail.description || '--' }} + + + {{ currentDetail.animalType || '--' }} + + + {{ currentDetail.animalAge || '--' }} + + + {{ currentDetail.animalGender || '--' }} + + + + + + {{ currentDetail.createdTime || '--' }} + + + + @@ -198,6 +244,7 @@ export default { return { // 遮罩层 loading: true, + detailLoading: false, // 选中数组 ids: [], // 非单个禁用 @@ -218,6 +265,9 @@ export default { title: "", // 是否显示弹出层 open: false, + detailViews: false, + // 当前查看的详情 + currentDetail: {}, // 查询参数 queryParams: { pageNum: 1, @@ -310,6 +360,22 @@ export default { console.log('点击回复,问诊单ID:', row.formId) console.log('当前currentConsultationId:', this.currentConsultationId) }, + /** 详情按钮操作 */ + handleView(row) { + this.detailViews = true; + this.detailLoading = true; + this.currentDetail = {}; + + const formId = row.formId; + getConsultation(formId).then(response => { + if (response.code === 200) { + this.currentDetail = response.data; + } else { + this.$modal.msgError("获取详情失败"); + } + this.detailLoading = false; + }); + }, /** 新增按钮操作 */ handleAdd() { this.reset() @@ -365,3 +431,132 @@ export default { } } + + + + diff --git a/chenhai-ui/src/views/syd.vue b/chenhai-ui/src/views/syd.vue index 185e1e8..4eec69c 100644 --- a/chenhai-ui/src/views/syd.vue +++ b/chenhai-ui/src/views/syd.vue @@ -1,5 +1,64 @@
- - + + + + + + + - - + + - - - + + + + + + + + + + + - + + + + + + - - + + - - - - - + + + + + + + + + + + + - + - +
+ +
- + @@ -153,6 +166,7 @@ export default { title: "", // 是否显示弹出层 open: false, + // imgUrl:[], // 查询参数 queryParams: { pageNum: 1, @@ -239,6 +253,9 @@ export default { this.reset() const id = row.id || this.ids getComments(id).then(response => { + // console.log(1111,response) + // const imgUrl = JSON.parse(response.data.images) + // console.log(222,img) this.form = response.data this.open = true this.title = "修改兽医回复" @@ -308,3 +325,113 @@ export default { } } + + + + + diff --git a/chenhai-ui/src/views/vet/experts/index.vue b/chenhai-ui/src/views/vet/experts/index.vue index 0f1e388..3d4fe8c 100644 --- a/chenhai-ui/src/views/vet/experts/index.vue +++ b/chenhai-ui/src/views/vet/experts/index.vue @@ -1,6 +1,33 @@
- - - - - - - - - + + + + + + + + + - + - +
+ +
- + @@ -110,9 +153,15 @@ - - + + + + + + + + @@ -124,6 +173,42 @@ 取 消 + + + + + + {{ currentDetail.realName || '--' }} + + + {{ currentDetail.iphone || '--' }} + + + {{ currentDetail.email || '--' }} + + + {{ currentDetail.title || '--' }} + + + {{ currentDetail.workExperience || '--' }} + + + {{ currentDetail.expert || '--' }} + + + {{ currentDetail.expertiseArea || '--' }} + + + {{ currentDetail.address || '--' }} + + + {{ currentDetail.introduction || '--' }} + + + + @@ -137,6 +222,7 @@ export default { return { // 遮罩层 loading: true, + detailLoading: false, // 选中数组 ids: [], // 非单个禁用 @@ -153,6 +239,10 @@ export default { title: "", // 是否显示弹出层 open: false, + detailViews: false, + + // 当前查看的详情 + currentDetail: {}, // 查询参数 queryParams: { pageNum: 1, @@ -170,6 +260,8 @@ export default { userId: null, realName: null, expertiseArea: null, + iphone: null, + email: null, contactInfo: null, isOnline: null, sortOrder: null, @@ -219,6 +311,8 @@ export default { realName: null, expertiseArea: null, contactInfo: null, + iphone: null, + email: null, isOnline: null, sortOrder: null, status: null @@ -257,6 +351,24 @@ export default { this.title = "修改专家信息" }) }, + + /** 详情 */ + handleView(row) { + this.detailViews = true; + this.detailLoading = true; + this.currentDetail = {}; + + const expertId = row.expertId; + getExperts(expertId).then(response => { + if (response.code === 200) { + this.currentDetail = response.data; + } else { + this.$modal.msgError("获取详情失败"); + } + this.detailLoading = false; + }); + }, + /** 聊天咨询按钮操作 */ handleChat(row) { // 获取当前用户信息 @@ -330,7 +442,27 @@ export default { + + diff --git a/chenhai-ui/src/views/vet/info/index.vue b/chenhai-ui/src/views/vet/info/index.vue index c206941..8819eb2 100644 --- a/chenhai-ui/src/views/vet/info/index.vue +++ b/chenhai-ui/src/views/vet/info/index.vue @@ -10,14 +10,14 @@ @keyup.enter.native="handleQuery" />
- - - + + + + + + + + - - - + + + + + + + + - - + + - - + + - - - - - - - - + + + + + + + + - + + + diff --git a/chenhai-ui/src/views/vet/notification/index.vue b/chenhai-ui/src/views/vet/notification/index.vue index e5184fa..c52f489 100644 --- a/chenhai-ui/src/views/vet/notification/index.vue +++ b/chenhai-ui/src/views/vet/notification/index.vue @@ -111,42 +111,46 @@