lex 1 год назад
Родитель
Сommit
a1183c6838
51 измененных файлов с 520 добавлено и 417 удалено
  1. 1 0
      dist/assets/auth-login-legacy.5431f464.js
  2. 1 0
      dist/assets/auth-login-legacy.67220a59.js
  3. 1 0
      dist/assets/auth-login.246dc6b0.js
  4. 1 0
      dist/assets/auth-login.6ab2e634.js
  5. 0 0
      dist/assets/create-legacy.b8cadd00.js
  6. 0 0
      dist/assets/create-legacy.dde9ef64.js
  7. 0 0
      dist/assets/create.ebc17e99.js
  8. 0 0
      dist/assets/create.f0078a28.js
  9. 0 0
      dist/assets/download-legacy.b41a8568.js
  10. 0 0
      dist/assets/download.3106dc1b.js
  11. 1 0
      dist/assets/home-layout-center-legacy.8bfcbdc4.js
  12. 4 0
      dist/assets/home-layout-center.b0ec2b5a.js
  13. 5 0
      dist/assets/home-layout-center.fb6fe482.js
  14. 1 0
      dist/assets/index-legacy.14496d9d.js
  15. 1 0
      dist/assets/index-legacy.4aeccacf.js
  16. 1 0
      dist/assets/index-legacy.631a8425.js
  17. 1 0
      dist/assets/index-legacy.bc050eab.js
  18. 1 0
      dist/assets/index-legacy.d6b61ce6.js
  19. 1 0
      dist/assets/index-legacy.e9e945da.js
  20. 1 0
      dist/assets/index.0ec57d78.js
  21. 1 0
      dist/assets/index.da8049a1.js
  22. 0 0
      dist/assets/index.e843d9dd.js
  23. 1 0
      dist/assets/index.f4254c4b.js
  24. 1 0
      dist/assets/login-legacy.0543bfb7.js
  25. 1 0
      dist/assets/login-legacy.98b25973.js
  26. 1 0
      dist/assets/login.1014b468.js
  27. 1 0
      dist/assets/login.4ea7ff39.js
  28. 0 0
      dist/assets/new-index-legacy.ed55fc57.js
  29. 1 0
      dist/assets/new-index.a22f9ddf.js
  30. 1 0
      dist/assets/new-index.e081d384.js
  31. 0 0
      dist/assets/routes-common.d5b4267c.js
  32. 0 0
      dist/assets/select-subject.5e7efcef.css
  33. 1 0
      dist/assets/teacher-legacy.90c50844.js
  34. 1 0
      dist/assets/teacher-legacy.f86d179b.js
  35. 0 0
      dist/assets/teacher.10277b1c.js
  36. 1 0
      dist/assets/tenant-legacy.5d49d5b2.js
  37. 1 0
      dist/assets/tenant-legacy.c17b747a.js
  38. 0 0
      dist/assets/tenant.1032bcd6.js
  39. 1 0
      dist/assets/transfer-legacy.497a225e.js
  40. 1 0
      dist/assets/transfer-legacy.bf39643f.js
  41. 1 0
      dist/assets/transfer.ed19cb86.js
  42. 11 0
      dist/index.html
  43. 10 0
      dist/teacher.html
  44. 10 0
      dist/tenant.html
  45. 25 16
      src/student/down-load/download.tsx
  46. 19 4
      src/student/down-load/transfer.tsx
  47. 292 297
      src/student/home/index.tsx
  48. 20 3
      src/student/invite-teacher/invite-success/index.tsx
  49. 46 46
      src/teacher/live-class/create-components/createState.ts
  50. 50 50
      src/teacher/video-class/createState.tsx
  51. 1 1
      vite.config.ts

Разница между файлами не показана из-за своего большого размера
+ 1 - 0
dist/assets/auth-login-legacy.5431f464.js


Разница между файлами не показана из-за своего большого размера
+ 1 - 0
dist/assets/auth-login-legacy.67220a59.js


Разница между файлами не показана из-за своего большого размера
+ 1 - 0
dist/assets/auth-login.246dc6b0.js


Разница между файлами не показана из-за своего большого размера
+ 1 - 0
dist/assets/auth-login.6ab2e634.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
dist/assets/create-legacy.b8cadd00.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
dist/assets/create-legacy.dde9ef64.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
dist/assets/create.ebc17e99.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
dist/assets/create.f0078a28.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
dist/assets/download-legacy.b41a8568.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
dist/assets/download.3106dc1b.js


+ 1 - 0
dist/assets/home-layout-center-legacy.8bfcbdc4.js

@@ -0,0 +1 @@
+!function(){function e(e,t,n,r,o,s,u){try{var a=e[s](u),c=a.value}catch(i){return void n(i)}a.done?t(c):Promise.resolve(c).then(r,o)}System.register(["./index-legacy.e3dcb6a6.js","./index-legacy.d6b61ce6.js","./auth-legacy.0dc848de.js","./routes-common-legacy.19c8e2d2.js"],(function(t){"use strict";var n,r,o,s,u,a,c,i,d,f;return{setters:[function(e){n=e.d,r=e.g,o=e.t,s=e.p,u=e.i,a=e.j,c=e.C,i=e.F},function(e){d=e.a,f=e.b},function(){},function(){}],execute:function(){t("default",n({name:"home-layout-center",data:function(){return{status:!1}},mounted:function(){this.getUserInfo()},methods:{getUserInfo:function(){var t,n=this;return(t=regeneratorRuntime.mark((function e(){var t,a,c;return regeneratorRuntime.wrap((function(e){for(;;)switch(e.prev=e.next){case 0:return e.prev=0,e.next=3,d.post("/api-auth/smsLogin",{requestType:"form",data:{clientId:"student",clientSecret:"student",phone:r.orchestraInfo.phone,token:r.orchestraInfo.token,isSurportRegister:!0}});case 3:return t=e.sent,a=t.data.authentication,o(a.token_type+" "+a.access_token),s({api:"setCache",content:{key:"h5-colexiu-token",value:a.token_type+" "+a.access_token}}),e.next=9,d.get("/api-student/student/queryUserInfo",{initRequest:!0});case 9:c=e.sent,u(c.data),n.$router.push("/home"),e.next=17;break;case 14:e.prev=14,e.t0=e.catch(0),n.status=!0;case 17:case"end":return e.stop()}}),e,null,[[0,14]])})),function(){var n=this,r=arguments;return new Promise((function(o,s){var u=t.apply(n,r);function a(t){e(u,o,s,a,c,"next",t)}function c(t){e(u,o,s,a,c,"throw",t)}a(void 0)}))})()}},render:function(){return a(i,null,[this.status?a("div",{class:f.error},[a(c,{type:"notFond",classImgSize:"CERT",tips:"加载失败,请稍后重试",buttonText:"重新加载",plain:!0,onClick:this.getUserInfo},null)]):a("div",null,null)])}}))}}}))}();

