Merge branch 'main' of http://git.njrzwl.cn:3000/wangmingchuan/yanzong_vue_admin

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: {

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

src/views/store/auth.vue

@@ -19,13 +19,26 @@
           <a-form-item class="search-btn">
             <a-button type="primary" @click="handleQrcode">授权二维码</a-button>
           </a-form-item>
+          <a-form-item class="search-btn">
+            <a-button type="primary" @click="handleBatchTest">批量发布体验版</a-button>
+          </a-form-item>
+          <a-form-item class="search-btn">
+            <a-button type="primary" @click="handleBatch">批量发布正式版</a-button>
+          </a-form-item>
         </a-form>
       </a-row>
       <!-- 操作板块 -->
       <div class="row-item-tab clearfix"></div>
     </div>
 
-    <a-table :rowKey="(record) => record.id" :columns="columns" :data-source="list" bordered :pagination="false">
+    <a-table
+      :rowKey="(record) => record.appid"
+      :columns="columns"
+      :data-source="list"
+      bordered
+      :pagination="false"
+      :rowSelection="rowSelection"
+    >
       <span slot="exp_info" slot-scope="text, item">
         <p v-if="item.exp_info.exp_version">版本:{{ item.exp_info.exp_version }}</p>
         <p v-if="item.exp_info.exp_time">时间:{{ item.exp_info.exp_time }}</p>
@@ -41,8 +54,9 @@
       </span>
       <!-- 操作项 -->
       <span class="actions" slot="action" slot-scope="text, item">
-        <a @click="handleCommit(item)">发布体验版</a>
-        <a @click="handleVersion(item)">刷新版本信息</a>
+        <a @click="handleCommit(item.appid)">发布体验版</a>
+        <a @click="handleAudit(item.appid)">发布正式版</a>
+        <a @click="handleVersion(item)">刷新版本</a>
       </span>
     </a-table>
     <Qrcode ref="qrcode" />
@@ -89,6 +103,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 +120,7 @@ const columns = [
     scopedSlots: { customRender: 'exp_info' },
   },
   {
-    title: '线上版',
+    title: '正式版',
     width: '200px',
     key: 'release_info',
     scopedSlots: { customRender: 'release_info' },
@@ -117,7 +141,7 @@ const columns = [
 
   {
     title: '操作',
-    width: '300px',
+    width: '250px',
     key: 'action',
     fixed: 'right',
     scopedSlots: { customRender: 'action' },
@@ -183,8 +207,29 @@ 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()
+        })
+        .finally(() => this.fetchData())
     },
     handleSearch() {
       this.queryParam.page = 1
@@ -207,7 +252,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 +276,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(this.fetchData())
+        },
+      })
+    },
     /**
      * 刷新列表
      * @param Boolean bool 强制刷新到第一页

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()
     },

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',