fix

src/layouts/navbar/index.vue

@@ -7,6 +7,7 @@
       </div>
       <el-menu
         :default-active="active"
+        :default-openeds="['user']"
         background-color="#001529"
         text-color="#fff"
         active-text-color="#fff"
@@ -97,7 +98,7 @@ export default {
         site: this.$store.state.content.site,
         collapse: false,
         active: this.$route.path,
-        siteActive: '/page',
+        siteActive: '/column',
         menus: [],
         defaultMenus: [
           {

src/pages/account/login/index.vue

@@ -66,7 +66,7 @@ export default {
   },
   methods: {
     ...mapMutations('user', [
-      'setUserId', 'setUserName'
+      'setUserId', 'setUserName', 'setAvatar'
     ]),
     // 获取验证码图片
     getVerImg() {
@@ -80,6 +80,7 @@ export default {
         util.successMsg('登录成功')
         this.setUserId(data.id || 1)
         this.setUserName(data.username)
+        this.setAvatar(data.userAvatars)
         this.$router.push('/site')
       }).catch(res => {
         this.getVerImg()

src/pages/article/add/index.vue

@@ -73,7 +73,7 @@
             placeholder="请输入作者"
             v-model.trim="form.author"
             clearable
-            maxlength="15"
+            maxlength="200"
             class="inline-input"
             @change="nameChange"
           ></el-input>
@@ -242,7 +242,7 @@
     </el-form>
     <div class="btns">
       <el-button type="primary" @click="submit(1)">发布</el-button>
-      <el-button @click="preview">预览</el-button>
+      <el-button v-if="$route.query.id" @click="preview">预览</el-button>
       <el-button @click="submit(0)">保存草稿</el-button>
       <el-button @click="back">取消</el-button>
     </div>
@@ -323,6 +323,7 @@
   </div>
 </template>
 <script>
+import Setting from '@/setting'
 import util from '@/libs/util'
 import ColumnConst from '@/const/column'
 import { mapState } from 'vuex'
@@ -364,7 +365,7 @@ export default {
             file: '',
             isRelease: 0,
             mainBody: '',
-            releaseTime: '',
+            releaseTime: new Date(),
             source: '',
             summary	: '',
             title: '',
@@ -787,7 +788,7 @@ export default {
       },
       // 预览
       preview() {
-
+        window.open((Setting.isDev ? `http://${location.hostname}:8095` : 'http://192.168.31.136') + `/#/article?id=${this.form.id}&siteId=${this.form.siteId}`)
       },
       // 返回
       back() {

src/pages/article/list/index.vue

@@ -47,8 +47,8 @@
         </el-table-column>
         <el-table-column v-if="settings[4].show" prop="founderName" label="录入人" align="center" min-width="80"></el-table-column>
         <el-table-column v-if="settings[5].show" prop="editorName" label="修改人" align="center" min-width="80"></el-table-column>
-        <el-table-column v-if="settings[6].show" prop="updateTime" label="修改日期" align="center" min-width="130"></el-table-column>
-        <el-table-column v-if="settings[7].show" prop="releaseTime" label="发布日期" align="center" min-width="130"></el-table-column>
+        <el-table-column v-if="settings[6].show" prop="updateTime" label="修改日期" align="center" min-width="140"></el-table-column>
+        <el-table-column v-if="settings[7].show" prop="releaseTime" label="发布日期" align="center" min-width="140"></el-table-column>
         <el-table-column v-if="settings[8].show" prop="totalBrowsing" label="总浏览" align="center" min-width="80"></el-table-column>
         <el-table-column v-if="settings[9].show" prop="workNumber" label="状态" align="center" min-width="80">
           <template slot-scope="scope">

src/pages/column/page/application.vue

@@ -249,7 +249,7 @@ export default {
     line-height: 143px;
     color: #272727;
     text-align: center;
-    background-color: #F5F5F5;
+    background-color: #fff;
   }
 }
 .news-block {

src/pages/column/page/home.vue

@@ -312,6 +312,9 @@ export default {
   .glance {
     padding-bottom: 50px;
     font-size: 45px;
+    font-weight: bold;
+    font-family: SFProDisplay-Bold, SFProDisplay;
+    text-align: center;
     border-bottom: 1px solid #DEDEDE;
   }
   .stat {

src/pages/setting/list/index.vue

@@ -16,7 +16,7 @@
         </ul>
       </div>
     </div>
-    <info class="flex-1" ref="info" @updateStatus="updateStatus"></info>
+    <info class="flex-1" ref="info" @updateStatus="updateStatus" @back="back"></info>
   </div>
 </template>
 
@@ -51,7 +51,7 @@ export default {
           this.$refs.info.submit()
           next()
         }).catch(() => {
-          next(false)
+          next()
         })
       }else{
         next()
@@ -69,6 +69,22 @@ export default {
       },
       updateStatus(status){
         this.edited = status
+      },
+      // 返回
+      back() {
+        if(this.edited){
+          this.edited = false
+          this.$confirm(`您所更改的内容未更新，是否更新？`, '提示', {
+            type: 'warning'
+          }).then(() => {
+            this.$refs.info.submit()
+            this.$router.back()
+          }).catch(() => {
+            this.$router.back()
+          })
+        }else{
+          this.$router.back()
+        }
       }
     }
 };

src/pages/setting/list/info.vue

@@ -43,7 +43,7 @@
         </ul>
       </div>
       <div class="btn-wrap">
-        <el-button size="small" v-throttle @click="$router.back()">取消</el-button>
+        <el-button size="small" v-throttle @click="$emit('back')">取消</el-button>
         <el-button type="primary" size="small" v-throttle @click="submit">更新</el-button>
       </div>
     </div>
@@ -287,6 +287,7 @@ export default {
             username: form.username,
             sex: form.sex,
           }).then(res => {
+            this.$emit('updateStatus', false)
             this.setUserName(form.username)
             this.$message.success("提交成功！")
           }).catch(res => {})

src/styles/common.scss

@@ -4,6 +4,10 @@
   font-family: PingFang;
   src: url('font/PingFang-Regular.otf');
 }
+@font-face {
+  font-family: SFProDisplay-Bold;
+  src: url('font/SF-Pro-Display-Bold.otf');
+}
 [v-cloak] {
   display: none;
 }

src/styles/page/page.scss

@@ -4,7 +4,10 @@
     position: relative;
     margin-bottom: 50px;
     font-size: 50px;
-    line-height: 59px;
+    font-family: SFProDisplay-Bold, SFProDisplay;
+    font-weight: bold;
+    color: #333333;
+    line-height: 60px;
     text-align: center;
     color: #1F1F1F;
     &:after {