Merge branch 'online' into video-tcplayer

dist/assets/index-90f4d536.js → dist/assets/index-10f45099.js

@@ -1 +1 @@
-import{A as o,d as a,y as r,z as e,b as l,X as s,aI as i,x as n,au as t,aw as d,o as u,N as c,c as v,J as g,G as f,a3 as h,U as m,b9 as p,S as b,a1 as w,H as y}from"./index-a9ecc63e.js";const[z,S]=o("image"),x=y(a({name:z,props:{src:String,alt:String,fit:String,position:String,round:Boolean,block:Boolean,width:g,height:g,radius:g,lazyLoad:Boolean,iconSize:g,showError:f,errorIcon:h("photo-fail"),iconPrefix:String,showLoading:f,loadingIcon:h("photo")},emits:["load","error"],setup(o,{emit:a,slots:g}){const f=r(!1),h=r(!0),y=r(),{$Lazyload:z}=e().proxy,x=l((()=>{const a={width:s(o.width),height:s(o.height)};return i(o.radius)&&(a.overflow="hidden",a.borderRadius=s(o.radius)),a}));n((()=>o.src),(()=>{f.value=!1,h.value=!0}));const L=o=>{h.value&&(h.value=!1,a("load",o))},I=()=>{const o=new Event("load");Object.defineProperty(o,"target",{value:y.value,enumerable:!0}),L(o)},P=o=>{f.value=!0,h.value=!1,a("error",o)},$=(a,r,e)=>e?e():v(w,{name:a,size:o.iconSize,"class":r,classPrefix:o.iconPrefix},null),j=()=>{if(f.value||!o.src)return;const a={alt:o.alt,"class":S("img"),style:{objectFit:o.fit,objectPosition:o.position}};return o.lazyLoad?m(v("img",b({ref:y},a),null),[[p("lazy"),o.src]]):v("img",b({ref:y,src:o.src,onLoad:L,onError:P},a),null)},E=({el:o})=>{const a=()=>{o===y.value&&h.value&&I()};y.value?a():c(a)},k=({el:o})=>{o!==y.value||f.value||P()};return z&&t&&(z.$on("loaded",E),z.$on("error",k),d((()=>{z.$off("loaded",E),z.$off("error",k)}))),u((()=>{c((()=>{var a;(null==(a=y.value)?void 0:a.complete)&&!o.lazyLoad&&I()}))})),()=>{var a;return v("div",{"class":S({round:o.round,block:o.block}),style:x.value},[j(),h.value&&o.showLoading?v("div",{"class":S("loading")},[$(o.loadingIcon,S("loading-icon"),g.loading)]):f.value&&o.showError?v("div",{"class":S("error")},[$(o.errorIcon,S("error-icon"),g.error)]):void 0,null==(a=g["default"])?void 0:a.call(g)])}}}));export{x as I};
+import{A as o,d as a,y as r,z as e,a as l,X as s,aI as i,x as n,au as t,aw as d,o as u,N as c,c as v,J as g,G as f,a3 as h,U as m,b9 as p,S as w,a1 as y,H as b}from"./index-90ebf078.js";const[z,S]=o("image"),x=b(a({name:z,props:{src:String,alt:String,fit:String,position:String,round:Boolean,block:Boolean,width:g,height:g,radius:g,lazyLoad:Boolean,iconSize:g,showError:f,errorIcon:h("photo-fail"),iconPrefix:String,showLoading:f,loadingIcon:h("photo")},emits:["load","error"],setup(o,{emit:a,slots:g}){const f=r(!1),h=r(!0),b=r(),{$Lazyload:z}=e().proxy,x=l((()=>{const a={width:s(o.width),height:s(o.height)};return i(o.radius)&&(a.overflow="hidden",a.borderRadius=s(o.radius)),a}));n((()=>o.src),(()=>{f.value=!1,h.value=!0}));const L=o=>{h.value&&(h.value=!1,a("load",o))},I=()=>{const o=new Event("load");Object.defineProperty(o,"target",{value:b.value,enumerable:!0}),L(o)},P=o=>{f.value=!0,h.value=!1,a("error",o)},$=(a,r,e)=>e?e():v(y,{name:a,size:o.iconSize,"class":r,classPrefix:o.iconPrefix},null),j=()=>{if(f.value||!o.src)return;const a={alt:o.alt,"class":S("img"),style:{objectFit:o.fit,objectPosition:o.position}};return o.lazyLoad?m(v("img",w({ref:b},a),null),[[p("lazy"),o.src]]):v("img",w({ref:b,src:o.src,onLoad:L,onError:P},a),null)},E=({el:o})=>{const a=()=>{o===b.value&&h.value&&I()};b.value?a():c(a)},k=({el:o})=>{o!==b.value||f.value||P()};return z&&t&&(z.$on("loaded",E),z.$on("error",k),d((()=>{z.$off("loaded",E),z.$off("error",k)}))),u((()=>{c((()=>{var a;(null==(a=b.value)?void 0:a.complete)&&!o.lazyLoad&&I()}))})),()=>{var a;return v("div",{"class":S({round:o.round,block:o.block}),style:x.value},[j(),h.value&&o.showLoading?v("div",{"class":S("loading")},[$(o.loadingIcon,S("loading-icon"),g.loading)]):f.value&&o.showError?v("div",{"class":S("error")},[$(o.errorIcon,S("error-icon"),g.error)]):void 0,null==(a=g["default"])?void 0:a.call(g)])}}}));export{x as I};

