Merge branch 'iteration-20240219' into jenkins-main

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

@@ -54,6 +54,7 @@ export default defineComponent({
       currentPrice: 0,
       dialogStatus: false,
       dialogMessage: '',
+      dialogType: '',
       submitStatus: false
     })
 
@@ -108,6 +109,7 @@ export default defineComponent({
           // status
           state.dialogStatus = true
           state.dialogMessage = '订单' + orderStatus[data.status]
+          state.dialogType = data.status
         }
       } catch {
         //
@@ -282,8 +284,11 @@ export default defineComponent({
             receiveAddress: null
           }
         })
-        // console.log(data)
-        if (data.status !== 'WAIT_PAY' && data.status !== 'PAYING') {
+        if (data.status == 'CLOSED') {
+          state.dialogStatus = true
+          state.dialogMessage = '订单已关闭'
+          state.dialogType = 'CLOSED'
+        } else if (data.status !== 'WAIT_PAY' && data.status !== 'PAYING') {
           checkOrderTypeJump()
         } else {
           callback && callback()
@@ -299,9 +304,13 @@ export default defineComponent({
     const checkOrderTypeJump = () => {
       // 判断是否是乐团报名 并且在不在app里面
       if (orderType.value === 'ORCHESTRA' && !browser().isApp) {
-        window.location.replace(
-          'https://mp.weixin.qq.com/s?__biz=MzkxMDMwOTI5Nw==&mid=2247485362&idx=3&sn=9b265d36b5dabe7f9393fc679c367540&chksm=c12c256cf65bac7ae2a865435b950f6e1285afd226356db0ffde815b1ee345f29cfcdb798cc9#rd'
-        )
+        if (state.dialogType === 'CLOSED') {
+          router.back()
+        } else {
+          window.location.replace(
+            'https://mp.weixin.qq.com/s?__biz=MzkxMDMwOTI5Nw==&mid=2247485362&idx=3&sn=9b265d36b5dabe7f9393fc679c367540&chksm=c12c256cf65bac7ae2a865435b950f6e1285afd226356db0ffde815b1ee345f29cfcdb798cc9#rd'
+          )
+        }
       } else {
         router.replace({
           path: '/payment-result',
@@ -517,6 +526,10 @@ export default defineComponent({
           confirmButtonText="确定"
           onConfirm={() => {
             checkOrderTypeJump()
+            // if (state.dialogType === 'CLOSED') {
+            // } else {
+            //   checkOrderTypeJump()
+            // }
           }}
         />
       </>