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

zhou zhou

昨天 592aadefa836da71e40043dc14d83a82ef602ca8

 pages/login/login.vue

@@ -295,8 +295,8 @@
               this.loading = true;

               this.loginButton = 'login.loging';               

               uni.setStorageSync('token', data.accessToken);   

               uni.setStorageSync('userData', data.user);				
               if (this.remberPassword) {						
               uni.setStorageSync('userData', data.user);		
               if (this.remberPassword) {

                  uni.setStorageSync('user', this.user);

               } else {

                  uni.removeStorageSync('user');