From c2592a5e42377dd390358231e00c2f57ffc0a2fe Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Thu, 20 Oct 2022 11:44:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BE=E7=89=87=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/{img => images}/annex.png       | Bin
 src/assets/{img => images}/article1.png    | Bin
 src/assets/{img => images}/article2.png    | Bin
 src/assets/{img => images}/article3.png    | Bin
 src/assets/{img => images}/code.png        | Bin
 src/assets/{img => images}/content.png     | Bin
 src/assets/{img => images}/expand.png      | Bin
 src/assets/{img => images}/group.png       | Bin
 src/assets/{img => images}/index.png       | Bin
 src/assets/{img => images}/info1.png       | Bin
 src/assets/{img => images}/list1.png       | Bin
 src/assets/{img => images}/list2.png       | Bin
 src/assets/{img => images}/list3.png       | Bin
 src/assets/{img => images}/logo.png        | Bin
 src/assets/{img => images}/node.png        | Bin
 src/assets/{img => images}/notice.png      | Bin
 src/assets/{img => images}/person/bg.png   | Bin
 src/assets/{img => images}/phone.png       | Bin
 src/assets/{img => images}/plus.png        | Bin
 src/assets/{img => images}/pw.png          | Bin
 src/assets/{img => images}/ques.png        | Bin
 src/assets/{img => images}/setting.png     | Bin
 src/assets/{img => images}/site-active.png | Bin
 src/assets/{img => images}/site.png        | Bin
 src/assets/{img => images}/style1.png      | Bin
 src/assets/{img => images}/style2.png      | Bin
 src/assets/{img => images}/user.png        | Bin
 src/layouts/header/index.vue               |   6 ++--
 src/layouts/navbar/index.vue               |  14 ++++----
 src/pages/account/login/index.vue          |   6 ++--
 src/pages/article/add/editor.js            |  39 ++++++++++++++++++---
 src/pages/article/add/index.vue            |   8 ++---
 src/pages/article/list/index.vue           |  10 ++++--
 src/pages/column/add/index.vue             |  14 ++++----
 src/pages/column/list/index.vue            |   6 ++--
 src/pages/page/add/index.vue               |  12 +++----
 src/pages/page/list/index.vue              |  30 ++++++----------
 src/pages/setting/list/info.vue            |   2 +-
 src/pages/user/list/index.vue              |   6 ++--
 src/setting.js                             |   2 +-
 40 files changed, 90 insertions(+), 65 deletions(-)
 rename src/assets/{img => images}/annex.png (100%)
 rename src/assets/{img => images}/article1.png (100%)
 rename src/assets/{img => images}/article2.png (100%)
 rename src/assets/{img => images}/article3.png (100%)
 rename src/assets/{img => images}/code.png (100%)
 rename src/assets/{img => images}/content.png (100%)
 rename src/assets/{img => images}/expand.png (100%)
 rename src/assets/{img => images}/group.png (100%)
 rename src/assets/{img => images}/index.png (100%)
 rename src/assets/{img => images}/info1.png (100%)
 rename src/assets/{img => images}/list1.png (100%)
 rename src/assets/{img => images}/list2.png (100%)
 rename src/assets/{img => images}/list3.png (100%)
 rename src/assets/{img => images}/logo.png (100%)
 rename src/assets/{img => images}/node.png (100%)
 rename src/assets/{img => images}/notice.png (100%)
 rename src/assets/{img => images}/person/bg.png (100%)
 rename src/assets/{img => images}/phone.png (100%)
 rename src/assets/{img => images}/plus.png (100%)
 rename src/assets/{img => images}/pw.png (100%)
 rename src/assets/{img => images}/ques.png (100%)
 rename src/assets/{img => images}/setting.png (100%)
 rename src/assets/{img => images}/site-active.png (100%)
 rename src/assets/{img => images}/site.png (100%)
 rename src/assets/{img => images}/style1.png (100%)
 rename src/assets/{img => images}/style2.png (100%)
 rename src/assets/{img => images}/user.png (100%)

