From 8e11b2da10de9a08d0557e1715024d127ef7eaa7 Mon Sep 17 00:00:00 2001
From: Guoguo <i@qwq.trade>
Date: Sat, 18 Jul 2026 20:25:57 -0700
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=8A=A5=E5=91=8A=20device=5Fid=20?=
 =?UTF-8?q?=E7=94=A8=20ble.getDeviceId()(=E4=BF=AE=20P2=20=E7=A9=BA?=
 =?UTF-8?q?=E5=BD=92=E5=B1=9E)+=E6=89=8B=E5=8A=A8=E5=85=A5=E5=8F=A3?=
 =?UTF-8?q?=E6=8E=A5=E5=85=A5=20i18n(P3)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 miniprogram/i18n/locales/manual.js                     | 6 ++++--
 miniprogram/pages/auto-scan/auto-scan.js               | 3 ++-
 miniprogram/pages/treatment-setup/treatment-setup.js   | 2 ++
 miniprogram/pages/treatment-setup/treatment-setup.wxml | 2 +-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/miniprogram/i18n/locales/manual.js b/miniprogram/i18n/locales/manual.js
index 7836e46..eecca53 100644
--- a/miniprogram/i18n/locales/manual.js
+++ b/miniprogram/i18n/locales/manual.js
@@ -18,7 +18,8 @@ module.exports = {
     start: '开始护理',
     starting: '启动中...',
     noRegionSelected: '请至少选择一个区域',
-    startFailed: '启动失败'
+    startFailed: '启动失败',
+    entryLink: '手动选择波长护理 ›'
   },
   en: {
     navTitle: 'Manual Care',
@@ -37,6 +38,7 @@ module.exports = {
     start: 'Start Care',
     starting: 'Starting...',
     noRegionSelected: 'Please select at least one region',
-    startFailed: 'Failed to start'
+    startFailed: 'Failed to start',
+    entryLink: 'Manual wavelength care ›'
   }
 }
diff --git a/miniprogram/pages/auto-scan/auto-scan.js b/miniprogram/pages/auto-scan/auto-scan.js
index b6ce938..44221bf 100644
--- a/miniprogram/pages/auto-scan/auto-scan.js
+++ b/miniprogram/pages/auto-scan/auto-scan.js
@@ -175,7 +175,8 @@ Page({
     var self = this
     var app = getApp()
     var mask = self.data.regions || 0x1F
-    var deviceId = (app.globalData.connectedDevice && app.globalData.connectedDevice.device_id) || null
+    // Same device-id source the treating page uses (services/ble getDeviceId + currentDevice fallback).
+    var deviceId = ble.getDeviceId() || (app.globalData.currentDevice && app.globalData.currentDevice.device_id) || null
     var scannedAt = Date.now()
 
     function proceed(config) {
diff --git a/miniprogram/pages/treatment-setup/treatment-setup.js b/miniprogram/pages/treatment-setup/treatment-setup.js
index ba01633..d821690 100644
--- a/miniprogram/pages/treatment-setup/treatment-setup.js
+++ b/miniprogram/pages/treatment-setup/treatment-setup.js
@@ -1,4 +1,5 @@
 var ble = require('../../services/ble')
+var i18n = require('../../i18n/index')
 Page({
   data: {
     statusBarHeight: 44,
@@ -32,6 +33,7 @@ Page({
   onLoad: function () {
     var app = getApp()
     this.setData({ statusBarHeight: app.globalData.statusBarHeight })
+    i18n.bind(this)
     this.checkSubscription()
   },
 
diff --git a/miniprogram/pages/treatment-setup/treatment-setup.wxml b/miniprogram/pages/treatment-setup/treatment-setup.wxml
index 1a94989..0c9082e 100644
--- a/miniprogram/pages/treatment-setup/treatment-setup.wxml
+++ b/miniprogram/pages/treatment-setup/treatment-setup.wxml
@@ -37,7 +37,7 @@
       开始使用
     </button>
 
-    <view class="manual-entry" bindtap="onManual" style="text-align:center;color:#E8503A;font-size:26rpx;margin-top:28rpx;">手动选择波长护理 ›</view>
+    <view class="manual-entry" bindtap="onManual" style="text-align:center;color:#E8503A;font-size:26rpx;margin-top:28rpx;">{{i18n.manual.entryLink}}</view>
 
     <view class="error-text" wx:if="{{error}}">{{error}}</view>
   </view>