Merge branch 'iteration-20240417-subject' into jenkins-test

src/views/adapay/payment/index.tsx

@@ -29,7 +29,7 @@ export default defineComponent({
       default: {}
     }
   },
-  emits: ['backOut', 'close', 'confirm'],
+  emits: ['backOut', 'close', 'confirm', 'confirmNative'],
   setup(props, { slots, attrs, emit }) {
     const router = useRouter();
     const state = reactive({
@@ -129,6 +129,8 @@ export default defineComponent({
           }
         );
 
+        emit('confirmNative', { payChannel });
+
         postMessage({
           api: 'paymentOrder',
           content: {

src/views/student-register/index-apply.tsx

@@ -123,6 +123,7 @@ export default defineComponent({
     const forms = reactive({
       schoolId: route.query.sId as any,
       paymentType: '', // 支付类型
+      paymentChannel: '',
       multi_user_limit: 1, // 限制注册学生数量
       // popupShow: false,
       registerDetails: {} as any,
@@ -1050,7 +1051,7 @@ export default defineComponent({
           // 直接去拉取微信支付
           onConfirm({
             payCode: 'payResult',
-            pay_channel: 'wx_pub'
+            pay_channel: forms.paymentChannel
           });
         }
       }
@@ -1288,7 +1289,10 @@ export default defineComponent({
             if (item.paramName === 'contract_sign') {
               forms.contract_sign = item.paramValue === '1' ? true : false;
             } else if (item.paramName === 'payment_service_provider') {
-              forms.paymentType = item.paramValue || '';
+              // forms.paymentType = item.paramValue || '';
+              const provider = JSON.parse(item.paramValue);
+              forms.paymentType = provider.vendor;
+              forms.paymentChannel = provider.channel;
             } else if (item.paramName === 'multi_user_limit') {
               forms.multi_user_limit = item.paramValue
                 ? Number(item.paramValue)

src/views/student-register/index.tsx

@@ -1265,7 +1265,6 @@ export default defineComponent({
               const provider = JSON.parse(item.paramValue);
               forms.paymentType = provider.vendor;
               forms.paymentChannel = provider.channel;
-              console.log(item.paramValue);
             } else if (item.paramName === 'multi_user_limit') {
               forms.multi_user_limit = item.paramValue
                 ? Number(item.paramValue)

src/views/student-register/order-detail.tsx

@@ -566,6 +566,9 @@ export default defineComponent({
             onClose={() => (state.paymentStatus = false)}
             onBackOut={onBackOut}
             onConfirm={(val: any) => onConfirm(val)}
+            onConfirmNative={(val: any) => {
+              state.config.paymentChannel = val.payChannel;
+            }}
           />
         </Popup>