Merge branch 'master' of https://github.com/qier222/YesPlayMusic

# Conflicts:
#	src/store/mutations.js

src/store/actions.js

@@ -1,4 +1,3 @@
-// import { getMP3 } from "@/api/track";
 import { updateMediaSessionMetaData } from "@/utils/mediaSession";
 import { getTrackDetail, scrobble } from "@/api/track";
 

src/store/mutations.js

@@ -1,5 +1,4 @@
 import { Howl, Howler } from "howler";
-import state from "./state";
 import { shuffleAList } from "@/utils/common";
 
 export default {
@@ -85,7 +84,7 @@ export default {
   updateUser(state, user) {
     state.settings.user = user;
   },
-  updateUserInfo(sate, { key, value }) {
+  updateUserInfo(state, { key, value }) {
     state.settings.user[key] = value;
   },
   updateLikedSongs(state, trackIDs) {

src/utils/request.js

@@ -15,9 +15,9 @@ service.interceptors.response.use(
       } else if (res.code === 502) {
         alert(res.msg);
       } else if (res.code === 301) {
-        alert("required login");
+        alert("login required");
       } else {
-        alert("unknow error");
+        alert("unknown error");
       }
     } else {
       return res;

src/views/loginAccount.vue

@@ -137,8 +137,8 @@ export default {
           return;
         }
         loginWithPhone({
-          countrycode: this.countryCode.replace("+", "").replaceAll(" ", ""),
-          phone: this.phoneNumber.replaceAll(" ", ""),
+          countrycode: this.countryCode.replace("+", "").replace(/\s/g, ''),
+          phone: this.phoneNumber.replace(/\s/g, ''),
           password: "fakePassword",
           md5_password: md5(this.password).toString(),
         })
@@ -156,7 +156,7 @@ export default {
           return;
         }
         loginWithEmail({
-          email: this.email.replaceAll(" ", ""),
+          email: this.email.replace(/\s/g, ''),
           password: "fakePassword",
           md5_password: md5(this.password).toString(),
         })