Merge pull request 'develop' (#9) from develop into master

Reviewed-on: http://gitea.qinglakeji.com:3000/develop/qwl-data-report-h5/pulls/9

src/views/login.vue

@@ -6,22 +6,22 @@
       let url = this.$route.query;
       let token;
       let url_string = JSON.stringify(url);
-      // if (url_string == "{}") {
-      //   this.$toast('请先登录')
-      // } else {
-      //   token = url.token_type + " " + url.access_token;
-      //   this.$store.commit("user/setToken", token);
-      //   this.$router.push({
-      //   path: "/home",
-      // });
-      // }
-
-      token =
-        "bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC90ZXN0LnFpbmd3ZWlsYWk4ODgueHl6XC9hZG1pblwvbG9naW4iLCJpYXQiOjE2Mjc0NjU1ODksImV4cCI6MTk4NzQ2NTU4OSwibmJmIjoxNjI3NDY1NTg5LCJqdGkiOiJ6clVHYnJCOXlPWkpRanRUIiwic3ViIjoxNjEsInBydiI6IjBiMzZjMGUwMjMyZGVlZTlkOTZhZDA0NGY3YWE2MjQ2YTUwYTU3ZmEifQ.aFc5fCUffmDN7zBRn-D13kx1LuLNG1Ej7vQOu4O2_AA"
-      this.$store.commit("user/setToken", token);
-      this.$router.push({
+      if (url_string == "{}") {
+        this.$toast('请先登录')
+      } else {
+        token = url.token_type + " " + url.access_token;
+        this.$store.commit("user/setToken", token);
+        this.$router.push({
         path: "/home",
       });
+      }
+
+      // token =
+      //   "bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC90ZXN0LnFpbmd3ZWlsYWk4ODgueHl6XC9hZG1pblwvbG9naW4iLCJpYXQiOjE2Mjc0NjU1ODksImV4cCI6MTk4NzQ2NTU4OSwibmJmIjoxNjI3NDY1NTg5LCJqdGkiOiJ6clVHYnJCOXlPWkpRanRUIiwic3ViIjoxNjEsInBydiI6IjBiMzZjMGUwMjMyZGVlZTlkOTZhZDA0NGY3YWE2MjQ2YTUwYTU3ZmEifQ.aFc5fCUffmDN7zBRn-D13kx1LuLNG1Ej7vQOu4O2_AA"
+      // this.$store.commit("user/setToken", token);
+      // this.$router.push({
+      //   path: "/home",
+      // });
     },
   };
 </script>