Browse Source

Merge branch 'develop_qbyc' of chelingzhu-web/storeCheck-admin-html into master

李磊 4 years ago
parent
commit
35cda5e921
3 changed files with 3 additions and 8 deletions
  1. 1 1
      src/main.js
  2. 0 5
      src/views/user/Login.vue
  3. 2 2
      vue.config.js

+ 1 - 1
src/main.js

@@ -44,7 +44,7 @@ Vue.prototype.$hasPermissions = function (value) {
 }
 // 禁止输入框输入空格,换行符,<,>
 Vue.prototype.$filterEmpty = function (e) {
-  return e.target.value.replace(/\s|\r\n|\n|<|>/g, '')
+  return e.target.value.replace(/\s|\r\n|\n|<|>|"/g, '')
 }
 new Vue({
   router,

+ 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