From 4149c35a0aa189623bbaba1dbdfa2982cb2586d3 Mon Sep 17 00:00:00 2001 From: Guoguo Date: Tue, 12 May 2026 06:34:52 -0700 Subject: [PATCH] fix: wear-check page stuck spinning in vendor_33 mode - vendor_33 mode skips BLE wear detection (protocol doesn't support it) and passes check immediately if device is connected - Show error message if device is not connected - Retry button navigates back if disconnected instead of re-checking --- miniprogram/pages/wear-check/wear-check.js | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/miniprogram/pages/wear-check/wear-check.js b/miniprogram/pages/wear-check/wear-check.js index 3671e23..b9f40af 100644 --- a/miniprogram/pages/wear-check/wear-check.js +++ b/miniprogram/pages/wear-check/wear-check.js @@ -38,6 +38,17 @@ Page({ var self = this self.setData({ checking: true, result: null, error: '' }) + if (!ble.isConnected()) { + self.setData({ checking: false, result: 'fail', error: '设备未连接,请返回重新连接' }) + return + } + + var protocol = require('../../services/ble/protocol') + if (protocol.PROTOCOL_MODE === 'vendor_33') { + self.setData({ checking: false, result: 'ok', connected: true }) + return + } + if (this._onStatus) ble.off('status', this._onStatus) this._onStatus = function (status) { self.setData({ checking: false }) @@ -66,6 +77,10 @@ Page({ }, onRetry: function () { + if (!ble.isConnected()) { + wx.navigateBack() + return + } this.checkWearing() },