chao 6 mesiacov pred
rodič
commit
1e2da64708

+ 1 - 1
.gitignore

@@ -9,7 +9,7 @@ lerna-debug.log*
 
 node_modules
 .DS_Store
-# dist
+dist
 dist-ssr
 coverage
 *.local

+ 5 - 0
dist/assets/Details-1KCqOqYA.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/Details-HHd4qq79.js
+import{u as m,r as i,o as p,a as l,b as a,c as b,d as t,w as s,F as f,H as h,e as n,t as k,f as v,g,h as r,i as y,C,j as x,P as B,k as N}from"./index-WgZ6H4AX.js";const V={class:"iframDiv"},P={__name:"Details",setup(D){const{query:u,params:o}=m();console.log(u,o);const e=i("");return p(()=>{e.value=o.title}),(w,F)=>{const c=l("el-breadcrumb-item"),_=l("el-breadcrumb"),d=l("el-page-header");return a(),b(f,null,[t(h),t(d,null,{breadcrumb:s(()=>[t(_,{separator:"/"},{default:s(()=>[t(c,{to:{path:"/"}},{default:s(()=>[n(" 首页 ")]),_:1}),t(c,null,{default:s(()=>[n(k(v(o).title),1)]),_:1})]),_:1})]),default:s(()=>[g("div",V,[e.value=="课程列表"?(a(),r(C,{key:0})):e.value=="资源中心"?(a(),r(x,{key:1})):e.value=="实践中心"?(a(),r(B,{key:2})):e.value=="其他课程资源"?(a(),r(N,{key:3})):y("",!0)])]),_:1})],64)}}};export{P as default};
+========
+import{u as m,r as i,o as p,a as l,b as a,c as b,d as t,w as s,F as f,H as h,e as n,t as k,f as v,g,h as r,i as y,C,j as x,P as B,k as N}from"./index-ZD92vPJd.js";const V={class:"iframDiv"},P={__name:"Details",setup(D){const{query:u,params:o}=m();console.log(u,o);const e=i("");return p(()=>{e.value=o.title}),(w,F)=>{const c=l("el-breadcrumb-item"),_=l("el-breadcrumb"),d=l("el-page-header");return a(),b(f,null,[t(h),t(d,null,{breadcrumb:s(()=>[t(_,{separator:"/"},{default:s(()=>[t(c,{to:{path:"/"}},{default:s(()=>[n(" 首页 ")]),_:1}),t(c,null,{default:s(()=>[n(k(v(o).title),1)]),_:1})]),_:1})]),default:s(()=>[g("div",V,[e.value=="课程列表"?(a(),r(C,{key:0})):e.value=="资源中心"?(a(),r(x,{key:1})):e.value=="实践中心"?(a(),r(B,{key:2})):e.value=="其他课程资源"?(a(),r(N,{key:3})):y("",!0)])]),_:1})],64)}}};export{P as default};
+>>>>>>>> 2ecb6ad975ab91258270d35e5da20210b121d6cf:dist/assets/Details-1KCqOqYA.js

+ 4 - 0
dist/assets/Details-HHd4qq79.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/Details-HHd4qq79.js
 import{u as m,r as i,o as p,a as l,b as a,c as b,d as t,w as s,F as f,H as h,e as n,t as k,f as v,g,h as r,i as y,C,j as x,P as B,k as N}from"./index-WgZ6H4AX.js";const V={class:"iframDiv"},P={__name:"Details",setup(D){const{query:u,params:o}=m();console.log(u,o);const e=i("");return p(()=>{e.value=o.title}),(w,F)=>{const c=l("el-breadcrumb-item"),_=l("el-breadcrumb"),d=l("el-page-header");return a(),b(f,null,[t(h),t(d,null,{breadcrumb:s(()=>[t(_,{separator:"/"},{default:s(()=>[t(c,{to:{path:"/"}},{default:s(()=>[n(" 首页 ")]),_:1}),t(c,null,{default:s(()=>[n(k(v(o).title),1)]),_:1})]),_:1})]),default:s(()=>[g("div",V,[e.value=="课程列表"?(a(),r(C,{key:0})):e.value=="资源中心"?(a(),r(x,{key:1})):e.value=="实践中心"?(a(),r(B,{key:2})):e.value=="其他课程资源"?(a(),r(N,{key:3})):y("",!0)])]),_:1})],64)}}};export{P as default};
