Merge branch 'master' of http://gitlab.oytour.com/viitto/pptist

src/views/components/Order/Review.vue

@@ -174,11 +174,10 @@ const getOrderStatus = async ()=>{
     if(orderNum.value!=''){
         const response = await OrderService.GetOrderPayStatusAsync(orderNum.value)
         if(response.data.resultCode == ApiResult.SUCCESS){
+            stopTimerHandler()
             currentPayStatus.value = parseInt(response.data.message)
             PaySuccessDatas.value = response.data.data
             dialogVisible.value = true
-        }else{
-            stopTimerHandler()
         }
     }
         
@@ -192,7 +191,7 @@ const setPaymentQrCode = async ()=>{
         vipid:currentProduct.value.vipid,
         pricetype:1,
         price:currentProduct.value.price,
-        activedate:'2024-04-15',
+        // activedate:'2024-04-15',
         orderid:0
     }
     const response = await OrderService.CreateTempOrderPaymentAsync(parameters)