Merge branch 'dev-1.0' of…

Merge branch 'dev-1.0' of https://gitlab.infra.miyatech.com/pengguangpu/doublescreen-front into dev-1.0

pages/login/login.js

@@ -35,11 +35,11 @@ Page({
     console.log("localLoginInfo==>" + JSON.stringify(localLoginInfo));
     if (localLoginInfo.success != false && localLoginInfo.data != null) {
       //赋值
-      this.setData({
-        name: localLoginInfo.data.name,
-        password: localLoginInfo.data.password,
-        sn: localLoginInfo.data.sn
-      })
+      // this.setData({
+      //   name: localLoginInfo.data.name,
+      //   password: localLoginInfo.data.password,
+      //   sn: localLoginInfo.data.sn
+      // })
     }
   },
   onNameClear() {