From 251dc122956298522fac00632aaaa3a5378ccedb Mon Sep 17 00:00:00 2001
From: lucky <srf428110@163.com>
Date: Sat, 26 Feb 2022 20:15:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=A0=E9=99=A4=E5=BC=B9?=
 =?UTF-8?q?=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Banner/index.vue | 51 ++++++++++++++++-----------------
 src/components/Detail/index.vue | 51 ++++++++++++++++-----------------
 src/components/News/index.vue   |  5 ++--
 src/utils/request.js            |  2 +-
 4 files changed, 52 insertions(+), 57 deletions(-)

diff --git a/src/components/Banner/index.vue b/src/components/Banner/index.vue
index 424ed24..f3132b2 100644
--- a/src/components/Banner/index.vue
+++ b/src/components/Banner/index.vue
@@ -52,7 +52,7 @@
                     fixed="right"
                     label="操作"
                     align="center"
-                    width="250">
+                    width="230">
                     <template slot-scope="lists">
                         <el-button
                             type="primary"
@@ -62,19 +62,7 @@
                             size="mini">
                             编辑
                         </el-button>
-
-                        <el-popover
-                            placement="top"
-                            width="160"
-                            :value="visible">
-                            <p>确定删除吗？</p>
-                            <div style="text-align: right; margin: 0">
-                                <el-button size="mini" type="text" @click="visible = false">取消</el-button>
-                                <el-button type="danger" size="mini" plain @click="deleteItem(lists.row.id)">确定</el-button>
-                            </div>
-                            <el-button slot="reference" @click="visible = true" type="danger" icon="el-icon-delete" size="mini">删除</el-button>
-                        </el-popover>
-
+                        <el-button type="danger" icon="el-icon-delete" size="mini" @click="deleteItem(lists.row.id)">删除</el-button>
                     </template>
                 </el-table-column>
             </el-table>
@@ -128,7 +116,6 @@
                 currList: null,
                 pageSize: 10,
                 pageNum: 1,
-                visible: false,
                 showAdd: true,
             }
         },
@@ -204,18 +191,28 @@
              * 删除
              */
             deleteItem(id) {
-                const params = {
-                    id
-                };
-                POST_DELETE_CAROUSEL(params).then((res) => {
-                    if(res.code === 200){
-                        Alert.success('删除成功');
-                        this.getList()
-                    }else{
-                        Alert.fail(res.msg || '删除失败');
-                    }
-                });
-                this.visible = false
+                try {
+                    this.$alert('确定删除该条轮播图吗？', '请确认', {
+                        confirmButtonText: '确定',
+                        callback: res => {
+                            if(res === 'confirm') {
+                                const params = {
+                                    id
+                                };
+                                POST_DELETE_CAROUSEL(params).then((res) => {
+                                    if(res.code === 200){
+                                        Alert.success('删除成功');
+                                        this.getList()
+                                    }else{
+                                        Alert.fail(res.msg || '删除失败');
+                                    }
+                                });
+                            }
+                        }
+                    });
+                } catch (error) {
+                    console.error('error: ', error);
+                }
             },
 
             // 关闭弹窗
diff --git a/src/components/Detail/index.vue b/src/components/Detail/index.vue
index eef0640..bb94fef 100644
--- a/src/components/Detail/index.vue
+++ b/src/components/Detail/index.vue
@@ -67,6 +67,7 @@
                     fixed="right"
                     label="操作"
                     align="center"
+                    width="230"
                     >
                     <template slot-scope="lists">
                         <el-button
@@ -77,19 +78,7 @@
                             size="mini">
                             编辑
                         </el-button>
-
-                        <el-popover
-                            placement="top"
-                            width="160"
-                            :value="visible">
-                            <p>确定删除吗？</p>
-                            <div style="text-align: right; margin: 0">
-                                <el-button size="mini" type="text" @click="visible = false">取消</el-button>
-                                <el-button type="danger" size="mini" plain @click="deleteItem(lists.row.detailId)">确定</el-button>
-                            </div>
-                            <el-button slot="reference" @click="visible = true" type="danger" icon="el-icon-delete" size="mini">删除</el-button>
-                        </el-popover>
-
+                        <el-button type="danger" icon="el-icon-delete" size="mini" @click="deleteItem(lists.row.detailId)">删除</el-button>
                     </template>
                 </el-table-column>
             </el-table>
@@ -143,7 +132,6 @@
                 currList: null,
                 pageSize: 10,
                 pageNum: 1,
-                visible: false,
                 showAdd: true,
                 content: '',
                 keys: []
@@ -262,18 +250,29 @@
              * 删除
              */
             deleteItem(detailId) {
-                const params = {
-                    detailId
-                };
-                DELETE_DETAIL(params).then((res) => {
-                    if(res.code === 200){
-                        Alert.success('删除成功');
-                        this.getList()
-                    }else{
-                        Alert.fail(res.msg || '删除失败');
-                    }
-                });
-                this.visible = false
+                try {
+                    this.$alert('确定删除该条内容吗？', '请确认', {
+                        confirmButtonText: '确定',
+                        callback: res => {
+                            if(res === 'confirm') {
+                                const params = {
+                                    detailId
+                                };
+                                DELETE_DETAIL(params).then((res) => {
+                                    if(res.code === 200){
+                                        Alert.success('删除成功');
+                                        this.getList()
+                                    }else{
+                                        Alert.fail(res.msg || '删除失败');
+                                    }
+                                });
+                            }
+                        }
+                    });
+                } catch (error) {
+                    console.error('error: ', error);
+                }
+
             },
         }
     }
diff --git a/src/components/News/index.vue b/src/components/News/index.vue
index 9285c5b..2f4aa64 100644
--- a/src/components/News/index.vue
+++ b/src/components/News/index.vue
@@ -81,7 +81,7 @@
                     fixed="right"
                     label="操作"
                     align="center"
-                    width="250"
+                    width="230"
                     >
                     <template slot-scope="lists">
                         <el-button
@@ -198,11 +198,10 @@
             /**
              * 单个内容详情
              */
-            async getDetail(row, title){
+            async getDetail(row){
                 try {
                     const params = {
                         introId: row.introId,
-                        title: title || '',
                     };
                     this.loading = true
                     await QUERY_DETAIL(params).then(res => {
diff --git a/src/utils/request.js b/src/utils/request.js
index 5b6bc49..9c3b3fc 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -9,7 +9,7 @@ import myalert from './alert';
 // create an axios instance
 const service = axios.create({
   baseURL: BASE_API, // api 的 base_url
-  timeout: 8000 // request timeout
+  timeout: 20000 // request timeout
 })
 
 // request interceptor