Merge branch 'newVersion' of http://git.dayaedu.com/lex/colexiu-project into newVersion

dist/assets/hold-legacy.fa388436.js

@@ -0,0 +1 @@
+;(function(){System.register([],function(exports){'use strict';return{execute:function execute(){var hold=exports('h',"./assets/hold.abbcc7ab.png");}};});})();

dist/assets/icon-legacy.aed5a5b3.js

@@ -1 +1 @@
-System.register([],(function(e){"use strict";return{execute:function(){e("i","./assets/icon.c76ae863.png")}}}));
+;(function(){System.register([],function(exports){'use strict';return{execute:function execute(){var icon=exports('i',"./assets/icon.c76ae863.png");}};});})();

dist/assets/index-legacy.0bd009c3.js

@@ -0,0 +1 @@
+;(function(){System.register(['./vendor-legacy.2e9920fe.js'],function(exports){'use strict';var defineComponent,createVNode,ElImage,createTextVNode;return{setters:[function(module){defineComponent=module.d;createVNode=module.c;ElImage=module.x;createTextVNode=module.a;}],execute:function execute(){var Item=exports('I',defineComponent({name:'item',props:{item:{type:Object,default:function _default(){return{};}}},render:function render(){var _this=this;var item=this.item;return createVNode("div",{"class":"border border-[#E0E0E0] box-border rounded-[10px] w-[218px] m-auto overflow-hidden relative transition-all cursor-pointer","onClick":function onClick(){console.log(item);if(item.type==='video'){_this.$router.push({path:'/videoDetail',query:{id:item.id}});}}},[createVNode("div",{"class":"relative"},[createVNode(ElImage,{"class":"w-full h-[122px] align-middle","fit":"cover","src":item.backgroundPic},null),createVNode("div",{"class":"text-sm text-[#52FFDC] h-7 leading-7 px-3 flex items-center justify-end absolute left-0 right-0 bottom-0 bg-black/60"},[createVNode("i",{"class":"w-1 h-1 bg-[#52FFDC] rounded-full mr-1.5 inline-block"},null),item.studentCount,createTextVNode("\u4EBA\u5DF2\u8D2D\u4E70")])]),createVNode("div",{"class":"text-base px-2.5 pt-2 text-[#666666] leading-none font-semibold whitespace-nowrap overflow-hidden text-ellipsis"},[item.courseGroupName]),item.courseStartTime&&createVNode("p",{"class":"text-[#999] text-xs px-2.5 leading-none pt-1.5"},[createTextVNode("\u5F00\u8BFE\u65F6\u95F4\uFF1A"),item.courseStartTime]),createVNode("div",{"class":"mx-2.5 pt-1.5 pb-2 flex items-center justify-between"},[createVNode("div",{"class":"text-xl text-[#F90000] font-semibold leading-none"},[createVNode("span",{"class":"text-sm leading-7"},[createTextVNode("\uFFE5")]),item.coursePrice]),createVNode("div",{"class":"text-base text-[#FF5F22] leading-none"},[item.courseNum,createTextVNode("\u8BFE\u65F6")])])]);}}));}};});})();

dist/assets/index-legacy.59cc8d6d.js