dist/assets/index-4d1dca67.js → dist/assets/index-9d474d35.js

@@ -1 +1 @@
-import{A as l,I as e,Z as a,d as i,_ as r,c as t,a3 as n,J as s,G as o,aN as c,aI as u,a1 as d,H as v}from"./index-a9ecc63e.js";const[b,f]=l("cell"),g={tag:n("div"),icon:String,size:String,title:s,value:s,label:s,center:Boolean,isLink:Boolean,border:o,iconPrefix:String,valueClass:c,labelClass:c,titleClass:c,titleStyle:null,arrowDirection:String,required:{type:[Boolean,String],"default":null},clickable:{type:Boolean,"default":null}},p=v(i({name:b,props:e({},g,a),setup(l,{slots:e}){const a=r(),i=()=>{if(e.label||u(l.label))return t("div",{"class":[f("label"),l.labelClass]},[e.label?e.label():l.label])},n=()=>{var a;if(e.title||u(l.title)){const r=null==(a=e.title)?void 0:a.call(e);if(Array.isArray(r)&&0===r.length)return;return t("div",{"class":[f("title"),l.titleClass],style:l.titleStyle},[r||t("span",null,[l.title]),i()])}},s=()=>{const a=e.value||e["default"];if(a||u(l.value))return t("div",{"class":[f("value"),l.valueClass]},[a?a():t("span",null,[l.value])])},o=()=>{if(e["right-icon"])return e["right-icon"]();if(l.isLink){const e=l.arrowDirection&&"right"!==l.arrowDirection?"arrow-".concat(l.arrowDirection):"arrow";return t(d,{name:e,"class":f("right-icon")},null)}};return()=>{var i;const{tag:r,size:c,center:u,border:v,isLink:b,required:g}=l,p=null!=(i=l.clickable)?i:b,C={center:u,required:!!g,clickable:p,borderless:!v};return c&&(C[c]=!!c),t(r,{"class":f(C),role:p?"button":void 0,tabindex:p?0:void 0,onClick:a},{"default":()=>{var a;return[e.icon?e.icon():l.icon?t(d,{name:l.icon,"class":f("left-icon"),classPrefix:l.iconPrefix},null):void 0,n(),s(),o(),null==(a=e.extra)?void 0:a.call(e)]}})}}}));export{p as C,g as c};
+import{A as l,I as e,Z as a,d as i,_ as r,c as t,a3 as n,J as s,G as o,aN as c,aI as u,a1 as d,H as v}from"./index-90ebf078.js";const[b,f]=l("cell"),g={tag:n("div"),icon:String,size:String,title:s,value:s,label:s,center:Boolean,isLink:Boolean,border:o,iconPrefix:String,valueClass:c,labelClass:c,titleClass:c,titleStyle:null,arrowDirection:String,required:{type:[Boolean,String],"default":null},clickable:{type:Boolean,"default":null}},p=v(i({name:b,props:e({},g,a),setup(l,{slots:e}){const a=r(),i=()=>{if(e.label||u(l.label))return t("div",{"class":[f("label"),l.labelClass]},[e.label?e.label():l.label])},n=()=>{var a;if(e.title||u(l.title)){const r=null==(a=e.title)?void 0:a.call(e);if(Array.isArray(r)&&0===r.length)return;return t("div",{"class":[f("title"),l.titleClass],style:l.titleStyle},[r||t("span",null,[l.title]),i()])}},s=()=>{const a=e.value||e["default"];if(a||u(l.value))return t("div",{"class":[f("value"),l.valueClass]},[a?a():t("span",null,[l.value])])},o=()=>{if(e["right-icon"])return e["right-icon"]();if(l.isLink){const e=l.arrowDirection&&"right"!==l.arrowDirection?"arrow-".concat(l.arrowDirection):"arrow";return t(d,{name:e,"class":f("right-icon")},null)}};return()=>{var i;const{tag:r,size:c,center:u,border:v,isLink:b,required:g}=l,p=null!=(i=l.clickable)?i:b,C={center:u,required:!!g,clickable:p,borderless:!v};return c&&(C[c]=!!c),t(r,{"class":f(C),role:p?"button":void 0,tabindex:p?0:void 0,onClick:a},{"default":()=>{var a;return[e.icon?e.icon():l.icon?t(d,{name:l.icon,"class":f("left-icon"),classPrefix:l.iconPrefix},null):void 0,n(),s(),o(),null==(a=e.extra)?void 0:a.call(e)]}})}}}));export{p as C,g as c};

