Merge remote-tracking branch 'origin/master'

master
e 3 years ago
commit 3537333baa
  1. 16
      src/App.vue
  2. 0
      src/util/local.js
  3. 20
      src/utils/http.js
  4. 2
      src/views/Transaction.vue

@ -8,7 +8,21 @@
</div>
</template>
<style>
<script>
export default {
created () {
//localStorage
localStorage.getItem("userMsg") && this.$store.replaceState(Object.assign(this.$store.state,JSON.parse(localStorage.getItem("userMsg"))));
//vuexlocalStorage
window.addEventListener("beforeunload",()=>{
localStorage.setItem("userMsg",JSON.stringify(this.$store.state))
})
}
}
</script>
<style lang='scss'>
#app {
font-family: Avenir, Helvetica, Arial, sans-serif;
-webkit-font-smoothing: antialiased;

@ -170,11 +170,11 @@ export function get(url, params){
})
.catch(err => {
reject(err.data)
// this.$message({
// showClose: true,
// message: '请求失败,请刷新页面重新进行请求',
// type: 'error'
// });
this.$message({
showClose: true,
message: '请求失败,请刷新页面重新进行请求',
type: 'error'
});
})
});
}
@ -229,11 +229,11 @@ export function post(url, params) {
})
.catch(err => {
reject(err.data)
// this.$message({
// showClose: true,
// message: '请求失败,请刷新页面重新进行请求',
// type: 'error'
// });
this.$message({
showClose: true,
message: '请求失败,请刷新页面重新进行请求',
type: 'error'
});
})
});
}

@ -393,7 +393,7 @@ export default {
token: atob(decodeURI(this.$route.query.token))
});
this.checkChange.push(false)
console.log('remounted')
this.getTreeData();
console.log(this.treeData)
if (this.$route.query.systemId) {

Loading…
Cancel
Save