Merge remote-tracking branch 'origin/test' into test

yudao-ui-app/App.vue

@@ -222,6 +222,7 @@
       // 是否扫物业二维码
       isProperty() {
         const is_property = this.$route.query.isProperty || false
+        console.log('is_property', is_property)
         if(parseInt(is_property) === 1){
           this.$store.commit("SET_IS_PROPERTY", !!is_property)
         }

yudao-ui-app/api/api.js

@@ -39,7 +39,9 @@ export function getWeChatOpenId(code) {
 
 // 获取租户信息
 export function fetchTenantInfo(id) {
-  return request.get('tenant/get?id=' + id, {});
+  return request.get('tenant/get?id=' + id, {}, {
+    noAuth: true
+  });
 }
 
 /**

yudao-ui-app/libs/login.js

@@ -12,8 +12,12 @@ const whiteListPage=['pages/users/privacy/index']
 
 function prePage(){
 	let pages = getCurrentPages();
+  if(pages.length > 0){
    let prePage = pages[pages.length - 1];
    return prePage.route; 
+  } else {
+    return ''
+  }
 }
 
 export const toLogin = Debounce(_toLogin,800)