Merge branch 'resetName' into online

src/student/main.ts

@@ -21,7 +21,6 @@ promisefiyPostMessage({ api: 'getToken' }).then((res: any) => {
   }
 })
 
-
 // 设置是否显示导航栏 0 不显示 1 显示
 postMessage({ api: 'setBarStatus', content: { status: 0 } })
 // 导航栏高度

src/student/music-group/layout/index.module.less

@@ -97,6 +97,7 @@
     background-size: cover;
     border-radius: 20px;
     overflow: hidden;
+    padding: 0 20px;
     .title {
       padding-top: 57px;
       text-align: center;

src/student/music-group/layout/login.tsx

@@ -40,7 +40,8 @@ export default defineComponent({
       orchestraInfo: {} as any,
 
       // 是否开启微信登录（测试使用）默认为false
-      testIsWeixin: false
+      testIsWeixin: false,
+      noPaymentList: ['1656572729093021697', '1656572205262200834', '1656488025144713217']
     }
   },
   computed: {
@@ -59,6 +60,14 @@ export default defineComponent({
       this.showPopup = true
     }
 
+    if (this.$route.query.id && this.noPaymentList.indexOf(this.$route.query.id as string) != -1) {
+      console.log('提示乐团报名失败')
+      // 提示乐团报名失败
+      this.showPopupMessage =
+        '尊敬的用户，为了进一步提升服务质量 ，<br />系统需临时升级，完成后将以短信的形式通知， 带来的不便敬请谅解，感谢您的支持！'
+      this.showPopup = true
+    }
+
     this.getDetails()
   },
   methods: {
@@ -276,7 +285,7 @@ export default defineComponent({
         >
           <div class={styles.popupContainer}>
             <p class={styles.title}>温馨提示</p>
-            <p class={styles.popupTips}>{this.showPopupMessage}</p>
+            <p class={styles.popupTips} v-html={this.showPopupMessage}></p>
           </div>
         </Popup>
       </div>

src/student/music-group/pre-apply/component/payment.tsx

@@ -7,6 +7,7 @@ import {
   CheckboxGroup,
   Icon,
   Image,
+  Popup,
   showConfirmDialog,
   showToast,
   Tag

src/student/music-group/pre-apply/index.module.less

@@ -16,6 +16,8 @@
   }
 
   .popupContainer {
+    background: url('./images/wx-no-bg.png') no-repeat top center;
+    padding: 0 15px;
     .dialogTitle {
       i {
         display: inline-block;
@@ -39,6 +41,21 @@
       padding: 15px 0 45px;
       font-size: 16px;
     }
+    .title1 {
+      padding-top: 57px;
+      text-align: center;
+      font-size: 18px;
+      font-weight: 500;
+      color: #3b2300;
+    }
+    .popupTips {
+      padding-top: 12px;
+      padding-bottom: 47px;
+      text-align: left;
+      font-size: 15px;
+      color: #777777;
+      line-height: 21px;
+    }
   }
 
   .banner {

src/student/music-group/pre-apply/index.tsx

@@ -31,7 +31,18 @@ export default defineComponent({
       // 是否开启微信登录（测试使用）默认为false
       testIsWeixin: false
     })
-
+    const showPopup = ref(false)
+    const noPaymentList = ref(['1656572729093021697', '1656572205262200834', '1656488025144713217'])
+    console.log(
+      '提示乐团报名失败',
+      route.query.id,
+      noPaymentList.value.indexOf(route.query.id as string)
+    )
+    if (route.query.id && noPaymentList.value.indexOf(route.query.id as string) != -1) {
+      console.log('提示乐团报名失败')
+      // 提示乐团报名失败
+      showPopup.value = true
+    }
     const onNext = async (name: string) => {
       if (name === 'payment') {
         await getRegisterStatus()
@@ -274,6 +285,22 @@ export default defineComponent({
             })
           }}
         />
+
+        <Popup
+          v-model:show={showPopup.value}
+          round
+          style={{ width: '88%', marginTop: '-6vh' }}
+          closeOnClickOverlay={false}
+          class={styles.wxPopupDialog}
+        >
+          <div class={styles.popupContainer}>
+            <p class={styles.title1}>温馨提示</p>
+            <p class={styles.popupTips}>
+              尊敬的用户，为了进一步提升服务质量 ，<br />
+              系统需临时升级，完成后将以短信的形式通知， 带来的不便敬请谅解，感谢您的支持！
+            </p>
+          </div>
+        </Popup>
       </div>
     )
   }