更新打包

dist/assets/index-legacy.fda8590e.js → dist/assets/index-legacy.251ff4a3.js

@@ -1 +1 @@
-;(function(){var __vite_style__=document.createElement('style');__vite_style__.innerHTML="._f404_h02wy_1{min-height:100vh;text-align:center}._f404_h02wy_1 p{font-size:.42667rem;color:#999}._f404_h02wy_1 .van-image{margin-top:2.66667rem;width:70%}._f404_h02wy_1 .van-button{margin-top:.53333rem;background-color:transparent;width:50%}\n";document.head.appendChild(__vite_style__);System.register(['./vendor-legacy.cf95e81c.js','./index-legacy.f25f109a4.js','./main-legacy.b1b9c2b3.js'],function(exports){'use strict';var defineComponent,createVNode,Image,createTextVNode,Button,browser,postMessage;return{setters:[function(module){defineComponent=module.d;createVNode=module.b;Image=module.m;createTextVNode=module.f;Button=module.B;},function(){},function(module){browser=module.d;postMessage=module.p;}],execute:function execute(){var f404="_f404_h02wy_1";var styles={f404:f404};var img404="./assets/404.91cd33be.png";var index=exports('default',defineComponent({name:'NotFound',render:function render(){var _this=this;return createVNode("div",{"class":styles.f404},[createVNode(Image,{"src":img404},null),createVNode("p",null,[createTextVNode("\u9875\u9762\u627E\u4E0D\u5230\u4E86")]),createVNode(Button,{"type":"primary","plain":true,"round":true,"onClick":function onClick(){if(browser().iPhone){postMessage({api:'back'});}else{_this.$router.back();}}},{default:function _default(){return[createTextVNode("\u8FD4\u56DE")];}})]);}}));}};});})();
+;(function(){var __vite_style__=document.createElement('style');__vite_style__.innerHTML="._f404_h02wy_1{min-height:100vh;text-align:center}._f404_h02wy_1 p{font-size:.42667rem;color:#999}._f404_h02wy_1 .van-image{margin-top:2.66667rem;width:70%}._f404_h02wy_1 .van-button{margin-top:.53333rem;background-color:transparent;width:50%}\n";document.head.appendChild(__vite_style__);System.register(['./vendor-legacy.cf95e81c.js','./index-legacy.f25f109a4.js','./main-legacy.6e5fd7b3.js'],function(exports){'use strict';var defineComponent,createVNode,Image,createTextVNode,Button,browser,postMessage;return{setters:[function(module){defineComponent=module.d;createVNode=module.b;Image=module.m;createTextVNode=module.f;Button=module.B;},function(){},function(module){browser=module.d;postMessage=module.p;}],execute:function execute(){var f404="_f404_h02wy_1";var styles={f404:f404};var img404="./assets/404.91cd33be.png";var index=exports('default',defineComponent({name:'NotFound',render:function render(){var _this=this;return createVNode("div",{"class":styles.f404},[createVNode(Image,{"src":img404},null),createVNode("p",null,[createTextVNode("\u9875\u9762\u627E\u4E0D\u5230\u4E86")]),createVNode(Button,{"type":"primary","plain":true,"round":true,"onClick":function onClick(){if(browser().iPhone){postMessage({api:'back'});}else{_this.$router.back();}}},{default:function _default(){return[createTextVNode("\u8FD4\u56DE")];}})]);}}));}};});})();

dist/assets/index-legacy.726a14c0.js → dist/assets/index-legacy.c43a32a1.js

@@ -1 +1 @@
-;(function(){System.register(['./main-legacy.b1b9c2b3.js','./vendor-legacy.cf95e81c.js'],function(){'use strict';return{setters:[function(){},function(){}],execute:function execute(){}};});})();
+;(function(){System.register(['./main-legacy.6e5fd7b3.js','./vendor-legacy.cf95e81c.js'],function(){'use strict';return{setters:[function(){},function(){}],execute:function execute(){}};});})();

