Merge branch 'iteration_0307' into jenkins

src/student/member-center/index.tsx

@@ -120,11 +120,11 @@ export default defineComponent({
               this.$router.push({
                 path: '/orderDetail',
                 query: {
-                  config: JSON.stringify(paymentConfig.paymentConfig),
-                  // config: JSON.stringify({
-                  //   ...paymentConfig.paymentConfig,
-                  //   paymentType: paymentConfig.paymentType
-                  // }),
+                  // config: JSON.stringify(paymentConfig.paymentConfig),
+                  config: JSON.stringify({
+                    ...paymentConfig.paymentConfig,
+                    paymentType: paymentConfig.paymentType
+                  }),
                   orderNo: paymentConfig.orderNo
                 }
               })

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

@@ -743,11 +743,15 @@ export default defineComponent({
           showCancelButton
           onConfirm={() => {
             const paymentConfig = state.dialogConfig.paymentConfig
+
             router.push({
               path: '/orderDetail',
               query: {
                 pm: 1, // h5乐团报名
-                config: JSON.stringify(paymentConfig.paymentConfig),
+                config: JSON.stringify({
+                  ...paymentConfig.paymentConfig,
+                  paymentType: paymentConfig.paymentType
+                }),
                 orderNo: paymentConfig.orderNo
               }
             })

src/views/adapay/pay-result/index.tsx

@@ -30,7 +30,7 @@ export default defineComponent({
     const init = () => {
       const query = route.query
       console.log(query)
-      const isYeePay = state.paymentType.indexOf('yeepay') !== -1
+      const isYeePay = state.paymentType?.indexOf('yeepay') !== -1
       // 判断是否有支付对象
       if (!query.orderNo || !query.pay_channel) {
         showConfirmDialog({