diff --git a/src/assets/img/annex.png b/src/assets/images/annex.png
similarity index 100%
rename from src/assets/img/annex.png
rename to src/assets/images/annex.png
diff --git a/src/assets/img/article1.png b/src/assets/images/article1.png
similarity index 100%
rename from src/assets/img/article1.png
rename to src/assets/images/article1.png
diff --git a/src/assets/img/article2.png b/src/assets/images/article2.png
similarity index 100%
rename from src/assets/img/article2.png
rename to src/assets/images/article2.png
diff --git a/src/assets/img/article3.png b/src/assets/images/article3.png
similarity index 100%
rename from src/assets/img/article3.png
rename to src/assets/images/article3.png
diff --git a/src/assets/img/code.png b/src/assets/images/code.png
similarity index 100%
rename from src/assets/img/code.png
rename to src/assets/images/code.png
diff --git a/src/assets/img/content.png b/src/assets/images/content.png
similarity index 100%
rename from src/assets/img/content.png
rename to src/assets/images/content.png
diff --git a/src/assets/img/expand.png b/src/assets/images/expand.png
similarity index 100%
rename from src/assets/img/expand.png
rename to src/assets/images/expand.png
diff --git a/src/assets/img/group.png b/src/assets/images/group.png
similarity index 100%
rename from src/assets/img/group.png
rename to src/assets/images/group.png
diff --git a/src/assets/img/index.png b/src/assets/images/index.png
similarity index 100%
rename from src/assets/img/index.png
rename to src/assets/images/index.png
diff --git a/src/assets/img/info1.png b/src/assets/images/info1.png
similarity index 100%
rename from src/assets/img/info1.png
rename to src/assets/images/info1.png
diff --git a/src/assets/img/list1.png b/src/assets/images/list1.png
similarity index 100%
rename from src/assets/img/list1.png
rename to src/assets/images/list1.png
diff --git a/src/assets/img/list2.png b/src/assets/images/list2.png
similarity index 100%
rename from src/assets/img/list2.png
rename to src/assets/images/list2.png
diff --git a/src/assets/img/list3.png b/src/assets/images/list3.png
similarity index 100%
rename from src/assets/img/list3.png
rename to src/assets/images/list3.png
diff --git a/src/assets/img/logo.png b/src/assets/images/logo.png
similarity index 100%
rename from src/assets/img/logo.png
rename to src/assets/images/logo.png
diff --git a/src/assets/img/node.png b/src/assets/images/node.png
similarity index 100%
rename from src/assets/img/node.png
rename to src/assets/images/node.png
diff --git a/src/assets/img/notice.png b/src/assets/images/notice.png
similarity index 100%
rename from src/assets/img/notice.png
rename to src/assets/images/notice.png
diff --git a/src/assets/img/person/bg.png b/src/assets/images/person/bg.png
similarity index 100%
rename from src/assets/img/person/bg.png
rename to src/assets/images/person/bg.png
diff --git a/src/assets/img/phone.png b/src/assets/images/phone.png
similarity index 100%
rename from src/assets/img/phone.png
rename to src/assets/images/phone.png
diff --git a/src/assets/img/plus.png b/src/assets/images/plus.png
similarity index 100%
rename from src/assets/img/plus.png
rename to src/assets/images/plus.png
diff --git a/src/assets/img/pw.png b/src/assets/images/pw.png
similarity index 100%
rename from src/assets/img/pw.png
rename to src/assets/images/pw.png
diff --git a/src/assets/img/ques.png b/src/assets/images/ques.png
similarity index 100%
rename from src/assets/img/ques.png
rename to src/assets/images/ques.png
diff --git a/src/assets/img/setting.png b/src/assets/images/setting.png
similarity index 100%
rename from src/assets/img/setting.png
rename to src/assets/images/setting.png
diff --git a/src/assets/img/site-active.png b/src/assets/images/site-active.png
similarity index 100%
rename from src/assets/img/site-active.png
rename to src/assets/images/site-active.png
diff --git a/src/assets/img/site.png b/src/assets/images/site.png
similarity index 100%
rename from src/assets/img/site.png
rename to src/assets/images/site.png
diff --git a/src/assets/img/style1.png b/src/assets/images/style1.png
similarity index 100%
rename from src/assets/img/style1.png
rename to src/assets/images/style1.png
diff --git a/src/assets/img/style2.png b/src/assets/images/style2.png
similarity index 100%
rename from src/assets/img/style2.png
rename to src/assets/images/style2.png
diff --git a/src/assets/img/user.png b/src/assets/images/user.png
similarity index 100%
rename from src/assets/img/user.png
rename to src/assets/images/user.png
diff --git a/src/layouts/header/index.vue b/src/layouts/header/index.vue
index 53392d9..baa2587 100644
--- a/src/layouts/header/index.vue
+++ b/src/layouts/header/index.vue
@@ -1,13 +1,13 @@
 <template>
   <div class="header">
     <div class="group">
-      <img src="@/assets/img/group.png">
+      <img src="@/assets/images/group.png">
       <breadcrumb v-if="crumbRefresh" ref="breadcrumb" :data="crumbs"></breadcrumb>
     </div>
     <div class="user-tool">
       <template v-if="inContent">
         <div class="site cp">