dist/assets/index-8b20e0a3.js → dist/assets/index-9d5d8f87.js

@@ -1 +1 @@
-import{A as t,d as s,c as e,F as i,G as l,S as a,be as r,E as n,H as o}from"./index-a9ecc63e.js";const[d,c]=t("cell-group"),u=o(s({name:d,inheritAttrs:!1,props:{title:String,inset:Boolean,border:l},setup(t,{slots:s,attrs:l}){const o=()=>{var i;return e("div",a({"class":[c({inset:t.inset}),{[n]:t.border&&!t.inset}]},l,r()),[null==(i=s["default"])?void 0:i.call(s)])};return()=>t.title||s.title?e(i,null,[e("div",{"class":c("title",{inset:t.inset})},[s.title?s.title():t.title]),o()]):o()}}));export{u as C};
+import{A as t,d as s,c as e,F as i,G as l,S as a,be as r,E as n,H as o}from"./index-90ebf078.js";const[d,c]=t("cell-group"),u=o(s({name:d,inheritAttrs:!1,props:{title:String,inset:Boolean,border:l},setup(t,{slots:s,attrs:l}){const o=()=>{var i;return e("div",a({"class":[c({inset:t.inset}),{[n]:t.border&&!t.inset}]},l,r()),[null==(i=s["default"])?void 0:i.call(s)])};return()=>t.title||s.title?e(i,null,[e("div",{"class":c("title",{inset:t.inset})},[s.title?s.title():t.title]),o()]):o()}}));export{u as C};

dist/assets/index-legacy-74f7a903.js → dist/assets/index-legacy-1fd35b3b.js