dist/assets/index.575214ea.js → dist/assets/index.4ab04181.js

@@ -1 +1 @@
-import{d as r,b as e,m as s,f as a,B as t}from"./vendor.287f5a98.js";/* empty css               */import{d as o,p as n}from"./main.bdfd1ed3.js";const u="_f404_h02wy_1";var d={f404:u},i="./assets/404.91cd33be.png",l=r({name:"NotFound",render(){return e("div",{class:d.f404},[e(s,{src:i},null),e("p",null,[a("\u9875\u9762\u627E\u4E0D\u5230\u4E86")]),e(t,{type:"primary",plain:!0,round:!0,onClick:()=>{o().iPhone?n({api:"back"}):this.$router.back()}},{default:()=>[a("\u8FD4\u56DE")]})])}});export{l as default};
+import{d as r,b as e,m as s,f as a,B as t}from"./vendor.287f5a98.js";/* empty css               */import{d as o,p as n}from"./main.8de2b158.js";const u="_f404_h02wy_1";var d={f404:u},i="./assets/404.91cd33be.png",l=r({name:"NotFound",render(){return e("div",{class:d.f404},[e(s,{src:i},null),e("p",null,[a("\u9875\u9762\u627E\u4E0D\u5230\u4E86")]),e(t,{type:"primary",plain:!0,round:!0,onClick:()=>{o().iPhone?n({api:"back"}):this.$router.back()}},{default:()=>[a("\u8FD4\u56DE")]})])}});export{l as default};

dist/assets/index.610cc458.js → dist/assets/index.8e0db568.js

@@ -1 +1 @@
-import{p as a}from"./main.bdfd1ed3.js";import{d as h,b as i,F as d,N as c}from"./vendor.287f5a98.js";const g="_colHeader_1rdkc_1",u="_transparent_1rdkc_5",p="_headerSection_1rdkc_8";var s={colHeader:g,transparent:u,headerSection:p},v=h({name:"col-header",props:{title:String,isBack:{type:Boolean,default:!1},isFixed:{type:Boolean,default:!0},styleName:{type:Object,default:()=>({})},titleClass:String,background:{type:String,default:"white"},color:{type:String,default:"#323233"},rightText:String,onClickRight:{type:Function,default:()=>{}},border:{type:Boolean,default:!0}},data(){return{headerTitle:null,navBarHeight:0,titleHeight:44}},mounted(){this.headerTitle=this.title||this.$route.meta.title,this.navBarInit()},unmounted(){a({api:"setBarStatus",content:{status:1}})},methods:{navBarInit(){a({api:"setBarStatus",content:{status:0}});let n=sessionStorage.getItem("navHeight"),o=sessionStorage.getItem("titleHeight");n&&o?this.navBarHeight=Number(n):a({api:"getNavHeight"},l=>{const{content:t}=l,r=t.dpi||2;if(t.navHeight){const e=t.navHeight/r;sessionStorage.setItem("navHeight",String(e)),this.navBarHeight=e}if(t.titleHeight){const e=t.titleHeight/r;sessionStorage.setItem("titleHeight",String(e)),this.titleHeight=e}})},onClickLeft(){this.$router.back()},clickRight(){this.onClickRight&&this.onClickRight()}},render(){return i("div",null,[this.$slots.content?i("div",{style:{paddingTop:`${this.navBarHeight}px`},class:s.headerSection},[this.$slots.content(this.navBarHeight)]):i(d,null,[i("div",{style:{paddingTop:`${this.navBarHeight}px`},class:s.headerSection},[i(c,{title:this.headerTitle,class:[s.colHeader],style:{background:this.background,color:this.color},"left-arrow":this.isBack,rightText:this.rightText,fixed:this.isFixed,border:this.border,"onClick-right":this.clickRight,"onClick-left":this.onClickLeft},null)]),this.$slots.default?this.$slots.default():null])])}});export{v as C};
+import{p as a}from"./main.8de2b158.js";import{d as h,b as i,F as d,N as c}from"./vendor.287f5a98.js";const g="_colHeader_1rdkc_1",u="_transparent_1rdkc_5",p="_headerSection_1rdkc_8";var s={colHeader:g,transparent:u,headerSection:p},f=h({name:"col-header",props:{title:String,isBack:{type:Boolean,default:!1},isFixed:{type:Boolean,default:!0},styleName:{type:Object,default:()=>({})},titleClass:String,background:{type:String,default:"white"},color:{type:String,default:"#323233"},rightText:String,onClickRight:{type:Function,default:()=>{}},border:{type:Boolean,default:!0}},data(){return{headerTitle:null,navBarHeight:0,titleHeight:44}},mounted(){this.headerTitle=this.title||this.$route.meta.title,this.navBarInit()},unmounted(){a({api:"setBarStatus",content:{status:1}})},methods:{navBarInit(){a({api:"setBarStatus",content:{status:0}});let n=sessionStorage.getItem("navHeight"),o=sessionStorage.getItem("titleHeight");n&&o?this.navBarHeight=Number(n):a({api:"getNavHeight"},l=>{const{content:t}=l,r=t.dpi||2;if(t.navHeight){const e=t.navHeight/r;sessionStorage.setItem("navHeight",String(e)),this.navBarHeight=e}if(t.titleHeight){const e=t.titleHeight/r;sessionStorage.setItem("titleHeight",String(e)),this.titleHeight=e}})},onClickLeft(){this.$router.back()},clickRight(){this.onClickRight&&this.onClickRight()}},render(){return i("div",null,[this.$slots.content?i("div",{style:{paddingTop:`${this.navBarHeight}px`},class:s.headerSection},[this.$slots.content(this.navBarHeight)]):i(d,null,[i("div",{style:{paddingTop:`${this.navBarHeight}px`},class:s.headerSection},[i(c,{title:this.headerTitle,class:[s.colHeader],style:{background:this.background,color:this.color},"left-arrow":this.isBack,rightText:this.rightText,fixed:this.isFixed,border:this.border,"onClick-right":this.clickRight,"onClick-left":this.onClickLeft},null)]),this.$slots.default?this.$slots.default():null])])}});export{f as C};