+========
+import{u as m,r as i,o as p,a as l,b as a,c as b,d as t,w as s,F as f,H as h,e as n,t as k,f as v,g,h as r,i as y,C,j as x,P as B,k as N}from"./index-ZD92vPJd.js";const V={class:"iframDiv"},P={__name:"Details",setup(D){const{query:u,params:o}=m();console.log(u,o);const e=i("");return p(()=>{e.value=o.title}),(w,F)=>{const c=l("el-breadcrumb-item"),_=l("el-breadcrumb"),d=l("el-page-header");return a(),b(f,null,[t(h),t(d,null,{breadcrumb:s(()=>[t(_,{separator:"/"},{default:s(()=>[t(c,{to:{path:"/"}},{default:s(()=>[n(" 首页 ")]),_:1}),t(c,null,{default:s(()=>[n(k(v(o).title),1)]),_:1})]),_:1})]),default:s(()=>[g("div",V,[e.value=="课程列表"?(a(),r(C,{key:0})):e.value=="资源中心"?(a(),r(x,{key:1})):e.value=="实践中心"?(a(),r(B,{key:2})):e.value=="其他课程资源"?(a(),r(N,{key:3})):y("",!0)])]),_:1})],64)}}};export{P as default};
+>>>>>>>> 2ecb6ad975ab91258270d35e5da20210b121d6cf:dist/assets/Details-1KCqOqYA.js

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 1 - 0
dist/assets/admin-3sLcJarU.js


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 1 - 0
dist/assets/admin-A-6neWZL.js


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 4 - 0
dist/assets/index-ZD92vPJd.js


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 1 - 0
dist/assets/index-cGYxIlnS.css


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 1 - 0
dist/assets/index-sC9fXj0r.css


+ 20 - 0
dist/index.html

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 <!DOCTYPE html>
 <html lang="en">
   <head>
@@ -15,3 +16,22 @@
     <div id="app"></div>
   </body>
 </html>
+=======
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8">
+    <link rel="icon" href="./assets/logo-OffHA7jB.png">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>深教AI6</title>
+    <script>
+      document.domain = "cocorobo.cn"
+    </script>
+    <script type="module" crossorigin src="./assets/index-ZD92vPJd.js"></script>
+    <link rel="stylesheet" crossorigin href="./assets/index-cGYxIlnS.css">
+  </head>
+  <body>
+    <div id="app"></div>

+  </body>
+</html>
+>>>>>>> 2ecb6ad975ab91258270d35e5da20210b121d6cf

+ 3 - 3
src/App.vue

@@ -11,7 +11,7 @@ const route = useRoute()
 const store = userInfoStore()
 const CurrentRole = userCurrentRole()
 const name = ref('')
-const isShow = ref(true)
+const isShow = ref(false)
 const setTimeState = ref(null)
 
 onMounted(() => {
@@ -39,11 +39,11 @@ onMounted(() => {
           }
         })
       } else {
-        linkLogin()
+        // linkLogin()
       }
     })
   } else {
-    linkLogin()
+    // linkLogin()
   }
 })
 

+ 10 - 9
src/components/main/other.vue

@@ -58,15 +58,16 @@ const dialogVisible = ref(false)
 
 const openApplication = (type) => {
   console.log(type, InfoStore.user)
-  if (type == "study") {
-    if (InfoStore.user.type == 2) {
-      top.U.MD.D.I.openApplication('studentStudy')
-    } else {
-      top.U.MD.D.I.openApplication('study')
-    }
-  } else {
-    top.U.MD.D.I.openApplication(type)
-  }
+  // if (type == "study") {
+  //   if (InfoStore.user.type == 2) {
+  //     top.U.MD.D.I.openApplication('studentStudy')
+  //   } else {
+  //     top.U.MD.D.I.openApplication('study')
+  //   }
+  // } else {
+  //   top.U.MD.D.I.openApplication(type)
+  // }
+  window.open('https://cloud.cocorobo.cn//#/'+type)
 }
 const courseDown = e => {
   dialogVisible.value = true

Niektoré súbory nie sú zobrazené, pretože je v týchto rozdielových dátach zmenené mnoho súborov