-          <img src="@/assets/img/index.png">
+          <img src="@/assets/images/index.png">
           当前站点首页
         </div>
         <el-dropdown class="site-switch cp" @command="siteCommand">
@@ -19,7 +19,7 @@
           </el-dropdown-menu>
         </el-dropdown>
       </template>
-      <!-- <img class="cp" src="@/assets/img/notice.png"> -->
+      <!-- <img class="cp" src="@/assets/images/notice.png"> -->
       <el-dropdown class="user-wrap" @command="userCommand">
         <div class="user">
           <el-avatar :size="36" :src="avatar"></el-avatar>
diff --git a/src/layouts/navbar/index.vue b/src/layouts/navbar/index.vue
index 56c17d1..0c3374f 100644
--- a/src/layouts/navbar/index.vue
+++ b/src/layouts/navbar/index.vue
@@ -2,7 +2,7 @@
   <div>
     <div v-show="!collapse" class="flex-1">
       <div class="logo">
-        <img src="@/assets/img/logo.png" alt="">
+        <img src="@/assets/images/logo.png" alt="">
         <span>网站管理后台</span>
       </div>
       <el-menu
@@ -18,7 +18,7 @@
           <template v-if="item.subs">
             <el-submenu :index="item.index" :key="item.index">
                 <template slot="title">
-                  <img class="icon" :src="require('@/assets/img/' + item.icon + '.png')" alt="">
+                  <img class="icon" :src="require('@/assets/images/' + item.icon + '.png')" alt="">
                   <span slot="title">{{ item.title }}</span>
                 </template>
                 <template v-for="subItem in item.subs">
@@ -32,7 +32,7 @@
           </template>
           <template v-else>
             <el-menu-item :index="item.index" :key="item.index">
-              <img class="icon" :src="require('@/assets/img/' + item.icon + '.png')" alt="">
+              <img class="icon" :src="require('@/assets/images/' + item.icon + '.png')" alt="">
               <span slot="title">{{ item.title }}</span>
             </el-menu-item>
           </template>
@@ -41,10 +41,10 @@
     </div>
     <div v-show="collapse" class="light">
       <div class="col-wrap">
-        <img class="logo-icon" src="@/assets/img/logo.png" alt="">
+        <img class="logo-icon" src="@/assets/images/logo.png" alt="">
         <ul class="col-nav">
           <li v-for="(item, i) in colNav" :key="i" @click="menuSelect(item.index)">
-            <img width="16" :src="require('@/assets/img/' + item.icon + '.png')" alt="">
+            <img width="16" :src="require('@/assets/images/' + item.icon + '.png')" alt="">
           </li>
         </ul>
       </div>
@@ -63,7 +63,7 @@
             <template v-if="item.subs">
               <el-submenu :index="item.index" :key="item.index">
                   <template slot="title">
-                    <img width="14" class="icon" :src="require('@/assets/img/' + item.icon + '.png')" alt="">
+                    <img width="14" class="icon" :src="require('@/assets/images/' + item.icon + '.png')" alt="">
                     <span slot="title">{{ item.title }}</span>
                   </template>
                   <template v-for="subItem in item.subs">
@@ -77,7 +77,7 @@
             </template>
             <template v-else>
               <el-menu-item :index="item.index" :key="item.index">
-                <img class="icon" :src="require('@/assets/img/' + item.icon + '.png')" alt="">
+                <img class="icon" :src="require('@/assets/images/' + item.icon + '.png')" alt="">
                 <span slot="title">{{ item.title }}</span>
               </el-menu-item>
             </template>