dist/assets/index.f2e91494.js → dist/assets/index.ea8663fa.js

@@ -1 +1 @@
-import"./main.bdfd1ed3.js";import"./vendor.287f5a98.js";function t(){import("data:text/javascript,")}export{t as __vite_legacy_guard};
+import"./main.8de2b158.js";import"./vendor.287f5a98.js";function t(){import("data:text/javascript,")}export{t as __vite_legacy_guard};

dist/assets/switch.a34b1b24.js → dist/assets/switch.d53f0710.js

@@ -1 +1 @@
-import{d as a,b as t,B as l,f as u,X as n,W as d,Y as o,Z as i}from"./vendor.287f5a98.js";/* empty css               *//* empty css               *//* empty css               *//* empty css               */import{r as c}from"./main.bdfd1ed3.js";var f=a({name:"MusicListItem",props:{data:{type:Object,default:()=>null}},render(){return this.data?t("div",null,null):null}}),h={"list-contaner":"_list-contaner_v1ygs_1"};function p(e){return typeof e=="function"||Object.prototype.toString.call(e)==="[object Object]"&&!d(e)}var s=a({name:"MusicList",props:{auditStatus:{type:Number,default:0}},data(){return{list:[],loading:!1,error:!1,finished:!1,page:1}},methods:{async FetchList(){this.loading=!0;try{const e=await c.post("/api-web/music/sheet/list",{data:{auditStatus:this.auditStatus}});e.data.length&&(this.list=this.list.concat(e.data))}catch{this.error=!0}this.loading=!1},toUpload(){this.$router.push({path:"/music-upload"})}},render(){let e;return t("div",{class:h["list-contaner"]},[t(l,{onClick:this.toUpload},{default:()=>[u("\u4E0A\u4F20\u66F2\u8C31")]}),t(n,{loading:this.loading,error:this.error,finished:this.finished,onLoad:this.FetchList},p(e=this.list.map(r=>t(f,{data:r},null)))?e:{default:()=>[e]})])}}),S=a({name:"MusicListSwitch",render(){return t("div",null,[t(o,null,{default:()=>[t(i,{title:"\u5DF2\u4E0A\u67B6"},{default:()=>[t(s,{auditStatus:0},null)]}),t(i,{title:"\u5BA1\u6838\u4E2D"},{default:()=>[t(s,{auditStatus:1},null)]}),t(i,{title:"\u5BA1\u6838\u5931\u8D25"},{default:()=>[t(s,{auditStatus:2},null)]})]})])}});export{S as default};
+import{d as a,b as t,B as l,f as u,X as n,W as d,Y as o,Z as i}from"./vendor.287f5a98.js";/* empty css               *//* empty css               *//* empty css               *//* empty css               */import{r as c}from"./main.8de2b158.js";var h=a({name:"MusicListItem",props:{data:{type:Object,default:()=>null}},render(){return this.data?t("div",null,null):null}}),f={"list-contaner":"_list-contaner_v1ygs_1"};function p(e){return typeof e=="function"||Object.prototype.toString.call(e)==="[object Object]"&&!d(e)}var s=a({name:"MusicList",props:{auditStatus:{type:Number,default:0}},data(){return{list:[],loading:!1,error:!1,finished:!1,page:1}},methods:{async FetchList(){this.loading=!0;try{const e=await c.post("/api-web/music/sheet/list",{data:{auditStatus:this.auditStatus}});e.data.length&&(this.list=this.list.concat(e.data))}catch{this.error=!0}this.loading=!1},toUpload(){this.$router.push({path:"/music-upload"})}},render(){let e;return t("div",{class:f["list-contaner"]},[t(l,{onClick:this.toUpload},{default:()=>[u("\u4E0A\u4F20\u66F2\u8C31")]}),t(n,{loading:this.loading,error:this.error,finished:this.finished,onLoad:this.FetchList},p(e=this.list.map(r=>t(h,{data:r},null)))?e:{default:()=>[e]})])}}),S=a({name:"MusicListSwitch",render(){return t("div",null,[t(o,null,{default:()=>[t(i,{title:"\u5DF2\u4E0A\u67B6"},{default:()=>[t(s,{auditStatus:0},null)]}),t(i,{title:"\u5BA1\u6838\u4E2D"},{default:()=>[t(s,{auditStatus:1},null)]}),t(i,{title:"\u5BA1\u6838\u5931\u8D25"},{default:()=>[t(s,{auditStatus:2},null)]})]})])}});export{S as default};