+ 4 - 0
dist/assets/home-layout-center.b0ec2b5a.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/home-layout-center.b0ec2b5a.js
 import{d as r,g as s,t as u,p as i,i as c,j as e,C as l,F as p}from"./index.902e8590.js";import{a,b as h}from"./index.fcf9c140.js";import"./auth.9d4eae24.js";import"./routes-common.117ebb37.js";var g=r({name:"home-layout-center",data(){return{status:!1}},mounted(){this.getUserInfo()},methods:{async getUserInfo(){try{const o=await a.post("/api-auth/smsLogin",{requestType:"form",data:{clientId:"student",clientSecret:"student",phone:s.orchestraInfo.phone,token:s.orchestraInfo.token,isSurportRegister:!0}}),{authentication:t}=o.data;u(t.token_type+" "+t.access_token),i({api:"setCache",content:{key:"h5-colexiu-token",value:t.token_type+" "+t.access_token}});const n=await a.get("/api-student/student/queryUserInfo",{initRequest:!0});c(n.data),this.$router.push("/home")}catch{this.status=!0}}},render(){return e(p,null,[this.status?e("div",{class:h.error},[e(l,{type:"notFond",classImgSize:"CERT",tips:"\u52A0\u8F7D\u5931\u8D25\uFF0C\u8BF7\u7A0D\u540E\u91CD\u8BD5",buttonText:"\u91CD\u65B0\u52A0\u8F7D",plain:!0,onClick:this.getUserInfo},null)]):e("div",null,null)])}});export{g as default};
+========
+import{d as r,g as s,t as u,p as i,i as c,j as e,C as l,F as p}from"./index.95ce382c.js";import{a,b as h}from"./index.e843d9dd.js";import"./auth.27f1cea0.js";import"./routes-common.d5b4267c.js";var g=r({name:"home-layout-center",data(){return{status:!1}},mounted(){this.getUserInfo()},methods:{async getUserInfo(){try{const o=await a.post("/api-auth/smsLogin",{requestType:"form",data:{clientId:"student",clientSecret:"student",phone:s.orchestraInfo.phone,token:s.orchestraInfo.token,isSurportRegister:!0}}),{authentication:t}=o.data;u(t.token_type+" "+t.access_token),i({api:"setCache",content:{key:"h5-colexiu-token",value:t.token_type+" "+t.access_token}});const n=await a.get("/api-student/student/queryUserInfo",{initRequest:!0});c(n.data),this.$router.push("/home")}catch{this.status=!0}}},render(){return e(p,null,[this.status?e("div",{class:h.error},[e(l,{type:"notFond",classImgSize:"CERT",tips:"\u52A0\u8F7D\u5931\u8D25\uFF0C\u8BF7\u7A0D\u540E\u91CD\u8BD5",buttonText:"\u91CD\u65B0\u52A0\u8F7D",plain:!0,onClick:this.getUserInfo},null)]):e("div",null,null)])}});export{g as default};
+>>>>>>>> iteration-oss-up:dist/assets/home-layout-center.fb6fe482.js

+ 5 - 0
dist/assets/home-layout-center.fb6fe482.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/home-layout-center.b0ec2b5a.js
+import{d as r,g as s,t as u,p as i,i as c,j as e,C as l,F as p}from"./index.902e8590.js";import{a,b as h}from"./index.fcf9c140.js";import"./auth.9d4eae24.js";import"./routes-common.117ebb37.js";var g=r({name:"home-layout-center",data(){return{status:!1}},mounted(){this.getUserInfo()},methods:{async getUserInfo(){try{const o=await a.post("/api-auth/smsLogin",{requestType:"form",data:{clientId:"student",clientSecret:"student",phone:s.orchestraInfo.phone,token:s.orchestraInfo.token,isSurportRegister:!0}}),{authentication:t}=o.data;u(t.token_type+" "+t.access_token),i({api:"setCache",content:{key:"h5-colexiu-token",value:t.token_type+" "+t.access_token}});const n=await a.get("/api-student/student/queryUserInfo",{initRequest:!0});c(n.data),this.$router.push("/home")}catch{this.status=!0}}},render(){return e(p,null,[this.status?e("div",{class:h.error},[e(l,{type:"notFond",classImgSize:"CERT",tips:"\u52A0\u8F7D\u5931\u8D25\uFF0C\u8BF7\u7A0D\u540E\u91CD\u8BD5",buttonText:"\u91CD\u65B0\u52A0\u8F7D",plain:!0,onClick:this.getUserInfo},null)]):e("div",null,null)])}});export{g as default};
+========
+import{d as r,g as s,t as u,p as i,i as c,j as e,C as l,F as p}from"./index.95ce382c.js";import{a,b as h}from"./index.e843d9dd.js";import"./auth.27f1cea0.js";import"./routes-common.d5b4267c.js";var g=r({name:"home-layout-center",data(){return{status:!1}},mounted(){this.getUserInfo()},methods:{async getUserInfo(){try{const o=await a.post("/api-auth/smsLogin",{requestType:"form",data:{clientId:"student",clientSecret:"student",phone:s.orchestraInfo.phone,token:s.orchestraInfo.token,isSurportRegister:!0}}),{authentication:t}=o.data;u(t.token_type+" "+t.access_token),i({api:"setCache",content:{key:"h5-colexiu-token",value:t.token_type+" "+t.access_token}});const n=await a.get("/api-student/student/queryUserInfo",{initRequest:!0});c(n.data),this.$router.push("/home")}catch{this.status=!0}}},render(){return e(p,null,[this.status?e("div",{class:h.error},[e(l,{type:"notFond",classImgSize:"CERT",tips:"\u52A0\u8F7D\u5931\u8D25\uFF0C\u8BF7\u7A0D\u540E\u91CD\u8BD5",buttonText:"\u91CD\u65B0\u52A0\u8F7D",plain:!0,onClick:this.getUserInfo},null)]):e("div",null,null)])}});export{g as default};
+>>>>>>>> iteration-oss-up:dist/assets/home-layout-center.fb6fe482.js

Разница между файлами не показана из-за своего большого размера
+ 1 - 0
dist/assets/index-legacy.14496d9d.js


Разница между файлами не показана из-за своего большого размера
+ 1 - 0
dist/assets/index-legacy.4aeccacf.js


Разница между файлами не показана из-за своего большого размера
+ 1 - 0
dist/assets/index-legacy.631a8425.js


Разница между файлами не показана из-за своего большого размера
+ 1 - 0
dist/assets/index-legacy.bc050eab.js


Разница между файлами не показана из-за своего большого размера
+ 1 - 0
dist/assets/index-legacy.d6b61ce6.js


Разница между файлами не показана из-за своего большого размера
+ 1 - 0
dist/assets/index-legacy.e9e945da.js


Разница между файлами не показана из-за своего большого размера
+ 1 - 0
dist/assets/index.0ec57d78.js


Разница между файлами не показана из-за своего большого размера
+ 1 - 0
dist/assets/index.da8049a1.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
dist/assets/index.e843d9dd.js


+ 1 - 0
dist/assets/index.f4254c4b.js

