From a92d6ccdfb3dadfe4e73ac33c6bae44164ecfc4f Mon Sep 17 00:00:00 2001
From: zhuoqinglian <1035449612@qq.com>
Date: Fri, 24 Apr 2026 14:35:34 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E9=85=8D=E7=BD=91=E6=88=90=E5=8A=9F=E6=B2=A1=E6=9C=89=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E9=80=80=E5=87=BA=E9=85=8D=E7=BD=91=E6=A8=A1=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../device-config/components/wifi-config.vue  |  33 ++--
 .../components/wifi-selector.vue              | 150 +++++++++---------
 2 files changed, 94 insertions(+), 89 deletions(-)

diff --git a/main/manager-mobile/src/pages/device-config/components/wifi-config.vue b/main/manager-mobile/src/pages/device-config/components/wifi-config.vue
index e8a4d6b7..32792be4 100644
--- a/main/manager-mobile/src/pages/device-config/components/wifi-config.vue
+++ b/main/manager-mobile/src/pages/device-config/components/wifi-config.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { computed, ref } from 'vue'
-import { useToast } from 'wot-design-uni'
 import { t } from '@/i18n'
+import { toast } from '@/utils/toast'
 
 // 类型定义
 interface WiFiNetwork {
@@ -19,9 +19,6 @@ interface Props {
 
 const props = defineProps<Props>()
 
-// Toast 实例
-const toast = useToast()
-
 // 响应式数据
 const configuring = ref(false)
 
@@ -45,7 +42,7 @@ async function checkESP32Connection() {
     return response.statusCode === 200
   }
   catch (error) {
-    console.log(t('deviceConfig.esp32ConnectionCheckFailed') + ':', error)
+    console.log(`${t('deviceConfig.esp32ConnectionCheckFailed')}:`, error)
     return false
   }
 }
@@ -58,12 +55,12 @@ async function submitConfig() {
   // 检查ESP32连接
   const connected = await checkESP32Connection()
   if (!connected) {
-      toast.error(t('deviceConfig.connectXiaozhiHotspot'))
-      return
-    }
+    toast.error(t('deviceConfig.connectXiaozhiHotspot'))
+    return
+  }
 
   configuring.value = true
-    console.log(t('deviceConfig.startWifiConfig') + ':', props.selectedNetwork.ssid)
+  console.log(`${t('deviceConfig.startWifiConfig')}:`, props.selectedNetwork.ssid)
 
   try {
     const response = await uni.request({
@@ -83,6 +80,14 @@ async function submitConfig() {
 
     if (response.statusCode === 200 && (response.data as any)?.success) {
       toast.success(`${t('deviceConfig.configSuccess')}！${t('deviceConfig.deviceWillConnectTo')} ${props.selectedNetwork.ssid}，${t('deviceConfig.deviceWillRestart')}。${t('deviceConfig.pleaseDisconnectXiaozhiHotspot')}`)
+      // 设备退出配网模式
+      setTimeout(() => {
+        uni.request({
+          url: 'http://192.168.4.1/exit',
+          method: 'POST',
+          timeout: 15000,
+        })
+      }, 1500)
     }
     else {
       const errorMsg = (response.data as any)?.error || t('deviceConfig.configFailed')
@@ -90,8 +95,8 @@ async function submitConfig() {
     }
   }
   catch (error) {
-    console.error(t('deviceConfig.wifiConfigFailed') + ':', error)
-      toast.error(`${t('deviceConfig.configFailed')}，${t('deviceConfig.pleaseCheckNetworkConnection')}`)
+    console.error(`${t('deviceConfig.wifiConfigFailed')}:`, error)
+    toast.error(`${t('deviceConfig.configFailed')}，${t('deviceConfig.pleaseCheckNetworkConnection')}`)
   }
   finally {
     configuring.value = false
@@ -134,9 +139,9 @@ async function submitConfig() {
 
     <!-- 使用说明 -->
     <view class="help-section">
-        <view class="help-title">
-          {{ t('deviceConfig.wifiConfigInstructions') }}
-        </view>
+      <view class="help-title">
+        {{ t('deviceConfig.wifiConfigInstructions') }}
+      </view>
       <view class="help-content">
         <text class="help-item">
           1. {{ t('deviceConfig.phoneConnectXiaozhiHotspot') }} (xiaozhi-XXXXXX)
diff --git a/main/manager-mobile/src/pages/device-config/components/wifi-selector.vue b/main/manager-mobile/src/pages/device-config/components/wifi-selector.vue
index d89d9bae..097e5630 100644
--- a/main/manager-mobile/src/pages/device-config/components/wifi-selector.vue
+++ b/main/manager-mobile/src/pages/device-config/components/wifi-selector.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { computed, defineEmits, defineExpose, onMounted, ref } from 'vue'
+import { computed, onMounted, ref } from 'vue'
 import { useToast } from 'wot-design-uni'
 import { t } from '@/i18n'
 
@@ -71,9 +71,9 @@ async function checkESP32Connection() {
 // 扫描WiFi网络
 async function scanWifi() {
   if (!isConnectedToESP32.value) {
-      toast.error(t('deviceConfig.connectXiaozhiHotspot'))
-      return
-    }
+    toast.error(t('deviceConfig.connectXiaozhiHotspot'))
+    return
+  }
 
   scanning.value = true
   console.log('开始扫描WiFi网络')
@@ -85,7 +85,7 @@ async function scanWifi() {
       timeout: 10000,
     })
 
-    console.log(t('deviceConfig.wifiScanResponse') + ':', response)
+    console.log(`${t('deviceConfig.wifiScanResponse')}:`, response)
 
     if (response.statusCode === 200 && response.data) {
       const data = response.data as any
@@ -121,8 +121,8 @@ async function scanWifi() {
     }
   }
   catch (error) {
-    console.error(t('deviceConfig.wifiScanFailed') + ':', error)
-      toast.error(t('deviceConfig.scanFailedCheckConnection'))
+    console.error(`${t('deviceConfig.wifiScanFailed')}:`, error)
+    toast.error(t('deviceConfig.scanFailedCheckConnection'))
   }
   finally {
     scanning.value = false
@@ -135,9 +135,9 @@ async function showNetworkSelector() {
   await checkESP32Connection()
 
   if (!isConnectedToESP32.value) {
-      toast.error(t('deviceConfig.connectXiaozhiHotspot'))
-      return
-    }
+    toast.error(t('deviceConfig.connectXiaozhiHotspot'))
+    return
+  }
 
   selectorExpanded.value = true
 
@@ -223,73 +223,73 @@ onMounted(() => {
     <!-- Xiaozhi连接状态 -->
     <view v-if="props.autoConnect" class="connection-status">
       <view v-if="!isConnectedToESP32" class="status-warning">
-          <view class="status-content">
-            <text class="warning-text">
-              {{ t('deviceConfig.connectXiaozhiHotspot') }} (xiaozhi-XXXXXX)
-            </text>
-            <wd-button
-              size="small"
-              type="primary"
-              :loading="checkingConnection"
-              @click="checkESP32Connection"
-            >
-              {{ checkingConnection ? t('deviceConfig.checking') : t('deviceConfig.reCheck') }}
-            </wd-button>
-          </view>
+        <view class="status-content">
+          <text class="warning-text">
+            {{ t('deviceConfig.connectXiaozhiHotspot') }} (xiaozhi-XXXXXX)
+          </text>
+          <wd-button
+            size="small"
+            type="primary"
+            :loading="checkingConnection"
+            @click="checkESP32Connection"
+          >
+            {{ checkingConnection ? t('deviceConfig.checking') : t('deviceConfig.reCheck') }}
+          </wd-button>
         </view>
+      </view>
       <view v-else class="status-success">
-          <view class="status-content">
-            <text class="success-text">
-              {{ t('deviceConfig.connectedXiaozhiHotspot') }}
-            </text>
-            <wd-button
-              size="small"
-              :loading="checkingConnection"
-              @click="checkESP32Connection"
-            >
-              {{ checkingConnection ? t('deviceConfig.checking') : t('deviceConfig.refreshStatus') }}
-            </wd-button>
-          </view>
+        <view class="status-content">
+          <text class="success-text">
+            {{ t('deviceConfig.connectedXiaozhiHotspot') }}
+          </text>
+          <wd-button
+            size="small"
+            :loading="checkingConnection"
+            @click="checkESP32Connection"
+          >
+            {{ checkingConnection ? t('deviceConfig.checking') : t('deviceConfig.refreshStatus') }}
+          </wd-button>
         </view>
+      </view>
     </view>
 
     <!-- WiFi网络选择器 -->
     <view class="network-selector">
-        <view class="selector-item" @click="showNetworkSelector">
-          <text class="selector-label">
-            {{ t('deviceConfig.wifiNetwork') }}
-          </text>
-          <text class="selector-value">
-            {{ networkDisplayText }}
-          </text>
-          <wd-icon name="arrow-right" custom-class="arrow-icon" />
-        </view>
+      <view class="selector-item" @click="showNetworkSelector">
+        <text class="selector-label">
+          {{ t('deviceConfig.wifiNetwork') }}
+        </text>
+        <text class="selector-value">
+          {{ networkDisplayText }}
+        </text>
+        <wd-icon name="arrow-right" custom-class="arrow-icon" />
       </view>
+    </view>
 
     <!-- 展开的网络列表 -->
     <view v-if="selectorExpanded" class="network-list-overlay">
       <view class="network-list-container">
         <view class="list-header">
-            <text class="list-title">
-              {{ t('deviceConfig.selectWifiNetwork') }}
-            </text>
-            <view class="list-actions">
-              <wd-button
-                type="primary"
-                size="small"
-                :loading="scanning"
-                @click="scanWifi"
-              >
-                {{ scanning ? t('deviceConfig.scanning') : t('deviceConfig.refreshScan') }}
-              </wd-button>
-              <wd-button
-                size="small"
-                @click="selectorExpanded = false"
-              >
-                {{ t('deviceConfig.cancel') }}
-              </wd-button>
-            </view>
+          <text class="list-title">
+            {{ t('deviceConfig.selectWifiNetwork') }}
+          </text>
+          <view class="list-actions">
+            <wd-button
+              type="primary"
+              size="small"
+              :loading="scanning"
+              @click="scanWifi"
+            >
+              {{ scanning ? t('deviceConfig.scanning') : t('deviceConfig.refreshScan') }}
+            </wd-button>
+            <wd-button
+              size="small"
+              @click="selectorExpanded = false"
+            >
+              {{ t('deviceConfig.cancel') }}
+            </wd-button>
           </view>
+        </view>
 
         <view class="network-list">
           <view v-if="wifiNetworks.length === 0 && !scanning" class="empty-state">
@@ -323,7 +323,7 @@ onMounted(() => {
               </view>
               <view class="wifi-security">
                 <text class="security-icon">
-                  {{ network.authmode === 0 ? t('deviceConfig.open') : t('deviceConfig.encrypted') }}
+                  {{ network.authmode === 0 ? t('deviceConfig.open') : t('deviceConfig.encryptedNetwork') }}
                 </text>
               </view>
             </view>
@@ -335,17 +335,17 @@ onMounted(() => {
     <!-- 密码输入 -->
     <view v-if="selectedNetwork && selectedNetwork.authmode > 0" class="password-section">
       <view class="password-item">
-          <text class="password-label">
-            {{ t('deviceConfig.wifiPassword') }}
-          </text>
-          <wd-input
-            v-model="password"
-            :placeholder="t('deviceConfig.enterWifiPassword')"
-            show-password
-            clearable
-            @input="onPasswordChange"
-          />
-        </view>
+        <text class="password-label">
+          {{ t('deviceConfig.wifiPassword') }}
+        </text>
+        <wd-input
+          v-model="password"
+          :placeholder="t('deviceConfig.enterWifiPassword')"
+          show-password
+          clearable
+          @input="onPasswordChange"
+        />
+      </view>
     </view>
   </view>
 </template>