diff --git a/src/assets/images/about/6.png b/src/assets/images/about/6.png
index 3c8389b..4638750 100644
Binary files a/src/assets/images/about/6.png and b/src/assets/images/about/6.png differ
diff --git a/src/assets/images/about/7.png b/src/assets/images/about/7.png
index 2034a43..bd87c1d 100644
Binary files a/src/assets/images/about/7.png and b/src/assets/images/about/7.png differ
diff --git a/src/assets/images/about/8.png b/src/assets/images/about/8.png
index 9d7376a..1a5363d 100644
Binary files a/src/assets/images/about/8.png and b/src/assets/images/about/8.png differ
diff --git a/src/libs/util.js b/src/libs/util.js
index eb20a02..c529715 100644
--- a/src/libs/util.js
+++ b/src/libs/util.js
@@ -166,7 +166,8 @@ const util = {
     // 去掉html里的标签及空格
     removeTag(list, prop = 'mainBody') {
       list.map(e => {
-        e.mainBody = e[prop].replace(/(<[^>]+>)|((&nbsp;)+)/g , '')
+        // 有摘要取摘要，没有摘要就去掉正文里的标签空格
+        e.mainBody = e.summary || e[prop].replace(/(<[^>]+>)|((&nbsp;)+)/g , '')
       })
       return list
     },
diff --git a/src/mixins/article/index.js b/src/mixins/article/index.js
index 64e1263..906be4d 100644
--- a/src/mixins/article/index.js
+++ b/src/mixins/article/index.js
@@ -25,7 +25,7 @@ export default {
             (this.$route.query.siteId || this.site) :
             to.siteSelection
           if (ids[1]) { // 文章
-            href = '/article?id=' + ids[1]
+            href = '/article?articleId=' + ids[1]
           } else { // 栏目
             const columnIds = ids[0].split(',')
             href = '/column?id=' + columnIds[columnIds.length - 1]
diff --git a/src/pages/article/editor.css b/src/pages/article/editor.css
index 0c4cb80..ebe0613 100644
--- a/src/pages/article/editor.css
+++ b/src/pages/article/editor.css
@@ -46,6 +46,7 @@
 }
 .tiny-wrap .quote {
   padding: 15px;
+  margin-bottom: 10px;
   font-size: 16px;
   font-style: italic;
   border: 1px solid #e3e3e3;
@@ -63,4 +64,8 @@
   font-size: 14px;
   color: #8d8d8d;
   text-align: center;
+}
+.tiny-wrap .block .pic {
+  width: 300px;
+  height: 190px;
 }
\ No newline at end of file
diff --git a/src/pages/column/index.vue b/src/pages/column/index.vue
index d904352..0b6aa2e 100644
--- a/src/pages/column/index.vue
+++ b/src/pages/column/index.vue
@@ -278,7 +278,7 @@ export default {
     },
     // 左边栏目
     getLeftColumn() {
-      this.$post(`${this.api.oneLevelChecksThemAll}?id=${this.id}`).then(({ data }) => {
+      this.$post(`${this.api.oneLevelChecksThemAll}?id=${this.id}&isSort=1`).then(({ data }) => {
         const fromColumn = this.$route.query.column // 有column标识的，说明是通过点击左侧导航跳转过来的，这种情况只查询该栏目下的文章
         const { typeId } = this.info
         this.sameStyle = 1
diff --git a/src/pages/edu/index.vue b/src/pages/edu/index.vue
index 6346f8f..4d10a27 100644
--- a/src/pages/edu/index.vue
+++ b/src/pages/edu/index.vue
@@ -103,17 +103,18 @@ export default {
     }
   }
   .pic {
-    width: 47%;
-    height: 730px;
+    width: 662px;
+    height: 753px;
   }
   .texts {
     position: absolute;
     top: 120px;
-    left: 610px;
+    left: 44%;
     width: 60%;
-    height: 440px;
+    height: 455px;
     padding: 60px 30px 30px 100px;
     background-color: #fff;
+    overflow: hidden;
     transition: .3s;
     &:hover {
       transform: scale(1.05);
@@ -139,8 +140,10 @@ export default {
     .pic {
       width: 45%;
     }
-    .texts {
-      width: 50%;
+    li:nth-child(odd) {
+      .texts {
+        width: 50%;
+      }
     }
   }
 }
diff --git a/src/pages/news/index.vue b/src/pages/news/index.vue
index 07803fa..1cd2698 100644
--- a/src/pages/news/index.vue
+++ b/src/pages/news/index.vue
@@ -121,7 +121,11 @@
                   </p>
                   <p v-if="item.onlineLocation" class="text">
                     <img class="icon" src="@/assets/images/online.png" alt="">
-                    Address: {{ item.onlineLocation }}
+                    Onlone: {{ item.onlineLocation }}
+                  </p>
+                  <p v-if="item.offlineLocation" class="text">
+                    <img class="icon" src="@/assets/images/location.png" alt="">
+                    Address: {{ item.offlineLocation }}
                   </p>
                 </div>
               </li>
@@ -518,7 +522,7 @@ export default {
     display: flex;
   }
   .left {
-    width: 688px;
+    width: 718px;
     margin-right: 20px;
     background-color: #fff;
     cursor: pointer;
@@ -556,7 +560,7 @@ export default {
     }
   }
   .card-list {
-    width: 784px;
+    width: 754px;
     li {
       display: flex;
       padding: 24px;
@@ -573,7 +577,7 @@ export default {
     }
     .pic {
       width: 188px;
-      height: 130px;
+      height: 145px;
       margin-right: 28px;
     }
     h6 {
diff --git a/src/pages/publish/index.vue b/src/pages/publish/index.vue
index 19c6f63..78cd74e 100644
--- a/src/pages/publish/index.vue
+++ b/src/pages/publish/index.vue
@@ -14,7 +14,7 @@
       </ul>
 
       <ul class="list">
-        <li v-for="(item, i) in list" :key="i">
+        <li v-for="(item, i) in list" :key="i" @click="toArtice(item)">
           <img class="pic" :src="item.titleImg" alt="">
           <div class="texts">
             <h6>{{ item.title }}</h6>
@@ -128,6 +128,7 @@ export default {
     align-items: center;
     padding: 28px 0;
     border-bottom: 1px solid #ddd;
+    cursor: pointer;
     &:last-child {
       border-bottom: 0;
     }
diff --git a/src/pages/science/index.vue b/src/pages/science/index.vue
index 5737fde..ae39ec4 100644
--- a/src/pages/science/index.vue
+++ b/src/pages/science/index.vue
@@ -16,22 +16,22 @@
         <div class="item">
           <img src="@/assets/images/science/1.png" alt="">
           <div class="texts">
-            <h6>为什么要建设S³FEL？</h6>
-            <div class="des">2006年，世界上第一台软X射线自由电子激光诞生于德国汉堡同步加速器实验室。 2009年，世界第一台硬X 射线自由电子线性相干光源 成功出光， LCLS可提供更高亮度和更好横向相干性的XFEL脉冲…</div>
+            <h6>{{ modules[1].form.title }}</h6>
+            <div class="des">{{ modules[1].form.des }}</div>
           </div>
         </div>
         <div class="item">
           <img src="@/assets/images/science/2.png" alt="">
           <div class="texts">
             <h6>X射线是什么</h6>
-            <div class="des">光源是人类文明发展的助推器。从火光到激光，每次光源的发展创新都有效推动了科学技术的发展，显著改变了人类认识世界的方式，并引起了人类社会的广泛变革。先进光源是人类探测物质分子、原子和壳和工具。</div>
+            <div class="des">{{ modules[1].form.des }}</div>
           </div>
         </div>
         <div class="item">
           <img src="@/assets/images/science/3.png" alt="">
           <div class="texts">
             <h6>X射线自由电子激光</h6>
-            <div class="des">FEL是一种以真空中相对论电子束为工作介质、在周期变化磁场中以受激辐射方式放大电磁波的新型强相干光源。FEL的装置通常由加速器、波荡器和光束线站三部分组成的波长连续可调，可覆盖极紫外…</div>
+            <div class="des">{{ modules[1].form.des }}</div>
           </div>
         </div>
       </div>
@@ -57,7 +57,6 @@ export default {
   },
   mounted() {
     new WOW().init()
-    this.getColumn()
   },
   methods: {
     // 获取文章详情
@@ -74,34 +73,6 @@ export default {
         }
       }).catch(err => {})
     },
-    // 获取父级所有栏目名称和id
-    getParent(data, id) {
-      for (const e of data) {
-        if (e.id == id) {
-          this.routes.push({
-            name: e.columnName,
-            query: {
-              id: e.id
-            }
-          })
-          break
-        } else if (e.children.length) {
-          this.routes.push({
-            name: e.columnName,
-            query: {
-              id: e.id
-            }
-          })
-          this.getParent(e.children, id)
-        }
-      }
-    },
-    // 获取上级面包屑
-    getColumn() {
-      this.$post(`${this.api.oneLevelChecksThemAll}?id=${this.id}`).then(({ data }) => {
-        this.getParent(data, this.id)
-      }).catch(err => {})
-    },
   }
 };
 </script>
diff --git a/src/setting.js b/src/setting.js
index d17ac60..401c3db 100644
--- a/src/setting.js
+++ b/src/setting.js
@@ -6,8 +6,8 @@ let host = `${location.origin}/`
 if (isDev) {
     host = 'http://192.168.31.136:10000/' // 测试服
   //  host = 'https://31k70639y6.zicp.fun/' // 测试服
-  //  host = 'http://192.168.31.51:10000/' // 榕
-    host = 'http://192.168.31.116:10000/' // 赓
+   host = 'http://192.168.31.51:10000/' // 榕
+    // host = 'http://192.168.31.116:10000/' // 赓
 }
 
 const Setting = {