diff --git a/src/layouts/header/index.vue b/src/layouts/header/index.vue
index 94a6aab..e3679d4 100644
--- a/src/layouts/header/index.vue
+++ b/src/layouts/header/index.vue
@@ -133,6 +133,7 @@ $height: 90px;
   display: flex;
   padding: 10px;
   background-color: #fff;
+  box-shadow: 0px 4px 7px 0px rgba(0,0,0,0.3);
   .icon {
     display: inline-flex;
     justify-content: center;
diff --git a/src/layouts/navbar/index.vue b/src/layouts/navbar/index.vue
index d58dbd5..faa153c 100644
--- a/src/layouts/navbar/index.vue
+++ b/src/layouts/navbar/index.vue
@@ -104,6 +104,7 @@ export default {
     jump(id) {
       this.getPath(this.menus ,id || this.menus[0].id)
       this.columnTo(this.toItem)
+      this.$parent.showSearch = false
     }
   }
 };
diff --git a/src/libs/resize/index.js b/src/libs/resize/index.js
index 8c2831f..3c98c24 100644
--- a/src/libs/resize/index.js
+++ b/src/libs/resize/index.js
@@ -7,7 +7,8 @@ function setRem() {
     // 当前页面宽度相对于 1920宽的缩放比例，可根据自己需要修改。
     const scale = document.documentElement.clientWidth / 1920;
     // 设置页面根节点字体大小（“Math.min(scale, 2)” 指最高放大比例为2，可根据实际业务需求调整）
-    document.documentElement.style.fontSize = baseSize * Math.min(scale, 2) + "px";
+    const size = baseSize * Math.min(scale, 2)
+    document.documentElement.style.fontSize = (size < 14 ? 14 : size) + "px";
 }
 
 // 初始化