dist/assets/teacher-legacy.e5a5494f.js → dist/assets/teacher-legacy.e4f2ca47.js

@@ -1 +1 @@
-;(function(){System.register(['./main-legacy.b1b9c2b3.js','./vendor-legacy.cf95e81c.js'],function(){'use strict';return{setters:[function(){},function(){}],execute:function execute(){}};});})();
+;(function(){System.register(['./main-legacy.6e5fd7b3.js','./vendor-legacy.cf95e81c.js'],function(){'use strict';return{setters:[function(){},function(){}],execute:function execute(){}};});})();

dist/assets/teacher.22199134.js → dist/assets/teacher.9da880c3.js

@@ -1 +1 @@
-import"./main.bdfd1ed3.js";import"./vendor.287f5a98.js";function t(){import("data:text/javascript,")}export{t as __vite_legacy_guard};
+import"./main.8de2b158.js";import"./vendor.287f5a98.js";function t(){import("data:text/javascript,")}export{t as __vite_legacy_guard};

dist/index.html

@@ -34,11 +34,11 @@
   <meta name="msapplication-tap-highlight" content="no">
   <title>酷乐秀</title>
   <script src="./flexible.js" charset="UTF-8"></script>
-  <script type="module" crossorigin src="./assets/index.f2e91494.js"></script>
+  <script type="module" crossorigin src="./assets/index.ea8663fa.js"></script>
   <link rel="modulepreload" href="./assets/vendor.287f5a98.js">
