Преглед изворни кода

Merge branch 'develop_qbyc' of http://git.chelingzhu.com/chelingzhu-web/storeCheck-admin-html into develop_qbyc

lilei пре 4 година
родитељ
комит
6bb2583dd2

+ 1 - 1
src/components/GlobalFooter/GlobalFooter.vue

@@ -16,7 +16,7 @@
     </div> -->
     <div class="copyright">
       Copyright
-      <a-icon type="copyright" /> 2020 <span> {{ company }}</span>
+      <a-icon type="copyright" /> {{new Date().getFullYear()}} <span> {{ company }}</span>
     </div>
   </div>
 </template>

+ 1 - 1
src/layouts/UserLayout.vue

@@ -23,7 +23,7 @@
           <a href="_self">条款</a>
         </div> -->
         <div class="copyright">
-          Copyright &copy; 2020 {{ company }} <a href="http://beian.miit.gov.cn/" target="_blank">{{ icp }}</a>
+          Copyright &copy; {{new Date().getFullYear()}} {{ company }} <a href="http://beian.miit.gov.cn/" target="_blank">{{ icp }}</a>
         </div>
       </div>
     </div>

+ 0 - 5
src/views/user/Login.vue

@@ -165,11 +165,6 @@ export default {
       this.password = rem.password
       this.rememberMe = rem.rememberMe
     }
-    //  设置主题色
-    if (process.env.VUE_APP_THEME_COLOR) {
-      this.$store.dispatch('ToggleColor', process.env.VUE_APP_THEME_COLOR)
-      updateTheme(process.env.VUE_APP_THEME_COLOR)
-    }
   },
   methods: {
     ...mapActions(['Login', 'Logout']),

+ 2 - 2
vue.config.js

@@ -92,8 +92,8 @@ const vueConfig = {
         modifyVars: {
           // less vars,customize ant design theme
 
-          // 'primary-color': '#F5222D',
-          // 'link-color': '#F5222D',
+          'primary-color': process.env.VUE_APP_THEME_COLOR,
+          'link-color': process.env.VUE_APP_THEME_COLOR
           // 'border-radius-base': '4px'
         },
         // do not remove this line