merge
This commit is contained in:
parent
a6f4b81587
commit
dc13c05d22
@ -196,12 +196,7 @@ export default {
|
||||
};
|
||||
},
|
||||
created() {
|
||||
<<<<<<< HEAD
|
||||
this.loadLocalData();
|
||||
if (!this.account) {
|
||||
=======
|
||||
if (!this.$store.state.account) {
|
||||
>>>>>>> 143601a9eaaf179ba4addf3ef9f3f4ab6b329dab
|
||||
return;
|
||||
}
|
||||
this.$axios
|
||||
@ -238,7 +233,6 @@ export default {
|
||||
}, 500);
|
||||
},
|
||||
methods: {
|
||||
<<<<<<< HEAD
|
||||
loadLocalData() {
|
||||
let userInfo = localStorage.getItem("userinfo");
|
||||
if (userInfo) {
|
||||
@ -248,8 +242,6 @@ export default {
|
||||
} catch (err) {}
|
||||
}
|
||||
},
|
||||
=======
|
||||
>>>>>>> 143601a9eaaf179ba4addf3ef9f3f4ab6b329dab
|
||||
navigator() {
|
||||
this.$router.push("listdetails");
|
||||
},
|
||||
|
Loading…
x
Reference in New Issue
Block a user