diff --git a/src/mixins/page/index.js b/src/mixins/page/index.js
index 2e7601f..fcacf9f 100644
--- a/src/mixins/page/index.js
+++ b/src/mixins/page/index.js
@@ -11,7 +11,7 @@ export default {
     }
   },
   mounted() {
-    this.getInfo && this.getInfo()
+    this.getInfo && this.id && this.getInfo()
   },
   methods: {
     // 打开链接
diff --git a/src/pages/application/index.vue b/src/pages/application/index.vue
index f803485..626c719 100644
--- a/src/pages/application/index.vue
+++ b/src/pages/application/index.vue
@@ -122,7 +122,7 @@ export default {
 @import "../../styles/page/page.scss";
 .history {
   h2 {
-    font-size: 30px;
+    font-size: 1.8rem;
     color: #333;
   }
   .texts {
@@ -142,7 +142,7 @@ export default {
   }
   .des {
     margin: 20px 0;
-    font-size: 22px;
+    font-size: 1.2rem;
     color: #181818;
     line-height: 31px;
   }
@@ -199,7 +199,7 @@ export default {
   .text {
     position: relative;
     margin-top: 20px;
-    font-size: 32px;
+    font-size: 2rem;
     color: #fff;
   }
 }
@@ -231,7 +231,7 @@ export default {
     justify-content: center;
     align-items: center;
     height: 143px;
-    font-size: 30px;
+    font-size: 1.8rem;
     font-family: SFProDisplay-Bold, SFProDisplay;
     font-weight: bold;
     line-height: 40px;
@@ -269,17 +269,17 @@ export default {
     margin-left: 34px;
   }
   h6 {
-    font-size: 18px;
+    font-size: 1.1rem;
     color: #0648A8;
   }
   .des {
     margin: 14px 0;
-    font-size: 16px;
+    font-size: 1rem;
     color: #333;
     line-height: 22px;
   }
   .meta {
-    font-size: 16px;
+    font-size: 1rem;
     color: #999;
   }
 }
diff --git a/src/pages/article/activity.vue b/src/pages/article/activity.vue
index 613941e..b3661dc 100644
--- a/src/pages/article/activity.vue
+++ b/src/pages/article/activity.vue
@@ -142,6 +142,8 @@ export default {
     // 最新资讯
     getArticle() {
       this.$post(this.api.newlyPublishedArticles, {
+        role: 1,
+        isadmin: false,
         pageNum: 1,
         pageSize: 5,
         siteId: this.$route.query.siteId || this.$store.state.content.site
diff --git a/src/pages/article/index.vue b/src/pages/article/index.vue
index b0c3873..0774f62 100644
--- a/src/pages/article/index.vue
+++ b/src/pages/article/index.vue
@@ -86,7 +86,7 @@ export default {
   methods: {
     // 获取文章详情
     getInfo() {
-      this.$post(`${this.api.findArticle}?id=${this.id}`).then(({ data }) => {
+      this.id && this.$post(`${this.api.findArticle}?id=${this.id}`).then(({ data }) => {
         // 设置面包屑
         const { columnName, path, id } = this.$route.query
         this.routes = [
@@ -157,6 +157,8 @@ export default {
     // 最新资讯
     getArticle() {
       this.$post(this.api.newlyPublishedArticles, {
+        role: 1,
+        isadmin: false,
         pageNum: 1,
         pageSize: 5,
         siteId: this.$route.query.siteId || this.$store.state.content.site
diff --git a/src/pages/careers/index.vue b/src/pages/careers/index.vue
index 1976d40..a048f13 100644
--- a/src/pages/careers/index.vue
+++ b/src/pages/careers/index.vue
@@ -160,10 +160,10 @@ export default {
     }
     h6 {
       margin-bottom: 10px;
-      font-size: 35px;
+      font-size: 2rem;
     }
     .text {
-      font-size: 24px;
+      font-size: 1.3rem;
     }
     .arrow {
       position: absolute;
@@ -212,12 +212,12 @@ export default {
     width: 51%;
   }
   h6 {
-    font-size: 24px;
+    font-size: 1.4rem;
     color: #333;
   }
   .des {
     margin-top: 20px;
-    font-size: 20px;
+    font-size: 1.2rem;
     color: #666;
     line-height: 32px;
   }
@@ -275,17 +275,17 @@ export default {
     height: 100%;
   }
   h6 {
-    font-size: 46px;
+    font-size: 2.6rem;
     transition: .3s;
   }
   .sub {
     margin: 20px;
-    font-size: 36px;
+    font-size: 2rem;
     transition: .3s;
   }
   .des {
     margin-bottom: 40px;
-    font-size: 24px;
+    font-size: 1.2rem;
     transition: .3s;
   }
   .icon {
diff --git a/src/pages/column/index.vue b/src/pages/column/index.vue
index 98c6442..d73d080 100644
--- a/src/pages/column/index.vue
+++ b/src/pages/column/index.vue
@@ -202,7 +202,7 @@ export default {
     },
     // 获取栏目详情
     getInfo() {
-      this.$post(`${this.api.findColumn}?id=${this.id}`).then(({ data }) => {
+      this.id && this.$post(`${this.api.findColumn}?id=${this.id}`).then(({ data }) => {
         this.columnClick(data)
         if (data.typeId !== 3) this.loaded = true // 非长页，才展示页面
         this.info = data
@@ -321,6 +321,8 @@ export default {
     // 最新资讯
     getNews() {
       this.$post(this.api.newlyPublishedArticles, {
+        role: 1,
+        isadmin: false,
         pageNum: 1,
         pageSize: 5,
         siteId: this.$route.query.siteId || this.$store.state.content.site
@@ -391,6 +393,8 @@ export default {
         if (this.lableId.includes(e.id)) labelName.push(e.labelName)
       })
       this.$post(this.api.newlyPublishedArticles, {
+        role: 1,
+        isadmin: false,
         siteId: this.$route.query.siteId || this.site,
         columnIds,
         pageNum: this.page,
diff --git a/src/pages/column/result.vue b/src/pages/column/result.vue
index 43f0564..b4cf507 100644
--- a/src/pages/column/result.vue
+++ b/src/pages/column/result.vue
@@ -61,6 +61,8 @@ export default {
     getArticle() {
       this.setKeyword('')
       this.$post(this.api.newlyPublishedArticles, {
+        role: 1,
+        isadmin: false,
         siteId: this.$route.query.siteId || this.site,
         pageNum: 1,
         pageSize: 1000,
diff --git a/src/pages/deviceIntroBeam/index.vue b/src/pages/deviceIntroBeam/index.vue
index 07aafc6..7781f25 100644
--- a/src/pages/deviceIntroBeam/index.vue
+++ b/src/pages/deviceIntroBeam/index.vue
@@ -67,21 +67,21 @@ export default {
   }
   h6 {
     position: relative;
-    font-size: 48px;
+    font-size: 2.4rem;
     font-family: PingFangSC-Medium, PingFang SC;
     font-weight: 500;
     color: #333333;
   }
   .en {
-    margin-top: -35px;
-    font-size: 48px;
+    margin-top: -25px;
+    font-size: 2.4rem;
     font-family: PingFangSC-Light, PingFang SC;
     font-weight: 300;
     color: #E3E3E3;
   }
   .sum {
     margin-top: 60px;
-    font-size: 28px;
+    font-size: 1.2rem;
     font-family: PingFangSC-Medium, PingFang SC;
     font-weight: 500;
     color: #333333;
@@ -89,14 +89,14 @@ export default {
   }
   .des {
     margin-top: 25px;
-    font-size: 18px;
+    font-size: 1rem;
     color: #333;
     line-height: 37px;
     overflow: visible;
   }
   .pic {
-    width: 710px;
-    height: 509px;
+    width: 610px;
+    height: 409px;
     margin-top: -30px;
     border-top-left-radius: 20px;
   }
@@ -115,7 +115,7 @@ export default {
   .des {
     height: 100%;
     padding: 57px 60px 20px 60px;
-    font-size: 22px;
+    font-size: 1.2rem;
     color: #fff;
     line-height: 40px;
     background: #2E4984;
@@ -128,7 +128,7 @@ export default {
   h6 {
     padding-left: 15px;
     margin-bottom: 15px;
-    font-size: 20px;
+    font-size: 1.1rem;
     font-family: PingFangSC-Medium, PingFang SC;
     font-weight: 500;
     color: #2A2A2A;
diff --git a/src/pages/deviceIntroLayout/index.vue b/src/pages/deviceIntroLayout/index.vue
index d5f5380..aa8a5d3 100644
--- a/src/pages/deviceIntroLayout/index.vue
+++ b/src/pages/deviceIntroLayout/index.vue
@@ -68,14 +68,14 @@ export default {
   }
   h6 {
     position: relative;
-    font-size: 48px;
+    font-size: 2.2rem;
     font-family: PingFangSC-Medium, PingFang SC;
     font-weight: 500;
     color: #333333;
   }
   .en {
-    margin: -35px 0 40px;
-    font-size: 48px;
+    margin: -25px 0 40px;
+    font-size: 2.2rem;
     font-family: PingFangSC-Light, PingFang SC;
     font-weight: 300;
     color: #E3E3E3;
@@ -84,9 +84,9 @@ export default {
     position: absolute;
     left: 0;
     max-width: 1671px;
-    width: 90%;
+    width: 80%;
     padding: 32px 52px 25px 16%;
-    font-size: 24px;
+    font-size: 1.2rem;
     font-family: PingFangSC-Medium, PingFang SC;
     font-weight: 500;
     color: #FFFFFF;
@@ -95,7 +95,7 @@ export default {
   }
   .des {
     margin-top: 25px;
-    font-size: 18px;
+    font-size: 1rem;
     color: #333;
     line-height: 37px;
     overflow: visible;
@@ -129,7 +129,7 @@ export default {
   h6 {
     padding-left: 15px;
     margin-bottom: 15px;
-    font-size: 20px;
+    font-size: 1.1rem;
     font-family: PingFangSC-Medium, PingFang SC;
     font-weight: 500;
     color: #2A2A2A;
diff --git a/src/pages/deviceIntroLinear/index.vue b/src/pages/deviceIntroLinear/index.vue
index 801246e..b86c5d1 100644
--- a/src/pages/deviceIntroLinear/index.vue
+++ b/src/pages/deviceIntroLinear/index.vue
@@ -8,9 +8,9 @@
         <p class="en">Superconducting linac -1</p>
         <div class="texts wow fadeInDown" data-wow-delay="0.5s">
           <div class="left">
-            <h6>S³FEL的光阴极注入器/电子枪利用光电效应产生高亮度电子束团，并将其加速到90 MeV。</h6>
+            <h6>{{ modules[0].form.title }}</h6>
             <div class="line"></div>
-            <div class="des">主加速器基于超导连续波工作模式，采用三级加速、两级压缩的结构，将电子束团能量提高到2.5 GeV；同时在保持横向发射度不变的情况下，将电子束长度从几皮秒压缩到几十飞秒，峰值流强提升到800 A以上。相比基于常温加速技术的高增益FEL，超导直线加速器技术可以有效提高电子束流的重复频率，实现最高每秒106脉冲输出（常温加速技术为~102脉冲/秒），进而大幅度提高FEL激光的平均功率。</div>
+            <div class="text">{{ modules[0].form.des }}</div>
           </div>
           <img class="bg" src="@/assets/images/device/10.png" alt="">
         </div>
@@ -46,7 +46,20 @@ export default {
     new WOW().init()
   },
   methods: {
-    
+    // 获取文章详情
+    getInfo() {
+      // 预览/详情
+      this.$post(`${this.api[this.preview ? 'getRedisCache' : 'findPage']}?columnId=${this.id}`).then(({ data }) => {
+        if (data.length) {
+          // state：已发布（1）则取theEditedJson，草稿（0）则取jsonBeforeEditing
+          const json = JSON.parse(this.preview ?
+            data :
+            data[data.length - 1][data[data.length - 1].state ? 'theEditedJson' : 'jsonBeforeEditing'])
+          this.modules = json
+          console.log("🚀 ~ file: index.vue ~ line 180 ~ this.$post ~ json", json)
+        }
+      }).catch(err => {})
+    }
   }
 };
 </script>
@@ -64,14 +77,14 @@ export default {
   }
   h2 {
     position: relative;
-    font-size: 48px;
+    font-size: 2.2rem;
     font-family: PingFangSC-Semibold, PingFang SC;
     font-weight: 600;
     color: #1C1C1C;
   }
   .en {
-    margin: -35px 0 40px;
-    font-size: 48px;
+    margin: -25px 0 40px;
+    font-size: 2.2rem;
     font-family: PingFangSC-Light, PingFang SC;
     font-weight: 300;
     color: #E3E3E3;
@@ -92,7 +105,7 @@ export default {
     width: 50%;
   }
   h6 {
-    font-size: 28px;
+    font-size: 1.4rem;
     font-family: PingFangSC-Medium, PingFang SC;
     font-weight: 500;
     color: #FFFFFF;
@@ -104,13 +117,12 @@ export default {
     background: #FFFFFF;
     opacity: 0.52;
   }
-  .des {
-    font-size: 22px;
+  .text {
+    font-size: 1.1rem;
     font-family: PingFangSC-Regular, PingFang SC;
     font-weight: 400;
     color: #FFFFFF;
     line-height: 44px;
-    overflow: visible;
   }
   .bg {
     width: 50%;
@@ -121,8 +133,6 @@ export default {
 .intro {
   .inner {
     display: flex;
-    width: 90%;
-    max-width: 1504px;
   }
   .left {
     width: 30%;
@@ -133,7 +143,7 @@ export default {
   }
   h5 {
     margin-bottom: 15px;
-    font-size: 20px;
+    font-size: 1rem;
     font-family: PingFangSC-Medium, PingFang SC;
     font-weight: 500;
     color: #2A2A2A;
@@ -141,7 +151,7 @@ export default {
   h6 {
     padding-left: 15px;
     margin-bottom: 15px;
-    font-size: 20px;
+    font-size: 1rem;
     font-family: PingFangSC-Medium, PingFang SC;
     font-weight: 500;
     color: #2A2A2A;
diff --git a/src/pages/edu/index.vue b/src/pages/edu/index.vue
index a15d7ea..a659134 100644
--- a/src/pages/edu/index.vue
+++ b/src/pages/edu/index.vue
@@ -124,16 +124,16 @@ export default {
     }
   }
   h6 {
-    font-size: 40px;
+    font-size: 2.4rem;
     color: #3C3C3C;
   }
   .sub {
-    font-size: 24px;
+    font-size: 1.2rem;
     color: #1C1C1C;
     line-height: 33px;
   }
   .des {
-    font-size: 20px;
+    font-size: 1rem;
     color: #3C3C3C;
     line-height: 32px;
   }
diff --git a/src/pages/exp/index.vue b/src/pages/exp/index.vue
index 2756daf..7ff90eb 100644
--- a/src/pages/exp/index.vue
+++ b/src/pages/exp/index.vue
@@ -87,12 +87,9 @@ export default {
 @import url(../../plugins/wow/animate.css);
 @import "../../styles/page/page.scss";
 .station {
-  .inner {
-    width: 1200px;
-  }
   h6 {
     position: relative;
-    font-size: 48px;
+    font-size: 2rem;
     font-family: PingFangSC-Medium, PingFang SC;
     font-weight: 500;
     color: #333333;
@@ -100,18 +97,19 @@ export default {
   }
   .en {
     margin-bottom: 20px;
-    font-size: 45px;
+    font-size: 1.7rem;
     font-family: AppleSystemUIFont;
     color: #E4E4E4;
     line-height: 1;
   }
   .pic {
-    width: 100%;
-    height: 604px;
+    width: 80%;
+    height: 500px;
+    margin: 0 auto;
   }
   .des {
     margin-top: 55px;
-    font-size: 18px;
+    font-size: 1rem;
     color: #333;
     line-height: 34px;
     overflow: visible;
@@ -140,7 +138,7 @@ export default {
     position: absolute;
     top: 192px;
     left: 60px;
-    font-size: 30px;
+    font-size: 1.4rem;
     font-family: PingFangSC-Medium, PingFang SC;
     font-weight: 500;
     color: #fff;
diff --git a/src/pages/overviewDevHistory/index.vue b/src/pages/overviewDevHistory/index.vue
new file mode 100644
index 0000000..d2131bd
--- /dev/null
+++ b/src/pages/overviewDevHistory/index.vue
@@ -0,0 +1,127 @@
+<template>
+  <div class="wrap">
+    <div class="single-banner single-banner-overview">
+      <img class="banner-img" :src="modules[0].form.pic" alt="">
+      <div class="texts">
+        <h6 class="banner-title">{{ modules[0].form.title }}</h6>
+      </div>
+    </div>
+
+    <ul class="tabs wow fadeInLeft">
+      <template v-for="(item, i) in tabs">
+        <li :class="{active: i == active}" :key="i" @click="tabChange(i)">{{ item }}</li>
+      </template>
+    </ul>
+
+    <div class="tab-content">
+      <div class="org">
+        <div class="left">
+          <h6>组织架构</h6>
+          <p class="text">根据《深圳综合粒子设施理事会章程》有关规定，研究院实行理事会领导下的院长负责制，理事长由市长担任，副理事长由分管发改、科创副市长，以及中山大学、南方科技大学校长担任，理事成员包括市政府秘书长、相关副秘书长及政府部门、高等院校、科研机构、龙头企业相关负责同志。</p>
+        </div>
+        <img class="pic" src="@/assets/images/about.png" alt="">
+      </div>
+      <div class="lg-bg">
+        <img width="100%" src="@/assets/images/about-bg.png" alt="">
+      </div>
+      
+    </div>
+  </div>
+</template>
+
+<script>
+import mixins from '@/mixins/page'
+import WOW from 'wow.js'
+export default {
+  mixins: [mixins],
+  data() {
+    return {
+      active: 1,
+      tabs: ['S³FEL介绍', '发展历程', 'S³FEL宣传片', '地理位置', '机构设置']
+    }
+  },
+  mounted() {
+    new WOW().init()
+  },
+  methods: {
+    // 获取文章详情
+    getInfo() {
+      // 预览/详情
+      this.$post(`${this.api[this.preview ? 'getRedisCache' : 'findPage']}?columnId=${this.id}`).then(({ data }) => {
+        if (data.length) {
+          // state：已发布（1）则取theEditedJson，草稿（0）则取jsonBeforeEditing
+          const json = JSON.parse(this.preview ?
+            data :
+            data[data.length - 1][data[data.length - 1].state ? 'theEditedJson' : 'jsonBeforeEditing'])
+          this.modules = json
+          console.log("🚀 ~ file: index.vue ~ line 180 ~ this.$post ~ json", json)
+        }
+      }).catch(err => {})
+    },
+    // tab回调
+    tabChange(i) {
+      this.active = i
+      if (i == 2) this.$router.push('/overviewTrailer?id=165&siteId=3')
+    },
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+@import url(../../plugins/wow/animate.css);
+@import "../../styles/page/page.scss";
+.tabs {
+  display: flex;
+  justify-content: center;
+  box-shadow: 0px 2px 10px 0px rgba(223,223,223,0.28);
+  li {
+    padding: 25px 19px;
+    margin: 0 10px;
+    font-size: 1.1rem;
+    color: #333;
+    border-bottom: 4px solid transparent;
+    text-shadow: 0px 2px 14px rgba(167,167,167,0.26);
+    cursor: pointer;
+    &.active {
+      color: #1583FF;
+      border-bottom-color: #1583FF;
+    }
+  }
+}
+.tab-content {
+  padding: 77px 0;
+}
+.org {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  width: 1294px;
+  padding: 9px 86px 29px 116px;
+  margin: 0 auto 50px;
+  background: #FCFCFC;
+  border-radius: 160px;
+  .left {
+    width: 705px;
+  }
+  h6 {
+    font-size: 1.4rem;
+    font-family: AlimamaShuHeiTi-Bold, AlimamaShuHeiTi;
+    font-weight: bold;
+    color: #333;
+  }
+  .text {
+    margin-top: 10px;
+    font-size: 1rem;
+    color: #020202;
+    line-height: 2rem;
+  }
+  .pic {
+    width: 320px;
+    height: 282px;
+  }
+}
+.lg-bg {
+  width: 85%;
+  margin: 0 auto;
+}
+</style>
\ No newline at end of file
diff --git a/src/pages/overviewLocation/index.vue b/src/pages/overviewLocation/index.vue
index acb7b5a..e1676be 100644
--- a/src/pages/overviewLocation/index.vue
+++ b/src/pages/overviewLocation/index.vue
@@ -71,7 +71,7 @@ export default {
   li {
     padding: 25px 19px;
     margin: 0 10px;
-    font-size: 22px;
+    font-size: 1.1rem;
     color: #333;
     border-bottom: 4px solid transparent;
     text-shadow: 0px 2px 14px rgba(167,167,167,0.26);
diff --git a/src/pages/overviewSetup/index.vue b/src/pages/overviewSetup/index.vue
new file mode 100644
index 0000000..d34a1ee
--- /dev/null
+++ b/src/pages/overviewSetup/index.vue
@@ -0,0 +1,127 @@
+<template>
+  <div class="wrap">
+    <div class="single-banner single-banner-overview">
+      <img class="banner-img" :src="modules[0].form.pic" alt="">
+      <div class="texts">
+        <h6 class="banner-title">{{ modules[0].form.title }}</h6>
+      </div>
+    </div>
+
+    <ul class="tabs wow fadeInLeft">
+      <template v-for="(item, i) in tabs">
+        <li :class="{active: i == active}" :key="i" @click="tabChange(i)">{{ item }}</li>
+      </template>
+    </ul>
+
+    <div class="tab-content">
+      <div class="org">
+        <div class="left">
+          <h6>组织架构</h6>
+          <p class="text">根据《深圳综合粒子设施理事会章程》有关规定，研究院实行理事会领导下的院长负责制，理事长由市长担任，副理事长由分管发改、科创副市长，以及中山大学、南方科技大学校长担任，理事成员包括市政府秘书长、相关副秘书长及政府部门、高等院校、科研机构、龙头企业相关负责同志。</p>
+        </div>
+        <img class="pic" src="@/assets/images/about.png" alt="">
+      </div>
+      <div class="lg-bg">
+        <img width="100%" src="@/assets/images/about-bg.png" alt="">
+      </div>
+      
+    </div>
+  </div>
+</template>
+
+<script>
+import mixins from '@/mixins/page'
+import WOW from 'wow.js'
+export default {
+  mixins: [mixins],
+  data() {
+    return {
+      active: 4,
+      tabs: ['S³FEL介绍', '发展历程', 'S³FEL宣传片', '地理位置', '机构设置']
+    }
+  },
+  mounted() {
+    new WOW().init()
+  },
+  methods: {
+    // 获取文章详情
+    getInfo() {
+      // 预览/详情
+      this.$post(`${this.api[this.preview ? 'getRedisCache' : 'findPage']}?columnId=${this.id}`).then(({ data }) => {
+        if (data.length) {
+          // state：已发布（1）则取theEditedJson，草稿（0）则取jsonBeforeEditing
+          const json = JSON.parse(this.preview ?
+            data :
+            data[data.length - 1][data[data.length - 1].state ? 'theEditedJson' : 'jsonBeforeEditing'])
+          this.modules = json
+          console.log("🚀 ~ file: index.vue ~ line 180 ~ this.$post ~ json", json)
+        }
+      }).catch(err => {})
+    },
+    // tab回调
+    tabChange(i) {
+      this.active = i
+      if (i == 2) this.$router.push('/overviewTrailer?id=165&siteId=3')
+    },
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+@import url(../../plugins/wow/animate.css);
+@import "../../styles/page/page.scss";
+.tabs {
+  display: flex;
+  justify-content: center;
+  box-shadow: 0px 2px 10px 0px rgba(223,223,223,0.28);
+  li {
+    padding: 25px 19px;
+    margin: 0 10px;
+    font-size: 1.1rem;
+    color: #333;
+    border-bottom: 4px solid transparent;
+    text-shadow: 0px 2px 14px rgba(167,167,167,0.26);
+    cursor: pointer;
+    &.active {
+      color: #1583FF;
+      border-bottom-color: #1583FF;
+    }
+  }
+}
+.tab-content {
+  padding: 77px 0;
+}
+.org {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  width: 1294px;
+  padding: 9px 86px 29px 116px;
+  margin: 0 auto 50px;
+  background: #FCFCFC;
+  border-radius: 160px;
+  .left {
+    width: 705px;
+  }
+  h6 {
+    font-size: 1.4rem;
+    font-family: AlimamaShuHeiTi-Bold, AlimamaShuHeiTi;
+    font-weight: bold;
+    color: #333;
+  }
+  .text {
+    margin-top: 10px;
+    font-size: 1rem;
+    color: #020202;
+    line-height: 2rem;
+  }
+  .pic {
+    width: 320px;
+    height: 282px;
+  }
+}
+.lg-bg {
+  width: 85%;
+  margin: 0 auto;
+}
+</style>
\ No newline at end of file
diff --git a/src/pages/overviewTrailer/index.vue b/src/pages/overviewTrailer/index.vue
index 53dd6ca..35f68bf 100644
--- a/src/pages/overviewTrailer/index.vue
+++ b/src/pages/overviewTrailer/index.vue
@@ -77,7 +77,7 @@ export default {
   li {
     padding: 25px 19px;
     margin: 0 10px;
-    font-size: 22px;
+    font-size: 1.1rem;
     color: #333;
     border-bottom: 4px solid transparent;
     text-shadow: 0px 2px 14px rgba(167,167,167,0.26);
diff --git a/src/pages/publish/index.vue b/src/pages/publish/index.vue
index 78cd74e..165ef11 100644
--- a/src/pages/publish/index.vue
+++ b/src/pages/publish/index.vue
@@ -57,6 +57,8 @@ export default {
     // 查询文章列表
     getArticle() {
       this.$post(this.api.newlyPublishedArticles, {
+        role: 1,
+        isadmin: false,
         siteId: this.$route.query.siteId || this.site,
         columnIds: [this.id],
         pageNum: this.page,
diff --git a/src/pages/publish/show.vue b/src/pages/publish/show.vue
index 6ed0175..8cb79a3 100644
--- a/src/pages/publish/show.vue
+++ b/src/pages/publish/show.vue
@@ -150,6 +150,8 @@ export default {
       }).catch(err => {})
 
       this.$post(this.api.newlyPublishedArticles, {
+        role: 1,
+        isadmin: false,
         pageNum: 1,
         pageSize: 5,
         siteId: this.$route.query.siteId || this.$store.state.content.site
diff --git a/src/pages/research/index.vue b/src/pages/research/index.vue
index 392786e..c426ab3 100644
--- a/src/pages/research/index.vue
+++ b/src/pages/research/index.vue
@@ -149,11 +149,11 @@ export default {
     overflow: hidden;
   }
   h6 {
-    font-size: 30px;
+    font-size: 1.8rem;
     white-space: nowrap;
   }
   .des {
-    font-size: 22px;
+    font-size: 1.2rem;
     color: rgba(255,255,255,0.55);
   }
 }
@@ -186,7 +186,7 @@ export default {
     align-items: center;
     height: 143px;
     padding: 0 30px;
-    font-size: 30px;
+    font-size: 1.8rem;
     font-family: SFProDisplay-Bold, SFProDisplay;
     font-weight: bold;
     line-height: 40px;
@@ -196,9 +196,6 @@ export default {
     transition: .3s;
   }
 }
-.news-inner {
-  width: 1558px;
-}
 .news {
   display: flex;
   justify-content: center;
@@ -233,17 +230,12 @@ export default {
   }
   h6 {
     margin: 35px 0 12px;
-    font-size: 24px;
+    font-size: 1.3rem;
     line-height: 33px;
   }
   .des {
-    font-size: 18px;
+    font-size: 1.1rem;
     line-height: 26px;
   }
 }
-@media (max-width: 1570px) {
-  .news-inner {
-    width: 98%;
-  }
-}
 </style>
\ No newline at end of file
diff --git a/src/pages/science/index.vue b/src/pages/science/index.vue
index 45200cf..076eea7 100644
--- a/src/pages/science/index.vue
+++ b/src/pages/science/index.vue
@@ -87,8 +87,8 @@ export default {
     }
   }
   img {
-    width: 100%;
-    height: 508px;
+    width: 90%;
+    height: 400px;
   }
   &:nth-child(2) .texts {
     color: #fff;
@@ -100,7 +100,7 @@ export default {
   }
   &:nth-child(even) .texts {
     left: auto;
-    right: -28px;
+    right: 0;
   }
   .texts {
     position: absolute;
@@ -114,12 +114,12 @@ export default {
   }
   h6 {
     margin-bottom: 14px;
-    font-size: 36px;
+    font-size: 2rem;
     font-family: PingFangSC-Medium, PingFang SC;
     font-weight: 500;
   }
   .des {
-    font-size: 18px;
+    font-size: 1rem;
   }
 }
 </style>
\ No newline at end of file
diff --git a/src/pages/sfel/index.vue b/src/pages/sfel/index.vue
index d22d04f..905c63b 100644
--- a/src/pages/sfel/index.vue
+++ b/src/pages/sfel/index.vue
@@ -389,7 +389,7 @@ export default {
   border-bottom: 1px solid #ddd;
   h5 {
     padding-left: 16px;
-    font-size: 36px;
+    font-size: 1.6rem;
     font-family: PingFangSC-Medium, PingFang SC;
     font-weight: 500;
     color: #333333;
@@ -397,19 +397,19 @@ export default {
     border-left: 6px solid #2B96EF;
   }
   .sub {
-    font-size: 22px;
+    font-size: 1.1rem;
     font-family: PingFangSC-Medium, PingFang SC;
     font-weight: 500;
     color: #AFB7BF;
   }
   .more {
-    font-size: 14px;
+    font-size: .8rem;
     color: #666;
     cursor: pointer;
   }
 }
 .lg {
-  width: 1505px;
+  // width: 1505px;
 }
 /deep/.articles {
   width: 50%;
@@ -464,17 +464,17 @@ export default {
     }
   }
   h6 {
-    font-size: 24px;
+    font-size: 1.3rem;
     transition: .3s;
   }
   .des {
     margin: 30px 0;
-    font-size: 16px;
+    font-size: .9rem;
     line-height: 24px;
     transition: .3s;
   }
   .meta {
-    font-size: 16px;
+    font-size: .8rem;
     transition: .3s;
   }
 }
@@ -504,13 +504,13 @@ export default {
     padding: 40px 30px;
   }
   .meta {
-    font-size: 16px;
+    font-size: .9rem;
     color: #666;
   }
   .des {
     height: 60px;
     margin: 10px 0;
-    font-size: 20px;
+    font-size: 1.1rem;
     font-family: SFProDisplay;
     font-weight: 500;
     color: #333;
@@ -528,7 +528,7 @@ export default {
 .shop-shows {
   display: flex;
   .left {
-    width: 660px;
+    width: 50%;
     margin-right: 20px;
     .item {
       position: relative;
@@ -545,9 +545,9 @@ export default {
         left: 0;
         width: 100%;
         padding: 0 20px;
-        font-size: 18px;
+        font-size: 1rem;
         color: #fff;
-        line-height: 59px;
+        line-height: 3rem;
         @include ellipsis;
         background-color: rgba(0, 0, 0, 0.57);
       }
@@ -569,6 +569,7 @@ export default {
       }
     }
     .cards {
+      height: 136px;
       padding: 20px;
       background-color: #fff;
       transition: .5s;
@@ -578,20 +579,20 @@ export default {
       }
       h6 {
         margin-bottom: 10px;
-        font-size: 18px;
+        font-size: 1rem;
         color: #48525E;
       }
       .a-line {
         @include ellipsis;
       }
       .sum {
-        font-size: 14px;
+        font-size: .9rem;
         color: #6D7C8E;
         @include ellipsis;
       }
       .date {
         margin-top: 24px;
-        font-size: 14px;
+        font-size: .9rem;
         color: #C4CCD7;
       }
     }
@@ -607,7 +608,7 @@ export default {
     }
   }
   .right {
-    width: 824px;
+    width: 50%;
   }
   .card-list {
     li {
@@ -630,14 +631,14 @@ export default {
       text-align: center;
     }
     .d {
-      font-size: 36px;
+      font-size: 2rem;
       font-family: DINCondensed-Bold, DINCondensed;
       font-weight: bold;
       color: #333333;
       line-height: 43px;
     }
     .m {
-      font-size: 14px;
+      font-size: .9rem;
       font-family: PingFangSC-Regular, PingFang SC;
       font-weight: 400;
       color: #666666;
@@ -648,14 +649,14 @@ export default {
     }
     h6 {
       margin-bottom: 10px;
-      font-size: 18px;
+      font-size: 1.1rem;
       font-family: PingFangSC-Medium, PingFang SC;
       font-weight: 500;
       color: #1583FF;
       @include ellipsis;
     }
     .des {
-      font-size: 16px;
+      font-size: 1rem;
       color: #666;
       line-height: 26px;
       -webkit-line-clamp: 2;
@@ -677,8 +678,8 @@ export default {
       left: 0;
       width: 100%;
       padding: 0 12px;
-      line-height: 59px;
-      font-size: 18px;
+      line-height: 3rem;
+      font-size: 1rem;
       font-family: PingFangSC-Medium, PingFang SC;
       font-weight: 500;
       color: #FFFFFF;
@@ -698,8 +699,9 @@ export default {
   }
   .left {
     position: relative;
-    min-width: 698px;
-    height: 688px;
+    width: 550px;
+    min-width: 550px;
+    height: 550px;
     margin-right: 20px;
     cursor: pointer;
     overflow: hidden;
@@ -709,8 +711,8 @@ export default {
       left: 0;
       width: 100%;
       padding: 0 12px;
-      line-height: 59px;
-      font-size: 18px;
+      line-height: 3rem;
+      font-size: 1rem;
       font-family: PingFangSC-Medium, PingFang SC;
       font-weight: 500;
       color: #FFFFFF;
@@ -726,12 +728,12 @@ export default {
     }
   }
   .card-list {
-    width: 784px;
+    width: 600px;
     li {
       display: flex;
       align-items: center;
-      padding: 14px;
-      margin-bottom: 21px;
+      padding: 6px;
+      margin-bottom: 7px;
       background-color: #fff;
       cursor: pointer;
       transition: .3s;
@@ -743,22 +745,22 @@ export default {
       }
     }
     .pic {
-      width: 188px;
-      height: 188px;
+      width: 167px;
+      height: 167px;
       margin-right: 36px;
     }
     .texts {
-      width: 530px;
+      width: calc(100% - 210px);
     }
     h6 {
       margin-bottom: 10px;
-      font-size: 20px;
+      font-size: 1.2rem;
       color: #333;
       @include ellipsis;
     }
     .sum {
-      margin-bottom: 15px;
-      font-size: 16px;
+      margin-bottom: 6px;
+      font-size: 1rem;
       color: #666;
       @include ellipsis;
     }
@@ -766,6 +768,8 @@ export default {
       display: flex;
       align-items: center;
       margin: 10px 0;
+      font-size: .9rem;
+      @include ellipsis;
     }
     .icon {
       margin-right: 5px;
@@ -802,8 +806,8 @@ export default {
         left: 0;
         width: 100%;
         padding: 0 27px;
-        line-height: 48px;
-        font-size: 16px;
+        line-height: 2.5rem;
+        font-size: 1rem;
         color: #FFFFFF;
         @include ellipsis;
         background-color: rgba(0, 0, 0, 0.49);
@@ -832,7 +836,7 @@ export default {
       }
       h6 {
         margin-bottom: 17px;
-        font-size: 18px;
+        font-size: 1.1rem;
         font-family: PingFangSC-Medium, PingFang SC;
         font-weight: 500;
         color: #272727;
@@ -841,7 +845,7 @@ export default {
         @include ellipsis;
       }
       .des {
-        font-size: 14px;
+        font-size: .9rem;
         color: #666;
         -webkit-line-clamp: 2;
       }
@@ -866,7 +870,7 @@ export default {
       padding: 40px 28px;
     }
     h6 {
-      font-size: 24px;
+      font-size: 1.2rem;
       font-family: PingFangSC-Medium, PingFang SC;
       font-weight: 500;
       color: #272727;
@@ -875,7 +879,7 @@ export default {
       @include ellipsis;
     }
     .des {
-      margin-top: 16px;
+      margin-top: 1rem;
       font-size: 16px;
       color: #666;
       -webkit-line-clamp: 2;
@@ -894,9 +898,6 @@ export default {
 .news {
   background: url(../../assets/images/sfel/5.png) (0 504px)/auto no-repeat,
               url(../../assets/images/sfel/6.png) (bottom right)/auto no-repeat;
-  .inner {
-    width: 1400px;
-  }
 }
 .news {
   display: flex;
@@ -932,11 +933,11 @@ export default {
   }
   h6 {
     margin: 35px 0 12px;
-    font-size: 24px;
+    font-size: 1.3rem;
     line-height: 33px;
   }
   .des {
-    font-size: 18px;
+    font-size: 1rem;
     line-height: 26px;
   }
 }
@@ -952,19 +953,19 @@ export default {
     padding: 56px;
     background: #FBFBFB;
     h6 {
-      font-size: 24px;
+      font-size: 1.3rem;
       font-family: PingFangSC-Medium, PingFang SC;
       font-weight: 500;
       color: #333333;
     }
     .des {
       margin: 35px 0 25px;
-      font-size: 16px;
+      font-size: 1rem;
       color: #666;
       line-height: 32px;
     }
     .meta {
-      font-size: 14px;
+      font-size: .9rem;
       color: #666;
     }
   }
@@ -986,7 +987,7 @@ export default {
   .list {
     display: flex;
     li {
-      width: calc((100% - 44px) / 3);
+      width: calc((100% - 28px) / 3);
       height: 204px;
       padding: 36px 22px;
       margin-right: 14px;
@@ -1007,14 +1008,14 @@ export default {
     .des {
       height: 90px;
       margin-bottom: 30px;
-      font-size: 18px;
+      font-size: 1rem;
       font-family: PingFangSC-Medium, PingFang SC;
       font-weight: 500;
       color: #FFFFFF;
       line-height: 30px;
     }
     .date {
-      font-size: 16px;
+      font-size: .9rem;
       font-family: LaoSangamMN;
       color: #FFFFFF;
     }
@@ -1035,7 +1036,7 @@ export default {
   .nav {
     li {
       padding: 0 10px;
-      font-size: 16px;
+      font-size: 1.1rem;
       line-height: 50px;
       color: #fff;
       background-color: #1D1D1D;
@@ -1051,9 +1052,6 @@ export default {
   }
 }
 @media (max-width: 1520px) {
-  .lg {
-    width: 98%;
-  }
   .conference .card-list {
     width: 734px;
     .texts {
diff --git a/src/pages/talent/index.vue b/src/pages/talent/index.vue
index 47e3af2..677320f 100644
--- a/src/pages/talent/index.vue
+++ b/src/pages/talent/index.vue
@@ -160,12 +160,12 @@ export default {
   }
   h6 {
     margin-bottom: 24px;
-    font-size: 50px;
+    font-size: 2.4rem;
     font-family: PingFangSC-Light, PingFang SC;
     font-weight: 300;
   }
   .des {
-    font-size: 18px;
+    font-size: 1rem;
     line-height: 33px;
     -webkit-line-clamp: 8;
   }
@@ -173,7 +173,7 @@ export default {
 .style {
   h6 {
     margin-bottom: 59px;
-    font-size: 48px;
+    font-size: 2.4rem;
     font-family: PingFangSC-Medium, PingFang SC;
     font-weight: 500;
     text-align: center;
@@ -194,8 +194,8 @@ export default {
     left: 0;
     width: 100%;
     padding: 0 30px;
-    line-height: 68px;
-    font-size: 24px;
+    line-height: 3.4rem;
+    font-size: 1.2rem;
     color: #fff;
     background: rgba(0,0,0,0.38);
   }
@@ -237,17 +237,17 @@ export default {
     padding: 0 58px;
   }
   .type {
-    font-size: 18px;
+    font-size: 1rem;
   }
   h6 {
     margin: 20px 0;
-    font-size: 28px;
+    font-size: 1.6rem;
     font-family: PingFangSC-Medium, PingFang SC;
     font-weight: 500;
   }
   .des {
     margin-bottom: 30px;
-    font-size: 16px;
+    font-size: 0.9rem;
     line-height: 30px;
   }
 }
diff --git a/src/pages/userSharing/index.vue b/src/pages/userSharing/index.vue
index fa7f57d..c3f4618 100644
--- a/src/pages/userSharing/index.vue
+++ b/src/pages/userSharing/index.vue
@@ -86,33 +86,32 @@ export default {
   position: relative;
   .inner {
     display: flex;
-    width: 1476px;
   }
   .left {
-    width: 509px;
+    width: 40%;
   }
   h6 {
     position: relative;
-    font-size: 48px;
+    font-size: 2.2rem;
     font-family: PingFangSC-Medium, PingFang SC;
     font-weight: 500;
     color: #333333;
   }
   .en {
-    margin-top: -35px;
-    font-size: 45px;
+    margin-top: -25px;
+    font-size: 2rem;
     font-family: AppleSystemUIFont;
     color: #E4E4E4;
   }
   .des {
     margin-top: 25px;
-    font-size: 18px;
+    font-size: 1rem;
     color: #333;
     line-height: 37px;
     overflow: visible;
   }
   .pic {
-    width: 944px;
+    width: 60%;
     height: 568px;
     border-top-left-radius: 20px;
   }
@@ -122,20 +121,20 @@ export default {
     left: 0;
     width: 1068px;
     height: 145px;
-    padding: 20px 0 0 11%;
+    padding: 30px 0 0 11%;
     background: #7BACC4;
     border-radius: 0px 100px 0px 0px;
     opacity: 0.88;
   }
   .title {
     margin-bottom: 10px;
-    font-size: 40px;
+    font-size: 1.8rem;
     font-family: PingFangSC-Medium, PingFang SC;
     font-weight: 500;
     color: #fff;
   }
   .en-text {
-    font-size: 28px;
+    font-size: 1.3rem;
     font-family: AppleSystemUIFont;
     color: #fff;
     letter-spacing: 2px;
@@ -144,14 +143,19 @@ export default {
 .group {
   display: flex;
   justify-content: center;
+  width: 1000px;
+  margin: 0 auto;
   li {
     position: relative;
-    width: 420px;
-    height: 390px;
-    padding: 195px 0 0 32px;
+    width: calc((100% - 40px) / 3);
+    height: 300px;
+    padding: 110px 20px 0 32px;
     margin-right: 20px;
     color: #fff;
     overflow: hidden;
+    &:last-child {
+      margin-right: 0;
+    }
     &:hover {
       img {
         transform: scale(1.3);
@@ -168,14 +172,14 @@ export default {
   }
   h6 {
     position: relative;
-    font-size: 36px;
+    font-size: 1.5rem;
     font-family: PingFangSC-Medium, PingFang SC;
     font-weight: 500;
   }
   .des {
     position: relative;
     margin-top: 16px;
-    font-size: 18px;
+    font-size: 0.9rem;
     font-family: PingFangSC-Medium, PingFang SC;
     font-weight: 500;
     line-height: 31px;
diff --git a/src/router/modules/overviewSetup.js b/src/router/modules/overviewSetup.js
new file mode 100644
index 0000000..7e1b977
--- /dev/null
+++ b/src/router/modules/overviewSetup.js
@@ -0,0 +1,14 @@
+import BasicLayout from '@/layouts/home'
+const name = 'overviewSetup'
+export default {
+  path: `/${name}`,
+  component: BasicLayout,
+  children: [
+    {
+      name,
+      path: `/${name}`,
+      component: () => import(`@/pages/${name}`),
+      meta: { title: '' }
+    }
+  ]
+};
diff --git a/src/styles/page/page.scss b/src/styles/page/page.scss
index fcf1d2f..639b017 100644
--- a/src/styles/page/page.scss
+++ b/src/styles/page/page.scss
@@ -4,7 +4,7 @@
   .b-title {
     position: relative;
     margin-bottom: 50px;
-    font-size: 50px;
+    font-size: 3rem;
     font-family: SFProDisplay-Bold, SFProDisplay;
     font-weight: bold;
     color: #333333;
@@ -24,7 +24,7 @@
   }
   .intro {
     margin-bottom: 80px;
-    font-size: 30px;
+    font-size: 1.6rem;
     text-align: center;
     color: #5B5B5E;
     line-height: 40px;
@@ -32,13 +32,13 @@
   }
 }
 .inner {
-  width: 1400px;
+  width: 1200px;
   margin: 0 auto;
 }
 .banner {
   height: 280px;
   padding: 123px 0 0 243px;
-  font-size: 48px;
+  font-size: 2rem;
   color: #fff;
 }
 .banner-item {
@@ -53,7 +53,7 @@
     position: absolute;
     bottom: 87px;
     left: 213px;
-    font-size: 48px;
+    font-size: 2rem;
     font-family: SFProDisplay-Bold;
     font-weight: bold;
     line-height: 58px;
@@ -79,11 +79,11 @@
   }
   .banner-title {
     margin-bottom: 19px;
-    font-size: 48px;
+    font-size: 2.2rem;
     font-family: PingFangSC-Medium, PingFang SC;
   }
   .banner-des {
-    font-size: 24px;
+    font-size: 1.2rem;
     font-family: PingFangSC-Medium, PingFang SC;
   }
 }
@@ -113,6 +113,6 @@
 }
 @media (max-width: 1410px) {
   .inner {
-    width: 98%;
+    width: 80%;
   }
 }
\ No newline at end of file