Merge remote-tracking branch 'origin/dev' into dev

疯狂的狮子li

2021-08-18 e3d90b820d79958d4d7190d5e222d8fc7f5afc43

 ruoyi-ui/src/App.vue

@@ -1,11 +1,19 @@
<template>

  <div id="app">

    <router-view />

  </div>

</template>



<script>

export default  {

  name:  'App'

}

</script>

<template>
  <div id="app">
    <router-view />
  </div>
</template>

<script>
export default  {
  name:  'App',
    metaInfo() {
        return {
            title: this.$store.state.settings.dynamicTitle && this.$store.state.settings.title,
            titleTemplate: title => {
                return title ? `${title} - ${process.env.VUE_APP_TITLE}` : process.env.VUE_APP_TITLE
            }
        }
    }
}
</script>