修改支付

src/student/live-class/live-detail.tsx

@@ -233,7 +233,11 @@ export default defineComponent({
               orderStatus.orderObject.orderNo = result.orderNo
               orderStatus.orderObject.actualPrice = result.actualPrice
               orderStatus.orderObject.discountPrice = result.discountPrice
-              orderStatus.orderObject.paymentConfig = result.paymentConfig
+              orderStatus.orderObject.paymentConfig = {
+                ...result.paymentConfig,
+                paymentVendor: result.paymentVendor,
+                paymentVersion: result.paymentVersion
+              }
               this.routerTo()
             })
             .catch(() => {

src/student/trade/tradeOrder.ts

@@ -247,7 +247,9 @@ export const tradeOrder = (result: any, callBack?: any) => {
     orderDetailList,
     couponAmount, // 优惠金额
     discountPrice,
-    paymentConfig
+    paymentConfig,
+    paymentVendor,
+    paymentVersion
   } = result
   orderStatus.orderObject.orderType = orderType
   orderStatus.orderObject.orderName = orderName
@@ -255,7 +257,11 @@ export const tradeOrder = (result: any, callBack?: any) => {
   orderStatus.orderObject.actualPrice = actualPrice
   orderStatus.orderObject.orderNo = orderNo
   orderStatus.orderObject.discountPrice = discountPrice
-  orderStatus.orderObject.paymentConfig = paymentConfig
+  orderStatus.orderObject.paymentConfig = {
+    ...paymentConfig,
+    paymentVendor,
+    paymentVersion
+  }
   orderStatus.orderObject.orderList = []
   try {
     orderDetailList.forEach(async (item: any) => {

src/tenant/music/train-tool/index.tsx

@@ -248,7 +248,11 @@ export default defineComponent({
             orderStatus.orderObject.orderNo = result.orderNo
             orderStatus.orderObject.actualPrice = result.actualPrice
             orderStatus.orderObject.discountPrice = result.discountPrice
-            orderStatus.orderObject.paymentConfig = result.paymentConfig
+            orderStatus.orderObject.paymentConfig = {
+              ...result.paymentConfig,
+              paymentVendor: result.paymentVendor,
+              paymentVersion: result.paymentVersion
+            }
             routerTo()
           })
           .catch(() => {

src/tenant/trade/tradeOrder.ts

@@ -276,7 +276,9 @@ export const tradeOrder = (result: any, callBack?: any) => {
     orderDetailList,
     couponAmount, // 优惠金额
     discountPrice,
-    paymentConfig // v2 类型的订单才会用
+    paymentConfig, // v2 类型的订单才会用
+    paymentVendor,
+    paymentVersion
   } = result
   orderStatus.orderObject.orderType = orderType
   orderStatus.orderObject.orderName = orderName
@@ -285,7 +287,11 @@ export const tradeOrder = (result: any, callBack?: any) => {
   orderStatus.orderObject.orderNo = orderNo
   orderStatus.orderObject.discountPrice = discountPrice
   orderStatus.orderObject.orderList = []
-  orderStatus.orderObject.paymentConfig = paymentConfig
+  orderStatus.orderObject.paymentConfig = {
+    ...paymentConfig,
+    paymentVendor,
+    paymentVersion
+  }
   try {
     orderDetailList.forEach(async (item: any) => {
       await formatOrderDetail(item, {

src/views/music/album-detail/index.tsx

@@ -181,7 +181,11 @@ export default defineComponent({
             orderStatus.orderObject.orderNo = result.orderNo
             orderStatus.orderObject.actualPrice = result.actualPrice
             orderStatus.orderObject.discountPrice = result.discountPrice
-            orderStatus.orderObject.paymentConfig = result.paymentConfig
+            orderStatus.orderObject.paymentConfig = {
+              ...result.paymentConfig,
+              paymentVendor: result.paymentVendor,
+              paymentVersion: result.paymentVersion
+            }
             routerTo()
           })
           .catch(() => {

src/views/music/music-detail/index.tsx

@@ -431,7 +431,11 @@ export default defineComponent({
             orderStatus.orderObject.orderNo = result.orderNo
             orderStatus.orderObject.actualPrice = result.actualPrice
             orderStatus.orderObject.discountPrice = result.discountPrice
-            orderStatus.orderObject.paymentConfig = result.paymentConfig
+            orderStatus.orderObject.paymentConfig = {
+              ...result.paymentConfig,
+              paymentVendor: result.paymentVendor,
+              paymentVersion: result.paymentVersion
+            }
             routerTo()
           })
           .catch(() => {

src/views/order-detail/index.tsx

@@ -1,5 +1,5 @@
 import ColProtocol from '@/components/col-protocol'
-import { Button, Dialog, Icon, Popup, Sticky, Toast } from 'vant'
+import { Button, Dialog, Popup, Toast } from 'vant'
 import ColPopup from '@/components/col-popup'
 import { defineComponent } from 'vue'
 import { postMessage } from '@/helpers/native-message'
@@ -14,7 +14,7 @@ import qs from 'query-string'
 //   status: 'success | fail'
 // }})
 
-import iconTips from '@common/images/icon_tips.png'
+// import iconTips from '@common/images/icon_tips.png'
 import Payment from './payment'
 import UrlPayment from '../adapay/payment'
 import ColHeader from '@/components/col-header'
@@ -31,7 +31,7 @@ import OrderLive from './order-live'
 import OrderPractice from './order-practice'
 import OrderVip from './order-vip'
 import OrderMusic from './order-music'
-import { browser, moneyFormat } from '@/helpers/utils'
+import { moneyFormat } from '@/helpers/utils'
 import OrderPinao from './order-pinao'
 import { getMusicDetail } from '@/student/trade/tradeOrder'
 import OrderActive from './order-active'
@@ -119,7 +119,18 @@ export default defineComponent({
         //
       }
     }
-    await this.getOrderPayType()
+    // 判断是否已经有支付方式了
+    const paymentConfig = orderStatus.orderObject.paymentConfig || {}
+    if (
+      paymentConfig.paymentVendor &&
+      paymentConfig.paymentVersion &&
+      orderStatus.orderObject.orderNo
+    ) {
+      this.paymentVersion = orderStatus.orderObject.paymentVendor || 'V1'
+      this.paymentVendor = orderStatus.orderObject.paymentVersion
+    } else {
+      await this.getOrderPayType()
+    }
     this.orderAmount = orderStatus.orderObject.actualPrice || 0
     this.orderPrice = orderStatus.orderObject.actualPrice || 0
     this.dataLoading = false
@@ -214,7 +225,6 @@ export default defineComponent({
         }
       }
 
-      console.log(orderStatus.orderObject, 'orderInfo')
       // 判断是否有订单号
       if (orderStatus.orderObject.orderNo) {
         if (this.paymentVersion === 'V1') {