@@ -0,0 +1 @@
+import{d as o,f as u,j as s,z as e,B as i}from"./index.95ce382c.js";import{w as n}from"./wx_bg.3aa8574a.js";const a="_inviteSuccess_1k1g9_1",p="_h2_1k1g9_10",c="_tips_1k1g9_16",r="_btnDownload_1k1g9_22",d="_wxpopup_1k1g9_26";var t={inviteSuccess:a,h2:p,tips:c,btnDownload:r,wxpopup:d},l="./assets/success_tips.737b42b1.png",h=o({name:"inviteSuccess",data(){return{wxStatus:!1}},methods:{onDownload(){if(u().weixin){this.wxStatus=!0;return}/(iPhone|iPad|iPod|iOS)/i.test(navigator.userAgent)?window.location.href="https://itunes.apple.com/cn/app/id1626971695?mt=8":/(Android)/i.test(navigator.userAgent)?window.location.href="https://oss.dayaedu.com/appstore/clx-student-domain.apk":this.$toast("\u8BF7\u7528\u624B\u673A\u6216\u79FB\u52A8\u8BBE\u5907\u6253\u5F00")}},render(){return s("div",{class:t.inviteSuccess},[s("img",{src:l},null),s("p",{class:t.h2},[e("\u606D\u559C\u4F60\u6CE8\u518C\u6210\u529F")]),s("p",{class:t.tips},[e("\u4E0B\u8F7D\u9177\u4E50\u79C0APP\u5F00\u542F\u5668\u4E50\u5B66\u4E60\u4E4B\u65C5\uFF01")]),!u().isApp&&s("div",{class:"btnGroup"},[s(i,{type:"primary",round:!0,class:t.btnDownload,onClick:this.onDownload},{default:()=>[e("\u4E0B\u8F7D\u9177\u4E50\u79C0")]})]),this.wxStatus&&s("div",{class:t.wxpopup,onClick:()=>{this.wxStatus=!1}},[s("img",{src:n,alt:""},null)])])}});export{h as default};

Разница между файлами не показана из-за своего большого размера
+ 1 - 0
dist/assets/login-legacy.0543bfb7.js


Разница между файлами не показана из-за своего большого размера
+ 1 - 0
dist/assets/login-legacy.98b25973.js


Разница между файлами не показана из-за своего большого размера
+ 1 - 0
dist/assets/login.1014b468.js


Разница между файлами не показана из-за своего большого размера
+ 1 - 0
dist/assets/login.4ea7ff39.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
dist/assets/new-index-legacy.ed55fc57.js


Разница между файлами не показана из-за своего большого размера
+ 1 - 0
dist/assets/new-index.a22f9ddf.js


Разница между файлами не показана из-за своего большого размера
+ 1 - 0
dist/assets/new-index.e081d384.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
dist/assets/routes-common.d5b4267c.js


+ 0 - 0
dist/assets/organ-search.133b8c72.css → dist/assets/select-subject.5e7efcef.css


Разница между файлами не показана из-за своего большого размера
+ 1 - 0
dist/assets/teacher-legacy.90c50844.js


Разница между файлами не показана из-за своего большого размера
+ 1 - 0
dist/assets/teacher-legacy.f86d179b.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
dist/assets/teacher.10277b1c.js


Разница между файлами не показана из-за своего большого размера
+ 1 - 0
dist/assets/tenant-legacy.5d49d5b2.js


Разница между файлами не показана из-за своего большого размера
+ 1 - 0
dist/assets/tenant-legacy.c17b747a.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
dist/assets/tenant.1032bcd6.js


Разница между файлами не показана из-за своего большого размера
+ 1 - 0
dist/assets/transfer-legacy.497a225e.js


Разница между файлами не показана из-за своего большого размера
+ 1 - 0
dist/assets/transfer-legacy.bf39643f.js


+ 1 - 0
dist/assets/transfer.ed19cb86.js

@@ -0,0 +1 @@
+import{_ as d,a as u,b as p,c as m,d as c,s as o}from"./index.module.f9872746.js";import{_}from"./wx_bg.3aa8574a.js";import{d as f,T as h,f as g,j as t,B as w,z as b}from"./index.95ce382c.js";const r=s=>{const a=`./images/${s}`;return{"./images/bg.png":d,"./images/logo.png":u,"./images/student_bg.png":p,"./images/teacher_bg.png":m,"./images/teacher_logo.png":c,"./images/wx_bg.png":_}[a].default};var S=f({name:"transfer",data(){return{wxStatus:!1}},mounted(){const{origin:s,pathname:a}=location;let i=s+a+"#/";const e=this.$route.query;if(!e.url&&!e.action)return;i+=e.url;const n={url:i,action:e.action||"h5",pageTag:e.pageTag||1};e.liveRoomId&&(n.params="",n.params=JSON.stringify({liveRoomId:e.liveRoomId}));const l=encodeURIComponent(JSON.stringify(n));/(iPhone|iPad|iPod|iOS)/i.test(navigator.userAgent)?window.location.href=`ColexiuStudent://linkUrl=${l}`:/(Android)/i.test(navigator.userAgent)?window.location.href=`colexiustudent://html:8888/SplashActivity?url=${l}`:h("\u8BF7\u7528\u624B\u673A\u6216\u79FB\u52A8\u8BBE\u5907\u6253\u5F00")},methods:{downLoadApp(){if(g().weixin){this.wxStatus=!0;return}g().ios||/(iPhone|iPad|iPod|iOS)/i.test(navigator.userAgent)?window.location.href="https://itunes.apple.com/cn/app/id1626971695?mt=8":/(Android)/i.test(navigator.userAgent)?window.location.href="https://oss.dayaedu.com/appstore/clx-student-domain.apk":this.$toast("\u8BF7\u7528\u624B\u673A\u6216\u79FB\u52A8\u8BBE\u5907\u6253\u5F00")}},render(){return t("div",{class:o.downContainer},[t("div",{class:o.logo},[t("img",{src:r("logo.png"),alt:""},null)]),t("div",{class:o.down},[t(w,{type:"primary",round:!0,plain:!0,onClick:this.downLoadApp},{default:()=>[b("\u70B9\u51FB\u4E0B\u8F7DApp")]})]),t("div",{class:o.mainImg},[t("img",{src:r("student_bg.png"),alt:""},null)]),this.wxStatus&&t("div",{class:o.wxpopup,onClick:()=>{this.wxStatus=!1}},[t("img",{src:r("wx_bg.png"),alt:""},null)])])}});export{S as default,r as getAssetsHomeFile};

+ 11 - 0
dist/index.html

@@ -52,10 +52,17 @@
             _T_));
     })(Object);
   </script>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/index.fcf9c140.js"></script>
   <link rel="modulepreload" href="./assets/index.902e8590.js">
   <link rel="modulepreload" href="./assets/auth.9d4eae24.js">
   <link rel="modulepreload" href="./assets/routes-common.117ebb37.js">
+=======
+  <script type="module" crossorigin src="./assets/index.e843d9dd.js"></script>
+  <link rel="modulepreload" href="./assets/index.95ce382c.js">
+  <link rel="modulepreload" href="./assets/auth.27f1cea0.js">
+  <link rel="modulepreload" href="./assets/routes-common.d5b4267c.js">
+>>>>>>> iteration-oss-up
   <link rel="stylesheet" href="./assets/index.90dd4d0d.css">
   <link rel="stylesheet" href="./assets/auth.f09b6d78.css">
   <link rel="stylesheet" href="./assets/index.820e7d12.css">
