Explorar o código

fix:统一设置密码的保存

zeng.chen hai 2 meses
pai
achega
49deb01d99
Modificáronse 1 ficheiros con 8 adicións e 15 borrados
  1. 8 15
      pages/pageD/setWifi/setWifi.js

+ 8 - 15
pages/pageD/setWifi/setWifi.js

@@ -36,9 +36,10 @@ Page({
   },
   getConnectedWifi: function () {
     const that = this;
-    let wifiDic = store.getStore("wifiInfo")
-    let wifiName = wifiDic.wifiName
-    let pwd = wifiDic.wifiPassword
+    let wifiDic = store.getStore("wifiInfo") ?? "{}";
+    let json = JSON.parse(wifiDic)
+    let wifiName = json.ssid
+    let pwd = json.password
     // if (wifiName && pwd) {
     if (wifiName) {
       console.log("获取Wi-Fi信息", wifiName, pwd);
@@ -180,25 +181,17 @@ Page({
       //   icon: 'none'
       // })
       if (name === EnumCmdEvent.otaWifi && otaCmd === 1) {
-        store.setStore("wifiInfo", {
-          wifiName: _this.data.wifiName,
-          wifiPassword: _this.data.wifiPassword
+        let json = JSON.stringify({
+          "password": _this.data.wifiPassword,
+          "ssid": _this.data.wifiName
         })
+        store.setStore("wifiInfo", json)
       }
     }, _this)
   },
   wifiPageSuccess() {
     this.data._onNavigateBack = true
   },
-  // 获取保存的 Wi-Fi 账号和密码
-  getSavedWiFiInfo() {
-    const wifiName = wx.getStorageSync('wifiName') || '';
-    const wifiPassword = wx.getStorageSync('wifiPassword');
-    this.setData({
-      wifiName: wifiName,
-      wifiPassword: wifiPassword
-    });
-  },
   onLoad: function (options) {
     let param = options.param ?? "{}";
     let url = JSON.parse(param).url ?? "";