Merge branch 'beta'

dist/index.html

@@ -37,7 +37,7 @@
       width: 100%;
       background: #e6eaf0;
       font-family: '黑体';
-    }</style><link href=./static/css/app.da1e804cda5731d737ac867b5785147b.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.23ea04dc469b57e2b4f8.js></script><script type=text/javascript src=./static/js/vendor.2c492f3d5a39df08f4a3.js></script><script type=text/javascript src=./static/js/app.74f49b6298bbaadce2c0.js></script></body></html><script>function stopSafari() {
+    }</style><link href=./static/css/app.f8426c88a9c06c41914c7b63ef2e320d.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.23ea04dc469b57e2b4f8.js></script><script type=text/javascript src=./static/js/vendor.2c492f3d5a39df08f4a3.js></script><script type=text/javascript src=./static/js/app.a5f3f96d4582626b5a8f.js></script></body></html><script>function stopSafari() {
     //阻止safari浏览器双击放大功能
     let lastTouchEnd = 0  //更新手指弹起的时间
     document.documentElement.addEventListener("touchstart", function (event) {

dist/workPage.html

@@ -1,4 +1,4 @@
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>工作页面 - CocoFlow</title><link rel=icon href=../static/logo.ico><link href=./static/css/workPage.2c55608a031fd5e271ad61fde5544c55.css rel=stylesheet></head><body><noscript><strong>We're sorry but this app doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script type=text/javascript src=./static/js/workPage-manifest.2ece51fa34be51c8610a.js></script><script type=text/javascript src=./static/js/workPage-vendor.7b6275e4cf468b42a92b.js></script><script type=text/javascript src=./static/js/workPage.e152c1e61cd721df9c82.js></script></body></html><script>function stopSafari() {
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>工作页面 - CocoFlow</title><link rel=icon href=../static/logo.ico><link href=./static/css/workPage.12caa3dc5db1a12b5a56f4bb2db7ac67.css rel=stylesheet></head><body><noscript><strong>We're sorry but this app doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script type=text/javascript src=./static/js/workPage-manifest.2ece51fa34be51c8610a.js></script><script type=text/javascript src=./static/js/workPage-vendor.7b6275e4cf468b42a92b.js></script><script type=text/javascript src=./static/js/workPage.b7e25dae76fc8a0081e6.js></script></body></html><script>function stopSafari() {
     //阻止safari浏览器双击放大功能
     let lastTouchEnd = 0  //更新手指弹起的时间
     document.documentElement.addEventListener("touchstart", function (event) {

src/components/common/GradeClassSelector.vue

@@ -88,6 +88,9 @@ export default {
     filteredClassOptions() {
       if (this.selectedGrade === '') {
         return this.classOptions;
+      }else if(this.selectedGrade === '1'){
+        // 选择了兴趣班级，显示兴趣班级
+        return this.classOptions.filter(item => item.pid === '' || !item.pid);
       } else {
         return this.classOptions.filter(item => item.pid === this.selectedGrade);
       }
@@ -127,7 +130,7 @@ export default {
       this.selectedGrade = grade.id;
       // this.selectedClasses = [];
       // this.$emit('input', this.selectedClasses);
-      this.$emit('gradeChange', this.selectedGrade);
+      // this.$emit('gradeChange', this.selectedGrade);
     },
     toggleClass(classId) {
       const index = this.selectedClasses.indexOf(classId);

src/components/pages/pptEasy/addCourse3.vue

@@ -1328,6 +1328,11 @@ export default {
       this.initCourseSettingsOptions();
       this.dialogVisibleCourseSettings = true;
     },
+    courseSettings(subject, className){
+      this.selectedSubject = this.subjectOptions.some(item => item.name === subject);
+      this.selectedGrade = this.gradeOptions.some(item => item.name === className);
+      this.applyCourseSettings();
+    },
     // 初始化课程设置选项
     initCourseSettingsOptions() {
       // 从 CourseTypeJson 中获取学科和年级选项
@@ -1399,7 +1404,8 @@ export default {
       
       // 初始化年级选项，添加全部班级选项
       this.gradeOptions2 = [
-        { id: '', name: this.lang.allGrades }
+        { id: '', name: this.lang.ssAllClass },
+        { id: '1', name: this.lang.ssInterestClass }
       ].concat(this.gradeArray.map(item => ({
         id: item.id,
         name: item.name
@@ -1413,7 +1419,7 @@ export default {
       if (this.selectedGrade === '') {
         // 选择了全部班级，显示所有班级
         this.filteredClassOptions = this.classOptions;
-      } else {
+      }else {
         // 根据选择的年级筛选班级
         this.filteredClassOptions = this.classOptions.filter(item => item.pid === this.selectedGrade);
       }
@@ -1912,7 +1918,7 @@ export default {
               if (err) {
                 // var a = _this.$refs.upload1.uploadFiles;
                 // a.splice(a.length - 1, a.length);
-                _this.$message.error(this.lang.ssUploadPptFail);
+                _this.$message.error(_this.lang.ssUploadPptFail);
               } else {
                 //上传成功处理
                 // _this.unitJson[_this.unitIndex].chapterInfo[0].fileList1.push({
@@ -3870,6 +3876,7 @@ export default {
       this.dialogVisiblePublish = true;
     }
     window.openCourseSettings = () => this.openCourseSettings();
+    window.courseSettings = (subject, className) => this.courseSettings(subject, className);
     let _this = this;
     window.setCourseUrl = () => {
       console.log(_this.courseUrl)