Merge branch 'master' into jenkins

src/components/o-upload-all/index.tsx

@@ -76,7 +76,7 @@ export default defineComponent({
       postMessage(
         {
           api: 'chooseFile',
-          content: { type: type, max: 1, bucket: this.bucket }
+          content: { type: type, max: 1, bucket: this.bucket, path: this.path }
         },
         (res: any) => {
           console.log(res, 'fileUrl')

src/school/approval-manage/components/student-leave.tsx

@@ -67,8 +67,9 @@ export default defineComponent({
           state.dialogStatus = true
           state.dialogMessage = res.message
         } else {
-          showToast('提交成功')
-          router.push('/approval-manage')
+          // showToast('提交成功')
+          // router.push('/approval-manage')
+          router.back()
         }
       } catch (e: any) {
         showToast(e.message || '提交失败')

src/school/companion-teacher/companion-teacher-register.tsx

@@ -296,7 +296,9 @@ export default defineComponent({
     const onPreview = (type: any) => {
       if (type === 'REGISTER') {
         window.open(
-          window.location.origin + window.location.pathname + '#/preview-protocol',
+          window.location.origin +
+            window.location.pathname +
+            '#/preview-protocol?type=REGISTER_TEACHER',
           '_blank'
         )
       } else if (type === 'PRIVACY') {
@@ -668,16 +670,16 @@ export default defineComponent({
                 请认真阅读并勾选
               </span>
               <span class={styles.c} onClick={() => onPreview('REGISTER')}>
-                《管乐团用户注册协议》
+                《管乐团用户使用协议》
               </span>
               、
               <span class={styles.c} onClick={() => onPreview('PRIVACY')}>
                 《隐私协议》
               </span>
-              、
+              {/* 、
               <span class={styles.c} onClick={() => onPreview('WITHDRAW')}>
                 《共享经济平台注册经营者协议》
-              </span>
+              </span> */}
             </div>
           </div>
 

src/school/orchestra/create-orchestra/select-teacher.tsx

@@ -71,12 +71,14 @@ export default defineComponent({
 
     const onConfirm = () => {
       resestState()
-      router.replace('/train-planning')
+      router.back()
+      // router.replace('/train-planning')
     }
     // 取消
     const onCancel = () => {
       resestState()
-      router.replace('/my-orchestra')
+      router.back()
+      // router.replace('/my-orchestra')
     }
 
     return () => (

src/school/train-planning/modal/calendar/index.tsx

@@ -5,6 +5,7 @@ import styles from './index.module.less'
 import IconArrow from '../../images/icon_arrow.png'
 import IconArrowDefault from '../../images/icon_arrow_default.png'
 import IconToday from '../../images/icon-today.png'
+import IconTodayDefault from '../../images/icon-today-default.png'
 import isToday from 'dayjs/plugin/isToday'
 import isSameOrBefore from 'dayjs/plugin/isSameOrBefore'
 import OHeader from '@/components/o-header'
@@ -87,6 +88,11 @@ export default defineComponent({
     selectDayTitle() {
       // 选中日期标题
       return dayjs(this.currentDate).format('YYYY-MM-DD')
+    },
+    todayStatus() {
+      // 当前时间是否在当月
+      console.log(this.calendarDate)
+      return this.calendarDate ? dayjs().isSame(dayjs(this.calendarDate), 'month') : false
     }
   },
   watch: {
@@ -220,7 +226,12 @@ export default defineComponent({
                     class={[styles.right]}
                     onClick={this.onPrevMonth}
                   />
-                  <Icon name={IconToday} size={22} class={styles.today} onClick={this.onToday} />
+                  <Icon
+                    name={this.todayStatus ? IconToday : IconTodayDefault}
+                    size={22}
+                    class={styles.today}
+                    onClick={this.onToday}
+                  />
                   <Icon name={IconArrow} size={22} onClick={this.onNextMonth} />
                 </div>
               </div>

src/student/my-orchestra/apply-withdrawal.tsx

@@ -72,7 +72,7 @@ export default defineComponent({
         })
 
         forms.isClick = false
-        router.replace('/mine-orchestra')
+        router.back()
       } catch {
         //
         forms.isClick = false

src/views/exercise-record/exercis-detail.tsx

@@ -43,7 +43,8 @@ export default defineComponent({
       ],
       id: route.query.id,
       heightV: 0 as number,
-      scrollTop: 0 as number
+      scrollTop: 0 as number,
+      isClick: false
     })
 
     const forms = reactive({
@@ -71,7 +72,10 @@ export default defineComponent({
     const infoDetail = ref({} as any)
     const list = ref([])
     const getList = async () => {
-      loading.value = true
+      if (state.isClick) {
+        return
+      }
+      state.isClick = true
       if (refreshing.value) {
         list.value = []
         forms.page = 1
@@ -86,11 +90,11 @@ export default defineComponent({
           return
         }
 
-        forms.page = res.data.current + 1
         list.value = list.value.concat(res.data.rows || [])
+        forms.page = res.data.current + 1
         showContact.value = list.value.length > 0
         loading.value = false
-
+        console.log(res.data, res.data.current >= res.data.pages)
         finished.value = res.data.current >= res.data.pages
       } catch (e: any) {
         // console.log(e, 'e')
@@ -99,6 +103,7 @@ export default defineComponent({
         showContact.value = false
         finished.value = true
       }
+      state.isClick = false
     }
 
     const getDetail = async () => {