Merge branch 'master' into jenkins

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

@@ -42,20 +42,6 @@ export default defineComponent({
     if (!browser().weixin) {
       this.showPopup = true
     }
-    // if (browser().weixin) {
-    // 微信公众号支付
-    //授权
-    // const code = getUrlCode()
-    // console.log('login mounted code: ' + code)
-    // if (!code) {
-    //   this.getAppIdAndCode()
-    // } else {
-    //   this.code = code
-    // }
-    // this.getAppIdAndCode()
-    // } else {
-    //   this.showPopup = true
-    // }
   },
   methods: {
     async getAppIdAndCode(url?: string) {
@@ -90,15 +76,6 @@ export default defineComponent({
           'jump pre registration'
         )
 
-        // this.goAuth(data)
-        // console.log(returnUrl, isRegister, { ...rest })
-        // this.$router.replace({
-        //   path: returnUrl as any,
-        //   query: {
-        //     ...rest,
-        //     code: this.code
-        //   }
-        // })
         const newUrl =
           window.location.origin +
           window.location.pathname +
@@ -108,6 +85,7 @@ export default defineComponent({
           qs.stringify({
             ...rest
           })
+        // 直接跳转到授权页面
         this.getAppIdAndCode(newUrl)
         // this.locationReplace(newUrl)
       }

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

@@ -118,8 +118,10 @@ export default defineComponent({
         //     userId: config.userId
         //   }
         // })
-        window.location.href = window.location.origin
-        '/orchestra-student/#/payResult?' +
+
+        window.location.href =
+          window.location.origin +
+          '/orchestra-student/#/payResult?' +
           qs.stringify({
             pay_channel: val.pay_channel,
             wxAppId: config.wxAppId,