Merge branch 'iteration-20241126'

src/views/order-detail/index.tsx

@@ -298,10 +298,11 @@ export default defineComponent({
         if (this.paymentVersion === 'V1') {
           this.paymentStatus = true
         } else {
-          this.orderInfo = orderStatus.orderObject || {}
+          this.orderInfo = orderStatus.orderObject.paymentConfig || {}
+          console.log(orderStatus.orderObject, 'orderStatus.orderObject')
           this.orderNo = orderStatus.orderObject.orderNo
-          const paymentChannel = this.orderInfo.paymentConfig.paymentConfig.paymentChannel
-          console.log(this.orderInfo.paymentConfig, 'this.orderInfo.paymentConfig')
+          const paymentChannel = this.orderInfo.paymentConfig.paymentChannel
+          console.log(this.orderInfo, 'this.orderInfo.paymentConfig')
           // 判断是否为原生支付
           if (
             this.orderInfo.paymentVendor?.indexOf('wxpay') > -1 ||
@@ -407,12 +408,13 @@ export default defineComponent({
             })
             return
           }
-          orderStatus.orderObject.paymentConfig = result.paymentConfig || {}
+          orderStatus.orderObject.paymentConfig = result || {}
           // orderStatus.orderObject.paymentConfig.actualPrice = result.paymentConfig.price
           orderStatus.orderObject.actualPrice = result.paymentConfig.price
           orderStatus.orderObject.orderNo = result?.orderNo
           this.orderInfo = result
           this.orderNo = result.orderNo
+          
         }
         // console.log(orderStatus.orderObject, orderStatus.orderObject.paymentConfig, '111')
         this.paymentStatus = true
@@ -473,8 +475,7 @@ export default defineComponent({
     },
     onConfirm(val: any) {
       // debugger
-      const config: any = this.orderInfo.paymentConfig.paymentConfig || {}
-      console.log(config, '1212')
+      const config: any = this.orderInfo.paymentConfig || {}
       this.pay_channel = val.pay_channel
       const params = qs.stringify({
         pay_channel: val.pay_channel,
@@ -488,7 +489,7 @@ export default defineComponent({
       })
       orderStatus.orderObject.paymentConfig.paymentChannel = val.pay_channel
 
-      console.log(params, 'params ---')
+      console.log(params, 'params ---', config)
       if (val.payCode === 'payResult') {
         window.location.href =
           window.location.origin + state.payBackPath + '#/payResult?' + params