From 0174ea45c0320d19de3852b819abf57a14c43911 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Fri, 17 May 2024 13:52:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E4=BA=8E=E6=88=91=E4=BB=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/modules/module.vue |  5 ++-
 src/const/modules.js              | 38 +++++++++++++++----
 src/layouts/header/index.vue      |  3 ++
 src/pages/column/page/aboutUs.vue | 61 +++++++++++++++++--------------
 4 files changed, 70 insertions(+), 37 deletions(-)

diff --git a/src/components/modules/module.vue b/src/components/modules/module.vue
index 98ed084..ebb7bad 100644
--- a/src/components/modules/module.vue
+++ b/src/components/modules/module.vue
@@ -40,6 +40,7 @@
                   <i class="el-icon-picture-outline"></i>
                 </div>
               </template>
+							<div v-else-if="item.type === 'editor'" v-html="scope.row[item.prop]"></div>
               <p v-else>{{ scope.row[item.prop] }}</p>
             </template>
           </el-table-column>
@@ -78,7 +79,7 @@
                ref="form"
                :model="data.form"
                :rules="rules"
-               label-width="70px">
+               :label-width="data.labelWidth">
         <el-form-item v-for="(item, i) in data.forms"
                       :key="i"
                       :prop="item.prop"
@@ -385,6 +386,7 @@ export default {
     // 处理form表单参数
     handleForm () {
       const { type, forms, form, dialogWidth } = this.data
+      if (!this.data.labelWidth) this.data.labelWidth = '70px'
       this.fixed = false
       if (type === 'form' || type === 'forms') {
         forms.map(e => {
@@ -582,7 +584,6 @@ export default {
     // 编辑内容
     editIntro (row, i = 0) {
       this.data.form = JSON.parse(JSON.stringify(row))
-      if (!this.data.labelWidth) this.data.labelWidth = '60px'
       this.curModule = i
       this.contentVisible = true
     },
diff --git a/src/const/modules.js b/src/const/modules.js
index cb0a47a..95279af 100644
--- a/src/const/modules.js
+++ b/src/const/modules.js
@@ -698,7 +698,7 @@ export default {
 			}
 		},
 		{
-			type: 'form',
+			type: 'introduce',
 			forms: [
 				{
 					type: 'upload',
@@ -730,9 +730,9 @@ export default {
 				}
 			],
 			form: {
-				pic: 'https://huorantech.com/images/index/index0.png',
-				title: '他们说',
-				subTitle: '—— 河海大学老师',
+				pic: '',
+				title: '',
+				subTitle: '',
 				link: {
 					linkName: '无',
 					connectionType: 1,
@@ -744,8 +744,30 @@ export default {
 					otherArticleId: '',
 					isOpen: 1
 				},
-				des: `平台功能丰富，操作简单，自动判分功能，能更高效的批改作业给学生更好的指导。`
-			}
+				des: '',
+				isEnable: 1,
+			},
+			list: [
+				{
+					pic: 'https://huorantech.com/images/index/index0.png',
+					title: '他们说',
+					subTitle: '—— 河海大学老师',
+					link: {
+						linkName: '无',
+						connectionType: 1,
+						columnId: [],
+						articleId: '',
+						linkAddress	: '',
+						site: '',
+						otherColumnId: [],
+						otherArticleId: '',
+						isOpen: 1
+					},
+					des: `平台功能丰富，操作简单，自动判分功能，能更高效的批改作业给学生更好的指导。`,
+					isEnable: 1,
+				}
+			],
+      dialogWidth: '1100px',
 		},
 		{
 			type: 'introduce',
@@ -817,7 +839,7 @@ export default {
 				},
 				{
 					type: 'input',
-					prop: 'site',
+					prop: 'siteName',
 					label: '公司官网',
 				},
 				{
@@ -838,7 +860,7 @@ export default {
 			],
 			form: {
 				pic: 'https://huorantech.com/images/about/logo.png',
-				site: '公司官网：www.huorantech.com',
+				siteName: '公司官网：www.huorantech.com',
 				address: `地址：广东省深圳市南山区粤海街道海天二路盈峰中心2101`,
 				phone: `合作咨询：郭经理 17671782660`,
 				mail: `客户建议：service@huorantech.cn`,
diff --git a/src/layouts/header/index.vue b/src/layouts/header/index.vue
index ab5f99a..c984ea0 100644
--- a/src/layouts/header/index.vue
+++ b/src/layouts/header/index.vue
@@ -181,6 +181,9 @@ export default {
                 font-size: 14px;
             }
         }
+				/deep/.el-avatar > img {
+					width: 100%;
+				}
     }
 }
 </style>
\ No newline at end of file
diff --git a/src/pages/column/page/aboutUs.vue b/src/pages/column/page/aboutUs.vue
index 7e45494..695a9f9 100644
--- a/src/pages/column/page/aboutUs.vue
+++ b/src/pages/column/page/aboutUs.vue
@@ -179,36 +179,46 @@
                  @click="toSet(7)">点击更换标题与描述</div>
           </div>
 
-          <div class="client-pic c-wrap">
-            <img class="bg"
-                 :src="modules[8].form.pic"
-                 alt="">
-            <div class="text">
-              <div class="c-title1">
-                <img src="https://huorantech.com/images/index/comma1.png"
-                     alt="">
-                {{ modules[8].form.title }}
-              </div>
-              <div class="text"
-                   v-html="modules[8].form.des"></div>
-              <div class="c-title2">
-                {{ modules[8].form.subTitle }}
-                <img src="https://huorantech.com/images/index/comma2.png"
-                     alt="">
-              </div>
-              <div class="cover"
-                   @click="toSet(8)">点击更改图片、标题、概述与链接</div>
-            </div>
-          </div>
+					<el-carousel class="carousel" height="372px"
+                 :interval="6000"
+                 :arrow="(modules[8] && modules[8].list.filter(e => e.isEnable).length > 1) ? 'hover' : 'never'"
+                 :indicator-position="modules[8].list.filter(e => e.isEnable).length > 1 ? '' : 'none'">
+						<template v-for="(item, i) in modules[8].list">
+							<el-carousel-item v-if="item.isEnable" :key="i">
+								<div class="client-pic c-wrap">
+									<img class="bg"
+											:src="item.pic"
+											alt="">
+									<div class="text">
+										<div class="c-title1">
+											<img src="https://huorantech.com/images/index/comma1.png"
+													alt="">
+											{{ item.title }}
+										</div>
+										<div class="text"
+												v-html="item.des"></div>
+										<div class="c-title2">
+											{{ item.subTitle }}
+											<img src="https://huorantech.com/images/index/comma2.png"
+													alt="">
+										</div>
+										<div class="cover"
+												@click="toSet(8)">点击更改图片、标题、概述与链接</div>
+									</div>
+								</div>
+							</el-carousel-item>
+						</template>
+					</el-carousel>
+
           <div class="c-wrap">
             <scroll class="clients"
                     :data="modules[9].list"
                     :class-option="{limitMoveNum: 2, direction: 2}">
               <ul class="client-list"
                   ref="client">
-                <template v-for="item in modules[9].list">
+                <template v-for="(item, i) in modules[9].list">
                   <li v-if="item.isEnable"
-                      :key="item">
+                      :key="i">
                     <img :src="item.pic"
                          alt="">
                   </li>
@@ -245,7 +255,7 @@
                   <img class="icon"
                        src="https://huorantech.com/images/about/site.png"
                        alt="">
-                  {{ modules[11].form.site }}
+                  {{ modules[11].form.siteName }}
                 </div>
                 <div class="line">
                   <img class="icon"
@@ -268,9 +278,6 @@
                   {{ modules[11].form.mail }}
                 </div>
               </div>
-              <div class="cover"
-                   style="width: 800px"
-                   @click="toSet(11)">点击更改信息</div>
               <div class="cover"
                    style="width: 800px"
                    @click="toSet(11)">点击更改信息</div>