Merge branch 'master' into debug

src/views/Home.vue

@@ -509,7 +509,7 @@ export default {
     },
 
     logoLarge() {
-      return this.$store.state.baseInfo.logoCh || this.$setting.g_logo
+      return this.$store.state.baseInfo.logoCh
     },
 
     prefixPath() {

src/views/Login.vue

@@ -501,6 +501,7 @@ export default {
             localStorage.setItem("AdminName", res.Data.AdminName);
             localStorage.setItem("loginTime",new Date())
             storage.setCookie('ai_user',res.Data.AdminName)
+            storage.setCookie('expire',new Date().getTime()+(8 * 60 * 60 * 1000))
 
         },
         //根据角色判断应该进入系统的哪个页面，进入系统