Merge branch 'master' into ebiz-uat-2025-11-06

src/api/ajax.js

@@ -52,7 +52,12 @@ const formRequest=axios.create({
       if (code === 401) {
          //Message({message: msg, type: 'error'});
          store.dispatch('LogOut').then(() => {
-                 location.href = this.webBaseUrl + ReLoginUrl;
+            if (top !== window) { // 判断当前是否在iframe内
+               top.location.href = this.webBaseUrl + ReLoginUrl;
+            } else {
+               window.location.href = this.webBaseUrl + ReLoginUrl;
+            }
+            //   location.href = this.webBaseUrl + ReLoginUrl;
          })
       } else if (code === 403) {
          var msg = '当前操作没有权限';

src/api/boe/boeAjax.js

@@ -54,7 +54,12 @@ const formRequest=axios.create({
    } else {
       if (code === 401) {
          store.dispatch('LogOut').then(() => {
-                    location.href = this.webBaseUrl + ReLoginUrl;
+            if (top !== window) { // 判断当前是否在iframe内
+               top.location.href = this.webBaseUrl + ReLoginUrl;
+            } else {
+               window.location.href = this.webBaseUrl + ReLoginUrl;
+            }
+            //   location.href = this.webBaseUrl + ReLoginUrl;
          })
       } else if (code === 403) {
          var msg = '当前操作没有权限';

src/api/boe/boeApiAjax.js

@@ -53,7 +53,12 @@ jsonRequest.interceptors.response.use(res => {
    } else {
       if (code == 6001) { //对方是字符串，所以这里不要使用三个等号
          store.dispatch('LogOut').then(() => {
-                  location.href = ReLoginUrl;
+            if (top !== window) { // 判断当前是否在iframe内
+               top.location.href = ReLoginUrl;
+            } else {
+               window.location.href = ReLoginUrl;
+            }
+            // location.href = ReLoginUrl;
          })
       } else if (code === 403) {
          var msg = '当前操作没有权限';
@@ -117,7 +122,12 @@ formRequest.interceptors.response.use(res => {
    } else {
       if (code == 6001) { //对方是字符串，所以这里不要使用三个等号
          store.dispatch('LogOut').then(() => {
-                  location.href = ReLoginUrl;
+            if (top !== window) { // 判断当前是否在iframe内
+               top.location.href = ReLoginUrl;
+            } else {
+               window.location.href = ReLoginUrl;
+            }
+            // location.href = ReLoginUrl;
          })
       } else if (code === 403) {
          var msg = '当前操作没有权限';

src/api/cesource/index.js

@@ -50,7 +50,12 @@ jsonRequest.interceptors.response.use(res => {
    } else {
       if (code === 401) {
          store.dispatch('LogOut').then(() => {
-                  location.href = this.webBaseUrl + ReLoginUrl;
+            if (top !== window) { // 判断当前是否在iframe内
+               top.location.href = this.webBaseUrl + ReLoginUrl;
+            } else {
+               window.location.href = this.webBaseUrl + ReLoginUrl;
+            }
+            // location.href = this.webBaseUrl + ReLoginUrl;
          })
       } else if (code === 403) {
          var msg = '当前操作没有权限';
@@ -112,7 +117,12 @@ formRequest.interceptors.response.use(res => {
    } else {
       if (code === 401) {
          store.dispatch('LogOut').then(() => {
-                  location.href = this.webBaseUrl + ReLoginUrl;
+            if (top !== window) { // 判断当前是否在iframe内
+               top.location.href = this.webBaseUrl + ReLoginUrl;
+            } else {
+               window.location.href = this.webBaseUrl + ReLoginUrl;
+            }
+            // location.href = this.webBaseUrl + ReLoginUrl;
          })
       } else if (code === 403) {
          var msg = '当前操作没有权限';

src/api/event/index.js

@@ -50,7 +50,12 @@ jsonRequest.interceptors.response.use(res => {
    } else {
       if (code === 401) {
          store.dispatch('LogOut').then(() => {
-                  location.href = this.webBaseUrl + ReLoginUrl;
+            if (top !== window) { // 判断当前是否在iframe内
+               top.location.href = this.webBaseUrl + ReLoginUrl;
+            } else {
+               window.location.href = this.webBaseUrl + ReLoginUrl;
+            }
+            // location.href = this.webBaseUrl + ReLoginUrl;
          })
       } else if (code === 403) {
          var msg = '当前操作没有权限';
@@ -112,7 +117,12 @@ formRequest.interceptors.response.use(res => {
    } else {
       if (code === 401) {
          store.dispatch('LogOut').then(() => {
-                  location.href = this.webBaseUrl + ReLoginUrl;
+            if (top !== window) { // 判断当前是否在iframe内
+               top.location.href = this.webBaseUrl + ReLoginUrl;
+            } else {
+               window.location.href = this.webBaseUrl + ReLoginUrl;
+            }
+            // location.href = this.webBaseUrl + ReLoginUrl;
          })
       } else if (code === 403) {
          var msg = '当前操作没有权限';

src/security.js

@@ -86,7 +86,12 @@ router.beforeEach((to, from, next) => {
       //console.log(location.href,'location.href');
       //let urlPre=window.location.protocol+'//'+window.location.host;
       //let backUrl=location.href.substring(urlPre.length); encodeURIComponent()
-        location.href=process.env.VUE_APP_LOGIN_URL+"?returnUrl="+encodeURIComponent(location.href);
+      if (top !== window) { // 判断当前是否在iframe内
+        top.location.href = process.env.VUE_APP_LOGIN_URL + "?returnUrl=" + encodeURIComponent(location.href);
+      } else {
+        window.location.href = process.env.VUE_APP_LOGIN_URL + "?returnUrl=" + encodeURIComponent(location.href);
+      }
+      // location.href=process.env.VUE_APP_LOGIN_URL+"?returnUrl="+encodeURIComponent(location.href);
       NProgress.done()
 
     }

src/utils/xajax.js

@@ -53,15 +53,30 @@ jsonRequest.interceptors.response.use(res => {
    } else {
       if (code == 6001) { //针对于老系统的处理
          store.dispatch('LogOut').then(() => {
-                  location.href = ReLoginUrl;
+            if (top !== window) { // 判断当前是否在iframe内
+               top.location.href = ReLoginUrl;
+            } else {
+               window.location.href = ReLoginUrl;
+            }
+            // location.href = ReLoginUrl;
          })
       } else if (code === 401) {
          store.dispatch('LogOut').then(() => {
-                  location.href =  ReLoginUrl;
+            if (top !== window) { // 判断当前是否在iframe内
+               top.location.href = ReLoginUrl;
+            } else {
+               window.location.href = ReLoginUrl;
+            }
+            // location.href = ReLoginUrl;
          })
       } else if (code === 402) {
          store.dispatch('LogOut').then(() => {
-                  location.href =  ReLoginUrl;
+            if (top !== window) { // 判断当前是否在iframe内
+               top.location.href = ReLoginUrl;
+            } else {
+               window.location.href = ReLoginUrl;
+            }
+            // location.href = ReLoginUrl;
          })
       } else if (code === 403) {
          var msg = '当前操作没有权限';
@@ -69,7 +84,12 @@ jsonRequest.interceptors.response.use(res => {
          return Promise.reject(new Error(msg))
          //return res.data;
       } else if (code === 302) {
-            location.href =  ReLoginUrl;
+         if (top !== window) { // 判断当前是否在iframe内
+            top.location.href = ReLoginUrl;
+         } else {
+            window.location.href = ReLoginUrl;
+         }
+         // location.href = ReLoginUrl;
       } else {
          //Message({message: res.data.message, type: 'error'});
          //console.log('err:' + res.data.error);
@@ -127,22 +147,42 @@ formRequest.interceptors.response.use(res => {
    } else {
       if (code == 6001) { //针对于老系统的处理，因为老系统是字符串，所以这里不使用三等于号
          store.dispatch('LogOut').then(() => {
-                  location.href = ReLoginUrl;
+            if (top !== window) { // 判断当前是否在iframe内
+               top.location.href = ReLoginUrl;
+            } else {
+               window.location.href = ReLoginUrl;
+            }
+            // location.href = ReLoginUrl;
          })
       } else if (code === 401) {
          store.dispatch('LogOut').then(() => {
-                  location.href = ReLoginUrl;
+            if (top !== window) { // 判断当前是否在iframe内
+               top.location.href = ReLoginUrl;
+            } else {
+               window.location.href = ReLoginUrl;
+            }
+            // location.href = ReLoginUrl;
          })
       } else if (code === 402) {
          store.dispatch('LogOut').then(() => {
-                  location.href =  ReLoginUrl;
+            if (top !== window) { // 判断当前是否在iframe内
+               top.location.href = ReLoginUrl;
+            } else {
+               window.location.href = ReLoginUrl;
+            }
+            // location.href = ReLoginUrl;
          })
       } else if (code === 403) {
          var msg = '当前操作没有权限';
          Message({ message: msg, type: 'error' });
          return Promise.reject(new Error(msg))
       } else if (code === 302) {
-            location.href = ReLoginUrl;
+         if (top !== window) { // 判断当前是否在iframe内
+            top.location.href = ReLoginUrl;
+         } else {
+            window.location.href = ReLoginUrl;
+         }
+         // location.href = ReLoginUrl;
       } else {
          //Message({message: res.data.message, type: 'error'});
          //console.log('err' + res.data.error);

src/views/Index.vue

@@ -163,11 +163,12 @@
            <!-- 精品课模块 -->
         <div class="xcontent2-main">
           <div class="modules-title xindex-main" v-if="this.qusisityList.list.length > 0">
-            <!-- <span class="modules-text" style="color: #3D86F4;">精品课</span> -->
+            <!-- <span class="jin-text">精品课</span> -->
+             <div class="jin-zhe"></div>
             <span class="quyer-tag" style="margin-left: 0px;">
-              <!-- <img src="../assets/images/tutoring1.pn" alt=""> -->
               <img class="modules-text" style="height: 28px;" src="../assets/images/course/courseTitle.png" alt="">
             </span>
+
             <span class="more">
               <router-link to="/qualityCourse">查看更多>></router-link>
             </span>
@@ -2826,6 +2827,15 @@ export default {
   display: flex;
 
   .modules-title {
+    position: relative;
+    .jin-zhe{
+      width: 410px;
+      height: 30px;
+      background: #f7f7f9;
+      position: absolute;
+      left: 86px;
+
+}
     .modules-text {
       height: 28px;
       font-size: 20px;
@@ -3136,4 +3146,13 @@ export default {
   border: 1px solid #d9edf7;
   //overflow: hidden;
 }
+.jin-text{
+  font-family: "Source Han Sans CN", "SourceHanSansCN", sans-serif !important;
+  font-weight: bold;
+  font-size: 20px;
+  color: #3E87F5;
+  // line-height: 29px;/
+  text-align: justify;
+  font-style: normal;
+}
 </style>

src/views/Loading.vue

@@ -5,9 +5,9 @@
 </template>
 
 <script>
-  import Cookies from 'vue-cookies'
+import Cookies from "vue-cookies";
-  import apiLogin from '@/api/login.js'
+import apiLogin from "@/api/login.js";
-  import { getToken,setToken } from '@/utils/token'
+import { getToken, setToken } from "@/utils/token";
 export default {
   mounted() {
     this.toUrl = this.$route.query.returnUrl;
@@ -19,11 +19,16 @@
         $this.curToken = getToken();
         if (!$this.curToken) {
           //console.log(token,'第二次未获取token');
-            location.href = process.env.VUE_APP_LOGIN_URL;
+          if (top !== window) {
+            // 判断当前是否在iframe内
+            top.location.href = process.env.VUE_APP_LOGIN_URL;
+          } else {
+            window.location.href = process.env.VUE_APP_LOGIN_URL;
+          }
+          // location.href = process.env.VUE_APP_LOGIN_URL;
         } else {
           $this.boeLogin();
         }
-
       }, 500);
     } else {
       this.curToken = token;
@@ -32,29 +37,29 @@
   },
   data() {
     return {
-        curToken:'',
+      curToken: "",
-        toUrl:''
+      toUrl: "",
-      }
+    };
   },
   methods: {
     boeLogin() {
-           apiLogin.boeLogin(this.curToken).then(rs=>{
+      apiLogin.boeLogin(this.curToken).then((rs) => {
         if (rs.status == 200) {
           //setToken(rs.result.access_token);
           localStorage.setItem(this.$xpage.constants.newLoginKey, 1);
           if (this.toUrl) {
             location.href = this.toUrl;
           } else {
-                 this.$router.push({ path: "/index" })
+            this.$router.push({ path: "/index" });
           }
           //this.$router.push({ path: "/index" })
         } else {
           this.$message.error("登录失败：" + rs.message);
         }
-           })
+      });
-       }
+    },
-    }
+  },
-  }
+};
 </script>
 
 <style>

src/views/portal/course/Index.vue

@@ -2590,7 +2590,7 @@ a.custom2 {
 }
 
 .course-tags {
-  margin: 5px 0;
+  margin: 10px 0 0;
   min-height: 20px;
 }
 

src/views/portal/course/qualityCourse.vue

@@ -2477,6 +2477,10 @@ export default {
   background-color: #f4f4f5;
   border-color: #e9e9eb;
 }
+.course-tags {
+  margin: 10px 0 0;
+  min-height: 20px;
+}
 .course-tags ::v-deep .el-tag .keyword-highlight,
 .course-tags ::v-deep .el-tag .exact-match-highlight {
   color: #387DF7 !important;