更改

1 week ago · 2437d21cc4
parent 604b262c3b
commit 2437d21cc4
5 changed files with 42 additions and 31 deletions
--- a/pages/reservation/index.vue
+++ b/pages/reservation/index.vue
@ -125,13 +125,17 @@ export default {
    this.isWeixinBrowser = /MicroMessenger/i.test(navigator.userAgent)
    // #endif
  },
-  onShow() {
-    this.fetchDirectionEnum().then(() => {
-      this.fetchShipTypeEnum().then(() => {
-        this.fetchShipList();
-      });
-    });
-    // 进入页面先提示需要获取位置信息，用户确认后再获取
+  async onShow() {
+    // 先拉取方向、船型和可用船舶信息，如果没有可用船舶，则直接返回，不再进行后续操作（如获取位置信息等）
+    await this.fetchDirectionEnum();
+    await this.fetchShipTypeEnum();
+    const hasShip = await this.fetchShipList();
+    if (!hasShip) {
+      // 已在 fetchShipList 内部给出提示并跳转
+      return;
+    }
+
+    // 有可用船舶时，再弹出获取位置信息的提示
    uni.showModal({
      title: '提示',
      content: '预约前需要先获取您的位置信息',
@ -150,8 +154,9 @@ export default {
        }
      }
    });
-    this.fetchDailyReservationDeadline();

+    // 最后再拉取每日预约截止时间并设置默认日期
+    this.fetchDailyReservationDeadline();
  },
  methods: {
    // 获取用户位置
@ -493,7 +498,10 @@ export default {
    },
    async fetchShipList() {
      const token = uni.getStorageSync('token');
-      if (!token) return;
+      if (!token) {
+        uni.showToast({ title: '请先登录', icon: 'none' });
+        return false;
+      }
      try {
        const res = await new Promise((resolve, reject) => {
          uni.request({
@ -505,14 +513,12 @@ export default {
        });
      
        if (res.data && res.data.errcode === 0) {
-          
          if (!res.data.data) {
-              uni.showToast({ title: '暂无船舶信息', icon: 'none' });
+            uni.showToast({ title: '暂无船舶信息', icon: 'none', duration: 1500 });
            setTimeout(() => {
-                uni.navigateBack();
-                uni.navigateTo({ url: '/pages/index/ship_manage' });
+              uni.redirectTo({ url: '/pages/index/ship_manage' });
            }, 1000);
-              return;
+            return false;
          }

          this.currentShip = {
@ -524,9 +530,14 @@ export default {
            total_tonnage: res.data.data.total_tonnage,
            ship_type: res.data.data.ship_type
          };
+          return true;
+        } else {
+          uni.showToast({ title: (res.data && res.data.errmsg) || '获取船舶信息失败', icon: 'none' });
+          return false;
        }
      } catch (e) {
-        // 可选：错误处理
+        uni.showToast({ title: '网络错误', icon: 'none' });
+        return false;
      }
    },
    async fetchDirectionEnum() {
--- a/unpackage/dist/build/web/index.html
+++ b/unpackage/dist/build/web/index.html
@ -1,2 +1,2 @@
 <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>胥口闸站购票</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
-            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/h5/static/index.883130ca.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/h5/static/js/chunk-vendors.f93c9f80.js></script><script src=/h5/static/js/index.c970d746.js></script></body></html>
+            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/h5/static/index.883130ca.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/h5/static/js/chunk-vendors.f93c9f80.js></script><script src=/h5/static/js/index.14b82f73.js></script></body></html>
--- a/unpackage/dist/build/web/static/js/index.14b82f73.js
+++ b/unpackage/dist/build/web/static/js/index.14b82f73.js
--- a/unpackage/dist/build/web/static/js/pages-reservation-index.206014f9.js
+++ b/unpackage/dist/build/web/static/js/pages-reservation-index.206014f9.js
--- a/unpackage/dist/build/web/static/js/pages-reservation-index.52621408.js
+++ b/unpackage/dist/build/web/static/js/pages-reservation-index.52621408.js