@@ -0,0 +1,2 @@
+;(function(){System.register(['./vendor-legacy.2e9920fe.js'],function(exports){'use strict';var defineComponent,createVNode,ElButton;return{setters:[function(module){defineComponent=module.d;createVNode=module.c;ElButton=module.k;}],execute:function execute(){var empty="./assets/icon_empty.df5db7bf.png";var live="./assets/icon_no_live.fcb0eb56.png";var teacherCert="./assets/icon_teacher_cert.ee709a8f.png";var musicCert="./assets/icon_music_cert.a65c8b91.png";var ColEmpty=exports('C',defineComponent({name:'col-empty',props:{message:{type:String,default:'暂无数据'},buttonText:{type:String,default:'去首页'},buttonVisibility:{type:Boolean,default:false},type:{type:String,default:'empty'// 'empty' | 'live' | 'teacherCert' | 'musicCert'
+},onDetail:{type:Function,default:function _default(){}}},computed:{icon:function icon(){switch(this.type){case'empty':return empty;case'live':return live;case'teacherCert':return teacherCert;case'musicCert':return musicCert;default:return empty;}}},render:function render(){var _this=this;return createVNode("div",{"class":"w-full h-full text-center flex items-center justify-center flex-col"},[createVNode("img",{"src":this.icon,"class":"w-64 m-auto"},null),createVNode("p",{"class":"text-base text-[#999999] pt-4 pb-6"},[this.message]),this.buttonVisibility&&createVNode(ElButton,{"type":"primary","class":"rounded-sm !px-12","round":true,"style":{height:'48px'},"onClick":function onClick(){_this.onDetail();}},{default:function _default(){return[_this.buttonText];}})]);}}));}};});})();

dist/assets/index-legacy.d41d3c5c.js

@@ -0,0 +1,2 @@
+;(function(){var __vite_style__=document.createElement('style');__vite_style__.innerHTML="._pagination-container_1x1u9_1{background:transparent;padding:24px 16px 32px;width:100%;display:flex;flex-direction:row;justify-content:center}._pagination-container_1x1u9_1 .el-pagination.is-background .btn-next,._pagination-container_1x1u9_1 .el-pagination.is-background .btn-prev,._pagination-container_1x1u9_1 .el-pagination.is-background .el-pager li{border-radius:999px;box-sizing:border-box;border:1px solid #329e8a;background-color:#fff;color:#329e8a}._pagination-container_1x1u9_1 .el-pagination.is-background .el-pager li:not(.is-disabled).is-active{border-color:var(--el-color-primary)}._pagination-container_1x1u9_1 .el-input__wrapper{border-radius:99px}._pagination-container_1x1u9_1 .el-input__inner{border-radius:99px;background-color:#fff!important}._pagination-container_1x1u9_1._hidden_1x1u9_28{display:none}\n";document.head.appendChild(__vite_style__);System.register(['./index-legacy.4f1ba0d0.js','./vendor-legacy.2e9920fe.js'],function(exports){'use strict';var scrollAnimation,defineComponent,createVNode,ElPagination;return{setters:[function(module){scrollAnimation=module.f;},function(module){defineComponent=module.d;createVNode=module.c;ElPagination=module.a4;}],execute:function execute(){var hidden="_hidden_1x1u9_28";var styles={"pagination-container":"_pagination-container_1x1u9_1",hidden:hidden};var Pagination=exports('P',defineComponent({name:'pagination',props:{total:{required:true,type:Number},page:{type:Number,default:1},limit:{type:Number,default:10},pageSizes:{type:Array,default:[5,10,20,30,50]},// , jumper
+layout:{type:String,default:'total, sizes, prev, pager, next'},showMuitiple:{type:Number,default:10},hideOnSinglePage:{type:Boolean,default:true},background:{type:Boolean,default:true},autoScroll:{type:Boolean,default:true},hidden:{type:Boolean,default:false},sync:{type:Boolean,default:false},saveKey:{type:String,default:''},pagination:{type:Function,default:function _default(){}}},methods:{handleSizeChange:function handleSizeChange(val){this.$emit('update:page',1);this.$emit('update:limit',val);this.pagination();if(this.autoScroll){var currentY=document.documentElement.scrollTop||document.body.scrollTop;scrollAnimation(currentY,0);}},handleCurrentChange:function handleCurrentChange(val){this.$emit('update:page',val);this.$emit('update:limit',this.limit);this.pagination();if(this.autoScroll){var currentY=document.documentElement.scrollTop||document.body.scrollTop;scrollAnimation(currentY,0);}}},render:function render(){var _this=this;return createVNode("div",{"class":[styles['pagination-container'],this.hidden&&styles.hidden]},[createVNode(ElPagination,{"currentPage":this.page,"pageSize":this.limit,"onUpdate:currentPage":function onUpdateCurrentPage(val){},"onUpdate:pageSize":function onUpdatePageSize(val){_this.handleSizeChange(val);},"pageSizes":this.pageSizes,"total":this.total,"hideOnSinglePage":this.total>this.showMuitiple?false:this.hideOnSinglePage,"background":this.background,"layout":this.layout,"onSise-change":this.handleSizeChange,"onCurrent-change":this.handleCurrentChange},null)]);}}));}};});})();

