From 8e8625dcda97071e7930d396536d1bc3b65d4fbb Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Thu, 20 Apr 2023 16:48:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/devHistory/index.vue         |  4 ++--
 src/pages/estate/event/index.vue       |  6 +++---
 src/pages/estate/index/index.vue       |  2 +-
 src/pages/estate/location/index.vue    |  4 ++--
 src/pages/estate/survey/index.vue      |  2 +-
 src/pages/org/index.vue                | 22 ++++++++++------------
 src/pages/overview/index.vue           | 14 +++++++-------
 src/pages/overviewDevHistory/index.vue |  2 +-
 8 files changed, 27 insertions(+), 29 deletions(-)

diff --git a/src/pages/devHistory/index.vue b/src/pages/devHistory/index.vue
index 259d9d6..728e45f 100644
--- a/src/pages/devHistory/index.vue
+++ b/src/pages/devHistory/index.vue
@@ -66,14 +66,14 @@ export default {
 .history {
   h6 {
     position: relative;
-    font-size: 2.4rem;
+    font-size: 2.2rem;
     font-family: PingFangSC-Medium, PingFang SC;
     font-weight: 500;
     color: #333333;
   }
   .en {
     margin-top: -25px;
-    font-size: 2.4rem;
+    font-size: 2.2rem;
     font-family: PingFangSC-Light, PingFang SC;
     font-weight: 300;
     color: #E3E3E3;
diff --git a/src/pages/estate/event/index.vue b/src/pages/estate/event/index.vue
index c1fa526..df06781 100644
--- a/src/pages/estate/event/index.vue
+++ b/src/pages/estate/event/index.vue
@@ -97,14 +97,14 @@ export default {
 .history {
   h2 {
     position: relative;
-    font-size: 2.2rem;
+    font-size: 2rem;
     font-family: PingFangSC-Semibold, PingFang SC;
     font-weight: 600;
     color: #1C1C1C;
   }
   .en {
     margin: -15px 0 40px;
-    font-size: 2.2rem;
+    font-size: 2rem;
     font-family: PingFangSC-Light, PingFang SC;
     font-weight: 300;
     color: #E3E3E3;
@@ -150,7 +150,7 @@ export default {
   }
   .year {
     margin: 0 0 20px 20px;
-    font-size: 3.8rem;
+    font-size: 3.2rem;
     font-family: ToppanBunkyuMidashiGothicStdN-ExtraBold, ToppanBunkyuMidashiGothicStdN;
     font-weight: 800;
     color: #1A81F4;
diff --git a/src/pages/estate/index/index.vue b/src/pages/estate/index/index.vue
index 794e8a1..b55bf6e 100644
--- a/src/pages/estate/index/index.vue
+++ b/src/pages/estate/index/index.vue
@@ -381,7 +381,7 @@ export default {
   .des {
     height: 60px;
     margin: 10px 0;
-    font-size: 1.1rem;
+    font-size: 1rem;
     font-family: SFProDisplay;
     font-weight: 500;
     color: #333;
diff --git a/src/pages/estate/location/index.vue b/src/pages/estate/location/index.vue
index a97e61e..a8f8400 100644
--- a/src/pages/estate/location/index.vue
+++ b/src/pages/estate/location/index.vue
@@ -89,7 +89,7 @@ export default {
 }
 
 .tab-content {
-  width: 80%;
+  width: 70%;
   max-width: 1504px;
   padding-bottom: 100px;
   margin: 30px auto 0;
@@ -131,7 +131,7 @@ export default {
   }
   h6 {
     margin-bottom: 24px;
-    font-size: 2.4rem;
+    font-size: 2rem;
     font-family: PingFangSC-Light, PingFang SC;
     font-weight: 300;
   }
diff --git a/src/pages/estate/survey/index.vue b/src/pages/estate/survey/index.vue
index f866a8a..82aebfe 100644
--- a/src/pages/estate/survey/index.vue
+++ b/src/pages/estate/survey/index.vue
@@ -83,7 +83,7 @@ export default {
   h6 {
     position: relative;
     margin-bottom: 30px;
-    font-size: 1.4rem;
+    font-size: 1.2rem;
     font-family: AlimamaShuHeiTi-Bold, AlimamaShuHeiTi;
     font-weight: bold;
     color: #333;
diff --git a/src/pages/org/index.vue b/src/pages/org/index.vue
index d5c0917..d125ce4 100644
--- a/src/pages/org/index.vue
+++ b/src/pages/org/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="wrap">
+  <div class="wrap p-b-30">
     <div class="single-banner single-banner-overview">
       <img class="banner-img" :src="modules[0].form.pic" alt="">
       <div class="texts">
@@ -7,17 +7,15 @@
       </div>
     </div>
 
-    <div class="tab-content">
-      <div class="org">
-        <div class="left">
-          <h6>{{ modules[1].form.title }}</h6>
-          <p class="text" v-html="modules[1].form.des"></p>
-        </div>
-        <img class="pic" src="http://10.10.11.7/images/overviewSetup/1.png" alt="">
-      </div>
-      <div class="lg-bg">
-        <img width="100%" :src="modules[2].form.pic" alt="">
+    <div class="org">
+      <div class="left">
+        <h6>{{ modules[1].form.title }}</h6>
+        <p class="text" v-html="modules[1].form.des"></p>
       </div>
+      <img class="pic" src="http://10.10.11.7/images/overviewSetup/1.png" alt="">
+    </div>
+    <div class="lg-bg">
+      <img width="100%" :src="modules[2].form.pic" alt="">
     </div>
   </div>
 </template>
@@ -95,7 +93,7 @@ export default {
   }
 }
 .lg-bg {
-  width: 85%;
+  width: 65%;
   margin: 0 auto;
 }
 @media (max-width: 1200px) {
diff --git a/src/pages/overview/index.vue b/src/pages/overview/index.vue
index 8ebb287..5ead310 100644
--- a/src/pages/overview/index.vue
+++ b/src/pages/overview/index.vue
@@ -29,7 +29,7 @@
             <div class="texts">
               <h6>{{ modules[5].form.title }}</h6>
               <div class="text" v-html="modules[5].form.des"></div>
-              <img src="@/assets/images/arrow.png" alt="" class="arrow">
+              <img src="@/assets/images/arrow.png" alt="" :class="{'arrow': isLink(modules[5].form.link.linkName)}" @click="openLink(modules[5].form)">
             </div>
           </li>
           <li>
@@ -37,26 +37,26 @@
             <div class="texts">
               <h6>{{ modules[6].form.title }}</h6>
               <div class="text" v-html="modules[6].form.des"></div>
-              <img src="@/assets/images/arrow.png" alt="" class="arrow">
+              <img src="@/assets/images/arrow.png" alt="" :class="{'arrow': isLink(modules[6].form.link.linkName)}" @click="openLink(modules[6].form)">
             </div>
           </li>
         </ul>
         <ul class="l-card">
-          <li>
+          <li :class="{'cursor-pointer': isLink(modules[7].form.link.linkName)}" @click="openLink(modules[7].form)">
             <img :src="modules[7].form.pic" alt="" class="pic" />
             <div class="texts">
               <h6>{{ modules[7].form.title }}</h6>
               <div class="text" v-html="modules[7].form.des"></div>
             </div>
           </li>
-          <li>
+          <li :class="{'cursor-pointer': isLink(modules[8].form.link.linkName)}" @click="openLink(modules[8].form)">
             <img :src="modules[8].form.pic" alt="" class="pic" />
             <div class="texts">
               <h6>{{ modules[8].form.title }}</h6>
               <div class="text" v-html="modules[8].form.des"></div>
             </div>
           </li>
-          <li>
+          <li :class="{'cursor-pointer': isLink(modules[9].form.link.linkName)}" @click="openLink(modules[9].form)">
             <img :src="modules[9].form.pic" alt="" class="pic" />
             <div class="texts">
               <h6>{{ modules[9].form.title }}</h6>
@@ -230,7 +230,7 @@ export default {
     }
     h6 {
       margin-bottom: 15px;
-      font-size: 2rem;
+      font-size: 1.6rem;
       font-family: PingFangSC-Medium, PingFang SC;
     }
     .text {
@@ -284,7 +284,7 @@ export default {
       font-size: 1rem;
       font-family: PingFangSC-Medium, PingFang SC;
       color: #333;
-      line-height: 2;
+      line-height: 1.6;
       @include mul-ellipsis(2);
     }
   }
diff --git a/src/pages/overviewDevHistory/index.vue b/src/pages/overviewDevHistory/index.vue
index ef16598..da246b7 100644
--- a/src/pages/overviewDevHistory/index.vue
+++ b/src/pages/overviewDevHistory/index.vue
@@ -149,7 +149,7 @@ export default {
   }
   .year {
     margin: 0 0 20px 20px;
-    font-size: 3.8rem;
+    font-size: 3.2rem;
     font-family: ToppanBunkyuMidashiGothicStdN-ExtraBold, ToppanBunkyuMidashiGothicStdN;
     font-weight: 800;
     color: #1A81F4;