NEZ-593 header link 按钮不显示问题修改

2021-04-30 14:40:56 +08:00
parent a48f100d43
commit 918b9b60f1
1 changed files with 0 additions and 6 deletions
--- a/nezha-fronted/src/components/layout/header.vue
+++ b/nezha-fronted/src/components/layout/header.vue
@@ -133,17 +133,11 @@ export default {
      })
    },
    getLinkData () {
-<<<<<<< HEAD
      this.$get('link').then(response => {
        this.$store.commit('setLinkData', response.data.list)
        // this.linkData = response.data.list
        // console.log(this.linkData);
      }) 
-=======
-      this.$get('link').then(response =>{
-        this.$store.commit('setLinkData',response.data.list)
-      })
->>>>>>> 0f37c1d20484cd184721b1c759597e853126b275
    },
    changeLocal (lang) {
      if (lang != localStorage.getItem('nz-language')) {