dist/assets/music-legacy.146bf361.js

@@ -1 +1 @@
-System.register([],(function(e){"use strict";return{execute:function(){e("m","./assets/music.24d07fa6.png")}}}));
+;(function(){System.register([],function(exports){'use strict';return{execute:function execute(){var music=exports('m',"./assets/music.24d07fa6.png");}};});})();

dist/assets/toolsValidate-legacy.b90c63da.js

@@ -1 +1 @@
-System.register([],(function(e){"use strict";return{execute:function(){e({a:function(e){var r=e.replace(/(^\s*)|(\s*$)/g,"");return r=(r=(r=(r=r.replace(/[\.]*/g,"")).replace(/(^0[\d]*)$/g,"0")).replace(/^0\d$/g,"0")).replace(/[^\d]/g,"")},v:function(e){var r=e.replace(/(^\s*)|(\s*$)/g,"");return r=(r=(r=(r=(r=r.replace(/[^\d.]/g,"")).replace(/^0{2}$/g,"0")).replace(/^\./g,"")).replace(".","$#$").replace(/\./g,"").replace("$#$",".")).replace(/^(\-)*(\d+)\.(\d\d).*$/,"$1$2.$3")}})}}}));
+;(function(){System.register([],function(exports){'use strict';return{execute:function execute(){exports({a:verifiyNumberInteger,v:verifyNumberIntegerAndFloat});function verifyNumberIntegerAndFloat(val){var v=val.replace(/(^\s*)|(\s*$)/g,"");v=v.replace(/[^\d.]/g,"");v=v.replace(/^0{2}$/g,"0");v=v.replace(/^\./g,"");v=v.replace(".","$#$").replace(/\./g,"").replace("$#$",".");v=v.replace(/^(\-)*(\d+)\.(\d\d).*$/,"$1$2.$3");return v;}function verifiyNumberInteger(val){var v=val.replace(/(^\s*)|(\s*$)/g,"");v=v.replace(/[\.]*/g,"");v=v.replace(/(^0[\d]*)$/g,"0");v=v.replace(/^0\d$/g,"0");v=v.replace(/[^\d]/g,"");return v;}}};});})();

src/components/col-calendar/index.tsx

