Merge branch 'newVersion' into dev

src/components/col-cropper/index.tsx

@@ -43,7 +43,7 @@ export default defineComponent({
     },
     accept: {
       type: String,
-      default: 'image/*'
+      default: '.png,.jpg,.jpeg'
     },
     tips: {
       type: String,

src/components/col-header/index.css

@@ -168,7 +168,7 @@
 
 .itemCenter {
   position: relative;
-  margin-right: 40px;
+  margin-right: 70px;
   line-height: 62px;
   height: 62px;
   font-size: 20px;

src/components/col-header/index.tsx

@@ -53,7 +53,7 @@ export default defineComponent({
   },
   watch: {
     $route(res: any) {
-      console.log(res)
+      // console.log(res)
       this.isdark = !!res.meta.isdark
       this.navigator.forEach((item: any) => {
         item.current = false
@@ -78,15 +78,17 @@ export default defineComponent({
             this.isdark ? 'isdark' : ''
           ]}
         >
-
           <div class="flex items-center h-full">
-          <div class="logoWrap" onClick={() => this.gotoMain()}>
-            <img class="w-full" src={ (this.isdark||!this.isTop)?logo:whileLogo} alt="" />
-          </div>
-
+            <div class="logoWrap" onClick={() => this.gotoMain()}>
+              <img
+                class="w-full"
+                src={this.isdark || !this.isTop ? logo : whileLogo}
+                alt=""
+              />
+            </div>
           </div>
-          <div class={['rightWrap','flex','items-center']}>
-          <div class="flex mr160">
+          <div class={['rightWrap', 'flex', 'items-center']}>
+            <div class="flex mr120">
               {this.navigator.map((item: any) => (
                 <div
                 // onClick={() => {

src/components/col-header/modals/index.module.less

@@ -84,7 +84,7 @@
           text-align: center;
         }
         .icon {
-          margin-left: 14px;
+          margin-left: 10px;
           width: 26px;
           height: 26px;
         }
@@ -104,7 +104,7 @@
     width: 100%;
     position: relative;
     vertical-align: bottom;
-    border-radius: 10px 10px 0px 0px;
+    // border-radius: 10px 10px 0px 0px;
   }
   .dropdownInfo {
     display: flex;
@@ -143,7 +143,7 @@
         height: 22px;
         font-size: 16px;
         font-family: PingFangSC-Regular, PingFang SC;
-        font-weight: 600;
+        font-weight: 400;
         color: #999;
         line-height: 22px;
       }
@@ -191,8 +191,8 @@
         align-items: center;
         justify-content: space-between;
         .icon_back {
-          width: 8px;
-          height: 15px;
+          width: 7px;
+          height: 12px;
           margin-right: 13px;
         }
       }
@@ -221,6 +221,7 @@
        span {
         margin-right: 20px;
         color: #666;
+        font-weight: 400;
        }
       }
       .backWrap {

src/components/col-header/modals/loganInfo.tsx

@@ -192,7 +192,7 @@ export default defineComponent({
         <ElDropdown
           onCommand={val => this.changeState(val)}
           popper-class="loginPopper"
-          trigger="hover"
+          trigger="click"
           v-slots={{
             dropdown: () => (
               <>
@@ -213,6 +213,7 @@ export default defineComponent({
                         <img
                           class={classes.vipLogo}
                           src={this.user.isVip ? vipIcon : noVipIcon}
+                          style="object-fit: cover;"
                           alt=""
                         />
                       </div>

src/components/col-upload/index.tsx

@@ -30,7 +30,7 @@ export default defineComponent({
     },
     accept: {
       type: String,
-      default: 'image/*'
+      default: '.png,.jpg,.jpeg'
     },
     tips: {
       type: String,

src/router/routes-admin.ts

@@ -87,7 +87,7 @@ export default [
       title: '视频课',
       index: 3,
       highlightPath: '/videoDetailList',
-      isdark: true
+      isdark: false
     }
   },
   {

src/views/login/components/teacher-auth/index.tsx

@@ -17,7 +17,9 @@ export default defineComponent({
     onDetail(type = 'teacher' as 'teacher' | 'music') {
       this.onClose()
       if (type === 'teacher') {
-        this.$router.push('/teacherAuth')
+        window.location.href =
+          location.origin + location.pathname + '#/teacherAuth'
+        // this.$router.push('/teacherAuth')
       } else if (type === 'music') {
         this.$router.push('/musicAuth')
       }

src/views/student-info/components/users/index.module.less

@@ -10,5 +10,8 @@
     .el-dialog__header {
       padding: 0;
     }
+    .el-dialog__headerbtn .el-dialog__close {
+      font-size: 24px;
+    }
   }
 }

src/views/student-info/components/users/index.tsx

@@ -69,9 +69,7 @@ export default defineComponent({
           <span
             class="flex items-center justify-center flex-col leading-6 cursor-pointer flex-1"
             onClick={() => {
-              if (getUserType() === 'STUDENT') {
-                this.$router.push('/studentInfo/myFollow')
-              }
+              this.$router.push('/studentInfo/myFollow')
             }}
           >
             <b class="text-[#333333] text-[28px] pl-1 pb-1">

src/views/student-info/my-follow/item.tsx

@@ -62,7 +62,7 @@ export default defineComponent({
             src={item.avatar || iconTeacher}
             class="w-12 h-12 rounded-full border-2 border-[#2DC7AA] object-cover"
           />
-          {item.isVip && <ElImage src={iconVip} class="h-7 -mt-4" />}
+          {item.isVip > 0 && <ElImage src={iconVip} class="h-7 -mt-4" />}
         </div>
 
         <p class="text-base text-[#333] font-semibold leading-tight pb-5 pt-2 text-center">

src/views/user-info/components/open-member/index.tsx

@@ -20,8 +20,7 @@ export default defineComponent({
           class="w-[318px] absolute -top-10 left-1/2 -ml-[158px]"
         />
         <div class="text-center text-2xl font-semibold text-[#333] pt-[70px] pb-9">
-          手机扫码开通{getUserType() === 'STUDENT' ? '酷乐秀' : '酷乐秀学院'}
-          会员
+          手机扫码下载{getUserType() === 'STUDENT' ? '酷乐秀' : '酷乐秀学院'}App
         </div>
 
         {getUserType() === 'TEACHER' ? (
@@ -38,7 +37,7 @@ export default defineComponent({
 
         <p class="text-lg text-center text-[#333] pt-8">
           打开{getUserType() === 'STUDENT' ? '酷乐秀' : '酷乐秀学院'}
-          App，扫一扫开通会员
+          App开通会员
         </p>
       </div>
     )

src/views/user-info/components/users/index.module.less

@@ -10,5 +10,8 @@
     .el-dialog__header {
       padding: 0;
     }
+    .el-dialog__headerbtn .el-dialog__close {
+      font-size: 24px;
+    }
   }
 }

src/views/user-info/model/practice-timer/index.tsx

@@ -67,7 +67,6 @@ export default defineComponent({
       this.endSetting,
       this.courseMinutes + this.freeMinutes || 30
     )
-    console.log(this.endSetting)
   },
   methods: {
     timerInit(startTime: string, endTime: string, space: number) {

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

@@ -40,7 +40,6 @@ export default defineComponent({
           }
         )
         this.list = data.rows || []
-        console.log(this.list)
         this.pageInfo.total = data.total
         if (data.total <= 0) {
           this.dataShow = true
@@ -62,7 +61,7 @@ export default defineComponent({
           我的粉丝
         </div>
 
-        <div class=" pt-4">
+        <div class={!this.dataShow && 'pt-4'}>
           <ElSkeleton
             loading={this.loading}
             animated
@@ -104,7 +103,7 @@ export default defineComponent({
                         src={item.avatar}
                         class="w-12 h-12 rounded-full border-2 border-[#2DC7AA]"
                       />
-                      {item.isVip && (
+                      {item.isVip > 0 && (
                         <ElImage src={iconVip} class="h-7 -mt-4" />
                       )}
                     </div>
@@ -134,6 +133,7 @@ export default defineComponent({
           </ElSkeleton>
         </div>
 
+        {this.dataShow && <ColEmpty />}
         <Pagination
           total={this.pageInfo.total}
           v-model:page={this.pageInfo.page}
@@ -141,8 +141,6 @@ export default defineComponent({
           pageSizes={this.pageInfo.page_size}
           pagination={this.getList}
         />
-
-        {this.dataShow && <ColEmpty />}
       </div>
     )
   }

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

@@ -368,6 +368,7 @@ export default defineComponent({
                     type="text"
                     placeholder="请输入陪练价格"
                     v-model={item.subjectPrice}
+                    maxlength={8}
                     v-slots={{
                       append: () => (
                         <span class="text-base text-[#333]">元</span>
@@ -448,17 +449,19 @@ export default defineComponent({
           showClose
           width={'488px'}
         >
-          <PracticeTimer
-            onChoice={this.onChoiceTimer}
-            onClose={() => {
-              this.timerStatus = false
-            }}
-            timerObject={this.timerObject}
-            courseMinutes={Number(this.timeSetting.courseMinutes)}
-            freeMinutes={Number(this.timeSetting.freeMinutes)}
-            startSetting={this.timeSetting.startSetting}
-            endSetting={this.timeSetting.endSetting}
-          />
+          {this.timerStatus && (
+            <PracticeTimer
+              onChoice={this.onChoiceTimer}
+              onClose={() => {
+                this.timerStatus = false
+              }}
+              timerObject={this.timerObject}
+              courseMinutes={Number(this.timeSetting.courseMinutes)}
+              freeMinutes={Number(this.timeSetting.freeMinutes)}
+              startSetting={this.timeSetting.startSetting}
+              endSetting={this.timeSetting.endSetting}
+            />
+          )}
         </ElDialog>
       </div>
     )

src/views/videoDetailList/index.tsx

@@ -92,7 +92,7 @@ export default defineComponent({
     return () => (
       <>
         <div>
-          <div class="wall" style={{ height: '60px' }}></div>
+          {/* <div class="wall" style={{ height: '60px' }}></div> */}
           <banner></banner>
           <div class={styles.w1200}>
             <div class={styles.section}>