From 793c69760960076ea59a8ed9747bb7c243bd5fd5 Mon Sep 17 00:00:00 2001
From: song <srf428110@163.com>
Date: Wed, 2 Mar 2022 11:34:51 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=98=AF=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Detail/editor.vue  |  1 -
 src/components/News/addOrEdit.vue | 20 ++++++++++++++++----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/components/Detail/editor.vue b/src/components/Detail/editor.vue
index 83a4fea..b44abb4 100644
--- a/src/components/Detail/editor.vue
+++ b/src/components/Detail/editor.vue
@@ -59,7 +59,6 @@
     width: 100%;
     margin: 0 auto;
     position: relative;
-    z-index: 0;
   }
   .toolbar {
     border: 1px solid #ccc;
diff --git a/src/components/News/addOrEdit.vue b/src/components/News/addOrEdit.vue
index dc1b827..20779e1 100644
--- a/src/components/News/addOrEdit.vue
+++ b/src/components/News/addOrEdit.vue
@@ -1,7 +1,13 @@
 <template>
-    <div class="container">
+    <div class="container" v-loading.fullscreen.lock="showLoading" element-loading-text="拼命加载中">
         <div class="title">{{ showAdd ? '添加' : '修改' }}详情</div>
-        <el-form :model="formLabelAlign" :rules="rules" ref="ruleForm" label-width="140px" class="demo-ruleForm">
+        <el-form
+            :model="formLabelAlign"
+            :rules="rules"
+            ref="ruleForm"
+            label-width="140px"
+            class="demo-ruleForm"
+        >
             <el-form-item label="标题：" prop="title">
                 <el-input v-model="formLabelAlign.title" placeholder="标题" />
             </el-form-item>
@@ -32,7 +38,7 @@
                     <span slot="tip" class="el-upload__tip">只能上传jpg/png文件，且不超过500kb</span>
                 </el-upload>
             </el-form-item>
-            <el-form-item label="标题图片/视频：" prop="titleUrl" :rules="[
+            <el-form-item v-if="formLabelAlign.showType !== 0" :label="formLabelAlign.showType === 1 ? '标题图片：' : '标题视频：'" prop="titleUrl" :rules="[
                         { required: formLabelAlign.showType === 0 ? false : true, message: formLabelAlign.showType === 1 ? '请上传标题图片' : '请上传标题视频' },
                     ]">
                 <el-upload
@@ -103,6 +109,7 @@
 </template>
 
 <script>
+import { Loading } from 'element-ui';
     import Editor from '../Detail/editor.vue';
     import AddContentRelation from './addContentRelation.vue';
     import {BASE_API} from '../../config';
@@ -148,6 +155,7 @@
                     children: 'children'
                 },
                 loading: false,
+                showLoading: false,
                 rules: {
                     title: [
                         { type: 'string', required: true, message: '请输入标题', trigger: 'blur' }
@@ -260,7 +268,8 @@
              */
             async addCarousel(formName){
                 try {
-                    this.loading = true;
+                    // this.loading = true;
+                    Loading.service(options);
                     const params = formName;
                     params.showPage = formName.showPage[1],
                     await ADD_DETAIL(params).then((res) => {
@@ -306,11 +315,13 @@
              */
             async getDetail(){
                 try {
+                    this.showLoading = true;
                     const { introId } = this.currList
                     const params = {
                         introId,
                     };
                     await QUERY_DETAIL(params).then(res => {
+                        this.showLoading = false;
                         if(res.code === 200){
                             this.formLabelAlign.content = res.data.content
                         }else{
@@ -318,6 +329,7 @@
                         }
                     });
                 } catch (error) {
+                    this.showLoading = false;
                     console.log('error: ', error);
                 }
             },