@@ -254,7 +254,7 @@ export default defineComponent({
           modelValue={this.show}
           onUpdate:modelValue={e => (this.show = e)}
           title={this.selectDayTitle}
-          width={'440px'}
+          width={'488px'}
         >
           <div class={[styles.container, 'flex flex-wrap']}>
             {this.dayList.map((item: any) => (

src/components/col-header/index.tsx

@@ -25,20 +25,22 @@ export default defineComponent({
       navPath: ['', '/musicLibrary', '', '', '/downLoad'],
       isTop: false,
       isdark: false,
-      token: '',
-      userType: '',
-      isLogin: false,
+      // token: '',
+      // userType: '',
       userInfo: {}
     }
   },
-  mounted() {
-    this.token = getAuth()
-    this.userType = getUserType()
-    if (this.userType && this.token) {
-      this.isLogin = true
-
-      // this.userInfo =
+  computed: {
+    isLogin() {
+      // const token = getAuth()
+      // const userType = getUserType()
+      if (state.user.data.userId) {
+        return true
+      }
+      return false
     }
+  },
+  mounted() {
     window.addEventListener('scroll', e => {
       //函数体
       let scrollTop =

src/components/col-upload-video/index.module.less

@@ -14,7 +14,7 @@
   min-width: 300px;
   height: 40px;
   border: 1px solid rgba(142, 142, 142, 0.26);
-  border-radius: 4px;
+  border-radius: 10px;
   display: flex;
   align-items: center;
   padding: 0 15px;

src/components/col-upload/index.module.less

@@ -2,7 +2,7 @@
   width: 150px;
   height: 85px;
   background: #f8faf9;
-  border-radius: 4px;
+  border-radius: 10px;
   border: 1px solid rgba(45, 199, 170, 0.26);
   font-size: 14px;
   color: #2dc7aa;
@@ -14,7 +14,7 @@
   min-width: 300px;
   height: 50px;
   border: 1px solid rgba(142, 142, 142, 0.26);
-  border-radius: 4px;
+  border-radius: 10px;
   display: flex;
   align-items: center;
   padding: 0 15px;

src/views/login/components/login/index.tsx

@@ -29,6 +29,7 @@ export default defineComponent({
     tabType(val: string) {
       // 切换登录类型时需要清除定时器
       if (val != 'qrLogin') {
+        sessionStorage.removeItem('scanCode')
         clearInterval(state.loginPopupTimer)
       }
     }

src/views/user-info/live-operation/course-class/index.module.less

@@ -14,6 +14,7 @@
 
     .el-dialog {
       --el-dialog-width: 375px !important;
+      --el-dialog-border-radius: 10px;
     }
 
     .el-dialog__body {

src/views/user-info/live-operation/course-class/index.tsx

@@ -203,7 +203,7 @@ export default defineComponent({
               onKeyup={this.onFormatter}
               maxlength={8}
               v-slots={{
-                append: () => <span class="text-base text-[#333]">人</span>
+                suffix: () => <span class="text-base text-[#999]">人</span>
               }}
             />
           </ElFormItem>

src/views/user-info/live-operation/course-content/index.module.less

@@ -44,7 +44,10 @@
   }
 
   .times {
-    padding-top: 18px;
+    margin-top: 18px;
+    max-height: 212px;
+    overflow-y: auto;
+    overflow-x: hidden;
 
     & > div {
       display: block;
@@ -54,6 +57,9 @@
       background: rgba(45, 199, 170, 0.1);
       border-radius: 10px;
       color: #2dc7aa;
+      &:last-child {
+        margin-bottom: 0;
+      }
     }
   }
 

src/views/user-info/live-operation/course-info/index.tsx

@@ -195,7 +195,7 @@ export default defineComponent({
               onKeyup={this.onFormaterCourse}
               maxlength={2}
               v-slots={{
-                append: () => <span class="text-base text-[#333]">课时</span>
+                suffix: () => <span class="text-base text-[#999]">课时</span>
               }}
             />
           </ElFormItem>
@@ -263,7 +263,7 @@ export default defineComponent({
               }}
               maxlength={8}
               v-slots={{
-                append: () => <span class="text-base text-[#333]">元</span>
+                suffix: () => <span class="text-base text-[#999]">元</span>
               }}
             />
           </ElFormItem>

src/views/user-info/music-operation/index.module.less

@@ -17,7 +17,7 @@
       border: var(--el-border);
       border-radius: var(--el-border-radius-base) !important;
       width: 100%;
-      padding: 11px 19px !important;
+      padding: 16px 19px !important;
     }
     .el-radio-button__original-radio:checked + .el-radio-button__inner {
       background-color: #e9fff8;

src/views/user-info/music-operation/index.tsx

@@ -419,7 +419,7 @@ export default defineComponent({
                   maxlength={5}
                   onKeyup={this.onFormatter}
                   v-slots={{
-                    append: () => <span>元</span>
+                    suffix: () => <span class="text-base text-[#999]">元</span>
                   }}
                 />
               </ElFormItem>

src/views/user-info/my-fans/index.tsx

@@ -111,21 +111,23 @@ export default defineComponent({
                     <p class="text-base text-[#333] font-semibold leading-tight pb-5 pt-2 text-center">
                       {item.userName}
                     </p>
-                    <p>
-                      <ElTag
-                        effect="dark"
-                        // size="small"
-                        color="#E0FEF9"
-                        round
-                        style={{
-                          borderColor: '#E0FEF9',
-                          color: '#1B967E',
-                          margin: '0 4px'
-                        }}
-                      >
-                        {item.subjectName}
-                      </ElTag>
-                    </p>
+                    {item.subjectName && (
+                      <p>
+                        <ElTag
+                          effect="dark"
+                          // size="small"
+                          color="#E0FEF9"
+                          round
+                          style={{
+                            borderColor: '#E0FEF9',
+                            color: '#1B967E',
+                            margin: '0 4px'
+                          }}
+                        >
+                          {item.subjectName}
+                        </ElTag>
+                      </p>
+                    )}
                   </div>
                 </div>
               ))}

src/views/user-info/open-live/index.tsx

@@ -124,7 +124,7 @@ export default defineComponent({
             >
               <div class="flex justify-between items-center">
                 <span class="text-2xl text-[#666]">
-                  <i class="text-[#E32121]">*</i>粉丝数
+                  <i class="text-[#E32121] pr-1">*</i>粉丝数
                 </span>
                 <div class="text-2xl text-[#999] font-semibold flex items-center">
                   <span class="text-4xl text-black leading-none">
@@ -153,7 +153,7 @@ export default defineComponent({
             >
               <div class="flex justify-between items-center">
                 <span class="text-2xl text-[#666]">
-                  <i class="text-[#E32121]">*</i>课程数
+                  <i class="text-[#E32121] pr-1">*</i>课程数
                 </span>
                 <div class="text-2xl text-[#999] font-semibold flex items-center">
                   <span class="text-4xl text-black leading-none">

src/views/user-info/practice-setting/index.module.less

@@ -35,5 +35,17 @@
     .el-checkbox__inner {
       @apply rounded-full overflow-hidden;
     }
+
+    .el-select .el-select__tags .el-tag {
+      background-color: #dffff8;
+      border: 1px solid #4bb39e;
+      border-radius: 10px;
+      margin: 0 6px 0 0;
+      height: 30px;
+    }
+    .el-tag .el-icon {
+      color: #4bb39e;
+      background-color: transparent;
+    }
   }
 }

src/views/user-info/practice-setting/index.tsx

@@ -373,8 +373,8 @@ export default defineComponent({
                     v-model={item.subjectPrice}
                     maxlength={8}
                     v-slots={{
-                      append: () => (
-                        <span class="text-base text-[#333]">元</span>
+                      suffix: () => (
+                        <span class="text-base text-[#999]">元</span>
                       )
                     }}
                   />

src/views/user-info/video-operation/course-info/index.module.less

@@ -8,7 +8,7 @@
 
 .imgCover {
   width: 150px;
-  height: 85px;
+  // height: 85px;
 }
 
 .courseInfo {

src/views/user-info/video-operation/course-info/index.tsx

@@ -185,7 +185,7 @@ export default defineComponent({
               onKeyup={this.onFormatter}
               maxlength={9}
               v-slots={{
-                append: () => <span class="text-base text-[#333]">元</span>
+                suffix: () => <span class="text-base text-[#999]">元</span>
               }}
             />
           </ElFormItem>
@@ -197,7 +197,7 @@ export default defineComponent({
             </p>
             <p>您的课程收入将在课程结束后结算到您的账户中 </p>
           </div>
-          <ElFormItem label="课程封面" class="!mb-0">
+          <ElFormItem label="课程封面" class="!mb-0" required>
             <ElTabs
               v-model={createState.tabIndex}
               class={styles.tabs}

src/views/videoDetailList/modals/videoCourseItem.tsx

@@ -21,7 +21,7 @@ export default defineComponent({
     const state = reactive({
       title: props.item,
       item: props.item,
-      showDown: true
+      showDown: false
     })
     watch(
       () => props.item,