From 98fe7a96b9355c0ad9e6146db5aeabd8597cd99b Mon Sep 17 00:00:00 2001
From: "@fawn-nine" <1271023382@qq.com>
Date: Mon, 31 Jul 2023 16:14:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/page/articleListEditor_E.vue | 14 +++++++++-----
 src/components/page/comArtHtmlEdit.vue      |  2 +-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/components/page/articleListEditor_E.vue b/src/components/page/articleListEditor_E.vue
index 73d7165..cbcd210 100644
--- a/src/components/page/articleListEditor_E.vue
+++ b/src/components/page/articleListEditor_E.vue
@@ -225,8 +225,8 @@
 				</div> -->
 				<p style="border-top: 2px dashed #0066994d;margin: 20px 0 0 0;padding: 20px 0 0 0;"> </p>
 				<el-collapse  v-model="collapseActiveNames">
-					<el-collapse-item name="html">
-						<template slot="title">
+					<el-collapse-item name="html" v-loading="loadHtml">
+						<template slot="title" >
 							Html Layout : 
 							<span style="margin-left: 15px;color: #666;" v-if="mains==''">No Layout</span>
 							<span style="margin-left: 15px;color: #0b4b6a;" v-if="mains!=''">Typesetting completed</span>
@@ -392,6 +392,7 @@ import { watch } from 'vue';
 				chooseData: [],
 				loading: false,
 				steps_jour: 0,
+				loadHtml:false,    // mains 加载动画
 				form:{
 					manuscirpt: '',
 				},
@@ -815,11 +816,13 @@ import { watch } from 'vue';
 
 			// 点击HTML查询数据
 			getMainsInfo(e){
+				this.loadHtml = true
 				this.$api
 					.post('api/Publish/getArticleMains', {
 						'article_id': e.article_id
 					})
 					.then(res => {
+						this.loadHtml = false
 						if (res.code == 0) {
 							// console.log(res,'res')	
 							this.mains = res.data.mains
@@ -827,7 +830,8 @@ import { watch } from 'vue';
 							this.$message.error(res.msg);
 						}
 					})
-					.catch(err => {						
+					.catch(err => {	
+						this.loadHtml = false					
 						this.$message.error(err);
 					});	
 			},
@@ -884,7 +888,7 @@ import { watch } from 'vue';
 						if (res.code == 0) {
 							loading.close()
 							this.HtmlVisible = false
-							if (this.UpHtpFIle.mains == '') {
+							if (this.mains == '') {
 								this.$router.push({
 									path: 'comArtHtmlCreat',
 									query: {
@@ -964,7 +968,7 @@ import { watch } from 'vue';
 		watch:{
 			HtmlVisible:{
 				handler(newVal, oldVal) {  				
-				if(this.UpHtpFIle.mains=='' && newVal == true){ //打开赋值
+				if(this.UpHtpFIle.mains==0 && newVal == true){ //打开赋值
 					this.collapseActiveNames.push('html')
 				}else{ // 关闭清空
 					this.collapseActiveNames = []
diff --git a/src/components/page/comArtHtmlEdit.vue b/src/components/page/comArtHtmlEdit.vue
index c796e10..8bde595 100644
--- a/src/components/page/comArtHtmlEdit.vue
+++ b/src/components/page/comArtHtmlEdit.vue
@@ -525,7 +525,7 @@ import VueUeditorWrap from 'vue-ueditor-wrap'; // ES6 Module
 			},
 			// 修改选中
 			handleCheckedChange(val){
-				console.log(val)				
+				// console.log(val)				
 			},
 
 			// 添加段落