@@ -1 +1 @@
-System.register(["./index-legacy-f74d0852.js"],(function(t,e){"use strict";var s,i,r,n,l,c,o,u,a;return{setters:[t=>{s=t.A,i=t.d,r=t.c,n=t.F,l=t.G,c=t.S,o=t.be,u=t.E,a=t.H}],execute:function(){const[e,d]=s("cell-group"),v={title:String,inset:Boolean,border:l};var g=i({name:e,inheritAttrs:!1,props:v,setup(t,{slots:e,attrs:s}){const i=()=>{var i;return r("div",c({"class":[d({inset:t.inset}),{[u]:t.border&&!t.inset}]},s,o()),[null==(i=e["default"])?void 0:i.call(e)])};return()=>t.title||e.title?r(n,null,[r("div",{"class":d("title",{inset:t.inset})},[e.title?e.title():t.title]),i()]):i()}});t("C",a(g))}}}));
+System.register(["./index-legacy-42d9020b.js"],(function(t,e){"use strict";var s,i,r,n,l,c,o,u,a;return{setters:[t=>{s=t.A,i=t.d,r=t.c,n=t.F,l=t.G,c=t.S,o=t.be,u=t.E,a=t.H}],execute:function(){const[e,d]=s("cell-group"),v={title:String,inset:Boolean,border:l};var g=i({name:e,inheritAttrs:!1,props:v,setup(t,{slots:e,attrs:s}){const i=()=>{var i;return r("div",c({"class":[d({inset:t.inset}),{[u]:t.border&&!t.inset}]},s,o()),[null==(i=e["default"])?void 0:i.call(e)])};return()=>t.title||e.title?r(n,null,[r("div",{"class":d("title",{inset:t.inset})},[e.title?e.title():t.title]),i()]):i()}});t("C",a(g))}}}));

dist/assets/index-legacy-02b0827e.js → dist/assets/index-legacy-f58a07e9.js

@@ -1 +1 @@
-System.register(["./index-legacy-f74d0852.js"],(function(e,l){"use strict";var t,r,i,n,a,s,o,c,u,d,v,b,f;return{setters:[e=>{t=e.A,r=e.I,i=e.Z,n=e.d,a=e._,s=e.c,o=e.a3,c=e.J,u=e.G,d=e.aN,v=e.aI,b=e.a1,f=e.H}],execute:function(){const[l,g]=t("cell"),y=e("c",{tag:o("div"),icon:String,size:String,title:c,value:c,label:c,center:Boolean,isLink:Boolean,border:u,iconPrefix:String,valueClass:d,labelClass:d,titleClass:d,titleStyle:null,arrowDirection:String,required:{type:[Boolean,String],"default":null},clickable:{type:Boolean,"default":null}}),C=r({},y,i);var S=n({name:l,props:C,setup(e,{slots:l}){const t=a(),r=()=>{if(l.label||v(e.label))return s("div",{"class":[g("label"),e.labelClass]},[l.label?l.label():e.label])},i=()=>{var t;if(l.title||v(e.title)){const i=null==(t=l.title)?void 0:t.call(l);if(Array.isArray(i)&&0===i.length)return;return s("div",{"class":[g("title"),e.titleClass],style:e.titleStyle},[i||s("span",null,[e.title]),r()])}},n=()=>{const t=l.value||l["default"];if(t||v(e.value))return s("div",{"class":[g("value"),e.valueClass]},[t?t():s("span",null,[e.value])])},o=()=>{if(l["right-icon"])return l["right-icon"]();if(e.isLink){const l=e.arrowDirection&&"right"!==e.arrowDirection?`arrow-${e.arrowDirection}`:"arrow";return s(b,{name:l,"class":g("right-icon")},null)}};return()=>{var r;const{tag:a,size:c,center:u,border:d,isLink:v,required:f}=e,y=null!=(r=e.clickable)?r:v,C={center:u,required:!!f,clickable:y,borderless:!d};return c&&(C[c]=!!c),s(a,{"class":g(C),role:y?"button":void 0,tabindex:y?0:void 0,onClick:t},{"default":()=>{var t;return[l.icon?l.icon():e.icon?s(b,{name:e.icon,"class":g("left-icon"),classPrefix:e.iconPrefix},null):void 0,i(),n(),o(),null==(t=l.extra)?void 0:t.call(l)]}})}}});e("C",f(S))}}}));
+System.register(["./index-legacy-42d9020b.js"],(function(e,l){"use strict";var t,r,i,n,a,s,o,c,u,d,v,b,f;return{setters:[e=>{t=e.A,r=e.I,i=e.Z,n=e.d,a=e._,s=e.c,o=e.a3,c=e.J,u=e.G,d=e.aN,v=e.aI,b=e.a1,f=e.H}],execute:function(){const[l,g]=t("cell"),y=e("c",{tag:o("div"),icon:String,size:String,title:c,value:c,label:c,center:Boolean,isLink:Boolean,border:u,iconPrefix:String,valueClass:d,labelClass:d,titleClass:d,titleStyle:null,arrowDirection:String,required:{type:[Boolean,String],"default":null},clickable:{type:Boolean,"default":null}}),C=r({},y,i);var S=n({name:l,props:C,setup(e,{slots:l}){const t=a(),r=()=>{if(l.label||v(e.label))return s("div",{"class":[g("label"),e.labelClass]},[l.label?l.label():e.label])},i=()=>{var t;if(l.title||v(e.title)){const i=null==(t=l.title)?void 0:t.call(l);if(Array.isArray(i)&&0===i.length)return;return s("div",{"class":[g("title"),e.titleClass],style:e.titleStyle},[i||s("span",null,[e.title]),r()])}},n=()=>{const t=l.value||l["default"];if(t||v(e.value))return s("div",{"class":[g("value"),e.valueClass]},[t?t():s("span",null,[e.value])])},o=()=>{if(l["right-icon"])return l["right-icon"]();if(e.isLink){const l=e.arrowDirection&&"right"!==e.arrowDirection?`arrow-${e.arrowDirection}`:"arrow";return s(b,{name:l,"class":g("right-icon")},null)}};return()=>{var r;const{tag:a,size:c,center:u,border:d,isLink:v,required:f}=e,y=null!=(r=e.clickable)?r:v,C={center:u,required:!!f,clickable:y,borderless:!d};return c&&(C[c]=!!c),s(a,{"class":g(C),role:y?"button":void 0,tabindex:y?0:void 0,onClick:t},{"default":()=>{var t;return[l.icon?l.icon():e.icon?s(b,{name:e.icon,"class":g("left-icon"),classPrefix:e.iconPrefix},null):void 0,i(),n(),o(),null==(t=l.extra)?void 0:t.call(l)]}})}}});e("C",f(S))}}}));

