查询是否更新日志等

src/api/index.js

@@ -14,6 +14,7 @@ export default {
     isClient: `${host}users/users/user/isClient`,
 
     platformLogList: `${host}nakadai/log/platformLogList`,
+    logNotification: `${host}nakadai/log/logNotification`,
     //实验台
     curriculumDetail: `${host}nakadai/nakadai/curriculum/curriculumDetail`, // 课程详情
     curriculumChapter: `${host}nakadai/curriculum/chapter/queryChaptersAndSubsections`, // 根据课程id查询章节小节,树状结构

src/layouts/navbar/index.vue

@@ -70,7 +70,7 @@ export default {
                 },
                 {
                     index: "/log/list",
-                    title: "最近更新"
+                    title: "更新日志"
                 }
             ],
             menus: [],

src/pages/account/login/index.vue

@@ -158,11 +158,19 @@ export default {
         // 处理登录成功
         setLogin() {
             util.local.set(Setting.tokenKey, this.token, Setting.tokenExpires)
-            util.successMsg('登录成功')
             util.cookies.remove('serverLogin')
             this.reloadIndex()
-            const redirect = this.$route.query.redirect ? decodeURIComponent(this.$route.query.redirect) : "/station"
+            // 查询是否有更新日志，如果返回了true，则直接跳转到日志页
-            this.$router.replace(redirect)
+            this.$get(this.api.logNotification).then(res => {
+              const history = this.$route.query.redirect
+              const redirect = res.notification ?
+                '/log' :
+                history ?
+                  decodeURIComponent(history) :
+                  '/station'
+              util.successMsg('登录成功')
+              this.$router.replace(redirect)
+            }).catch(res => {})
         },
         submitFormLogin() { // 提交登录
             this.$refs.form.validate(valid => {
@@ -267,13 +275,9 @@ export default {
                 util.successMsg("绑定成功");
                 this.form.phone = this.phone;
                 this.phoneVisible = false;
-
+                this.token = res.token
-                util.local.set(Setting.tokenKey, res.token, Setting.tokenExpires);
+                this.setLogin()
-                let redirect = this.$route.query.redirect ? decodeURIComponent(this.$route.query.redirect) : "/index";
+            }).catch(res => {})
-                this.$router.replace(redirect);
-                util.successMsg("登录成功");
-            }).catch(res => {
-            });
         }
     }
 };

src/setting.js

@@ -38,10 +38,10 @@ if (isHh) {
 } else if (isDev) {
     // 本地
     // host = "http://www.occupationlab.com:9000/";//线上
-    // host = "http://39.108.250.202:9000/"; // 中台测试服
+    host = "http://39.108.250.202:9000/"; // 中台测试服
     systemPath = `http://192.168.31.125:8093`
     // host = "http://192.168.31.137:9000"; // 赓
-    host = "http://192.168.31.151:9000/"; // 榕
+    // host = "http://192.168.31.151:9000/"; // 榕
     title = "职站";
 } else {
     console.log("其它版本");