diff --git a/.env.development b/.env.development index 2151311..0e72089 100644 --- a/.env.development +++ b/.env.development @@ -9,6 +9,6 @@ VUE_APP_SHEQU_URL = https://frbbs VUE_APP_ID_URL = https://id #VUE_APP_ID_URL = https://passport.fanruan.com #VUE_APP_CIDAPI_URL = https://cid.fanruan.com/api -VUE_APP_CIDAPI_URL = https://test-cid/api +VUE_APP_CIDAPI_URL = https://cid/api VUE_APP_PASS_URL = http://localhost:8080 VUE_APP_CERT_URL = https://admin.shequ.fanruan.com diff --git a/src/components/msgLogin.vue b/src/components/msgLogin.vue index b9a2f10..08487d6 100644 --- a/src/components/msgLogin.vue +++ b/src/components/msgLogin.vue @@ -2,7 +2,7 @@
- 无权限查看,当前页面需要 登录 + 无权限查看,当前页面需要 登录
diff --git a/src/mixins/mixins.js b/src/mixins/mixins.js index cc66f1a..950d256 100644 --- a/src/mixins/mixins.js +++ b/src/mixins/mixins.js @@ -7,6 +7,8 @@ */ //import { getToken } from "@/utils/cookie"; import store from '@/store' +// import { useRoute } from 'vue-router' + export const mixins = { data() { return { @@ -17,7 +19,8 @@ export const mixins = { com_node_env: process.env.VUE_APP_ENV || 'production', com_pass_url: process.env.VUE_APP_PASS_URL || 'https://fanruanclub.com', com_cert_url:process.env.VUE_APP_CERT_URL || 'https://cert.fanruan.com', - com_jump_url:encodeURIComponent(window.location.href) + com_jump_url:encodeURIComponent(window.location.href), + com_login_url:process.env.VUE_APP_ID_URL+'/signin/'+'?app=edu&protocol=cas&referrer='+window.location.href } }, created() { diff --git a/src/router.js b/src/router.js index e28ecf5..4a263a5 100644 --- a/src/router.js +++ b/src/router.js @@ -352,7 +352,7 @@ router.beforeEach((to, from, next) => { // ticket空执行删除 const is_ticket_null = new URL(window.location); if(is_ticket_null.searchParams.has("ticket")){ - if(get_ticket===0){ + if(get_ticket===0 || get_ticket=='null'){ console.log('ticket空'); parent.window.location.replace(process.env.VUE_APP_ID_URL+'/login/token/logout?referrer='+encodeURIComponent(process.env.VUE_APP_EDU_URL)); } diff --git a/src/views/class/indexClass.vue b/src/views/class/indexClass.vue index 4936fc5..de99da6 100644 --- a/src/views/class/indexClass.vue +++ b/src/views/class/indexClass.vue @@ -18,7 +18,7 @@
登录后才能查看您参加的学习班哦, - 马上登录 + 马上登录
diff --git a/src/views/class/play-old.vue b/src/views/class/play-old.vue index a75014d..3679f17 100644 --- a/src/views/class/play-old.vue +++ b/src/views/class/play-old.vue @@ -3,7 +3,7 @@
无权限查看,当前页面需要 登录 + :href="com_login_url" class="col008">登录
diff --git a/src/views/class/play.vue b/src/views/class/play.vue index 0232f53..5dd4ddd 100644 --- a/src/views/class/play.vue +++ b/src/views/class/play.vue @@ -3,7 +3,7 @@
无权限查看,当前页面需要 登录 + :href="com_login_url" class="col008">登录
diff --git a/src/views/live/live_play.vue b/src/views/live/live_play.vue index cd2748c..db89f32 100644 --- a/src/views/live/live_play.vue +++ b/src/views/live/live_play.vue @@ -5,7 +5,7 @@
无权限查看,当前页面需要登录
diff --git a/src/views/live/live_view.vue b/src/views/live/live_view.vue index 43754f3..dbac116 100644 --- a/src/views/live/live_view.vue +++ b/src/views/live/live_view.vue @@ -133,7 +133,7 @@

您还未登录哦~~登录后再报名吧!