Merge branch 'master' of http://39.106.8.246:3003/sagacloud/sagacloud-sagacare-miniprogram

pages/index/index.js

@@ -289,7 +289,7 @@ Page({
             this.setData({ logined: true });
             !$.storage.get("openId") &&
                 $.storage.set("openId", res.content.openId);
-            !$.storage.get("openId") && $.storage.set("userId", res.content.id);
+            !$.storage.get("userId") && $.storage.set("userId", res.content.id);
             $.storage.set("projectId", currentTenant.projectId);
             $.storage.set("tenantId", currentTenant.tenantId);
             $.storage.set("tenantName", currentTenant.tenantName);

pages/spacelist/index.js

@@ -10,7 +10,7 @@ Page({
         alllistContent: [],
         projectId: "",
         tenantId: "",
-        userId: "",
+        userId: null,
         currtPage: 0,
         allListnum: 0,
         seachValue: "",