@@ -68,7 +75,11 @@
   <!-- <script type="module" src="/src/teacher/main.ts"></script> -->
   <script nomodule>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",(function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()}),!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script>
   <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.efb7d450.js"></script>
+<<<<<<< HEAD
   <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.14496d9d.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.d6b61ce6.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> iteration-oss-up
 </body>
 
 </html>

+ 10 - 0
dist/teacher.html

@@ -52,9 +52,15 @@
             _T_));
     })(Object);
   </script>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/teacher.bae20335.js"></script>
   <link rel="modulepreload" href="./assets/index.902e8590.js">
   <link rel="modulepreload" href="./assets/routes-common.117ebb37.js">
+=======
+  <script type="module" crossorigin src="./assets/teacher.10277b1c.js"></script>
+  <link rel="modulepreload" href="./assets/index.95ce382c.js">
+  <link rel="modulepreload" href="./assets/routes-common.d5b4267c.js">
+>>>>>>> iteration-oss-up
   <link rel="stylesheet" href="./assets/index.90dd4d0d.css">
   <link rel="stylesheet" href="./assets/teacher.ded4b243.css">
   <script type="module">!function(){try{new Function("m","return import(m)")}catch(o){console.warn("vite: loading legacy build because dynamic import is unsupported, syntax error above should be ignored");var e=document.getElementById("vite-legacy-polyfill"),n=document.createElement("script");n.src=e.src,n.onload=function(){System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))},document.body.appendChild(n)}}();</script>
@@ -65,7 +71,11 @@
   
   <script nomodule>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",(function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()}),!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script>
   <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.efb7d450.js"></script>
+<<<<<<< HEAD
   <script nomodule id="vite-legacy-entry" data-src="./assets/teacher-legacy.f86d179b.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule id="vite-legacy-entry" data-src="./assets/teacher-legacy.90c50844.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> iteration-oss-up
 </body>
 
 </html>

+ 10 - 0
dist/tenant.html

@@ -52,9 +52,15 @@
             _T_));
     })(Object);
   </script>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/tenant.7e57642a.js"></script>
   <link rel="modulepreload" href="./assets/index.902e8590.js">
   <link rel="modulepreload" href="./assets/auth.9d4eae24.js">
+=======
+  <script type="module" crossorigin src="./assets/tenant.1032bcd6.js"></script>
+  <link rel="modulepreload" href="./assets/index.95ce382c.js">
+  <link rel="modulepreload" href="./assets/auth.27f1cea0.js">
+>>>>>>> iteration-oss-up
   <link rel="stylesheet" href="./assets/index.90dd4d0d.css">
   <link rel="stylesheet" href="./assets/auth.f09b6d78.css">
   <link rel="stylesheet" href="./assets/tenant.d44cc3f0.css">
@@ -67,7 +73,11 @@
   <!-- <script type="module" src="/src/teacher/main.ts"></script> -->
   <script nomodule>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",(function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()}),!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script>
   <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.efb7d450.js"></script>
+<<<<<<< HEAD
   <script nomodule id="vite-legacy-entry" data-src="./assets/tenant-legacy.c17b747a.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule id="vite-legacy-entry" data-src="./assets/tenant-legacy.5d49d5b2.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> iteration-oss-up
 </body>
 
 </html>

+ 25 - 16
src/student/down-load/download.tsx

@@ -2,6 +2,7 @@ import { browser } from '@/helpers/utils'
 import { Button, Toast } from 'vant'
 import { defineComponent } from 'vue'
 import styles from './index.module.less'
