登录添加查询日志状态

src/api/index.js

@@ -10,6 +10,7 @@ export default {
   getTopList: `${Setting.cryptoBaseURL}currency/market/getTopList`,
 
   platformLogList: `/nakadai/log/platformLogList`,
+  logNotification: `/nakadai/log/logNotification`,
   // 公用接口
   queryProvince: `/nakadai/nakadai/province/queryProvince`,
   queryCity: `/nakadai/nakadai/city/queryCity`,

src/layouts/navbar/index.vue

@@ -25,7 +25,7 @@ export default {
         title: '数据看板'
       }, {
           index: "/log/list",
-          title: "最近更新"
+          title: "更新日志"
       }],
       // 前台菜单
       dataMenu: {

src/pages/account/login/index.vue

@@ -53,11 +53,12 @@
 </template>
 
 <script>
-import { mapActions } from 'vuex'
+import { mapMutations, mapActions } from 'vuex'
 import vHead from '@/layouts/header'
 import util from '@/libs/util'
 import Setting from '@/setting'
 import vFooter from '@/layouts/footer'
+import axios from 'axios'
 export default {
     data: function() {
         return {
@@ -76,13 +77,16 @@ export default {
                 account: '',
                 password: '',
                 random: '',
-                code: ''
+                code: '',
+                type: 2, // 平台端区分：0->教师端 1->学生端 2->无端
+                platform: Setting.platformId, // 所属平台id(1.职站 2.数据平台 3.中台)
             },
             rules: {
                 account: [{ required: true, message: '请输入账号', trigger: 'blur' }],
                 password: [{ required: true, message: '请输入密码', trigger: 'blur' }],
                 code: [{ required: true, message: '请输入验证码', trigger: 'blur' }],
             },
+            token: '',
             phoneVisible: false,
             phone: '',
             phoneCode: '',
@@ -96,6 +100,9 @@ export default {
         this.getVerImg()
     },
     methods: {
+        ...mapMutations("user", [
+            'SET_CUSTOMERNAME', 'SET_CUSTOMER', 'SET_INFO'
+        ]),
         ...mapActions('user', [
             'login','setCustomer'
         ]),
@@ -105,18 +112,48 @@ export default {
             this.$refs.login.clearValidate()
             this.rules.account[0].message = item.id == 1 ? '请输入账号' : '请输入手机号/邮箱'
         },
+        // 处理登录成功
+        setLogin() {
+            window.opener && window.opener.location.reload() // 刷新官网
+            util.local.set(Setting.tokenKey, this.token, Setting.tokenExpires)
+            // 查询是否是客户，如果是客户，则弹出选择端的页面去选择跳转到哪个端
+            this.$get(this.api.isClient).then(res => {
+                // 如果是客户
+                this.SET_CUSTOMER(res.customer)
+                const userName = res.customerName
+                userName && this.SET_INFO({
+                    userName
+                })
+            }).catch(res => {})
+            // 查询schoolId
+            this.$post(this.api.getSchoolIdByToken).then(res => {
+                this.SET_INFO(res)
+            }).catch(res => {})
+            // 登录次数+1
+            this.$post(this.api.saveRecord,{
+                type: 3,
+            }).then(res => {}).catch(res => {})
+            // 查询是否有更新日志，如果返回了true，则直接跳转到日志页
+            this.$get(this.api.logNotification).then(res => {
+              const history = this.$route.query.redirect
+              const redirect = res.notification ?
+                '/log' :
+                history ?
+                  decodeURIComponent(history) :
+                  '/index'
+              util.successMsg('登录成功')
+              this.$router.replace(redirect)
+            }).catch(res => {})
+        },
         submitForm() {
             this.$refs.login.validate(valid => {
                 if (valid) {
-                    this.login(this.form).then(() => {
+                    this.$post(this.api.logins, this.form).then(res => {
-                        window.opener && window.opener.location.reload() // 刷新官网
+                        this.token = res.data.token
-                        let redirect = this.$route.query.redirect ? decodeURIComponent(this.$route.query.redirect) : '/index'
+                        this.setLogin()
-                        this.$router.replace(redirect)
                     }).catch(res => {
                         // 如果没有绑定手机号
-                        if(res && res.status == 30001){
+                        if (res && res.status == 30001) this.phoneVisible = true
-                            this.phoneVisible = true
-                        }
                         this.getVerImg()
                         this.form.code = ''
                     })
@@ -178,18 +215,7 @@ export default {
                 util.successMsg('绑定成功')
                 this.form.phone = this.phone
                 this.phoneVisible = false
-                // 是否是客户
+                this.setLogin()
-                this.$get(this.api.isClient).then(res => {
-                    this.setCustomer(res.customer)
-                }).catch(res => {})
-                util.local.set(Setting.tokenKey,res.token,43200000)
-                util.successMsg('登录成功')
-                setTimeout(() => {
-                    this.$post(this.api.saveRecord,{
-                        type: 3,
-                    }).then(res => {}).catch(res => {})
-                },3000)
-                this.$router.push('/index/list')
             }).catch(res => {})
         },
     },

src/setting.js

@@ -25,7 +25,7 @@ const Setting = {
      * 正式：http://www.dataforward.cn:9000
      * */
     // apiBaseURL: env === 'development' ? 'http://192.168.31.151:9000' : 'http://39.108.250.202:9000',
-    apiBaseURL: env === 'development' ? 'http://192.168.31.151:9000' : `${location.origin}:9000`,
+    apiBaseURL: env === 'development' ? 'http://39.108.250.202:9000' : `${location.origin}:9000`,
     // 加密货币接口地址
     cryptoBaseURL: `http://159.138.53.111/`,
     // 接口请求返回错误时，弹窗的持续时间，单位：秒