chao 1 рік тому
батько
коміт
1f2230cf3e

+ 1 - 1
dist/assets/Details-hJJ6RQKA.js → dist/assets/Details-i7CkNOHQ.js

@@ -1 +1 @@
-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-v6tQUUeD.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-Z8zF2AoJ.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};

Різницю між файлами не показано, бо вона завелика
+ 0 - 0
dist/assets/admin-JsTeTBfm.js


Різницю між файлами не показано, бо вона завелика
+ 0 - 0
dist/assets/index-8LfOUfRB.css


Різницю між файлами не показано, бо вона завелика
+ 0 - 0
dist/assets/index-Z8zF2AoJ.js


+ 2 - 2
dist/index.html

@@ -8,8 +8,8 @@
     <script>
       document.domain = "cocorobo.cn"
     </script>
-    <script type="module" crossorigin src="./assets/index-v6tQUUeD.js"></script>
-    <link rel="stylesheet" crossorigin href="./assets/index-6PG3a0c0.css">
+    <script type="module" crossorigin src="./assets/index-Z8zF2AoJ.js"></script>
+    <link rel="stylesheet" crossorigin href="./assets/index-8LfOUfRB.css">
   </head>
   <body>
     <div id="app"></div>

+ 10 - 2
src/App.vue

@@ -93,6 +93,7 @@ const userInfo = (data) => {
             })
           }, [], { "type": "POST", "withCredentials": true });
         } else {
+          isShow.value = false
           ElMessageBox.alert('没有绑定手机号,请先去绑定手机号', "提示", {
             confirmButtonText: '确定',
           })
@@ -100,16 +101,18 @@ const userInfo = (data) => {
       }
     }).catch(e => {
       if (data.telephoneNumber) {
-        top.U.A.Request("https://pbl.cocorobo.cn/api/pbl/batchRegistrationSzdjg", [data.userName, data.telephoneNumber + '@szdjg.com', '16ace517-b5c7-4168-a9bb-a9e0035df840', data.schoolName, data.telephoneNumber, userGrand, userIdentity, data.userId], function (r) {
+        top.U.A.Request("https://pbl.cocorobo.cn/api/pbl/batchRegistrationSzdjg", [data.userName, data.telephoneNumber + '@szdjg.com', '16ace517-b5c7-4168-a9bb-a9e0035df840', data.schoolName||"", data.telephoneNumber, userGrand, userIdentity, data.userId], function (r) {
           // console.log('rrrrr', r)
           axios.post(`https://beta.api.cocorobo.cn/api/user`, qs.stringify(params)).then(d => {
             // store.user = top.US.userInfo
             if (d.data && d.data[0][0].active == 1) {
+              isShow.value = false
               setStateUserinfo()
             }
           })
         }, [], { "type": "POST", "withCredentials": true });
       } else {
+        isShow.value = false
         ElMessageBox.alert('没有绑定手机号,请先去绑定手机号', "提示", {
           confirmButtonText: '确定',
         })
@@ -117,6 +120,7 @@ const userInfo = (data) => {
 
     })
   } else {
+    isShow.value = false
     ElMessageBox.alert('当前账号无使用平台权限,如需体验,您需申请体验账号,查看平台内容', "温馨提示", {
       confirmButtonText: '确定',
       showClose: false
@@ -131,6 +135,7 @@ const setStateUserinfo = () => {
   // setTimeState
   setTimeState.value = setInterval(() => {
     if (JSON.stringify(top.US.userInfo) != '{}') {
+      isShow.value = false
       store.user = top.US.userInfo
       clearInterval(setTimeState.value)
     }
@@ -156,9 +161,12 @@ const getUrlParam = (urlStr, urlKey) => {
 
 <template>
   <!-- <keep-alive> -->
-  <div v-if="isShow" style="height: 100%;">
+  <div v-loading="isShow" style="height: 100%;">
     <router-view></router-view>
   </div>
+  <el-dialog>
+
+  </el-dialog>
   <!-- </keep-alive> -->
 </template>
 

+ 5 - 1
src/components/header/headerRight.vue

@@ -11,7 +11,7 @@
             </div>
             <div>
                 <img src="" alt="">
-                <span>{{ userName }}</span>
+                <span @click="userInfoOpen()">{{ userName }}</span>
             </div>
         </div>
         <div v-else>
@@ -53,6 +53,10 @@ const goBack=()=>{
     top.location.href = "https://zy.szedu.cn/ai/"
 }
 
+const userInfoOpen = () => {
+    top.U.MD.D.I.openApplication('my') 
+}
+
 watchEffect(() => {
     // console.log(user, 2222222222)
     if (JSON.stringify(user.user) != "{}") {

+ 1 - 1
src/components/main/courseSelect.vue

@@ -315,7 +315,7 @@ const updateCourseId = (id, type) => {
       if (type == "openCourseUpdate") {
         top.U.MD.D.I.openInApplication("openCourseUpdate", res.value[0][0].courseId)
       } else {
-        top.U.MD.D.I.openInApplication("studyDetail", res.value[0][0].courseId, 2, user.user.type);
+        top.U.MD.D.I.openInApplication("studyDetail", res.value[0][0].courseId, 3, user.user.type);
       }
 
     }

Деякі файли не було показано, через те що забагато файлів було змінено