diff --git a/src/pages/account/login/index.vue b/src/pages/account/login/index.vue
index d994553..007ed55 100644
--- a/src/pages/account/login/index.vue
+++ b/src/pages/account/login/index.vue
@@ -187,13 +187,13 @@ export default {
       height: 100%;
       border-radius: 4px 0px 0px 4px;
       border-right: 1px solid #D9DDEB;
-      background: #F7F9FC url(../../../assets/img/phone.png) center center/auto no-repeat;
+      background: #F7F9FC url(../../../assets/images/phone.png) center center/auto no-repeat;
     }
     .pw {
-      background-image: url(../../../assets/img/pw.png);
+      background-image: url(../../../assets/images/pw.png);
     }
     .code {
-      background-image: url(../../../assets/img/code.png);
+      background-image: url(../../../assets/images/code.png);
     }
   }
   .el-input .el-input__inner {
diff --git a/src/pages/article/add/editor.js b/src/pages/article/add/editor.js
index 4aae076..2c9b536 100644
--- a/src/pages/article/add/editor.js
+++ b/src/pages/article/add/editor.js
@@ -20,8 +20,24 @@ export default {
   blockquote p {
     margin: 0;
     font-style: italic;
-  }`,
-  fontsize_formats: '12px 14px 16px 18px 24px 36px 48px 56px 72px',
+  }
+  .block {
+    margin-bottom: 20px;
+    overflow: hidden;
+  }
+  .block .fl {
+    float: left;
+    margin-right: 10px;
+  }
+  .block .fr {
+    float: right;
+    margin-left: 10px;
+  }
+  .block p {
+    margin: 0 0 10px;
+  }
+  `,
+  fontsize_formats: '12px 14px 16px 19px 24px 36px 48px 56px 72px',
   font_formats: '微软雅黑=Microsoft YaHei,Helvetica Neue,PingFang SC,sans-serif;苹果苹方=PingFang SC,Microsoft YaHei,sans-serif;宋体=simsun,serif;仿宋体=FangSong,serif;黑体=SimHei,sans-serif;Arial=arial,helvetica,sans-serif;Arial Black=arial black,avant garde;Book Antiqua=book antiqua,palatino;Comic Sans MS=comic sans ms,sans-serif;Courier New=courier new,courier;Georgia=georgia,palatino;Helvetica=helvetica;Impact=impact,chicago;Symbol=symbol;Tahoma=tahoma,arial,helvetica,sans-serif;Terminal=terminal,monaco;Times New Roman=times new roman,times;Verdana=verdana,geneva;Webdings=webdings;Wingdings=wingdings,zapf dingbats;知乎配置=BlinkMacSystemFont, Helvetica Neue, PingFang SC, Microsoft YaHei, Source Han Sans SC, Noto Sans CJK SC, WenQuanYi Micro Hei, sans-serif;小米配置=Helvetica Neue,Helvetica,Arial,Microsoft Yahei,Hiragino Sans GB,Heiti SC,WenQuanYi Micro Hei,sans-serif',
   link_list: [
       { title: '预置链接1', value: 'http://www.tinymce.com' },
@@ -50,8 +66,23 @@ export default {
   },
   //为内容模板插件提供预置模板
   templates: [
-      { title: '模板1', description: '介绍文字1', content: '模板内容' },
-      { title: '模板2', description: '介绍文字2', content: '<div class="mceTmpl"><span class="cdate">CDATE</span>，<span class="mdate">MDATE</span>，我的内容</div>' }
+      { title: '文章模板1', description: '图片文字流', content: `
+        <div class="block">
+          <img align="left" hspace="5" vspace="5" src="https://tse1-mm.cn.bing.net/th/id/OIP-C._S-t6T2kt-j6ydemeoB1wAHaEs?w=301&h=190&c=7&r=0&o=5&pid=1.7"/>
+          <div class="texts">
+            <p>S³FEL主要由一台超导直线加速器、波荡器、光束线和实验站组成，可产生重复频率达1MHz、电子束能量达2.5 GeV的软X 射线自由电子激光，可在百飞秒内级实现原子、分子及外壳层电子结构的无损、动态监测，是科学家认识和了解物质微观结构及动态变化的“高速摄像机”。S³FEL为科学家和企业用户提供了一种具有超高时间分辨、空间分辨和能量分辨的新方法、新技术。 S³FEL在量子材料、能源催化、生物医药、大气与星际科学、原子分子科学等领域的应用研究，将为促进我国战略性新兴产业创新发展和关键。
+            </p>
+          </div>
+        </div>
+        <div class="block">
+        <img align="right" hspace="5" vspace="5" src="https://tse1-mm.cn.bing.net/th/id/OIP-C._S-t6T2kt-j6ydemeoB1wAHaEs?w=301&h=190&c=7&r=0&o=5&pid=1.7"/>
+          <div>
+            <p>集聚世界前沿和原创性科学技术及产业研发，将推动一批高水平大学和科研机构的科技人才队伍建设及相关学科的高质量发展，营造粤港澳大湾区人才高地，并助力粤港澳大湾区国际科技创新中心的建设。此外， S³FEL作为重要的科普教育基地，</p>
+            <p>S³FEL汇聚并培养信息、生命、材料、能源等学科领域的国际水平科技领军人才，集聚世界前沿和原创性科学技术及产业研发，将推动一批高水平大学和科研机构的科技人才队伍建设及相关学科的高质量发展，营造粤港澳大湾区人才高地，并助力粤港澳大湾区国际科技创新中心的建设。此外， S³FEL作为重要的科普教育基地，是展示我国科技实力、提高全民族科学素质和民族自信的重要宣传窗口。 S³FEL主体建筑将成为深圳市地标式建筑，促进提升深圳市的城市形象和国际化知名度。</p>
+          </div>
+        </div>
+        ` 
+      }
   ],
   // content_security_policy: "https://cdn.tiny.cloud/1/rnk6zw9v267xqz7pf98twt1vmrvltmd436je7a642pckltda/tinymce/6/tinymce.min.js",
   // extended_valid_elements:'script[src]',
diff --git a/src/pages/article/add/index.vue b/src/pages/article/add/index.vue
index 12fda47..18e5b23 100644
--- a/src/pages/article/add/index.vue
+++ b/src/pages/article/add/index.vue
@@ -78,7 +78,7 @@
         >
           <img v-if="form.titleImg" :src="form.titleImg" class="avatar">
           <div class="uploader-default" v-else>
-            <img class="plus" src="@/assets/img/plus.png" alt="">
+            <img class="plus" src="@/assets/images/plus.png" alt="">
             <p>点击上传</p>
           </div>
         </el-upload>
@@ -100,7 +100,7 @@
         >
           <img v-if="form.bannerImg" :src="form.bannerImg" class="avatar-lg">
           <div class="uploader-default" v-else>
-            <img class="plus" src="@/assets/img/plus.png" alt="">
+            <img class="plus" src="@/assets/images/plus.png" alt="">
             <p>点击上传</p>
           </div>
         </el-upload>
@@ -110,7 +110,7 @@
           placement="top-start"
           trigger="hover"
           content="默认使用栏目中设置的文章样式，如果需要为该篇文章指定专门的模板样式，可以设置此项">
-          <img slot="reference" class="info" src="@/assets/img/ques.png" alt="">
+          <img slot="reference" class="info" src="@/assets/images/ques.png" alt="">
         </el-popover>
         <el-switch
           v-model="form.templateStatus"
@@ -121,7 +121,7 @@
           <template v-for="(item, i) in detailStyle">
             <li v-if="item.id !== column.detailStyle" :key="i" @click="form.articleTemplate = item.id">
               <div class="review">
-                <img :src="require('@/assets/img/article' + item.id + '.png')" alt="">
+                <img :src="require('@/assets/images/article' + item.id + '.png')" alt="">
               </div>
               <el-radio v-model="form.articleTemplate" :label="item.id">{{ item.name }}</el-radio>
             </li>
diff --git a/src/pages/article/list/index.vue b/src/pages/article/list/index.vue
index 82c0a0d..5cfc435 100644
--- a/src/pages/article/list/index.vue
+++ b/src/pages/article/list/index.vue
@@ -21,7 +21,7 @@
         </div>
         <div class="actions">
           <el-dropdown class="setting" trigger="click" :hide-on-click="false">
-            <img class="icon" src="@/assets/img/setting.png" alt="">
+            <img class="icon" src="@/assets/images/setting.png" alt="">
             <el-dropdown-menu>
               <el-dropdown-item>
                 <el-button @click="resetColumns" type="text">列重置</el-button>
@@ -57,7 +57,7 @@
         </el-table-column>
         <el-table-column v-if="settings[10].show" label="操作" align="center" width="140">
           <template slot-scope="scope">
-            <el-button v-auth="'/site/list:' + siteName + ':内容管理:文章管理:预览'" type="text" @click="resetPassword(scope.row)">预览</el-button>
+            <el-button v-auth="'/site/list:' + siteName + ':内容管理:文章管理:预览'" type="text" @click="preview(scope.row)">预览</el-button>
             <el-button v-auth="'/site/list:' + siteName + ':内容管理:文章管理:编辑'" type="text" @click="edit(scope.row)">编辑</el-button>
             <el-button v-auth="'/site/list:' + siteName + ':内容管理:文章管理:删除'" type="text" @click="handleDelete(scope.row)">删除</el-button>
           </template>
@@ -71,6 +71,7 @@
 </template>
 
 <script>
+import Setting from '@/setting'
 import util from '@/libs/util'
 import { mapMutations } from 'vuex'
 import ColumnConst from '@/const/column'
@@ -280,9 +281,12 @@ export default {
       add() {
         if (!this.columns.length) return util.errorMsg('请添加栏目')
         this.setColumn(this.$refs.column.getCurrentNode())
-        console.log("🚀 ~ file: index.vue ~ line 267 ~ add ~ this.$refs.column.getCurrentNode()", this.$refs.column.getCurrentNode())
         this.$router.push(`add?columnId=${this.$refs.column.getCurrentKey()}`)
       },
+      // 预览
+      preview(row) {
+        window.open(`http://192.168.31.${Setting.isDev ? 126 : 136}:8095/#/article?id=` + row.id)
+      },
       // 编辑
       edit(row) {
         this.$router.push(`add?id=${row.id}`)
diff --git a/src/pages/column/add/index.vue b/src/pages/column/add/index.vue
index 846da4d..dd29739 100644
--- a/src/pages/column/add/index.vue
+++ b/src/pages/column/add/index.vue
@@ -62,7 +62,7 @@
           >
             <img v-if="form.columnBanner" :src="form.columnBanner" class="avatar-lg">
             <div class="uploader-default" v-else>
-              <img class="plus" src="@/assets/img/plus.png" alt="">
+              <img class="plus" src="@/assets/images/plus.png" alt="">
               <p>点击上传</p>
             </div>
             <div slot="tip" class="el-upload__tip">
@@ -92,7 +92,7 @@
           <ul class="styles">
             <li v-for="(item, i) in listStyle" :key="i" @click="form.listStyleId = item.id">
               <div class="review">
-                <img :src="require('@/assets/img/list' + item.id + '.png')" alt="">
+                <img :src="require('@/assets/images/list' + item.id + '.png')" alt="">
               </div>
               <el-radio v-model="form.listStyleId" :label="item.id">{{ item.name }}</el-radio>
             </li>
@@ -102,7 +102,7 @@
           <ul class="styles">
             <li v-for="(item, i) in detailStyle" :key="i" @click="form.detailStyle = item.id">
               <div class="review">
-                <img :src="require('@/assets/img/article' + item.id + '.png')" alt="">
+                <img :src="require('@/assets/images/article' + item.id + '.png')" alt="">
               </div>
               <el-radio v-model="form.detailStyle" :label="item.id">{{ item.name }}</el-radio>
             </li>
@@ -197,26 +197,26 @@
           <ul class="styles">
             <li>
               <div class="review">
-                <img src="@/assets/img/list1.png" alt="">
+                <img src="@/assets/images/list1.png" alt="">
               </div>
               <el-radio v-model="form.listStyleId" :label="1">图片列表</el-radio>
             </li>
             <li>
               <div class="review">
-                <img src="@/assets/img/list2.png" alt="">
+                <img src="@/assets/images/list2.png" alt="">
               </div>
               <el-radio v-model="form.listStyleId" :label="2">新闻列表</el-radio>
             </li>
             <li>
               <div class="review">
-                <img src="@/assets/img/list2.png" alt="">
+                <img src="@/assets/images/list2.png" alt="">
               </div>
               <el-radio v-model="form.listStyleId" :label="3">出版物列表</el-radio>
             </li>
           </ul>
         </el-form-item>
       </template>
-      <el-form-item v-show="form.typeId === 4" prop="showWithDetails" label="只有一篇文章时，以详情方式展示">
+      <el-form-item v-show="form.typeId === 4" prop="showWithDetails" label="只有一篇文章时，以详情方式展示" label-width="240px">
         <el-switch
           v-model="form.showWithDetails"
           :active-value="1"
diff --git a/src/pages/column/list/index.vue b/src/pages/column/list/index.vue
index 55128fe..b0403dd 100644
--- a/src/pages/column/list/index.vue
+++ b/src/pages/column/list/index.vue
@@ -6,7 +6,7 @@
       </div>
       <div class="actions">
         <el-dropdown class="setting" trigger="click" :hide-on-click="false">
-          <img class="icon" src="@/assets/img/setting.png" alt="">
+          <img class="icon" src="@/assets/images/setting.png" alt="">
           <el-dropdown-menu>
             <el-dropdown-item>
               <el-button @click="resetColumns" type="text">列重置</el-button>
@@ -111,13 +111,13 @@
           <ul class="styles">
             <li>
               <div class="review">
-                <img src="@/assets/img/style1.png" alt="">
+                <img src="@/assets/images/style1.png" alt="">
               </div>
               <el-radio v-model="form.styleTemplate" :label="1">竖行导航</el-radio>
             </li>
             <li>
               <div class="review">
-                <img src="@/assets/img/style2.png" alt="">
+                <img src="@/assets/images/style2.png" alt="">
               </div>
               <el-radio v-model="form.styleTemplate" :label="2">横向导航</el-radio>
             </li>
diff --git a/src/pages/page/add/index.vue b/src/pages/page/add/index.vue
index a2c2515..42bf2e4 100644
--- a/src/pages/page/add/index.vue
+++ b/src/pages/page/add/index.vue
@@ -62,7 +62,7 @@
           >
             <img v-if="form.columnBanner" :src="form.columnBanner" class="avatar-lg">
             <div class="uploader-default" v-else>
-              <img class="plus" src="@/assets/img/plus.png" alt="">
+              <img class="plus" src="@/assets/images/plus.png" alt="">
               <p>点击上传</p>
             </div>
             <div slot="tip" class="el-upload__tip">
@@ -84,7 +84,7 @@
           <ul class="styles">
             <li v-for="(item, i) in listStyle" :key="i" @click="form.listStyleId = item.id">
               <div class="review">
-                <img :src="require('@/assets/img/list' + item.id + '.png')" alt="">
+                <img :src="require('@/assets/images/list' + item.id + '.png')" alt="">
               </div>
               <el-radio v-model="form.listStyleId" :label="item.id">{{ item.name }}</el-radio>
             </li>
@@ -94,7 +94,7 @@
           <ul class="styles">
             <li v-for="(item, i) in detailStyle" :key="i" @click="form.detailStyle = item.id">
               <div class="review">
-                <img :src="require('@/assets/img/article' + item.id + '.png')" alt="">
+                <img :src="require('@/assets/images/article' + item.id + '.png')" alt="">
               </div>
               <el-radio v-model="form.detailStyle" :label="item.id">{{ item.name }}</el-radio>
             </li>
@@ -189,19 +189,19 @@
           <ul class="styles">
             <li>
               <div class="review">
-                <img src="@/assets/img/list1.png" alt="">
+                <img src="@/assets/images/list1.png" alt="">
               </div>
               <el-radio v-model="form.listStyleId" :label="1">图片列表</el-radio>
             </li>
             <li>
               <div class="review">
-                <img src="@/assets/img/list2.png" alt="">
+                <img src="@/assets/images/list2.png" alt="">
               </div>
               <el-radio v-model="form.listStyleId" :label="2">新闻列表</el-radio>
             </li>
             <li>
               <div class="review">
-                <img src="@/assets/img/list2.png" alt="">
+                <img src="@/assets/images/list2.png" alt="">
               </div>
               <el-radio v-model="form.listStyleId" :label="3">出版物列表</el-radio>
             </li>
diff --git a/src/pages/page/list/index.vue b/src/pages/page/list/index.vue
index 5b1b6a4..2cc9abe 100644
--- a/src/pages/page/list/index.vue
+++ b/src/pages/page/list/index.vue
@@ -4,7 +4,7 @@
       <p class="page-name">页面列表</p>
       <div style="display: inline-flex;align-items: center;">
         <el-dropdown class="setting" trigger="click" :hide-on-click="false">
-          <img class="icon" src="@/assets/img/setting.png" alt="">
+          <img class="icon" src="@/assets/images/setting.png" alt="">
           <el-dropdown-menu>
             <el-dropdown-item>
               <el-button @click="resetColumns" type="text">列重置</el-button>
@@ -28,12 +28,8 @@
       </div>
     </div>
 
-    <el-table ref="table" :data="list" class="table" header-align="center" row-key="id">
-      <el-table-column type="index" width="60" label="序号" align="center">
-        <template slot-scope="scope">
-          {{ scope.$index + (page - 1) * pageSize + 1 }}
-        </template>
-      </el-table-column>
+    <el-table ref="table" :data="list" default-expand-all class="table" header-align="center" row-key="id">
+      <el-table-column type="index" width="60" label="序号" align="center"></el-table-column>
       <el-table-column v-if="settings[0].show" prop="columnName" label="长页栏目名称" align="center"></el-table-column>
       <el-table-column v-if="settings[1].show" prop="articleTemplate" label="模板名称" align="center"></el-table-column>
       <el-table-column v-if="settings[2].show" prop="columnName" label="上级栏目" align="center">
@@ -46,19 +42,17 @@
       <el-table-column v-if="settings[5].show" prop="editorName" label="编辑人" align="center"></el-table-column>
       <el-table-column v-if="settings[6].show" label="操作" width="170" align="center">
         <template slot-scope="scope">
-          <el-button v-auth="'/site/list:' + site.siteName + ':内容管理:页面管理:预览'" type="text" @click="start(scope.row)">预览</el-button>
+          <el-button v-auth="'/site/list:' + site.siteName + ':内容管理:页面管理:预览'" type="text" @click="preview(scope.row)">预览</el-button>
           <el-button v-auth="'/site/list:' + site.siteName + ':内容管理:页面管理:编辑'" type="text" @click="start(scope.row)">编辑</el-button>
           <el-button v-auth="'/site/list:' + site.siteName + ':内容管理:页面管理:删除'" type="text" @click="start(scope.row)">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
-    <div class="pagination">
-      <el-pagination background layout="total, prev, pager, next" :total="total" @current-change="handleCurrentChange" :current-page="page"></el-pagination>
-    </div>
   </div>
 </template>
 
 <script>
+import Setting from '@/setting'
 export default {
     data() {
       return {
@@ -75,9 +69,6 @@ export default {
           }
         ],
         keyword: '',
-        page: +this.$route.query.page || 1,
-        pageSize: 10,
-        total: 0,
         list: [],
         originSettings: [],
         settings: [
@@ -146,15 +137,13 @@ export default {
           programName: this.field === 'programName' ? this.keyword : '',
           templateName: this.field === 'templateName' ? this.keyword : ''
         }).then(({ data }) => {
-          const list = data.records
-          list.map(e => {
+          data.map(e => {
             // 上级栏目
             e.parents = e.superiorColumn ?
               e.superiorColumn.map(n => n.columnName).join(' / ') :
               '--'
           })
-          this.list = list
-          this.total = +data.total
+          this.list = data
         }).catch(err => {})
       },
       initData() {
@@ -169,8 +158,9 @@ export default {
         this.page = val
         this.getData()
       },
-      add() {
-        this.$router.push('add')
+      // 预览
+      preview(row) {
+        window.open(`http://192.168.31.${Setting.isDev ? 126 : 136}:8095/#/channel?id=` + row.id)
       },
       edit(row) {
         this.$router.push(`add?id=${row.id}`)
diff --git a/src/pages/setting/list/info.vue b/src/pages/setting/list/info.vue
index 06684f4..1228e5a 100644
--- a/src/pages/setting/list/info.vue
+++ b/src/pages/setting/list/info.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="relative" v-loading="loading">
     <div class="page">
-      <h6 class="l-title"><img src="@/assets/img/info1.png" alt=""> 基本信息</h6>
+      <h6 class="l-title"><img src="@/assets/images/info1.png" alt=""> 基本信息</h6>
       <div class="page-content">
         <ul class="list">
           <li>
diff --git a/src/pages/user/list/index.vue b/src/pages/user/list/index.vue
index c1b7975..5d8ff1f 100644
--- a/src/pages/user/list/index.vue
+++ b/src/pages/user/list/index.vue
@@ -23,11 +23,11 @@
           <el-tree class="org" ref="orgs" :data="orgs" :props="defaultProps" highlight-current :expand-on-click-node="false" default-expand-all node-key="id" @node-click="handleNodeClick">
             <span class="node-wrap" slot-scope="{ node, data }">
               <div class="left">
-                <img src="@/assets/img/node.png" alt="">
+                <img src="@/assets/images/node.png" alt="">
                 <span class="name">{{ node.label }}</span>
               </div>
               <el-dropdown :hide-on-click="false">
-                <img class="expand" src="@/assets/img/expand.png" alt="">
+                <img class="expand" src="@/assets/images/expand.png" alt="">
                 <el-dropdown-menu slot="dropdown">
                   <el-dropdown-item>
                     <el-button v-auth class="org-btn" @click="() => editOrg(node, data)" type="text">编辑部门</el-button>
@@ -78,7 +78,7 @@
         <el-input style="width: 250px;" placeholder="请输入员工姓名/账号/工号/手机号" v-model.trim="keyword" clearable></el-input>
         <div class="actions">
           <el-dropdown class="setting" trigger="click" :hide-on-click="false">
-            <img class="icon" src="@/assets/img/setting.png" alt="">
+            <img class="icon" src="@/assets/images/setting.png" alt="">
             <el-dropdown-menu>
               <el-dropdown-item>
                 <el-button @click="resetColumns" type="text">列重置</el-button>
diff --git a/src/setting.js b/src/setting.js
index 1944fe4..9fca1d3 100644
--- a/src/setting.js
+++ b/src/setting.js
@@ -6,7 +6,7 @@ const isDev = process.env.NODE_ENV === 'development' // 开发环境
 let host = `${location.origin}:10000/`
 if (isDev) {
     host = 'http://192.168.31.136:10000/' // 测试服
-    // host = 'http://192.168.31.151:10000/' // 榕
+    host = 'http://192.168.31.51:10000/' // 榕
     // host = 'http://192.168.31.137:10000/' // 赓
 }