From 4f20961af459609e558e4ab0dca1269642d5330b Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 19 Mar 2021 18:12:13 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=B2=E6=96=B9bb=E7=9A=84bug=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 8 +- src/components/Activity/ActivitySearch.vue | 13 +- src/components/Banner/BannerDate.vue | 5 +- src/components/Banner/BannerEdit.vue | 134 +++++++++--------- .../Development/DevelopmentSearch.vue | 13 +- .../EntityApply/EntityApplyDate.vue | 54 ++++--- src/components/Manage/ManageDate.vue | 28 ++-- src/components/Page/PageDate.vue | 26 +--- src/components/Partner/PartnerAdd.vue | 63 +++----- src/components/Policy/PolicySearch.vue | 29 +--- src/components/RD/RDDate.vue | 6 +- src/components/SpinOff/SpinOffDate.vue | 33 ++--- src/components/Transfer/TransferSearch.vue | 9 +- src/config/api.js | 5 +- src/views/CategoryManage/CategoryManage.vue | 11 +- .../EntityApplication/VirtualApplication.vue | 8 +- 16 files changed, 182 insertions(+), 263 deletions(-) diff --git a/src/App.vue b/src/App.vue index 92a4506..271b478 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,7 +1,7 @@ @@ -157,6 +157,9 @@ export default { const condition = { current, pageSize }; this.$emit('getListData', condition); }, + editSearch() { + this.$emit('getListData'); + }, // 删除 async onDelete(id) { try { diff --git a/src/components/Banner/BannerEdit.vue b/src/components/Banner/BannerEdit.vue index df37e5b..859fad9 100644 --- a/src/components/Banner/BannerEdit.vue +++ b/src/components/Banner/BannerEdit.vue @@ -11,29 +11,10 @@ width="700px" > - - - + - + - + - {{ item.name }} + {{ item.name }} - - - - 更换图片 - + + + 更换图片 @@ -114,8 +72,7 @@ diff --git a/src/components/Page/PageDate.vue b/src/components/Page/PageDate.vue index b54b439..f34cfa6 100644 --- a/src/components/Page/PageDate.vue +++ b/src/components/Page/PageDate.vue @@ -1,7 +1,7 @@ -
+
内容: @@ -48,12 +39,7 @@ - +
@@ -141,9 +127,9 @@ export default { }, // 删除 - async onDelete(pageId) { + async onDelete(id) { try { - const params = { param: { pageId } }; + const params = { param: { id } }; const res = await deletePage(params); const { data, msg, code } = res.data; if (code === 200) { diff --git a/src/components/Partner/PartnerAdd.vue b/src/components/Partner/PartnerAdd.vue index 8234b67..2c7566e 100644 --- a/src/components/Partner/PartnerAdd.vue +++ b/src/components/Partner/PartnerAdd.vue @@ -12,65 +12,35 @@ > - + - - - - 选择图片 - + + + 选择图片 - + - {{ item.value }} + {{ item.value }} - + @@ -177,6 +147,7 @@ export default { const { data, msg, code } = res.data; if (code === 200) { this.$message.success('添加成功'); + this.fileList = []; this.$emit('getBackendSearch'); } else { throw msg; diff --git a/src/components/Policy/PolicySearch.vue b/src/components/Policy/PolicySearch.vue index 1b4eb9e..40374fd 100644 --- a/src/components/Policy/PolicySearch.vue +++ b/src/components/Policy/PolicySearch.vue @@ -4,22 +4,13 @@
- - {{ type.value }} + + {{ type.value }} - +
@@ -31,18 +22,8 @@ 太原市
- - {{ state.value }} + + {{ state.value }} 搜索
diff --git a/src/components/RD/RDDate.vue b/src/components/RD/RDDate.vue index bdf83f9..d685334 100644 --- a/src/components/RD/RDDate.vue +++ b/src/components/RD/RDDate.vue @@ -35,7 +35,7 @@
- + {{ item }} @@ -131,6 +131,7 @@ export default { delId: '', dealStatus: '', enable: ['未处理', '处理中', '已处理'], + value: '', }; }, @@ -160,9 +161,11 @@ export default { showEditModal(id, status) { this.delId = id; this.dealStatus = status; + this.value = this.enable[status]; this.editVisible = true; }, getStatus(e) { + this.value = this.enable[e]; this.dealStatus = e; }, // 修改处理状态 @@ -178,6 +181,7 @@ export default { const { data, msg, code } = res.data; if (code === 200) { this.$message.success('修改成功'); + this.value = ''; this.$emit('searchServiceApply'); this.editVisible = false; // TODO: 填到列表中 diff --git a/src/components/SpinOff/SpinOffDate.vue b/src/components/SpinOff/SpinOffDate.vue index 185d801..e04e6ec 100644 --- a/src/components/SpinOff/SpinOffDate.vue +++ b/src/components/SpinOff/SpinOffDate.vue @@ -1,14 +1,7 @@
- - + + {{ item }} @@ -161,6 +143,7 @@ export default { delId: '', dealStatus: '', enable: ['未处理', '审核通过', '审核未通过'], + value: '', }; }, @@ -170,9 +153,10 @@ export default { methods: { showEditModal(id, dealStatus) { - this.editVisible = true; + this.value = this.enable[dealStatus]; this.delId = id; this.dealStatus = dealStatus; + this.editVisible = true; }, handleCancel() { this.editVisible = false; @@ -180,6 +164,8 @@ export default { this.dealStatus = ''; }, getStatus(e) { + console.log(e); + this.value = this.enable[e]; this.dealStatus = e; }, // 修改处理状态 @@ -196,6 +182,7 @@ export default { if (code === 200) { this.$emit('getCreatingPlatformSearch'); this.editVisible = false; + this.value = ''; this.$message.success('修改成功'); } else { throw msg; diff --git a/src/components/Transfer/TransferSearch.vue b/src/components/Transfer/TransferSearch.vue index efcd86b..c48cb63 100644 --- a/src/components/Transfer/TransferSearch.vue +++ b/src/components/Transfer/TransferSearch.vue @@ -2,7 +2,7 @@
- + {{ item.name }} @@ -14,12 +14,7 @@ 增加 - +
diff --git a/src/config/api.js b/src/config/api.js index 90cafa5..5812605 100644 --- a/src/config/api.js +++ b/src/config/api.js @@ -224,12 +224,15 @@ export const selLikeTeam = params => axios.post(`${researchTeam}/selLikeTeam`, p // 查询轮播图列表 export const queryCarousel = params => axios.post(`${carousel}/queryCarousel`, params); -// 查询轮播图列表 +// 添加轮播图 export const addCarousel = params => axios.post(`${carousel}/addCarousel`, params); // 删除轮播图 export const deleteCarousel = params => axios.post(`${carousel}/deleteCarousel`, params); +// 修改轮播图 +export const updateCarousel = params => axios.post(`${carousel}/updateCarousel`, params); + // 三大平台需求填报查询 export const searchServiceApply = params => axios.post(`${service}/searchServiceApply`, params); diff --git a/src/views/CategoryManage/CategoryManage.vue b/src/views/CategoryManage/CategoryManage.vue index a24abdc..184bef2 100644 --- a/src/views/CategoryManage/CategoryManage.vue +++ b/src/views/CategoryManage/CategoryManage.vue @@ -1,7 +1,7 @@ @@ -19,7 +19,8 @@ export default { data() { return { - lists: [], + lists: {}, + pagination: { current: 1, pageSize: 10, total: 0 }, }; }, @@ -52,6 +53,12 @@ export default { } const data = await this.getSelModelSearch(params); this.lists = data; + this.pagination.total = parseInt(data.total); + const paper = { ...this.pagination }; + paper.current = data.pageNum; + paper.total = +data.total; + paper.pageSize = data.pageSize; + this.pagination = paper; }, }, }; diff --git a/src/views/EntityApplication/VirtualApplication.vue b/src/views/EntityApplication/VirtualApplication.vue index 4c49895..91c13f2 100644 --- a/src/views/EntityApplication/VirtualApplication.vue +++ b/src/views/EntityApplication/VirtualApplication.vue @@ -1,11 +1,7 @@ @@ -25,7 +21,7 @@ export default { data() { return { lists: [], - pagination: { current: 1, pageSize: 10 }, + pagination: { current: 1, pageSize: 10, total: 0 }, }; },