Merge branch 'master' into deploy

# Conflicts:
#	src/settings.js

src/layout/components/AppMain.vue

@@ -8,7 +8,7 @@
     <el-backtop :bottom="50" :right="40"><i class="el-icon-caret-top" /></el-backtop>
     <div v-if="$store.state.settings.showFooter" id="el-main-footer">
       <span v-html="$store.state.settings.footerTxt" />
-      <span> ⋅ </span>
+      <span v-if="$store.state.settings.caseNumber"> ⋅ </span>
       <a href="https://beian.miit.gov.cn/#/Integrated/index" target="_blank">{{ $store.state.settings.caseNumber }}</a>
     </div>
   </section>

src/settings.js

@@ -2,7 +2,6 @@ module.exports = {
   /**
    * @description 网站标题
    */
-  // title: '个人软件测试',
   title: 'EL-ADMIN',
   /**
    * @description 是否显示 tagsView
@@ -39,9 +38,9 @@ module.exports = {
   /**
    * 底部文字，支持html语法
    */
-  footerTxt: '© 2019 Zheng Jie <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License 2.0</a>',
+  footerTxt: '© 2018-2022 Zheng Jie <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License 2.0</a>',
   /**
    * 备案号
    */
-  caseNumber: '浙ICP备18005431号-6'
+  caseNumber: ''
 }

src/views/login.vue

@@ -35,7 +35,7 @@
     <!--  底部  -->
     <div v-if="$store.state.settings.showFooter" id="el-login-footer">
       <span v-html="$store.state.settings.footerTxt" />
-      <span> ⋅ </span>
+      <span v-if="$store.state.settings.caseNumber"> ⋅ </span>
       <a href="https://beian.miit.gov.cn/#/Integrated/index" target="_blank">{{ $store.state.settings.caseNumber }}</a>
     </div>
   </div>