lex 2 gadi atpakaļ
vecāks
revīzija
ef34a66f6c

+ 8 - 0
src/school/approval-manage/index.module.less

@@ -288,3 +288,11 @@
   background: #fff;
   z-index: 10;
 }
+
+.rewardItem, .itemCourseName {
+  :global {
+    .van-cell__value {
+      flex: 0 auto;
+    }
+  }
+}

+ 1 - 0
src/school/approval-manage/subsidy/exercise-detail.tsx

@@ -108,6 +108,7 @@ export default defineComponent({
                   center
                   value={`${item.days}天`}
                   isLink
+                  class={styles.itemCourseName}
                   onClick={() => {
                     courseSalaryRecordDetailItem.value = item
                     router.push({

+ 2 - 1
src/school/attendance/modals/teacherAtt-item.module.less

@@ -89,7 +89,7 @@
           img {
             width: 18px;
             height: 18px;
-            margin-left: 60px;
+            // margin-left: 60px;
           }
         }
         .signTime {
@@ -104,6 +104,7 @@
     }
     .passWrap,
     .goWrap {
+      flex: 1;
       display: flex;
       flex-direction: row;
       align-items: center;

+ 13 - 10
src/student/download/index.tsx

@@ -31,27 +31,30 @@ export default defineComponent({
 
       let urlIos = ''
       let urlAndroid = ''
-      if (location.origin.indexOf('online.colexiu.com') > -1) {
+      if (location.origin.indexOf('online.lexiaoya.cn') > -1) {
         if (state.type === 'student') {
-          urlIos = 'https://itunes.apple.com/cn/app/id1626971695?mt=8'
+          urlIos =
+            'https://apps.apple.com/cn/app/%E7%AE%A1%E4%B9%90%E5%9B%A2%E7%AE%A1%E7%90%86%E7%AB%AF/id1671473981?uo=4'
           urlAndroid = 'https://appstore.ks3-cn-beijing.ksyuncs.com/clx-student-domain.apk'
         } else if (state.type === 'teacher') {
-          urlIos = 'https://itunes.apple.com/cn/app/id1626971149?mt=8'
+          urlIos =
+            'https://apps.apple.com/cn/app/%E7%AE%A1%E4%B9%90%E5%9B%A2%E4%BC%B4%E5%AD%A6%E7%AB%AF/id1670584741?uo=4'
           urlAndroid = 'https://appstore.ks3-cn-beijing.ksyuncs.com/clx-teacher-domain.apk'
         } else if (state.type === 'manage') {
-          urlIos = 'https://itunes.apple.com/cn/app/id1626971149?mt=8'
+          urlIos =
+            'https://apps.apple.com/cn/app/%E7%AE%A1%E4%B9%90%E5%9B%A2%E7%AE%A1%E7%90%86%E7%AB%AF/id1671473981?uo=4'
           urlAndroid = 'https://appstore.ks3-cn-beijing.ksyuncs.com/clx-teacher-domain.apk'
         }
       } else {
         if (state.type === 'student') {
-          urlIos = 'https://www.pgyer.com/powy'
-          urlAndroid = 'https://www.pgyer.com/70e7'
+          urlIos = 'https://www.pgyer.com/2Wg2'
+          urlAndroid = 'https://www.pgyer.com/9NBz'
         } else if (state.type === 'teacher') {
-          urlIos = 'https://www.pgyer.com/iO0m'
-          urlAndroid = 'https://www.pgyer.com/N2U3'
+          urlIos = 'https://www.pgyer.com/v5yB'
+          urlAndroid = 'https://www.pgyer.com/BQeE'
         } else if (state.type === 'manage') {
-          urlIos = 'https://www.pgyer.com/iO0m'
-          urlAndroid = 'https://www.pgyer.com/N2U3'
+          urlIos = 'https://www.pgyer.com/DGrR'
+          urlAndroid = 'https://www.pgyer.com/TEWv'
         }
       }
 

+ 30 - 2
src/student/download/transfer.tsx

@@ -89,11 +89,39 @@ export default defineComponent({
         this.wxStatus = true
         return
       }
+      let urlIos = ''
+      let urlAndroid = ''
+      if (location.origin.indexOf('online.lexiaoya.cn') > -1) {
+        if (this.type === 'student') {
+          urlIos =
+            'https://apps.apple.com/cn/app/%E7%AE%A1%E4%B9%90%E5%9B%A2%E7%AE%A1%E7%90%86%E7%AB%AF/id1671473981?uo=4'
+          urlAndroid = 'https://appstore.ks3-cn-beijing.ksyuncs.com/clx-student-domain.apk'
+        } else if (this.type === 'teacher') {
+          urlIos =
+            'https://apps.apple.com/cn/app/%E7%AE%A1%E4%B9%90%E5%9B%A2%E4%BC%B4%E5%AD%A6%E7%AB%AF/id1670584741?uo=4'
+          urlAndroid = 'https://appstore.ks3-cn-beijing.ksyuncs.com/clx-teacher-domain.apk'
+        } else if (this.type === 'manage') {
+          urlIos =
+            'https://apps.apple.com/cn/app/%E7%AE%A1%E4%B9%90%E5%9B%A2%E7%AE%A1%E7%90%86%E7%AB%AF/id1671473981?uo=4'
+          urlAndroid = 'https://appstore.ks3-cn-beijing.ksyuncs.com/clx-teacher-domain.apk'
+        }
+      } else {
+        if (this.type === 'student') {
+          urlIos = 'https://www.pgyer.com/2Wg2'
+          urlAndroid = 'https://www.pgyer.com/9NBz'
+        } else if (this.type === 'teacher') {
+          urlIos = 'https://www.pgyer.com/v5yB'
+          urlAndroid = 'https://www.pgyer.com/BQeE'
+        } else if (this.type === 'manage') {
+          urlIos = 'https://www.pgyer.com/DGrR'
+          urlAndroid = 'https://www.pgyer.com/TEWv'
+        }
+      }
 
       if (browser().ios || /(iPhone|iPad|iPod|iOS)/i.test(navigator.userAgent)) {
-        window.location.href = 'https://itunes.apple.com/cn/app/id1626971695?mt=8'
+        window.location.href = urlIos
       } else if (/(Android)/i.test(navigator.userAgent)) {
-        window.location.href = 'https://appstore.ks3-cn-beijing.ksyuncs.com/clx-student-domain.apk'
+        window.location.href = urlAndroid
       } else {
         showToast('请用手机或移动设备打开')
       }

+ 10 - 2
src/views/bind-wechat/index.tsx

@@ -51,8 +51,16 @@ export default defineComponent({
             phone: forms.phone
           }
         })
-        window.location.href =
-          'https://mp.weixin.qq.com/s?__biz=MzkxMDMwOTI5Nw==&mid=2247485261&idx=1&sn=70c79a832a609bf9fae01c9e90fb4f69&chksm=c12c2593f65bac85d26362bca470f6abc2bfc087d9f4dcf87c00094420bdf5a3acb1b870199b#rd'
+        if (state.platformType === 'STUDENT') {
+          window.location.href =
+            'https://mp.weixin.qq.com/s?__biz=MzkxMDMwOTI5Nw==&mid=2247485329&idx=3&sn=bc4012d392c12a6b7957390e88ee3ee5&chksm=c12c254ff65bac59e0a3bcd99e97601fab57ebe561b9bf3209376ed3b0b7491ca38381d21a65#rd'
+        } else if (state.platformType === 'TEACHER') {
+          window.location.href =
+            'https://mp.weixin.qq.com/s?__biz=MzkxMDMwOTI5Nw==&mid=2247485329&idx=2&sn=2927feae23d59514daf21cd07657c209&chksm=c12c254ff65bac598b636ffa4b88cb35999ad48aaef0b4c31c8c20804d83f514e2b60251b7c7#rd'
+        } else if (state.platformType === 'SCHOOL') {
+          window.location.href =
+            'https://mp.weixin.qq.com/s?__biz=MzkxMDMwOTI5Nw==&mid=2247485329&idx=1&sn=4791a51fa540f461d76308abdd8c40c8&chksm=c12c254ff65bac59b8d1d4138ecefe3344ca1f4d080fde8eee7a8c2d6be29e8fd1a5dbe82811#rd'
+        }
       } catch {
         //
       }

+ 25 - 4
src/views/unit-test/examination-mode/index.tsx

@@ -11,7 +11,7 @@ import {
   SwipeItem,
   Tag
 } from 'vant'
-import { defineComponent, nextTick, onMounted, onUnmounted, reactive, ref } from 'vue'
+import { defineComponent, nextTick, onMounted, onUnmounted, reactive, ref, watch } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import styles from './index.module.less'
 import iconQuestionNums from '../images/icon-question-nums.png'
@@ -29,6 +29,7 @@ import dayjs from 'dayjs'
 import ResultFinish from '../model/result-finish'
 import { eventUnit, QuestionType } from '../unit'
 import { useRect } from '@vant/use'
+import { useInterval } from '@vueuse/core'
 
 export default defineComponent({
   name: 'unit-detail',
@@ -54,6 +55,23 @@ export default defineComponent({
       quitStatus: false
     })
 
+    // 计时
+    const { counter, resume, pause } = useInterval(1000, { controls: true })
+
+    watch(
+      () => counter.value,
+      async () => {
+        console.log(counter.value, state.time / 1000, dayjs().format('HH:mm:ss'))
+        // 秒
+        if (counter.value >= state.time / 1000) {
+          pause()
+          eventUnit.emit('unitAudioStop')
+          await onConfirmExam()
+          state.visiableExam = true
+        }
+      }
+    )
+
     const getExamDetails = async () => {
       try {
         const { data } = await request.post(
@@ -97,8 +115,10 @@ export default defineComponent({
         state.visiableExam = true
       } else {
         state.time = Math.ceil(minu / 1000) * 1000
+        pause()
         setTimeout(() => {
           countDownRef.value?.start()
+          resume()
         }, 10)
       }
     }
@@ -265,6 +285,7 @@ export default defineComponent({
     }
 
     onMounted(async () => {
+      pause()
       await getExamDetails()
 
       // 初始化高度
@@ -302,9 +323,9 @@ export default defineComponent({
                     format={'mm:ss'}
                     autoStart={false}
                     onFinish={async () => {
-                      eventUnit.emit('unitAudioStop')
-                      await onConfirmExam()
-                      state.visiableExam = true
+                      // eventUnit.emit('unitAudioStop')
+                      // await onConfirmExam()
+                      // state.visiableExam = true
                     }}
                   />
                 </div>

+ 10 - 1
src/views/unit-test/practice-mode/index.tsx

@@ -13,7 +13,16 @@ import {
   SwipeItem,
   Tag
 } from 'vant'
-import { computed, defineComponent, nextTick, onMounted, onUnmounted, reactive, ref } from 'vue'
+import {
+  computed,
+  defineComponent,
+  nextTick,
+  onMounted,
+  onUnmounted,
+  reactive,
+  ref,
+  watch
+} from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import styles from './index.module.less'
 import iconButtonList from '../images/icon-button-list.png'