Merge branch 'iteration_0307' into jenkins

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

@@ -121,6 +121,7 @@ export default defineComponent({
       const params = qs.stringify({
         pay_channel: val.pay_channel,
         wxAppId: config.wxAppId,
+        alipayAppId: config.alipayAppId,
         body: config.body,
         price: config.price,
         paymentType: config.paymentType,

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

@@ -36,12 +36,13 @@ export default defineComponent({
         const payMap: any = {
           merOrderNo: state.orderNo,
           paymentChannel: state.pay_channel, // 支付渠道
-          userId: state.userId
+          userId: state.userId,
+          code: state.code
         }
         //     // 判断是否是微信公众号支付
-        if (state.pay_channel == 'wx_pub') {
-          payMap.code = state.code
-        }
+        // if (state.pay_channel == 'wx_pub') {
+        //   payMap.code = state.code
+        // }
         console.log(payMap, 'payMap')
         const { data } = await request.post('/api-student/open/userOrder/executePayment', {
           hideLoading: false,