Merge branch 'master' into jenkins

public/project/preRegister.html

@@ -579,7 +579,7 @@
             if (res.data.code === 200) {
               // this.submitStatus = true
               window.location.href =
-                'https://mp.weixin.qq.com/s?__biz=MzkxMDMwOTI5Nw==&mid=2247485261&idx=1&sn=70c79a832a609bf9fae01c9e90fb4f69&chksm=c12c2593f65bac85d26362bca470f6abc2bfc087d9f4dcf87c00094420bdf5a3acb1b870199b#rd%EF%BC%89'
+                'https://mp.weixin.qq.com/s?__biz=MzkxMDMwOTI5Nw==&mid=2247485362&idx=3&sn=9b265d36b5dabe7f9393fc679c367540&chksm=c12c256cf65bac7ae2a865435b950f6e1285afd226356db0ffde815b1ee345f29cfcdb798cc9#rd'
             } else {
               vant.showToast(res.data.message)
             }

src/components/o-guide/guide/components/andoird-guide.module.less

@@ -3,7 +3,7 @@
   .title {
     color: #fff;
     line-height: 18px;
-    font-size: 14px;
+    font-size: 16Px;
     padding-left: 22px;
     color: #fff;
     position: relative;
@@ -34,7 +34,7 @@
       }
     }
     h3 {
-      font-weight: bold;
+      font-weight: 400;
       color: #fff;
       font-size: 14px;
       line-height: 20px;
@@ -43,7 +43,7 @@
       font-weight: bold;
     }
     .red {
-      color: #EA6868;
+      color: #ff8057;
     }
   }
 }

src/components/o-guide/guide/components/ios-guide.module.less

@@ -12,10 +12,10 @@
   .topTitle {
     position: relative;
     h2 {
-      font-weight: bold;
+      font-weight: 400;
       color: #fff;
       line-height: 18px;
-      font-size: 14px;
+      font-size: 16Px;
       padding-left: 22px;
       color: #fff;
       position: relative;
@@ -34,22 +34,22 @@
         line-height: 20px;
       }
       p {
-        font-size: 13px;
+        font-size: 12px;
         line-height: 20px;
         margin-bottom: 20px;
       }
     }
     h3 {
-      font-weight: bold;
+      font-weight: 400;
       color: #fff;
-      font-size: 16px;
+      font-size: 14px;
       line-height: 20px;
     }
     .blod {
       font-weight: bold;
     }
     .red {
-      color: #ff0000;
+      color: #ff8057;
     }
   }
 }

src/components/o-guide/index.module.less

