diff --git a/miniprogram/lefu/service.ts b/miniprogram/lefu/service.ts index fbdb864..b0c0c2d 100644 --- a/miniprogram/lefu/service.ts +++ b/miniprogram/lefu/service.ts @@ -242,7 +242,8 @@ class LeFuService { }) } - configWifi(ssid: string, password: string, version: WifiVersion): Promise { + configWifi(ssid: string, password: string): Promise { + const version = (this._deviceInfo?.modelNumber ?? '').split('-').length === 5 ? 'domain2' : 'domain1' console.log(TAG, 'configWifi():', ssid, version) return new Promise((resolve, reject) => { if (!this._activeProtocol) { diff --git a/miniprogram/pages/connectedWifi/connectedWifi.less b/miniprogram/pages/connectedWifi/connectedWifi.less index 8998aa9..429f8f4 100644 --- a/miniprogram/pages/connectedWifi/connectedWifi.less +++ b/miniprogram/pages/connectedWifi/connectedWifi.less @@ -253,10 +253,16 @@ width: 100%; flex: 1; min-height: 0; - padding-left: 12rpx; + padding: 0 12rpx; box-sizing: border-box; } +.arrow { + &::after { + right: 4rpx; + } +} + /* 列表项:普通态 */ .wifiItem { width: 100%; @@ -294,7 +300,7 @@ /* 右箭头 */ >view:nth-of-type(2) { - width: 10rpx; + width: 20rpx; height: 18rpx; } } @@ -323,12 +329,11 @@ margin-right: 5rpx; } - >view { - width: 24rpx; - height: 24rpx; - border-radius: 50%; - background-color: #2AC79F; - } + /* 右箭头 */ + >view { + width: 20rpx; + height: 18rpx; + } } } diff --git a/miniprogram/pages/connectedWifi/connectedWifi.ts b/miniprogram/pages/connectedWifi/connectedWifi.ts index 90c1732..a752d09 100644 --- a/miniprogram/pages/connectedWifi/connectedWifi.ts +++ b/miniprogram/pages/connectedWifi/connectedWifi.ts @@ -1,5 +1,5 @@ import { lefuService } from '../../lefu/index' -import type { LeFuWifiItem, WifiVersion } from '../../lefu/index' +import type { LeFuWifiItem } from '../../lefu/index' interface WifiItem { ssid: string @@ -10,7 +10,6 @@ type WifiStatus = 'idle' | 'searching' | 'list' | 'empty' | 'password' | 'config type BleStatus = 'connected' | 'failed' | 'connecting' Page({ - _wifiVersion: 'domain2' as WifiVersion, data: { status: 'idle' as WifiStatus, @@ -107,7 +106,7 @@ Page({ if (!selectedSsid) return this.setData({ status: 'configuring' }) wx.showLoading({ title: '正在配网...', mask: true }) - lefuService.configWifi(selectedSsid, selectWifiPWD, this._wifiVersion) + lefuService.configWifi(selectedSsid, selectWifiPWD) .then(() => { wx.hideLoading() this.setData({ diff --git a/miniprogram/pages/connectedWifi/connectedWifi.wxml b/miniprogram/pages/connectedWifi/connectedWifi.wxml index b6abd97..c57c17b 100644 --- a/miniprogram/pages/connectedWifi/connectedWifi.wxml +++ b/miniprogram/pages/connectedWifi/connectedWifi.wxml @@ -93,7 +93,7 @@ {{item.ssid}} 已连接 - +