From 902767cde86e45e91bd248c86c5e03a9d276a2c0 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Fri, 17 May 2024 11:15:47 +0800
Subject: [PATCH] fix

---
 .env                        |  1 +
 .prettierrc                 |  2 +-
 public/index.html           |  2 --
 src/pages/aboutUs/index.vue | 54 +++++++++++++++++++++++--------------
 4 files changed, 36 insertions(+), 23 deletions(-)
 create mode 100644 .env
diff --git a/.env b/.env
new file mode 100644
index 0000000..603af94
--- /dev/null
+++ b/.env
@@ -0,0 +1 @@
+VUE_APP_BASE_URL = '/'
\ No newline at end of file
diff --git a/.prettierrc b/.prettierrc
index c5f454b..c4faeef 100644
--- a/.prettierrc
+++ b/.prettierrc
@@ -1,5 +1,5 @@
 {
-	"tabWidth": 4,
+	"tabWidth": 2,
 	"singleQuote": true,
 	"trailingComma": "none",
 	"printWidth": 140
diff --git a/public/index.html b/public/index.html
index 58b7de0..f69e0b0 100644
--- a/public/index.html
+++ b/public/index.html
@@ -5,7 +5,6 @@
         <meta http-equiv="X-UA-Compatible" content="IE=edge" />
         <meta name="keywords" content="职站商城,深圳或然科技,或然科技,教育产业互联网,金融科技,实训软件,虚拟仿真,数字经济,国泰安" />
         <meta name="description" content="一站式数字经济实训软件采购商城" />
-        <meta name="baidu-site-verification" content="code-TRfXe8xIkJ" />
         <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
         <!-- <meta name="viewport" content="width=device-width, user-scalable=yes, shrink-to-fit=no" /> -->
         <script>
@@ -17,7 +16,6 @@
                 s.parentNode.insertBefore(hm, s);
             })();
         </script>
-        <!-- <title>产业学院平台</title> -->
         <title>职站商城</title>
     </head>
     <body>
diff --git a/src/pages/aboutUs/index.vue b/src/pages/aboutUs/index.vue
index dca2e21..ce64bcc 100644
--- a/src/pages/aboutUs/index.vue
+++ b/src/pages/aboutUs/index.vue
@@ -141,25 +141,39 @@
         <h6 class="i-title animate">{{ modules[7].form.title }}</h6>
         <p class="en fadeInUp">{{ modules[7].form.subTitle }}</p>
         <p class="title-des animate">{{ modules[7].form.des }}</p>
-        <div class="client-pic">
-          <img class="bg fadeInLeft"
-               :src="modules[8].form.pic"
-               alt="">
-          <div class="text fadeInRight">
-            <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>
-        </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" :class="{'cursor-pointer': isLink(item.link.linkName)}"
+                     @click="openLink(item)">
+								<img class="bg fadeInLeft"
+										:src="item.pic"
+										alt="">
+								<div class="text fadeInRight">
+									<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>
+							</div>
+						</el-carousel-item>
+					</template>
+				</el-carousel>
+
+
         <scroll class="clients"
                 :data="clients"
                 :class-option="{limitMoveNum: 2, direction: 2}">
@@ -199,7 +213,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"