@@ -33,7 +33,7 @@
       width: 100%;
     }
     .item {
-      margin-bottom: 24px;
+      margin-bottom: 20px;
     }
     .title {
       font-size: 14px;

src/components/o-guide/index.tsx

@@ -24,7 +24,7 @@ export default defineComponent({
               <div class={styles.item}>
                 <div class={styles.title}>第1步</div>
                 <div>在需要投屏的电脑上打开以下链接</div>
-                <div style={{ color: '#33BDFF' }}>http://pc.i4.cn/pro_screen.html</div>
+                <a href='http://pc.i4.cn/pro_screen.html' target='_blank'><div style={{ color: '#33BDFF' }}>http://pc.i4.cn/pro_screen.html</div></a>
               </div>
 
               <div class={styles.item}>

src/helpers/toolsValidate.ts

@@ -375,10 +375,11 @@ export function verifyPostalCode(val: string) {
  */
 export function verifyUrl(val: string) {
   // false: url不正确
+  // !/^(?:(?:(?:https?|ftp):)?\/\/)(?:\S+(?::\S*)?@)?(?:(?!(?:10|127)(?:\.\d{1,3}){3})(?!(?:169\.254|192\.168)(?:\.\d{1,3}){2})(?!172\.(?:1[6-9]|2\d|3[0-1])(?:\.\d{1,3}){2})(?:[1-9]\d?|1\d\d|2[01]\d|22[0-3])(?:\.(?:1?\d{1,2}|2[0-4]\d|25[0-5])){2}(?:\.(?:[1-9]\d?|1\d\d|2[0-4]\d|25[0-4]))|(?:(?:[a-z\u00a1-\uffff0-9]-*)*[a-z\u00a1-\uffff0-9]+)(?:\.(?:[a-z\u00a1-\uffff0-9]-*)*[a-z\u00a1-\uffff0-9]+)*(?:\.(?:[a-z\u00a1-\uffff]{2,})).?)(?::\d{2,5})?(?:[/?#]\S*)?$/i.test(
+  //   val
+  // )
   if (
-    !/^(?:(?:(?:https?|ftp):)?\/\/)(?:\S+(?::\S*)?@)?(?:(?!(?:10|127)(?:\.\d{1,3}){3})(?!(?:169\.254|192\.168)(?:\.\d{1,3}){2})(?!172\.(?:1[6-9]|2\d|3[0-1])(?:\.\d{1,3}){2})(?:[1-9]\d?|1\d\d|2[01]\d|22[0-3])(?:\.(?:1?\d{1,2}|2[0-4]\d|25[0-5])){2}(?:\.(?:[1-9]\d?|1\d\d|2[0-4]\d|25[0-4]))|(?:(?:[a-z\u00a1-\uffff0-9]-*)*[a-z\u00a1-\uffff0-9]+)(?:\.(?:[a-z\u00a1-\uffff0-9]-*)*[a-z\u00a1-\uffff0-9]+)*(?:\.(?:[a-z\u00a1-\uffff]{2,})).?)(?::\d{2,5})?(?:[/?#]\S*)?$/i.test(
-      val
-    )
+    !/^(http|ftp|https):\/\/[\w\-_]+(\.[\w\-_]+)+([\w\-\.,@?^=%&:/~\+#]*[\w\-\@?^=%&/~\+#])?$/.test(val)
   )
     return false
   // true: url正确

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

@@ -111,7 +111,7 @@ export default defineComponent({
         })
         // state.submitStatus = true
         window.location.href =
-          'https://mp.weixin.qq.com/s?__biz=MzkxMDMwOTI5Nw==&mid=2247485329&idx=2&sn=2927feae23d59514daf21cd07657c209&chksm=c12c254ff65bac598b636ffa4b88cb35999ad48aaef0b4c31c8c20804d83f514e2b60251b7c7#rd'
+          'https://mp.weixin.qq.com/s?__biz=MzkxMDMwOTI5Nw==&mid=2247485362&idx=2&sn=e3eaa3b85315535fcf4fd344c0a9b548&chksm=c12c256cf65bac7a898b0bce0d59f02ff924b6a0eabd9ba3fa67a87a0bdb98b916c328fe43f0#rd'
       } catch {
         // showToast('保存失败，请重试')
       }

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

@@ -95,7 +95,7 @@ export default defineComponent({
         })
         // state.submitStatus = true
         window.location.href =
-          'https://mp.weixin.qq.com/s?__biz=MzkxMDMwOTI5Nw==&mid=2247485329&idx=1&sn=4791a51fa540f461d76308abdd8c40c8&chksm=c12c254ff65bac59b8d1d4138ecefe3344ca1f4d080fde8eee7a8c2d6be29e8fd1a5dbe82811#rd'
+          'https://mp.weixin.qq.com/s?__biz=MzkxMDMwOTI5Nw==&mid=2247485362&idx=1&sn=b9081f35ec8a09897a6a14c2ff617b35&chksm=c12c256cf65bac7ae7ad2627454d296870483070b861729a40c2b9deda54b097e75be206b49f#rd'
       } catch {
         //
       }

src/school/school-detail/eidt-school.tsx

@@ -3,7 +3,7 @@ import OSticky from '@/components/o-sticky'
 import { Form, Field, CellGroup, showToast, Icon, Popup, Picker, Button, Image } from 'vant'
 import { defineComponent, reactive, ref, onMounted } from 'vue'
 import styles from './index.module.less'
-import { useRouter } from 'vue-router'
+import { useRoute, useRouter } from 'vue-router'
 import { state as globalState } from '@/state'
 import logoIcon from './images/logo.png'
 import locIcon from './images/loc-icon.png'
@@ -15,6 +15,7 @@ export default defineComponent({
   name: 'school-detail',
   setup() {
     const router = useRouter()
+    const route = useRoute()
     const state = reactive({
       list: [],
       info: {} as any,
@@ -80,7 +81,11 @@ export default defineComponent({
             ...forms
           }
         })
-        router.go(-1)
+        if (route.query.page === 'type') {
+          router.go(-1)
+        } else {
+          postMessage({ api: 'back' })
+        }
       } catch (e: any) {
         showToast(e.message)
       }

src/school/school-detail/index.tsx

@@ -37,7 +37,12 @@ export default defineComponent({
     }
     const gotoEidt = () => {
       // /school-eidt
-      router.push({ path: '/school-eidt' })
+      router.push({
+        path: '/school-eidt',
+        query: {
+          page: 'type'
+        }
+      })
     }
     const getTeacherList = async () => {
       // const schoolId = (globalState.user.data.schoolInfos || [])

src/student/download/index.tsx

@@ -33,17 +33,16 @@ export default defineComponent({
       let urlAndroid = ''
       if (location.origin.indexOf('online.lexiaoya.cn') > -1) {
         if (state.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'
+          urlIos = ''
+          urlAndroid = 'https://appstore.ks3-cn-beijing.ksyuncs.com/gyt-student.apk'
         } else if (state.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'
+          urlAndroid = 'https://appstore.ks3-cn-beijing.ksyuncs.com/gyt-teacher.apk'
         } else if (state.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'
+          urlAndroid = 'https://appstore.ks3-cn-beijing.ksyuncs.com/gyt-manager.apk'
         }
       } else {
         if (state.type === 'student') {
@@ -59,7 +58,7 @@ export default defineComponent({
       }
 
       if (browser().ios || /(iPhone|iPad|iPod|iOS)/i.test(navigator.userAgent)) {
-        window.location.href = urlIos
+        urlIos && (window.location.href = urlIos)
       } else if (/(Android)/i.test(navigator.userAgent)) {
         window.location.href = urlAndroid
       } else {

src/student/download/transfer.tsx

@@ -93,17 +93,16 @@ export default defineComponent({
       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'
+          urlIos = ''
+          urlAndroid = 'https://appstore.ks3-cn-beijing.ksyuncs.com/gyt-student.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'
+          urlAndroid = 'https://appstore.ks3-cn-beijing.ksyuncs.com/gyt-teacher.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'
+          urlAndroid = 'https://appstore.ks3-cn-beijing.ksyuncs.com/gyt-manager.apk'
         }
       } else {
         if (this.type === 'student') {
@@ -119,7 +118,7 @@ export default defineComponent({
       }
 
       if (browser().ios || /(iPhone|iPad|iPod|iOS)/i.test(navigator.userAgent)) {
-        window.location.href = urlIos
+        urlIos && (window.location.href = urlIos)
       } else if (/(Android)/i.test(navigator.userAgent)) {
         window.location.href = urlAndroid
       } else {

src/student/music-group/pre-apply/order-detail.tsx

@@ -327,7 +327,7 @@ export default defineComponent({
       // 判断是否是乐团报名
       if (orderType.value === 'ORCHESTRA') {
         window.location.replace(
-          'https://mp.weixin.qq.com/s?__biz=MzkxMDMwOTI5Nw==&mid=2247485329&idx=3&sn=bc4012d392c12a6b7957390e88ee3ee5&chksm=c12c254ff65bac59e0a3bcd99e97601fab57ebe561b9bf3209376ed3b0b7491ca38381d21a65#rd'
+          'https://mp.weixin.qq.com/s?__biz=MzkxMDMwOTI5Nw==&mid=2247485362&idx=3&sn=9b265d36b5dabe7f9393fc679c367540&chksm=c12c256cf65bac7ae2a865435b950f6e1285afd226356db0ffde815b1ee345f29cfcdb798cc9#rd'
         )
       } else {
         router.replace({

src/views/bind-wechat/index.tsx

@@ -53,13 +53,13 @@ export default defineComponent({
         })
         if (state.platformType === 'STUDENT') {
           window.location.href =
-            'https://mp.weixin.qq.com/s?__biz=MzkxMDMwOTI5Nw==&mid=2247485329&idx=3&sn=bc4012d392c12a6b7957390e88ee3ee5&chksm=c12c254ff65bac59e0a3bcd99e97601fab57ebe561b9bf3209376ed3b0b7491ca38381d21a65#rd'
+            'https://mp.weixin.qq.com/s?__biz=MzkxMDMwOTI5Nw==&mid=2247485362&idx=3&sn=9b265d36b5dabe7f9393fc679c367540&chksm=c12c256cf65bac7ae2a865435b950f6e1285afd226356db0ffde815b1ee345f29cfcdb798cc9#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'
+            'https://mp.weixin.qq.com/s?__biz=MzkxMDMwOTI5Nw==&mid=2247485362&idx=2&sn=e3eaa3b85315535fcf4fd344c0a9b548&chksm=c12c256cf65bac7a898b0bce0d59f02ff924b6a0eabd9ba3fa67a87a0bdb98b916c328fe43f0#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'
+            'https://mp.weixin.qq.com/s?__biz=MzkxMDMwOTI5Nw==&mid=2247485362&idx=1&sn=b9081f35ec8a09897a6a14c2ff617b35&chksm=c12c256cf65bac7ae7ad2627454d296870483070b861729a40c2b9deda54b097e75be206b49f#rd'
         }
       } catch {
         //