-  <link rel="modulepreload" href="./assets/main.bdfd1ed3.js">
-  <link rel="stylesheet" href="./assets/vendor.177057eb.css">
+  <link rel="modulepreload" href="./assets/main.8de2b158.js">
   <link rel="stylesheet" href="./assets/main.bda54ae5.css">
+  <link rel="stylesheet" href="./assets/vendor.177057eb.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>
 </head>
 
@@ -48,7 +48,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 id="vite-legacy-polyfill" src="./assets/polyfills-legacy.26d82bb9.js"></script>
-  <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.726a14c0.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+  <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.c43a32a1.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 </body>
 
 </html>

dist/teacher.html

@@ -34,11 +34,11 @@
   <meta name="msapplication-tap-highlight" content="no">
   <title>酷乐秀</title>
   <script src="./flexible.js" charset="UTF-8"></script>
-  <script type="module" crossorigin src="./assets/teacher.22199134.js"></script>
+  <script type="module" crossorigin src="./assets/teacher.9da880c3.js"></script>
   <link rel="modulepreload" href="./assets/vendor.287f5a98.js">
-  <link rel="modulepreload" href="./assets/main.bdfd1ed3.js">
-  <link rel="stylesheet" href="./assets/main.bda54ae5.css">
+  <link rel="modulepreload" href="./assets/main.8de2b158.js">
   <link rel="stylesheet" href="./assets/vendor.177057eb.css">
+  <link rel="stylesheet" href="./assets/main.bda54ae5.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>
 </head>
 
@@ -47,7 +47,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 id="vite-legacy-polyfill" src="./assets/polyfills-legacy.26d82bb9.js"></script>
-  <script nomodule id="vite-legacy-entry" data-src="./assets/teacher-legacy.e5a5494f.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+  <script nomodule id="vite-legacy-entry" data-src="./assets/teacher-legacy.e4f2ca47.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 </body>
 
 </html>

package-lock.json

@@ -1837,7 +1837,6 @@
       "version": "7.17.7",
       "resolved": "https://registry.npmmirror.com/@babel/runtime/-/runtime-7.17.7.tgz",
       "integrity": "sha512-L6rvG9GDxaLgFjg41K+5Yv9OMrU98sWe+Ykmc6FDJW/+vYZMhdOMKkISgzptMaERHvS2Y2lw9MDRm2gHhlQQoA==",
-      "dev": true,
       "requires": {
         "regenerator-runtime": "^0.13.4"
       }
@@ -3333,6 +3332,11 @@
         "is-what": "^3.14.1"
       }
     },
+    "copy-text-to-clipboard": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmmirror.com/copy-text-to-clipboard/-/copy-text-to-clipboard-3.0.1.tgz",
+      "integrity": "sha512-rvVsHrpFcL4F2P8ihsoLdFHmd404+CMg71S756oRSeQgqk51U3kicGdnvfkrxva0xXH92SjGS62B0XIJsbh+9Q=="
+    },
     "core-js": {
       "version": "3.21.1",
       "resolved": "https://registry.npmmirror.com/core-js/-/core-js-3.21.1.tgz",
@@ -5330,6 +5334,11 @@
       "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
       "dev": true
     },
+    "mutation-observer": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmmirror.com/mutation-observer/-/mutation-observer-1.0.3.tgz",
+      "integrity": "sha512-M/O/4rF2h776hV7qGMZUH3utZLO/jK7p8rnNgGkjKUw8zCGjRQPxB8z6+5l8+VjRUQ3dNYu4vjqXYLr+U8ZVNA=="
+    },
     "mute-stream": {
       "version": "0.0.8",
       "resolved": "https://registry.npmmirror.com/mute-stream/-/mute-stream-0.0.8.tgz",
@@ -6146,8 +6155,7 @@
     "regenerator-runtime": {
       "version": "0.13.9",
       "resolved": "https://registry.npmmirror.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
-      "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==",
-      "dev": true
+      "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA=="
     },
     "regenerator-transform": {
       "version": "0.14.5",
@@ -6743,6 +6751,17 @@
         "@vant/use": "^1.3.6"
       }
     },
