yuchunlei/bodyWeight
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[AI Generated]: refactor(Comp): 移除配网超时机制、工号输入满8位自动查询用户

Browse Source
This commit is contained in:
17792275749
2026-04-10 11:42:34 +08:00
parent 8fd53c074d
commit 04740730da
3 changed files with 33 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/configureDevice_2_addUser/configureDevice_2_addUser.js
+6 -5
View File
@@ -100,12 +100,13 @@ Component({
}); });
}, },
// 监听工号输入（员工模式） // 监听工号输入（员工模式），输入满 8 位时自动查询
onWorkNoInput(e) { onWorkNoInput(e) {
this.setData({ const value = e.detail.value;
workNo: e.detail.value, this.setData({ workNo: value, userInfo: null });
userInfo: null if (value.trim().length === 8) {
}); this.searchUser();
}
}, },
// 监听身高输入（员工模式） // 监听身高输入（员工模式）
components/configureDevice_2_addUser/configureDevice_2_addUser.wxml
+9 -9
View File
@@ -39,9 +39,9 @@
<block wx:if="{{userInfo}}"> <block wx:if="{{userInfo}}">
{{userInfo.realname || ''}} {{userInfo.realname || ''}}
</block> </block>
<block wx:else> <!-- <block wx:else>-->
<text style="color: #808080;">请先输入工号</text> <!-- <text style="color: #808080;">请先输入工号</text>-->
</block> <!-- </block>-->
</view> </view>
<view></view> <view></view>
</view> </view>
@@ -54,9 +54,9 @@
<block wx:if="{{userInfo}}"> <block wx:if="{{userInfo}}">
{{userInfo.sex === 1 ? '男' : userInfo.sex === 2 ? '女' : ''}} {{userInfo.sex === 1 ? '男' : userInfo.sex === 2 ? '女' : ''}}
</block> </block>
<block wx:else> <!-- <block wx:else>-->
<text style="color: #808080;">请先输入工号</text> <!-- <text style="color: #808080;">请先输入工号</text>-->
</block> <!-- </block>-->
</view> </view>
<view></view> <view></view>
</view> </view>
@@ -69,9 +69,9 @@
<block wx:if="{{userInfo}}"> <block wx:if="{{userInfo}}">
{{userInfo.birthday || ''}} {{userInfo.birthday || ''}}
</block> </block>
<block wx:else> <!-- <block wx:else>-->
<text style="color: #808080;">请先输入工号</text> <!-- <text style="color: #808080;">请先输入工号</text>-->
</block> <!-- </block>-->
</view> </view>
<view></view> <view></view>
</view> </view>
components/configureDevice_3/configureDevice_3.js
+6 -26
View File
@@ -1,8 +1,5 @@
const app = getApp(); const app = getApp();
// 超时时间：15 秒
const SDK_TIMEOUT = 15000;
Component({ Component({
data: { data: {
progress: 0, progress: 0,
@@ -20,7 +17,6 @@ Component({
}, },
detached() { detached() {
console.log('configureDevice3 detached'); console.log('configureDevice3 detached');
if (this._sdkCancel) { this._sdkCancel(); this._sdkCancel = null; }
} }
}, },
@@ -84,42 +80,26 @@ Component({
let version = app.globalData.ppScale.version; let version = app.globalData.ppScale.version;
if (version === 'domain1') { if (version === 'domain1') {
this._sdkCancel = app.callWithTimeout( app.globalData.ppScale.activeProtocol.dataConfigNetWork({
(done) => app.globalData.ppScale.activeProtocol.dataConfigNetWork({
domain: app.globalData.ppScale.domain1, domain: app.globalData.ppScale.domain1,
ssid: this.data.selectWifi.ssid, ssid: this.data.selectWifi.ssid,
password: this.data.selectWifiPWD password: this.data.selectWifiPWD
}, done), }, (res) => {
SDK_TIMEOUT,
(res) => {
console.log("setNetwork.js dataConfigNetWork 1", res); console.log("setNetwork.js dataConfigNetWork 1", res);
this.netWorkCallBack(res); this.netWorkCallBack(res);
}, });
() => {
this.setData({ progress: 1 });
wx.showToast({ title: "配网超时，请重试", icon: "none" });
}
);
} }
if (version === 'domain2') { if (version === 'domain2') {
this._sdkCancel = app.callWithTimeout( app.globalData.ppScale.activeProtocol.dataConfigUserNetWork({
(done) => app.globalData.ppScale.activeProtocol.dataConfigUserNetWork({
domain: app.globalData.ppScale.domain2, domain: app.globalData.ppScale.domain2,
ssid: this.data.selectWifi.ssid, ssid: this.data.selectWifi.ssid,
password: this.data.selectWifiPWD, password: this.data.selectWifiPWD,
userName: "apiUser", userName: "apiUser",
userPassword: "3acebb95eb49577e9c2a2082589b9bd6", userPassword: "3acebb95eb49577e9c2a2082589b9bd6",
}, done), }, (res) => {
SDK_TIMEOUT,
(res) => {
console.log("setNetwork.js dataConfigUserNetWork 2", res); console.log("setNetwork.js dataConfigUserNetWork 2", res);
this.netWorkCallBack(res); this.netWorkCallBack(res);
}, });
() => {
this.setData({ progress: 1 });
wx.showToast({ title: "配网超时，请重试", icon: "none" });
}
);
} }
}, },