+import request from '@/helpers/request'
 
 export const getAssetsHomeFile = (fileName: string) => {
   const path = `./images/${fileName}`
@@ -15,15 +16,34 @@ export default defineComponent({
     const query = this.$route.query
     return {
       type: query.type || 'student',
+      androidUrl: '',
       wxStatus: false
     }
   },
-  mounted() {
+  async mounted() {
+    let platform = 'android-student'
     if (this.type === 'student') {
+      platform = 'android-student'
       document.title = '酷乐秀下载'
     } else if (this.type === 'teacher') {
+      platform = 'android-teacher'
       document.title = '酷乐秀学院下载'
     }
+
+    try {
+      const { data } = await request.get(
+        '/api-student/open/appVersionInfo/queryLatestByPlatform',
+        {
+          params: {
+            platform,
+            status: 'history'
+          }
+        }
+      )
+      this.androidUrl = data.downloadUrl
+    } catch {
+      //
+    }
   },
   methods: {
     downLoadApp() {
@@ -35,8 +55,6 @@ export default defineComponent({
       // 线上地址
       // https://itunes.apple.com/cn/app/id1626971149?mt=8   学院
       // https://itunes.apple.com/cn/app/id1626971695?mt=8   酷乐秀
-      // https://appstore.ks3-cn-beijing.ksyuncs.com/clx-student-domain.apk
-      // https://appstore.ks3-cn-beijing.ksyuncs.com/clx-teacher-domain.apk
 
       // 酷乐秀 安卓 DEV:
       // 老师端:https://www.pgyer.com/N2U3https://www.pgyer.com/cooleshow
@@ -49,20 +67,18 @@ export default defineComponent({
       if (location.origin.indexOf('online.colexiu.com') > -1) {
         if (this.type === 'student') {
           urlIos = 'https://itunes.apple.com/cn/app/id1626971695?mt=8'
-          urlAndroid =
-            'https://appstore.ks3-cn-beijing.ksyuncs.com/clx-student-domain.apk'
+          urlAndroid = this.androidUrl // 'https://oss.dayaedu.com/appstore/clx-student-domain.apk'
         } else if (this.type === 'teacher') {
           urlIos = 'https://itunes.apple.com/cn/app/id1626971149?mt=8'
-          urlAndroid =
-            'https://appstore.ks3-cn-beijing.ksyuncs.com/clx-teacher-domain.apk'
+          urlAndroid = this.androidUrl // 'https://oss.dayaedu.com/appstore/clx-teacher-domain.apk'
         }
       } else {
         if (this.type === 'student') {
           urlIos = 'https://www.pgyer.com/powy'
-          urlAndroid = 'https://www.pgyer.com/70e7'
+          urlAndroid = this.androidUrl // 'https://www.pgyer.com/70e7'
         } else {
           urlIos = 'https://www.pgyer.com/iO0m'
-          urlAndroid = 'https://www.pgyer.com/N2U3'
+          urlAndroid = this.androidUrl // 'https://www.pgyer.com/N2U3'
         }
       }
 
@@ -80,13 +96,6 @@ export default defineComponent({
         // }
       } else if (/(Android)/i.test(navigator.userAgent)) {
         window.location.href = urlAndroid
-        // if (this.type == 'student') {
-        //   window.location.href =
-        //     'https://appstore.ks3-cn-beijing.ksyuncs.com/clx-student-domain.apk'
-        // } else if (this.type == 'teacher') {
-        //   window.location.href =
-        //     'https://appstore.ks3-cn-beijing.ksyuncs.com/clx-teacher-domain.apk'
-        // }
       } else {
         this.$toast('请用手机或移动设备打开')
       }

+ 19 - 4
src/student/down-load/transfer.tsx

@@ -3,6 +3,7 @@ import { url } from 'inspector'
 import { Button, Toast } from 'vant'
 import { defineComponent } from 'vue'
 import styles from './index.module.less'
+import request from '@/helpers/request'
 
 export const getAssetsHomeFile = (fileName: string) => {
   const path = `./images/${fileName}`
@@ -14,10 +15,25 @@ export default defineComponent({
   name: 'transfer',
   data() {
     return {
-      wxStatus: false
+      wxStatus: false,
+      androidUrl: ''
     }
   },
-  mounted() {
+  async mounted() {
+    try {
+      const { data } = await request.get(
+        '/api-student/open/appVersionInfo/queryLatestByPlatform',
+        {
+          params: {
+            platform: 'android-student',
+            status: 'history'
+          }
+        }
+      )
+      this.androidUrl = data.downloadUrl
+    } catch {
+      //
+    }
     const { origin, pathname } = location
     let str = origin + pathname + '#/'
     const params = this.$route.query
@@ -65,8 +81,7 @@ export default defineComponent({
         window.location.href =
           'https://itunes.apple.com/cn/app/id1626971695?mt=8'
       } else if (/(Android)/i.test(navigator.userAgent)) {
-        window.location.href =
-          'https://appstore.ks3-cn-beijing.ksyuncs.com/clx-student-domain.apk'
+        window.location.href = this.androidUrl // 'https://oss.dayaedu.com/appstore/clx-student-domain.apk'
       } else {
         this.$toast('请用手机或移动设备打开')
       }

+ 292 - 297
src/student/home/index.tsx

@@ -1,297 +1,292 @@
-import request from '@/student/home-layout-orchestra/request-home'
-import { verifyUrl } from '@/helpers/toolsValidate'
-import { openDefaultWebView } from '@/student/home-layout-orchestra/state-orchestra'
-import { PullRefresh, Swipe, SwipeItem, Image, Tabs, Tab, Popup } from 'vant'
-import { defineComponent } from 'vue'
-import HotAlbum from './components/hot-album'
-import InfoList from './components/info-list'
-import MenuList from './components/menu-list'
-import Music from './components/music'
-import RecommendSage from './components/recommend-sage'
-import TalentStyle from './components/talent-style'
-import TheHomeHeader from './components/TheHomeHeader'
-import VideoClass from './components/video-class'
-import styles from './index.module.less'
-import Download from './model/download'
-import popupClose from './images/popup-close.png'
-import {
-  listenerMessage,
-  postMessage,
-  promisefiyPostMessage,
-  removeListenerMessage
-} from '@/helpers/native-message'
-import { browser } from '@/helpers/utils'
-import { setLogout, state } from '@/state'
-import event from './event'
-
-export default defineComponent({
-  name: 'home-index',
-  props: {
-    album: {
-      type: Array,
-      default: () => {
-        return []
-      }
-    }
-  },
-  data() {
-    return {
-      loading: false,
-      height: 'auto' as any,
-      banner: [], // BANNER列表
-      appMenu: [], // 按钮列表
-      albumList: [], // 热门专辑
-      musicList: {
-        topMusicSheet: [] as any,
-        newMusicSheet: [] as any,
-        hotMusicSheet: [] as any
-      },
-      sageList: [], // 推荐达人
-      videoList: [], // 视频课
-      headerHeight: 0,
-      downloadStatus: false
-    }
-  },
-  async mounted() {
-    await this.init()
-
-    event.on('downloadApp', async () => {
-      // 管乐团里面,获取是否已安装酷乐秀
-      const type = browser().orchestraAndroid
-        ? 'com.cooleshow.student'
-        : 'ColexiuStudent://'
-      await promisefiyPostMessage({
-        api: 'isInstall',
-        content: { type: type }
-      }).then((res: any) => {
-        const content = res.content
-        state.orchestraInfo.installStatus = content.installStatus
-        this.downloadStatus = true
-      })
-    })
-
-    listenerMessage('webViewOnResume', () => {
-      promisefiyPostMessage({ api: 'getUserAccount' }).then((res: any) => {
-        const content = res.content
-        // console.log(state.orchestraInfo, 'state.orchestraInfo')
-        // console.log(content, 'content')
-        if (content.phone !== state.orchestraInfo.phone) {
-          // 判断是否已经有关联编号
-          if (content.unionId) {
-            window.location.reload()
-          } else {
-            state.orchestraInfo.token = content.token.split(' ')[1]
-            state.orchestraInfo.phone = content.phone
-            state.orchestraInfo.nickname = content.nickname
-            state.orchestraInfo.avatar = content.avatar
-            state.orchestraInfo.unionId = content.unionId || 0
-            // 13310106048
-            // 15088666723
-            setLogout()
-            // window.location.reload()
-            this.$router.push({
-              path: '/home-auth'
-            })
-          }
-        }
-      })
-    })
-
-    postMessage({ api: 'setBarStatus', content: { status: 0 } })
-  },
-  unmounted() {
-    removeListenerMessage('webViewOnResume', () => {
-      //
-    })
-  },
-  methods: {
-    async init() {
-      try {
-        const res = await request.post('/api-cms/news/app/home', {
-          data: {
-            clientType: 'STUDENT'
-          }
-        })
-        const result = res.data || {}
-        this.banner = result.banner || []
-        this.appMenu = this.arrChange(5, result.appMenu || [])
-
-        // 热门专辑
-        const album = await request.post('/api-student/music/album/list', {
-          data: {
-            albumStatus: 1,
-            clientId: 'STUDENT'
-          }
-        })
-        this.albumList = album.data.rows || []
-
-        // 曲谱
-        const music = await request.post(
-          '/api-student/music/sheet/appMusicSheet',
-          {
-            data: {}
-          }
-        )
-        const musicData = music.data || []
-        this.musicList = {
-          topMusicSheet: this.arrChange(4, musicData.topMusicSheet || []),
-          newMusicSheet: this.arrChange(4, musicData.newMusicSheet || []),
-          hotMusicSheet: this.arrChange(4, musicData.hotMusicSheet || [])
-        }
-
-        const sage = await request.get(
-          '/api-student/teacher/queryHotTeacherList'
-        )
-        this.sageList = sage.data || []
-
-        const video = await request.get(
-          '/api-student/courseSchedule/queryLiveAndVideo'
-        )
-        this.videoList = video.data.videoList || []
-      } catch {
-        //
-      }
-      setTimeout(() => {
-        this.loading = false
-      }, 500)
-    },
-    arrChange(num: number, arr: any) {
-      const newArr = [] as any
-      while (arr.length > 0) {
-        newArr.push(arr.splice(0, num))
-      }
-      return newArr
-    },
-    async onRefresh() {
-      await this.init()
-      setTimeout(() => {
-        this.loading = false
-      }, 500)
-    }
-  },
-  render() {
-    return (
-      <div class={styles.home}>
-        <TheHomeHeader
-          ref="header"
-          onHeaderDom={(height: number) => {
-            console.log(height, 'height')
-            this.headerHeight = height
-          }}
-          onCart={() => {
-            event.emit('downloadApp')
-          }}
-          onSearch={() => {
-            // 搜索详情
-            event.emit('downloadApp')
-          }}
-          onMore={() => {
-            event.emit('downloadApp')
-          }}
-        />
-
-        <PullRefresh
-          v-model={this.loading}
-          loading-text="正在刷新..."
-          success-text="刷新完成"
-          onRefresh={() => this.onRefresh()}
-        >
-          <div class={styles.hotContent}>
-            <Swipe class={styles.swipe} autoplay={3000}>
-              {this.banner.map((item: any) => (
-                <SwipeItem
-                  onClick={() => {
-                    // 判断url是否正常
-                    // if (verifyUrl(item.linkUrl)) {
-                    //   openDefaultWebView(item.linkUrl, () => {
-                    //     window.location.href = item.linkUrl
-                    //   })
-                    // }
-                    event.emit('downloadApp')
-                  }}
-                >
-                  <Image
-                    class={styles.swipeItemImg}
-                    src={item.coverImage}
-                    fit="fill"
-                  />
-                </SwipeItem>
-              ))}
-            </Swipe>
-
-            <MenuList productList={this.appMenu} />
-          </div>
-
-          <HotAlbum album={this.albumList} />
-
-          <Music title="推荐曲目" music={this.musicList?.topMusicSheet || []} />
-          <Music title="最新曲目" music={this.musicList?.newMusicSheet || []} />
-          <Music title="最热曲目" music={this.musicList?.hotMusicSheet || []} />
-
-          {/* 推荐达人 */}
-          <RecommendSage sage={this.sageList} />
-
-          {/* 精品视频课 */}
-          <VideoClass video={this.videoList} />
-
-          <Tabs
-            shrink
-            background="#f6f8f9"
-            class={styles.homeTabs}
-            sticky
-            offsetTop={this.headerHeight + 'px'}
-          >
-            <Tab title="达人风采" name="sage">
-              <TalentStyle />
-            </Tab>
-            <Tab title="热门资讯" name="info">
-              <InfoList />
-            </Tab>
-          </Tabs>
-        </PullRefresh>
-
-        <Popup
-          v-model:show={this.downloadStatus}
-          round
-          style={{ width: '86%', background: 'transparent' }}
-          closeable
-          closeIcon={popupClose}
-        >
-          <Download
-            buttonText={
-              state.orchestraInfo.installStatus ? '打开酷乐秀' : '下载酷乐秀'
-            }
-            onConfirm={() => {
-              const type = browser().orchestraAndroid
-                ? 'com.cooleshow.student'
-                : 'ColexiuStudent://'
-              if (state.orchestraInfo.installStatus) {
-                postMessage({ api: 'openApp', content: { type: type } })
-              } else {
-                // const urlIos =
-                //   'https://itunes.apple.com/cn/app/id1626971695?mt=8'
-                // const urlAndroid =
-                //   'https://appstore.ks3-cn-beijing.ksyuncs.com/clx-student-domain.apk'
-
-                const url = browser().orchestraAndroid
-                  ? window.location.origin +
-                    window.location.pathname +
-                    '#/download'
-                  : 'https://itunes.apple.com/cn/app/id1626971695?mt=8'
-                postMessage({
-                  api: 'downloadApp',
-                  content: { type: type, url: url }
-                })
-              }
-            }}
-          />
-        </Popup>
-        {/* 
-          ColexiuStudent IOS 学生端
-          com.cooleshow.student ADNROID 学生端
-          com.cooleshow.teacher ADNROID 老师端
-         */}
-      </div>
-    )
-  }
-})
+import request from '@/student/home-layout-orchestra/request-home'
+import { verifyUrl } from '@/helpers/toolsValidate'
+import { openDefaultWebView } from '@/student/home-layout-orchestra/state-orchestra'
+import { PullRefresh, Swipe, SwipeItem, Image, Tabs, Tab, Popup } from 'vant'
+import { defineComponent } from 'vue'
+import HotAlbum from './components/hot-album'
+import InfoList from './components/info-list'
+import MenuList from './components/menu-list'
+import Music from './components/music'
+import RecommendSage from './components/recommend-sage'
+import TalentStyle from './components/talent-style'
+import TheHomeHeader from './components/TheHomeHeader'
+import VideoClass from './components/video-class'
+import styles from './index.module.less'
+import Download from './model/download'
+import popupClose from './images/popup-close.png'
+import {
+  listenerMessage,
+  postMessage,
+  promisefiyPostMessage,
+  removeListenerMessage
+} from '@/helpers/native-message'
+import { browser } from '@/helpers/utils'
+import { setLogout, state } from '@/state'
+import event from './event'
+
+export default defineComponent({
+  name: 'home-index',
+  props: {
+    album: {
+      type: Array,
+      default: () => {
+        return []
+      }
+    }
+  },
+  data() {
+    return {
+      loading: false,
+      height: 'auto' as any,
+      banner: [], // BANNER列表
+      appMenu: [], // 按钮列表
+      albumList: [], // 热门专辑
+      musicList: {
+        topMusicSheet: [] as any,
+        newMusicSheet: [] as any,
+        hotMusicSheet: [] as any
+      },
+      sageList: [], // 推荐达人
+      videoList: [], // 视频课
+      headerHeight: 0,
+      downloadStatus: false
+    }
+  },
+  async mounted() {
+    await this.init()
+
+    event.on('downloadApp', async () => {
+      // 管乐团里面,获取是否已安装酷乐秀
+      const type = browser().orchestraAndroid
+        ? 'com.cooleshow.student'
+        : 'ColexiuStudent://'
+      await promisefiyPostMessage({
+        api: 'isInstall',
+        content: { type: type }
+      }).then((res: any) => {
+        const content = res.content
+        state.orchestraInfo.installStatus = content.installStatus
+        this.downloadStatus = true
+      })
+    })
+
+    listenerMessage('webViewOnResume', () => {
+      promisefiyPostMessage({ api: 'getUserAccount' }).then((res: any) => {
+        const content = res.content
+        // console.log(state.orchestraInfo, 'state.orchestraInfo')
+        // console.log(content, 'content')
+        if (content.phone !== state.orchestraInfo.phone) {
+          // 判断是否已经有关联编号
+          if (content.unionId) {
+            window.location.reload()
+          } else {
+            state.orchestraInfo.token = content.token.split(' ')[1]
+            state.orchestraInfo.phone = content.phone
+            state.orchestraInfo.nickname = content.nickname
+            state.orchestraInfo.avatar = content.avatar
+            state.orchestraInfo.unionId = content.unionId || 0
+            // 13310106048
+            // 15088666723
+            setLogout()
+            // window.location.reload()
+            this.$router.push({
+              path: '/home-auth'
+            })
+          }
+        }
+      })
+    })
+
+    postMessage({ api: 'setBarStatus', content: { status: 0 } })
+  },
+  unmounted() {
+    removeListenerMessage('webViewOnResume', () => {
+      //
+    })
+  },
+  methods: {
+    async init() {
+      try {
+        const res = await request.post('/api-cms/news/app/home', {
+          data: {
+            clientType: 'STUDENT'
+          }
+        })
+        const result = res.data || {}
+        this.banner = result.banner || []
+        this.appMenu = this.arrChange(5, result.appMenu || [])
+
+        // 热门专辑
+        const album = await request.post('/api-student/music/album/list', {
+          data: {
+            albumStatus: 1,
+            clientId: 'STUDENT'
+          }
+        })
+        this.albumList = album.data.rows || []
+
+        // 曲谱
+        const music = await request.post(
+          '/api-student/music/sheet/appMusicSheet',
+          {
+            data: {}
+          }
+        )
+        const musicData = music.data || []
+        this.musicList = {
+          topMusicSheet: this.arrChange(4, musicData.topMusicSheet || []),
+          newMusicSheet: this.arrChange(4, musicData.newMusicSheet || []),
+          hotMusicSheet: this.arrChange(4, musicData.hotMusicSheet || [])
+        }
+
+        const sage = await request.get(
+          '/api-student/teacher/queryHotTeacherList'
+        )
+        this.sageList = sage.data || []
+
+        const video = await request.get(
+          '/api-student/courseSchedule/queryLiveAndVideo'
+        )
+        this.videoList = video.data.videoList || []
+      } catch {
+        //
+      }
+      setTimeout(() => {
+        this.loading = false
+      }, 500)
+    },
+    arrChange(num: number, arr: any) {
+      const newArr = [] as any
+      while (arr.length > 0) {
+        newArr.push(arr.splice(0, num))
+      }
+      return newArr
+    },
+    async onRefresh() {
+      await this.init()
+      setTimeout(() => {
+        this.loading = false
+      }, 500)
+    }
+  },
+  render() {
+    return (
+      <div class={styles.home}>
+        <TheHomeHeader
+          ref="header"
+          onHeaderDom={(height: number) => {
+            console.log(height, 'height')
+            this.headerHeight = height
+          }}
+          onCart={() => {
+            event.emit('downloadApp')
+          }}
+          onSearch={() => {
+            // 搜索详情
+            event.emit('downloadApp')
+          }}
+          onMore={() => {
+            event.emit('downloadApp')
+          }}
+        />
+
+        <PullRefresh
+          v-model={this.loading}
+          loading-text="正在刷新..."
+          success-text="刷新完成"
+          onRefresh={() => this.onRefresh()}
+        >
+          <div class={styles.hotContent}>
+            <Swipe class={styles.swipe} autoplay={3000}>
+              {this.banner.map((item: any) => (
+                <SwipeItem
+                  onClick={() => {
+                    // 判断url是否正常
+                    // if (verifyUrl(item.linkUrl)) {
+                    //   openDefaultWebView(item.linkUrl, () => {
+                    //     window.location.href = item.linkUrl
+                    //   })
+                    // }
+                    event.emit('downloadApp')
+                  }}
+                >
+                  <Image
+                    class={styles.swipeItemImg}
+                    src={item.coverImage}
+                    fit="fill"
+                  />
+                </SwipeItem>
+              ))}
+            </Swipe>
+
+            <MenuList productList={this.appMenu} />
+          </div>
+
+          <HotAlbum album={this.albumList} />
+
+          <Music title="推荐曲目" music={this.musicList?.topMusicSheet || []} />
+          <Music title="最新曲目" music={this.musicList?.newMusicSheet || []} />
+          <Music title="最热曲目" music={this.musicList?.hotMusicSheet || []} />
+
+          {/* 推荐达人 */}
+          <RecommendSage sage={this.sageList} />
+
+          {/* 精品视频课 */}
+          <VideoClass video={this.videoList} />
+
+          <Tabs
+            shrink
+            background="#f6f8f9"
+            class={styles.homeTabs}
+            sticky
+            offsetTop={this.headerHeight + 'px'}
+          >
+            <Tab title="达人风采" name="sage">
+              <TalentStyle />
+            </Tab>
+            <Tab title="热门资讯" name="info">
+              <InfoList />
+            </Tab>
+          </Tabs>
+        </PullRefresh>
+
+        <Popup
+          v-model:show={this.downloadStatus}
+          round
+          style={{ width: '86%', background: 'transparent' }}
+          closeable
+          closeIcon={popupClose}
+        >
+          <Download
+            buttonText={
+              state.orchestraInfo.installStatus ? '打开酷乐秀' : '下载酷乐秀'
+            }
+            onConfirm={() => {
+              const type = browser().orchestraAndroid
+                ? 'com.cooleshow.student'
+                : 'ColexiuStudent://'
+              if (state.orchestraInfo.installStatus) {
+                postMessage({ api: 'openApp', content: { type: type } })
+              } else {
+                const url = browser().orchestraAndroid
+                  ? window.location.origin +
+                    window.location.pathname +
+                    '#/download'
+                  : 'https://itunes.apple.com/cn/app/id1626971695?mt=8'
+                postMessage({
+                  api: 'downloadApp',
+                  content: { type: type, url: url }
+                })
+              }
+            }}
+          />
+        </Popup>
+        {/*
+          ColexiuStudent IOS 学生端
+          com.cooleshow.student ADNROID 学生端
+          com.cooleshow.teacher ADNROID 老师端
+         */}
+      </div>
+    )
+  }
+})

+ 20 - 3
src/student/invite-teacher/invite-success/index.tsx

@@ -5,12 +5,30 @@ import { Button } from 'vant'
 import { browser } from '@/helpers/utils'
 
 import wxBg from '../../down-load/images/wx_bg.png'
+import request from '@/helpers/request'
 
 export default defineComponent({
   name: 'inviteSuccess',
   data() {
     return {
-      wxStatus: false
+      wxStatus: false,
+      androidUrl: ''
+    }
+  },
+  async mounted() {
+    try {
+      const { data } = await request.get(
+        '/api-student/open/appVersionInfo/queryLatestByPlatform',
+        {
+          params: {
+            platform: 'android-student',
+            status: 'history'
+          }
+        }
+      )
+      this.androidUrl = data.downloadUrl
+    } catch {
+      //
     }
   },
   methods: {
@@ -23,8 +41,7 @@ export default defineComponent({
         window.location.href =
           'https://itunes.apple.com/cn/app/id1626971695?mt=8'
       } else if (/(Android)/i.test(navigator.userAgent)) {
-        window.location.href =
-          'https://appstore.ks3-cn-beijing.ksyuncs.com/clx-student-domain.apk'
+        window.location.href = this.androidUrl //  'https://oss.dayaedu.com/appstore/clx-student-domain.apk'
       } else {
         this.$toast('请用手机或移动设备打开')
       }

+ 46 - 46
src/teacher/live-class/create-components/createState.ts

@@ -1,46 +1,46 @@
-import { reactive } from 'vue'
-
-export const basePlan = {
-  plan: '',
-  startTime: '',
-  endTime: '',
-  classNum: 1
-}
-
-export const createState = reactive({
-  subjectList: [], // 声部列表
-  active: 1,
-  rate: 0,
-  minutes: [] as any,
-  tabIndex: 1,
-  templateList: [
-    'https://ks3-cn-beijing.ksyuncs.com/video-course/1657853010619green.png',
-    'https://ks3-cn-beijing.ksyuncs.com/video-course/1657853051064gray.png',
-    'https://ks3-cn-beijing.ksyuncs.com/video-course/1657853062314yellow.png',
-    'https://ks3-cn-beijing.ksyuncs.com/video-course/1657853076136linear.png'
-  ], // 模板列表
-  selectCourseList: [] as any, // 选择课程列表
-  coursePlanStatus: false, // 是否有锁课程
-  live: {
-    teacherId: '',
-    courseGroupId: '',
-    name: '',
-    subjectId: null as any,
-    courseIntroduce: '',
-    courseNum: null as any,
-    singleCourseMinutes: 0,
-    singleMins: null as any,
-    freeMinutes: 0,
-    coursePrice: null as any,
-    salesStartDate: '',
-    salesEndDate: '',
-    mixStudentNum: null as any,
-    backgroundPic: '',
-    backgroundPicTemplate: '',
-    coursePlanList: [
-      {
-        ...basePlan
-      }
-    ]
-  }
-})
+import { reactive } from 'vue'
+
+export const basePlan = {
+  plan: '',
+  startTime: '',
+  endTime: '',
+  classNum: 1
+}
+
+export const createState = reactive({
+  subjectList: [], // 声部列表
+  active: 1,
+  rate: 0,
+  minutes: [] as any,
+  tabIndex: 1,
+  templateList: [
+    'https://oss.dayaedu.com/video-course/1657853010619green.png',
+    'https://oss.dayaedu.com/video-course/1657853051064gray.png',
+    'https://oss.dayaedu.com/video-course/1657853062314yellow.png',
+    'https://oss.dayaedu.com/video-course/1657853076136linear.png'
+  ], // 模板列表
+  selectCourseList: [] as any, // 选择课程列表
+  coursePlanStatus: false, // 是否有锁课程
+  live: {
+    teacherId: '',
+    courseGroupId: '',
+    name: '',
+    subjectId: null as any,
+    courseIntroduce: '',
+    courseNum: null as any,
+    singleCourseMinutes: 0,
+    singleMins: null as any,
+    freeMinutes: 0,
+    coursePrice: null as any,
+    salesStartDate: '',
+    salesEndDate: '',
+    mixStudentNum: null as any,
+    backgroundPic: '',
+    backgroundPicTemplate: '',
+    coursePlanList: [
+      {
+        ...basePlan
+      }
+    ]
+  }
+})

+ 50 - 50
src/teacher/video-class/createState.tsx

@@ -1,50 +1,50 @@
-import { reactive } from 'vue'
-/*
-https://ks3-cn-beijing.ksyuncs.com/video-course/1657853010619green.png
-https://ks3-cn-beijing.ksyuncs.com/video-course/1657853051064gray.png
-https://ks3-cn-beijing.ksyuncs.com/video-course/1657853062314yellow.png
-https://ks3-cn-beijing.ksyuncs.com/video-course/1657853076136linear.png
-
-'https://daya.ks3-cn-beijing.ksyun.com/202204/T3unJdc.png',
-    'https://daya.ks3-cn-beijing.ksyun.com/202204/T3unJdl.png',
-    'https://daya.ks3-cn-beijing.ksyun.com/202204/T3unJdK.png',
-    'https://daya.ks3-cn-beijing.ksyun.com/202204/T3unJeA.png',
-
-*/
-export const createState = reactive({
-  groupId: 0,
-  active: 1,
-  tabIndex: 1,
-  loadingStatus: false,
-  rate: 0, // 手续费
-  video_account_period: 0, // 视频课收款账期
-  subjectList: [], // 声部列表
-  templateList: [
-    'https://ks3-cn-beijing.ksyuncs.com/video-course/1657853010619green.png',
-    'https://ks3-cn-beijing.ksyuncs.com/video-course/1657853051064gray.png',
-    'https://ks3-cn-beijing.ksyuncs.com/video-course/1657853062314yellow.png',
-    'https://ks3-cn-beijing.ksyuncs.com/video-course/1657853076136linear.png'
-  ], // 模板列表
-  lessonGroup: {
-    id: null,
-    lessonName: '',
-    lessonSubject: null as any,
-    lessonDesc: '',
-    lessonPrice: null as any,
-    lessonCoverUrl: '',
-    relationType: 'RECOMMEND',
-    lessonCoverTemplateUrl: ''
-  },
-  lessonList: [
-    {
-      videoTitle: '',
-      videoContent: '',
-      videoUrl: '',
-      coverUrl: '',
-      relationList: [] as any,
-      posterUrl: '' // 视频封面图
-    }
-  ]
-})
-// videoUrl: 'https://daya.ks3-cn-beijing.ksyun.com/202204/T1kHuSh.mp4',
-// coverUrl: 'https://daya.ks3-cn-beijing.ksyun.com/202204/T1kK2ao.png'
+import { reactive } from 'vue'
+/*
+https://oss.dayaedu.com/video-course/1657853010619green.png
+https://oss.dayaedu.com/video-course/1657853051064gray.png
+https://oss.dayaedu.com/video-course/1657853062314yellow.png
+https://oss.dayaedu.com/video-course/1657853076136linear.png
+
+'https://daya.ks3-cn-beijing.ksyun.com/202204/T3unJdc.png',
+    'https://daya.ks3-cn-beijing.ksyun.com/202204/T3unJdl.png',
+    'https://daya.ks3-cn-beijing.ksyun.com/202204/T3unJdK.png',
+    'https://daya.ks3-cn-beijing.ksyun.com/202204/T3unJeA.png',
+
+*/
+export const createState = reactive({
+  groupId: 0,
+  active: 1,
+  tabIndex: 1,
+  loadingStatus: false,
+  rate: 0, // 手续费
+  video_account_period: 0, // 视频课收款账期
+  subjectList: [], // 声部列表
+  templateList: [
+    'https://oss.dayaedu.com/video-course/1657853010619green.png',
+    'https://oss.dayaedu.com/video-course/1657853051064gray.png',
+    'https://oss.dayaedu.com/video-course/1657853062314yellow.png',
+    'https://oss.dayaedu.com/video-course/1657853076136linear.png'
+  ], // 模板列表
+  lessonGroup: {
+    id: null,
+    lessonName: '',
+    lessonSubject: null as any,
+    lessonDesc: '',
+    lessonPrice: null as any,
+    lessonCoverUrl: '',
+    relationType: 'RECOMMEND',
+    lessonCoverTemplateUrl: ''
+  },
+  lessonList: [
+    {
+      videoTitle: '',
+      videoContent: '',
+      videoUrl: '',
+      coverUrl: '',
+      relationList: [] as any,
+      posterUrl: '' // 视频封面图
+    }
+  ]
+})
+// videoUrl: 'https://daya.ks3-cn-beijing.ksyun.com/202204/T1kHuSh.mp4',
+// coverUrl: 'https://daya.ks3-cn-beijing.ksyun.com/202204/T1kK2ao.png'

+ 1 - 1
vite.config.ts

@@ -12,7 +12,7 @@ function resolve(dir: string) {
 // https://vitejs.dev/config/
 // https://github.com/vitejs/vite/issues/1930 .env
 // const proxyUrl = 'https://online.colexiu.com/';
-const proxyUrl = 'https://test.colexiu.com/'
+const proxyUrl = 'https://dev.colexiu.com/'
 // const proxyUrl = 'http://192.168.3.143:8000/'
 export default defineConfig({
   base: './',

Некоторые файлы не были показаны из-за большого количества измененных файлов