diff --git a/src/router/modules/root.js b/src/router/modules/root.js index 0efc59c..b2a5e21 100644 --- a/src/router/modules/root.js +++ b/src/router/modules/root.js @@ -82,6 +82,11 @@ export default [ meta: {requireLogin: true}, component: () => import(/* webpackChunkName: 'root' */ '@/views/project/MyProject.vue') }, + { + path: 'recycle', + meta: {requireLogin: true}, + component: () => import(/* webpackChunkName: 'root' */ '@/views/project/RecycleBin.vue') + }, { path: 'template/preview', meta: {requireLogin: true}, diff --git a/src/views/form/publish.vue b/src/views/form/publish.vue index f27d7c7..5b00ebb 100644 --- a/src/views/form/publish.vue +++ b/src/views/form/publish.vue @@ -32,6 +32,7 @@ 停止发布 @@ -90,6 +91,8 @@ export default { this.$api.get(`/user/project/${this.projectKey}`).then(res => { if (res.data.status == 2) { this.publishStatus = true + }else{ + this.publishStatus = false } }) }, @@ -99,6 +102,14 @@ export default { this.msgSuccess('发布成功') }) }, + stopPublishProject() { + this.$api.post('/user/project/stop', {'key': this.projectKey}).then(res => { + if (res.data) { + this.msgSuccess('停止成功') + this.getProjectStatus() + } + }) + }, qrCodeGenSuccess(dataUrl, id) { this.qrCodeUrl = dataUrl }, diff --git a/src/views/form/write.vue b/src/views/form/write.vue index 81ccd47..7a0b2e4 100644 --- a/src/views/form/write.vue +++ b/src/views/form/write.vue @@ -105,7 +105,7 @@ export default { }, queryProjectSettingStatus() { //是否能进入填写 - this.$api.get(`/user/project/setting/status`, {params: {projectKey: this.projectConfig.projectKey}}).then(res => { + this.$api.get(`/user/project/setting-status`, {params: {projectKey: this.projectConfig.projectKey}}).then(res => { if (res.msg) { this.writeNotStartPrompt = res.msg this.writeStatus = 0 diff --git a/src/views/home/HomButton.vue b/src/views/home/HomButton.vue index e7ec962..f81f782 100644 --- a/src/views/home/HomButton.vue +++ b/src/views/home/HomButton.vue @@ -16,7 +16,9 @@ - 回收站 + + 回收站 + diff --git a/src/views/home/dashboard.vue b/src/views/home/dashboard.vue index 42815c1..d3ba9d1 100644 --- a/src/views/home/dashboard.vue +++ b/src/views/home/dashboard.vue @@ -140,7 +140,7 @@ export default { created() { this.$api.get('/user/project/list', {params: {status: 2}}).then(res => { this.projectListData = res.data - if (res.data) { + if (res.data && res.data[0]) { this.activeProjectKey = res.data[0].key this.projectChangeHandle() } diff --git a/src/views/project/MyProject.vue b/src/views/project/MyProject.vue index 121c58d..8b9e438 100644 --- a/src/views/project/MyProject.vue +++ b/src/views/project/MyProject.vue @@ -48,7 +48,7 @@ - + 回收站 @@ -97,13 +97,40 @@ 编辑 - + + + 统计 + + + - - 统计 - + + + 停止 + + + + + + 删除 + + diff --git a/src/views/project/RecycleBin.vue b/src/views/project/RecycleBin.vue new file mode 100644 index 0000000..1d0feed --- /dev/null +++ b/src/views/project/RecycleBin.vue @@ -0,0 +1,148 @@ + + + +