yujialong 4 months ago
parent 3ecdb1d325
commit e1c1cddf9c
  1. 7
      src/layouts/navbar/index.vue
  2. 2
      src/pages/column/index.vue
  3. 4
      src/setting.js

@ -13,7 +13,6 @@
<menuTree :menuList="otherMenus" /> <menuTree :menuList="otherMenus" />
</el-submenu> </el-submenu>
</el-menu> </el-menu>
</div> </div>
</template> </template>
@ -150,8 +149,10 @@ export default {
}, },
// //
jump (id) { jump (id) {
this.getPath(this.otherMenus, id || this.otherMenus[0].id) id = id || this.otherMenus[0].id
this.getPath(this.menus, id || this.menus[0].id) this.active = id
this.getPath(this.otherMenus, id)
this.getPath(this.menus, id)
this.columnTo(this.toItem) this.columnTo(this.toItem)
this.$parent.showSearch = false this.$parent.showSearch = false
} }

@ -679,7 +679,7 @@ export default {
} }
} else if (typeId === 3) { } else if (typeId === 3) {
// path // path
this.$router.push(`/${to.path}?id=${to.id}&siteId=${this.site}`).catch((err) => { }); this.$router.replace(`/${to.path}?id=${to.id}&siteId=${this.site}`).catch((err) => { });
} else if (left && (typeId === 1 || (typeId === 4 && !to.children.length))) { } else if (left && (typeId === 1 || (typeId === 4 && !to.children.length))) {
// column // column
this.$router.push(`/column?id=${to.id + (to.level !== 1 || !this.sameStyle ? '&column=1' : '')}&siteId=${this.site}`).catch((err) => { }); this.$router.push(`/column?id=${to.id + (to.level !== 1 || !this.sameStyle ? '&column=1' : '')}&siteId=${this.site}`).catch((err) => { });

@ -3,9 +3,7 @@
* */ * */
const isDev = process.env.NODE_ENV === 'development' // 开发环境 const isDev = process.env.NODE_ENV === 'development' // 开发环境
let host = `${location.origin}/` let host = `${location.origin}/`
if (isDev) {
host = 'http://192.168.31.51:10000/'
}
const Setting = { const Setting = {
/** /**
* 基础配置 * 基础配置

Loading…
Cancel
Save