dist/index.html

@@ -15,7 +15,7 @@
   <meta name="HandheldFriendly" content="true" />
   <title>管乐迷</title>
   <script src="./flexible.js" charset="UTF-8"></script>
-  <script type="module" crossorigin src="./assets/index-a9ecc63e.js"></script>
+  <script type="module" crossorigin src="./assets/index-90ebf078.js"></script>
   <link rel="stylesheet" href="./assets/index-a5076509.css">
   <script type="module">import.meta.url;import("_").catch(()=>1);async function* g(){};if(location.protocol!="file:"){window.__vite_is_modern_browser=true}</script>
   <script type="module">!function(){if(window.__vite_is_modern_browser)return;console.warn("vite: loading legacy chunks, syntax error above and the same error below 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>
@@ -26,7 +26,7 @@
   
   <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 crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-9f17e47e.js"></script>
-  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/index-legacy-f74d0852.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/index-legacy-42d9020b.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 </body>
 
 </html>

src/components/o-img-code/index.tsx

@@ -102,6 +102,7 @@ export default defineComponent({
                 placeholder="请输入验证码"
                 v-model={this.code}
                 class={styles.field}
+                maxlength={4}
               />
             </Col>
             <Col span="10" class={styles.img}>

src/helpers/oss-file-upload.ts

@@ -2,7 +2,7 @@ import request from './request';
 // import axios from 'axios'
 import umiRequest from 'umi-request';
 import COS from 'cos-js-sdk-v5';
-// import { state } from '@/state';
+import { state } from '@/state';
 export const ossSwitch = 'tencent' as 'ks3' | 'tencent'; // 上传文件服务商
 const tencentBucket = 'daya-online-1303457149';
 
@@ -45,7 +45,7 @@ export const getUploadSign = async (params: any) => {
   } else {
     tempPostData = postData;
   }
-  return request.post('/api-student/open/getUploadSign', {
+  return request.post(state.platformApi + '/open/getUploadSign', {
     data: {
       postData: tempPostData,
       pluginName: ossType,

src/helpers/request.ts

@@ -1,9 +1,9 @@
 import { extend } from 'umi-request';
 import cleanDeep from 'clean-deep';
-import { browser, openLoading, closeLoading } from '@/helpers/utils';
+import { browser } from '@/helpers/utils';
 import { setLogout, setLoginError, state } from '@/state';
 import { postMessage } from './native-message';
-import { showLoadingToast, showToast, closeToast } from 'vant';
+import { showToast } from 'vant';
 // import baseEvent from '@/base-event'
 
 export interface SearchInitParams {

src/main.ts

@@ -32,9 +32,20 @@ postMessage({ api: 'getNavHeight' }, (res: any) => {
   }
 });
 
+const url = window.location.href;
+const urlIsTeacher =
+  /mteaonline.dayaedu.com/.test(url) || /mteatest.dayaedu.com/.test(url)
+    ? true
+    : false;
 // const paymentType = (window as any).paymentType; // 浏览器设置
-state.platformType = 'STUDENT';
-state.platformApi = '/api-student';
+// 判断是哪个环境
+if (urlIsTeacher) {
+  state.platformType = 'TEACHER';
+  state.platformApi = '/api-teacher';
+} else {
+  state.platformType = 'STUDENT';
+  state.platformApi = '/api-student';
+}
 
 const app = createApp(App);
 

src/views/courseList/index.tsx

@@ -90,7 +90,11 @@ export default defineComponent({
             });
           });
 
-          const _list = await checkCoursewareCache(res.data);
+          // 由于ios没有对应api
+          const _list =
+            state.platformType === 'STUDENT'
+              ? await checkCoursewareCache(res.data)
+              : [];
           data.list = browserInfo.isApp
             ? res.data.map((item: any) => {
                 const _item = _list.find(
@@ -149,38 +153,42 @@ export default defineComponent({
         return;
       }
 
-      const isVip = handleCheckVip();
-      if (!isVip) return;
+      // 学生端需要判断缓存
+      console.log(state.platformType, 'state.platformType');
+      if (state.platformType === 'STUDENT') {
+        const isVip = handleCheckVip();
+        if (!isVip) return;
 
-      if (!item.hasCache) {
-        // const hasFree = String(item.accessScope) === '0';
-        // if (!hasFree) {
+        if (!item.hasCache) {
+          // const hasFree = String(item.accessScope) === '0';
+          // if (!hasFree) {
 
-        // 下载中不提示
-        if (item.downloadStatus == 1) {
-          // 取消下载
-          postMessage({ api: 'cancelDownloadCourseware' });
-          setTimeout(() => {
+          // 下载中不提示
+          if (item.downloadStatus == 1) {
+            // 取消下载
             postMessage({ api: 'cancelDownloadCourseware' });
-            item.downloadStatus = 0;
-            data.isDownloading = false;
-          }, 1000);
-          showLoadingToast({
-            message: '取消中...',
-            forbidClick: false,
-            loadingType: 'spinner',
-            duration: 1000
-          });
-          return;
-        }
-        // 重新下载
-        if (item.downloadStatus == 3) {
-          downCatch(item);
+            setTimeout(() => {
+              postMessage({ api: 'cancelDownloadCourseware' });
+              item.downloadStatus = 0;
+              data.isDownloading = false;
+            }, 1000);
+            showLoadingToast({
+              message: '取消中...',
+              forbidClick: false,
+              loadingType: 'spinner',
+              duration: 1000
+            });
+            return;
+          }
+          // 重新下载
+          if (item.downloadStatus == 3) {
+            downCatch(item);
+            return;
+          }
+          data.catchStatus = true;
+          data.catchItem = item;
           return;
         }
-        data.catchStatus = true;
-        data.catchItem = item;
-        return;
       }
       gotoPlay(item);
     };
@@ -362,7 +370,10 @@ export default defineComponent({
                                       class={[
                                         styles.baseBtn,
                                         styles.look,
-                                        !hasVip() ? styles.disabled : ''
+                                        state.platformType === 'STUDENT' &&
+                                        !hasVip()
+                                          ? styles.disabled
+                                          : ''
                                       ]}>
                                       查看
                                     </Button>
@@ -371,7 +382,10 @@ export default defineComponent({
                                       class={[
                                         styles.baseBtn,
                                         styles.down,
-                                        !hasVip() ? styles.disabled : '',
+                                        state.platformType === 'STUDENT' &&
+                                        !hasVip()
+                                          ? styles.disabled
+                                          : '',
                                         item.downloadStatus == 1
                                           ? styles.downing
                                           : ''
@@ -399,7 +413,7 @@ export default defineComponent({
         {data.loading && <OLoading />}
         {!data.loading && !data.list.length && <OEmpty tips="暂无内容" />}
 
-        {!hasVip() && (
+        {state.platformType === 'STUDENT' && !hasVip() && (
           <OSticky position="bottom">
             <div class={styles.btnGroup}>
               <Button round block type="primary" onClick={gotoMemberCenter}>

src/views/coursewarePlay/component/tools/pen.tsx

@@ -34,7 +34,7 @@ export default defineComponent({
     const firstRender = ref(true);
     const src = /(localhost|192)/.test(location.host)
       ? 'https://test.lexiaoya.cn/whiteboard-noCollab'
-      : `${location.origin}/whiteboard-noCollab`;
+      : `https://kt.colexiu.com/classroom-whiteboard`;
 
     const exportImg = (event: MessageEvent) => {
       const data = event.data;

src/views/coursewarePlay/index.tsx

@@ -180,7 +180,10 @@ export default defineComponent({
         const material = materialList[j];
         //请求本地缓存
         if (browserInfo.isApp && ['VIDEO', 'IMG'].includes(material.typeCode)) {
-          const localData = await getCacheFilePath(material);
+          const localData: any =
+            state.platformType === 'STUDENT'
+              ? await getCacheFilePath(material)
+              : {};
           if (localData?.content?.localPath) {
             material.url = material.content;
             material.content = localData.content.localPath;
@@ -341,18 +344,20 @@ export default defineComponent({
       await getDetail();
       const hasFree = String(data.detail?.accessScope) === '0';
       if (!hasFree) {
-        const hasVip = handleCheckVip();
-        if (!hasVip) {
-          nextTick(() => {
-            postMessage({
-              api: 'courseLoading',
-              content: {
-                show: false,
-                type: 'fullscreen'
-              }
+        if (state.platformType === 'STUDENT') {
+          const hasVip = handleCheckVip();
+          if (!hasVip) {
+            nextTick(() => {
+              postMessage({
+                api: 'courseLoading',
+                content: {
+                  show: false,
+                  type: 'fullscreen'
+                }
+              });
             });
-          });
-          return;
+            return;
+          }
         }
       }
       // getCourseSchedule();
@@ -955,7 +960,7 @@ export default defineComponent({
                 onClick={() => (popupData.guideOpen = true)}>
                 <img src={iconTouping} />
               </div>
-              <div
+              {/* <div
                 class={styles.rightBtn}
                 onClick={() => {
                   openStudyTool({
@@ -965,7 +970,7 @@ export default defineComponent({
                   });
                 }}>
                 <img src={iconPen} />
-              </div>
+              </div> */}
               {/* <div class={styles.rightBtn} onClick={() => (popupData.toolOpen = true)}>
                 <img src={iconMore} />
               </div> */}

src/views/layout/auth.tsx

@@ -46,11 +46,16 @@ export default defineComponent({
       if (state.user.status === 'init' || state.user.status === 'error') {
         this.loading = true;
         try {
-          const res = await request.get('/api-student/student/queryUserInfo', {
-            initRequest: true, // 初始化接口
-            requestType: 'form',
-            hideLoading: true
-          });
+          const res = await request.get(
+            state.platformType === 'STUDENT'
+              ? state.platformApi + '/student/queryUserInfo'
+              : state.platformApi + '/teacher/queryUserInfo',
+            {
+              initRequest: true, // 初始化接口
+              requestType: 'form',
+              hideLoading: true
+            }
+          );
           setLogin(res.data);
         } catch (e: any) {
           const message = e.message;

src/views/layout/login.tsx

@@ -60,16 +60,16 @@ export default defineComponent({
             data: {
               username: this.username,
               password: this.password,
-              clientId: 'student',
-              clientSecret: 'student'
+              clientId: state.platformType,
+              clientSecret: state.platformType
             }
           });
         } else {
           res = await request.post('/api-auth/smsLogin', {
             requestType: 'form',
             data: {
-              clientId: 'student',
-              clientSecret: 'student',
+              clientId: state.platformType,
+              clientSecret: state.platformType,
               phone: this.username,
               smsCode: this.smsCode
             }
@@ -80,7 +80,9 @@ export default defineComponent({
         setAuth(authentication.token_type + ' ' + authentication.access_token);
 
         const userCash = await request.get(
-          '/api-student/student/queryUserInfo',
+          state.platformType === 'STUDENT'
+            ? state.platformApi + '/student/queryUserInfo'
+            : state.platformApi + '/teacher/queryUserInfo',
           {
             initRequest: true // 初始化接口
           }

src/views/lessonCourseware/index.tsx

@@ -10,19 +10,19 @@ import {
 } from 'vue';
 import styles from './index.module.less';
 // import iconLook from './image/look.svg';
-import { useRoute, useRouter } from 'vue-router';
+import { useRouter } from 'vue-router';
 import OEmpty from '@/components/o-empty';
 // import OSticky from '@/components/o-sticky';
 import OHeader from '@/components/o-header';
 import CourseItem from './component/CourseItem';
-import { courseEmnu } from '@/constant';
+// import { courseEmnu } from '@/constant';
 // import { browser } from '@/helpers/utils';
 import OLoading from '@/components/o-loading';
 import OSticky from '@/components/o-sticky';
 export default defineComponent({
   name: 'lessonCourseware',
   setup() {
-    const route = useRoute();
+    // const route = useRoute();
     const router = useRouter();
     const data = reactive({
       loading: true,
@@ -63,7 +63,7 @@ export default defineComponent({
     const getSubjectList = async () => {
       try {
         const res = await request.get(
-          '/api-student/lessonCourseware/getLessonCoursewareSubjectList'
+          state.platformApi + '/lessonCourseware/getLessonCoursewareSubjectList'
         );
 
         data.subjectList = res.data || [];
@@ -72,17 +72,25 @@ export default defineComponent({
       }
     };
     onMounted(async () => {
-      await getSubjectList();
-      console.log(state.user.data.student.subjectIdList);
-      const studentSubjectIds = state.user.data.student.subjectIdList;
-      const id = studentSubjectIds ? studentSubjectIds.split(',')[0] : 0;
-      data.subjectList.forEach((subject: any) => {
-        if (Number(id) === subject.id) {
-          data.actionKey = Number(id);
-        }
-      });
+      try {
+        await getSubjectList();
+        const studentSubjectIds =
+          state.platformType === 'TEACHER'
+            ? state.user.data.subjectId
+            : state.user.data.student.subjectIdList;
+        const id = studentSubjectIds ? studentSubjectIds.split(',')[0] : 0;
+        data.subjectList.forEach((subject: any) => {
+          if (Number(id) === subject.id) {
+            data.actionKey = Number(id);
+          }
+        });
 
-      getList();
+        await getList();
+      } catch (e) {
+        //
+        console.log(e, 'e');
+      }
+      data.loading = false;
     });
     const handleClick = (item: any) => {
       router.push({

vite.config.ts

@@ -87,6 +87,10 @@ export default defineConfig({
         target: proxyUrl,
         changeOrigin: true
       },
+      '/api-teacher': {
+        target: proxyUrl,
+        changeOrigin: true
+      },
       '/api-admin': {
         target: proxyUrl,
         changeOrigin: true