natasha il y a 1 an
Parent
commit
36d2644a63

+ 11 - 8
src/views/content_manage/course_manage/LiveCourse.vue

@@ -336,7 +336,8 @@ export default {
         this.$confirm('审核', '', {
           confirmButtonText: '审核通过',
           cancelButtonText: '驳回',
-          showClose: false,
+          showClose: true,
+          distinguishCancelAndClose: true,
           type: 'warning'
         }).then(() => {
             data.is_pass = "true";
@@ -345,13 +346,15 @@ export default {
                 this.$message.success("已审核通过");
                 this.$set(this.tableData, index, updataData);
             });
-        }).catch(() => {
-            data.is_pass = "false";
-            updataData.status = 3;
-            getLogin(Mname, data).then(res => {
-                this.$message.success("已驳回");
-                this.$set(this.tableData, index, updataData);
-            });      
+        }).catch((action) => {
+            if(action === 'cancel'){
+                data.is_pass = "false";
+                updataData.status = 3;
+                getLogin(Mname, data).then(res => {
+                    this.$message.success("已驳回");
+                    this.$set(this.tableData, index, updataData);
+                });   
+            }
         });
     },
     handleSizeChange(val) {

+ 11 - 11
src/views/content_manage/newspaper_manage/index.vue

@@ -401,10 +401,7 @@ export default {
         pageNumbers: window.localStorage.getItem('pageNumbers')?Number(window.localStorage.getItem('pageNumbers')):1,
         tableHeight: "", // 表格高度
         total_count: 0,
-        dataSort: {
-            prop:'update_time',
-            order: 'descending'
-        },
+        dataSort: {},
         tabsIndex: window.localStorage.getItem('tabsIndex')?Number(window.localStorage.getItem('tabsIndex'))*1:0,
         check_flag: window.localStorage.getItem('tabsIndex')?Number(window.localStorage.getItem('tabsIndex'))*1===1?false:true:true,
         checkNumber: [0,0],
@@ -520,6 +517,7 @@ export default {
         this.$confirm('审核', '提示', {
           confirmButtonText: '审核通过',
           cancelButtonText: '驳回',
+          distinguishCancelAndClose: true,
           type: 'warning'
         }).then(() => {
             data.iss_status = 1;
@@ -528,13 +526,15 @@ export default {
                 this.$message.success("操作成功");
                 this.getList()
             });
-        }).catch(() => {
-            data.iss_status = 3;
-            updataData.iss_status = 3;
-            getLogin(Mname, data).then(res => {
-                this.$message.success("操作成功");
-                this.getList()
-            });      
+        }).catch((action) => {
+            if(action === 'cancel'){
+                data.iss_status = 3;
+                updataData.iss_status = 3;
+                getLogin(Mname, data).then(res => {
+                    this.$message.success("操作成功");
+                    this.getList()
+                });   
+            }
         });
     },
     // 审核