From b0738fff882058e26d5fd2067aefdfd523cb1145 Mon Sep 17 00:00:00 2001 From: wang hou sheng <76928547+wanghousheng@users.noreply.github.com> Date: Wed, 10 Apr 2024 18:08:10 +0800 Subject: [PATCH 1/3] 1 --- src/api/api.config.js | 2 ++ src/api/store.js | 22 ++++++++++++++++++++++ src/views/store/auth.vue | 35 +++++++++++++++++++++++++++++++---- src/views/store/template.vue | 10 ---------- 4 files changed, 55 insertions(+), 14 deletions(-) diff --git a/src/api/api.config.js b/src/api/api.config.js index 72c09d7..c5308cb 100644 --- a/src/api/api.config.js +++ b/src/api/api.config.js @@ -30,6 +30,8 @@ export default { qrcode: 'wxserve/qrcode', commit: 'wxserve/commit', getVersion: 'wxserve/getVersion', + auditBeforeCheck: 'wxserve/auditBeforeCheck', + audit: 'wxserve/audit', // 商家功能模块管理 module: { diff --git a/src/api/store.js b/src/api/store.js index 5b4057d..9795b86 100644 --- a/src/api/store.js +++ b/src/api/store.js @@ -45,6 +45,28 @@ export function addTotemplate(params) { params, }) } +/** + * 获取列表 + * @param {*} params + */ +export function auditBeforeCheck(params) { + return axios({ + url: api.store.auditBeforeCheck, + method: 'get', + params, + }) +} +/** + * 获取列表 + * @param {*} params + */ +export function audit(params) { + return axios({ + url: api.store.audit, + method: 'get', + params, + }) +} /** * 获取列表 * @param {*} params diff --git a/src/views/store/auth.vue b/src/views/store/auth.vue index b6a76d9..e91c5ea 100644 --- a/src/views/store/auth.vue +++ b/src/views/store/auth.vue @@ -42,7 +42,8 @@ 发布体验版 - 刷新版本信息 + 发布正式版 + 刷新版本 @@ -89,6 +90,16 @@ const columns = [ width: '180px', dataIndex: 'nick_name', }, + { + title: '审核状态(正式版)', + width: '180px', + dataIndex: 'audit_status_text', + }, + { + title: '拒绝原因(正式版)', + width: '180px', + dataIndex: 'audit_reason', + }, { title: '体验版', width: '200px', @@ -96,7 +107,7 @@ const columns = [ scopedSlots: { customRender: 'exp_info' }, }, { - title: '线上版', + title: '正式版', width: '200px', key: 'release_info', scopedSlots: { customRender: 'release_info' }, @@ -117,7 +128,7 @@ const columns = [ { title: '操作', - width: '300px', + width: '250px', key: 'action', fixed: 'right', scopedSlots: { customRender: 'action' }, @@ -207,7 +218,8 @@ export default { }, handleVersion(item) { this.isLoading = true - Api.getVersion({ appid: item.appid }).then(() => { + Api.getVersion({ appid: item.appid }).then((result) => { + this.$message.success(result.message, 1.5) this.fetchData() }) }, @@ -230,6 +242,21 @@ export default { handleAcceptance(item) { this.$refs.acceptance.add(item) }, + handleAudit(appid) { + const self = this + const modal = this.$confirm({ + title: '您确定要发布正式版吗?', + content: '', + onOk() { + return Api.audit({ appid: appid }) + .then((result) => { + this.$message.success(result.message, 1.5) + this.fetchData() + }) + .finally(() => modal.destroy()) + }, + }) + }, /** * 刷新列表 * @param Boolean bool 强制刷新到第一页 diff --git a/src/views/store/template.vue b/src/views/store/template.vue index 1e901ed..5125fa1 100644 --- a/src/views/store/template.vue +++ b/src/views/store/template.vue @@ -37,21 +37,11 @@ const columns = [ dataIndex: 'user_version', ellipsis: true, }, - { - title: '状态', - dataIndex: 'audit_status_text', - ellipsis: true, - }, { title: '版本描述', dataIndex: 'user_desc', ellipsis: true, }, - { - title: '失败原因', - dataIndex: 'reason', - ellipsis: true, - }, { title: '提交时间', dataIndex: 'create_time', From 663c3bf32543a07471ec6354dcc9e1e25216111c Mon Sep 17 00:00:00 2001 From: wang hou sheng <76928547+wanghousheng@users.noreply.github.com> Date: Thu, 11 Apr 2024 13:22:26 +0800 Subject: [PATCH 2/3] 1 --- src/views/store/auth.vue | 40 +++++++++++++++++++++++++++--- src/views/store/modules/Commit.vue | 4 +-- 2 files changed, 38 insertions(+), 6 deletions(-) diff --git a/src/views/store/auth.vue b/src/views/store/auth.vue index e91c5ea..4246e68 100644 --- a/src/views/store/auth.vue +++ b/src/views/store/auth.vue @@ -19,13 +19,26 @@ 授权二维码 + + 批量发布体验版 + + + 批量发布正式版 +
- +

版本:{{ item.exp_info.exp_version }}

时间:{{ item.exp_info.exp_time }}

@@ -41,7 +54,7 @@ - 发布体验版 + 发布体验版 发布正式版 刷新版本 @@ -194,8 +207,27 @@ export default { handleQrcode() { this.$refs.qrcode.show() }, - handleCommit(item) { - this.$refs.commit.show(item) + handleCommit(appid) { + this.$refs.commit.show(appid) + }, + handleBatchTest() { + let appids = this.selectedRowKeys.join(',') + if (appids === '') { + this.$message.error('请选择需要提交的APPID') + return false + } + this.$refs.commit.show(appids) + }, + handleBatch() { + let appids = this.selectedRowKeys.join(',') + if (appids === '') { + this.$message.error('请选择需要提交的APPID') + return false + } + Api.audit({ appid: appids }).then((result) => { + this.$message.success(result.message, 1.5) + this.fetchData() + }) }, handleSearch() { this.queryParam.page = 1 diff --git a/src/views/store/modules/Commit.vue b/src/views/store/modules/Commit.vue index 7b22c67..a7e9e4f 100644 --- a/src/views/store/modules/Commit.vue +++ b/src/views/store/modules/Commit.vue @@ -51,8 +51,8 @@ export default { /** * 显示对话框 */ - show(item) { - this.form.appid = item.appid + show(appid) { + this.form.appid = appid this.visible = true this.getTemplatelist() }, From 73c89cfd7106e9770777316da518db7042bcf02a Mon Sep 17 00:00:00 2001 From: wang hou sheng <76928547+wanghousheng@users.noreply.github.com> Date: Thu, 11 Apr 2024 13:30:17 +0800 Subject: [PATCH 3/3] 1 --- src/views/store/auth.vue | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/views/store/auth.vue b/src/views/store/auth.vue index 4246e68..3406c24 100644 --- a/src/views/store/auth.vue +++ b/src/views/store/auth.vue @@ -224,10 +224,12 @@ export default { this.$message.error('请选择需要提交的APPID') return false } - Api.audit({ appid: appids }).then((result) => { - this.$message.success(result.message, 1.5) - this.fetchData() - }) + Api.audit({ appid: appids }) + .then((result) => { + this.$message.success(result.message, 1.5) + this.fetchData() + }) + .finally(() => this.fetchData()) }, handleSearch() { this.queryParam.page = 1 @@ -285,7 +287,7 @@ export default { this.$message.success(result.message, 1.5) this.fetchData() }) - .finally(() => modal.destroy()) + .finally(this.fetchData()) }, }) },