Merge branch 'master' into online

public/project/initiation.html

@@ -182,8 +182,7 @@
     <!-- <div class="banner">
       <img src="./images/initiation/banner.png" alt="">
     </div> -->
-    <div class="title" v-clock>
-      {{ orchestraName }} 启蒙登记表
+    <div class="title" v-clock v-html="(orchestraName || '') + '启蒙登记表'">
     </div>
     <van-form validate-first scroll-to-error @submit="onSubmit" ref='form' class="form">
       <div class="top-tips">科学的教育与关爱，足以改变世界。我们希望，学生的未来会因您和我们的共同努力而更加光辉灿烂！</div>

public/project/preRegister.html

@@ -182,9 +182,8 @@
     <!-- <div class="banner">
       <img src="./images/initiation/banner.png" alt="">
     </div> -->
-    <div class="title">
-      {{ orchestraName }} 首轮报名
-    </div>
+    <div class="title" v-clock v-html="(orchestraName || '') + '首轮报名'"></div>
+
     <van-form validate-first scroll-to-error @submit="onSubmit" ref='form' class="form">
       <div class="top-tips">科学的教育与关爱，足以改变世界。我们希望，学生的未来会因您和我们的共同努力而更加光辉灿烂！</div>
       <van-cell-group inset class="cell-group">
@@ -579,7 +578,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/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/approval-manage/agency/index.tsx

@@ -191,6 +191,7 @@ export default defineComponent({
                   style={{ '--van-cell-value-color': '#333' }}
                   center
                   label={`${data.schoolWeekPhoto.startDate} 至 ${data.schoolWeekPhoto.endDate}`}
+                  valueClass={styles.agencyNumber}
                   value={data.schoolWeekPhoto.photoNum + '/' + data.schoolWeekPhoto.expectPhotoNum}
                   isLink
                 >

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/student/member-center/index.tsx

@@ -345,8 +345,9 @@ export default defineComponent({
         <ODialog
           v-model:show={this.memberStatus}
           title="待激活团练宝"
-          message="为了避免团练宝会员时长浪费，报名乐团时购买的团练宝会员将在乐团首次训练结束后激活，具体训练时间请咨询乐团管理老师。"
+          message="为让团员有效使用乐团学习工具，首次加入乐团且购买团练宝的团员，团练宝的生效时间为乐团首次训练之日，具体训练时间可查看课表。"
           messageAlign="left"
+          dialogMarginTop="env(safe-area-inset-top)"
           confirmButtonText="我知道了"
         />
       </div>

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

@@ -329,7 +329,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 {
         //