Merge branch 'iteration-20240607-small' into online

src/views/member-center/index.tsx

@@ -106,6 +106,7 @@ export default defineComponent({
     },
     // 查询未支付订单
     async paymentOrderUnpaid() {
+      let result = false;
       try {
         const { data } = await request.get('/edu-app/userPaymentOrder/unpaid', {
           requestType: 'form',
@@ -114,7 +115,8 @@ export default defineComponent({
           }
         });
         // 判断是否有待支付订单
-        if (data.id) {
+        if (data?.id) {
+          result = true;
           showConfirmDialog({
             message: '您有待支付的订单,是否继续支付',
             cancelButtonText: '取消订单',
@@ -146,7 +148,9 @@ export default defineComponent({
         }
       } catch {
         //
+        result = true;
       }
+      return result;
     },
     calcSalePrice(item: any) {
       // discount
@@ -160,6 +164,8 @@ export default defineComponent({
     },
     // 购买
     async onSubmit() {
+      const data = await this.paymentOrderUnpaid();
+      if (data) return;
       try {
         const selectMember = this.selectMember;
         const params: any = [