Merge branch 'master' of http://192.168.5.34:10101/r/YiYunJianZhuBeta

src/views/login.vue

@@ -273,7 +273,6 @@ export default {
       if (this.$cookie.get("remember")) {
         this.account = this.$cookie.get("account");
         this.pwd = this.$cookie.get("pwd");
-        this.isBackground = true;
         var backgroundValue = this.$cookie.get("background");
         if (backgroundValue == "false") {
           this.isBackground = false;
@@ -421,11 +420,7 @@ export default {
      */
     loginBackManage: function() {
       this.loginShow = 2;
-      if(!this.isBackground){
-        this.isBackground = true;
-      }else{
-        this.isBackground = false;
-      }
+      this.isBackground = true;
     },
     /**
      * @description: 系统登录
@@ -472,7 +467,7 @@ export default {
               thisApp.$cookie.set("remember", true);
               thisApp.$cookie.set("account", thisApp.account);
               thisApp.$cookie.set("pwd", thisApp.pwd);
-              thisApp.$cookie.set("background", thisApp.isBackground);
+              thisApp.$cookie.set("background", thisApp.isBackground); 
             } else {
               thisApp.$cookie.remove("remember");
               thisApp.$cookie.remove("account");