+    "vconsole": {
+      "version": "3.14.6",
+      "resolved": "https://registry.npmmirror.com/vconsole/-/vconsole-3.14.6.tgz",
+      "integrity": "sha512-8Ffk2SfNe6EzKqZ0aNnNjpAVBVT7zgJo81lYEJdKySYLVYBeSawdSkWi9fSjDg3WsQhgS1vNPmRqJDTuwdVbnQ==",
+      "requires": {
+        "@babel/runtime": "^7.17.2",
+        "copy-text-to-clipboard": "^3.0.1",
+        "core-js": "^3.11.0",
+        "mutation-observer": "^1.0.3"
+      }
+    },
     "vite": {
       "version": "2.7.3",
       "resolved": "https://registry.npmmirror.com/vite/-/vite-2.7.3.tgz",

package.json

@@ -33,6 +33,7 @@
     "query-string": "^7.1.1",
     "umi-request": "^1.4.0",
     "vant": "^3.4.6",
+    "vconsole": "^3.14.6",
     "vue": "^3.2.26",
     "vue-cropper": "^1.0.3",
     "vue-router": "^4.0.12",

src/business-components/subject-list/index.tsx

@@ -59,8 +59,9 @@ export default defineComponent({
     this.checkBox = this.choiceSubjectIds as never[]
   },
   watch: {
-    choiceSubjectIds(val: any) {
+    choiceSubjectIds(val: any, oldVal) {
       // 同步更新显示数据
+      console.log(val, 12, oldVal)
       this.checkBox = [...val] as never[]
     }
   },

src/components/col-video/index.tsx

@@ -66,7 +66,7 @@ export default defineComponent({
         ...this.setting,
         fullscreen: {
           enabled: true,
-          fallback: true,
+          fallback: 'force',
           iosNative: true
         }
       })
@@ -81,6 +81,7 @@ export default defineComponent({
         <video
           ref="video"
           src={this.src}
+          playsinline
           poster={this.poster}
           style={{ ...this.styleValue }}
         />

src/helpers/request.ts

@@ -84,13 +84,13 @@ request.interceptors.response.use(
     const data = await res.clone().json()
     if (data.code !== 200 && data.errCode !== 0) {
       const msg = data.msg || '处理失败，请重试'
-      if (initRequest) {
-        if (data.code === 403 || data.code === 401) {
-          setLogout()
-        } else {
-          setLoginError()
-        }
+      // if (initRequest) {
+      if (data.code === 403 || data.code === 401) {
+        setLogout()
+      } else {
+        setLoginError()
       }
+      // }
       if (!(data.code === 403 || data.code === 401)) {
         Toast(msg)
       }

src/teacher/main.ts

@@ -23,6 +23,9 @@ const app = createApp(App)
 //   }
 // });
 
+// import Vconsole from 'vconsole'
+// const vconsole = new Vconsole()
+
 dayjs.locale('zh-ch')
 app.config.globalProperties.$dayjs = dayjs
 app.config.globalProperties.$filters = vueFilter

src/teacher/practice-class/model/timer.tsx

@@ -101,7 +101,38 @@ export default defineComponent({
       }
     },
     onSubmit() {
-      this.onChoice && this.onChoice(this.timerList)
+      const list = this.list
+      const weekList = {
+        monday: [],
+        tuesday: [],
+        wednesday: [],
+        thursday: [],
+        friday: [],
+        saturday: [],
+        sunday: []
+      }
+      const weekType = [
+        'monday',
+        'tuesday',
+        'wednesday',
+        'thursday',
+        'friday',
+        'saturday',
+        'sunday'
+      ]
+      let status = false
+      list.forEach((item: any, i: number) => {
+        item.forEach((times: any, j: number) => {
+          if (times.status) {
+            status = true
+            weekList[weekType[j]].push({
+              startTime: dayjs(times.startTime, 'HH:mm').format('HH:mm:ss'),
+              endTime: dayjs(times.endTime, 'HH:mm').format('HH:mm:ss')
+            })
+          }
+        })
+      })
+      this.onChoice && this.onChoice(weekList, status)
     }
   },
   render() {

src/teacher/practice-class/model/timerTools.ts

@@ -1,26 +0,0 @@
-import dayjs from 'dayjs'
-import isSameOrBefore from 'dayjs/plugin/isSameOrBefore'
-import customParseFormat from 'dayjs/plugin/customParseFormat'
-dayjs.extend(customParseFormat)
-dayjs.extend(isSameOrBefore)
-
-export const timerInit = (
-  startTime: string,
-  endTime: string,
-  space: number
-) => {
-  console.log(dayjs(startTime, 'HH:mm').format('YYYY-MM-DD HH:mm:ss'))
-  let start = dayjs(startTime, 'HH:mm')
-  const end = dayjs(endTime, 'HH:mm')
-
-  const timerList: any = []
-  while (start.add(space, 'minute').isSameOrBefore(dayjs(end))) {
-    timerList.push({
-      startTime: start.format('HH:mm'),
-      endTime: start.add(space, 'minute').format('HH:mm'),
-      status: false
-    })
-    start = start.add(space, 'minute')
-  }
-  return timerList
-}

src/teacher/practice-class/practice-setting.tsx

@@ -33,7 +33,14 @@ export default defineComponent({
       },
       classTimeStatus: false,
       subjectStatus: false,
-      timerStatus: true,
+      timerStatus: false,
+      timeSetting: {
+        courseMinutes: 25,
+        freeMinutes: 5,
+        startSetting: '08:00',
+        endSetting: '18:00'
+      },
+      timerObject: {},
       form: {
         courseMinutes: null as any,
         freeMinutes: 0,
@@ -48,15 +55,10 @@ export default defineComponent({
     }
   },
   computed: {
-    choiceSubject() {
-      // 选择的科目
-      let tempArr: any[] = []
-      this.subjectList.forEach((sub: any) => {
-        if (this.form.subjectId.includes(sub.id)) {
-          tempArr.push(sub as never)
-        }
-      })
-      return tempArr
+    choiceSubjectId() {
+      const form = this.form as any
+      const ids = form.subjectIdTemp ? form.subjectIdTemp.split(',') : []
+      return ids.map((item: any) => Number(item)) || []
     }
   },
   async mounted() {
@@ -87,6 +89,12 @@ export default defineComponent({
         if (item.paramName === 'practice_service_fee') {
           this.rate = item.paramValue
         }
+        if (item.paramName === 'course_start_setting') {
+          this.timeSetting.startSetting = item.paramValue
+        }
+        if (item.paramName === 'course_end_setting') {
+          this.timeSetting.endSetting = item.paramValue
+        }
       })
       //
       let teacher = await request.post('/api-teacher/teacher/querySubject')
@@ -105,22 +113,15 @@ export default defineComponent({
           Toast('请选择单课时时长')
           return
         }
-        // const res = await request.post(
-        //   '/api-teacher/teacherFreeTime/getDetail',
-        //   {
-        //     data: {
-        //       courseMinutes: form.courseMinutes,
-        //       freeMinutes: form.freeMinutes
-        //     }
-        //   }
-        // )
-        // console.log(res)
+        this.timeSetting.courseMinutes = this.form.courseMinutes
+        this.timeSetting.courseMinutes = this.form.freeMinutes
 
         this.timerStatus = true
       } catch {}
     },
-    onChoiceTimer(item: any) {
-      console.log(item)
+    onChoiceTimer(item: any, status: boolean) {
+      this.form.setting = status ? '已设置' : ''
+      this.timerObject = item
       this.timerStatus = false
     },
     onChoice(item: any) {
@@ -157,16 +158,22 @@ export default defineComponent({
     },
     onFormatter(val: any) {
       return verifyNumberIntegerAndFloat(val)
+    },
+    async onSubmit() {
+      try {
+        const res = await request.post('/api-teacher/teacherFreeTime/upSet', {
+          data: {
+            ...this.form,
+            ...this.timerObject
+          }
+        })
+        Toast('设置成功')
+      } catch {}
     }
   },
   render() {
     return (
-      <Form
-        style={{ paddingTop: '15px' }}
-        onFailed={() => {
-          console.log(this.form)
-        }}
-      >
+      <Form style={{ paddingTop: '15px' }} onSubmit={this.onSubmit}>
         <ColFieldGroup>
           <ColField title="可教授乐器" required>
             {this.form.subjectPrice && this.form.subjectPrice.length > 0 && (
@@ -174,6 +181,9 @@ export default defineComponent({
                 modelValue={this.form.subjectId}
                 class={styles['checkbox-group']}
                 disabled
+                onClick={() => {
+                  this.subjectStatus = true
+                }}
               >
                 {this.form.subjectPrice.map((item: any) => (
                   <Checkbox class={styles.checkbox}>
@@ -183,7 +193,13 @@ export default defineComponent({
                       round
                       closeable
                       size="medium"
-                      onClose={() => {
+                      onClick={e => {
+                        e.stopPropagation()
+                        e.preventDefault()
+                      }}
+                      onClose={e => {
+                        e.stopPropagation()
+                        e.preventDefault()
                         Dialog.confirm({
                           title: '提示',
                           message: '您是否要删除该选择的课程？',
@@ -200,6 +216,8 @@ export default defineComponent({
                           if (index2 !== -1) {
                             this.form.subjectPrice.splice(index2, 1)
                           }
+                          this.form.subjectIdTemp =
+                            this.form.subjectId.join(',')
                         })
                       }}
                     >
@@ -318,13 +336,19 @@ export default defineComponent({
             max={5}
             single
             subjectList={this.subjectList}
-            choiceSubjectIds={this.form.subjectId}
+            choiceSubjectIds={this.choiceSubjectId}
             onChoice={this.onChoice}
           />
         </ColPopup>
 
         <ColPopup v-model={this.timerStatus}>
-          <Timer onChoice={this.onChoiceTimer} />
+          <Timer
+            onChoice={this.onChoiceTimer}
+            courseMinutes={Number(this.timeSetting.courseMinutes)}
+            freeMinutes={Number(this.timeSetting.freeMinutes)}
+            startSetting={this.timeSetting.startSetting}
+            endSetting={this.timeSetting.endSetting}
+          />
         </ColPopup>
 
         <ActionSheet

src/teacher/teacher-cert/cert-one.tsx

@@ -149,6 +149,7 @@ export default defineComponent({
             v-model={this.popupDate}
             type="date"
             close-on-popstate={true}
+            minDate={new Date('1950-01-01')}
             maxDate={this.maxDate}
             onCancel={() => (this.popupShow = false)}
             onConfirm={this.onConfirm}

src/teacher/teacher-cert/index.tsx

@@ -83,7 +83,7 @@ export default defineComponent({
             data: {
               realName,
               idCardNo,
-              save: false
+              save: true
             }
           })
         }

src/teacher/video-class/video-detail.tsx

@@ -7,7 +7,6 @@ import { defineComponent } from 'vue'
 import { state } from '@/state'
 import styles from './video-detail.module.less'
 import request from '@/helpers/request'
-import { group } from 'console'
 import ColResult from '@/components/col-result'
 export default defineComponent({
   name: 'VideoDetail',
@@ -43,6 +42,7 @@ export default defineComponent({
         username: users.username,
         headUrl: users.headUrl,
         buyNum: 0,
+        lessonNum: result.lessonGroup.lessonCount,
         lessonName: result.lessonGroup.lessonName,
         lessonDesc: result.lessonGroup.lessonDesc,
         lessonPrice: result.lessonGroup.lessonPrice,