浏览代码

Merge branch 'deploy_qbyc' of chelingzhu-web/zyyc_channe_html into master

lilei 4 年之前
父节点
当前提交
fe734cf91a
共有 3 个文件被更改,包括 3 次插入8 次删除
  1. 1 1
      src/views/SetmealSales/attrModal.vue
  2. 0 5
      src/views/user/Login.vue
  3. 2 2
      vue.config.js

+ 1 - 1
src/views/SetmealSales/attrModal.vue

@@ -23,7 +23,7 @@
       <a-form-model-item label="套餐名称" class="item-con"><p class="item-main">{{ setmealData.bundle.name || '--' }}</p></a-form-model-item>
       <a-form-model-item label="套餐名称" class="item-con"><p class="item-main">{{ setmealData.bundle.name || '--' }}</p></a-form-model-item>
       <!-- 套餐别名 -->
       <!-- 套餐别名 -->
       <a-form-model-item label="套餐别名" class="item-con">
       <a-form-model-item label="套餐别名" class="item-con">
-        <a-input id="attr-goodsAlias" v-model.trim="form.goodsAlias" :maxLength="30" placeholder="请输入套餐别名" />
+        <a-input id="attr-goodsAlias" v-model.trim="form.goodsAlias" :maxLength="50" placeholder="请输入套餐别名" />
       </a-form-model-item>
       </a-form-model-item>
       <!-- 所属地区 -->
       <!-- 所属地区 -->
       <a-form-model-item label="所属地区" class="item-con" v-if="propertiesConfig.indexOf('BELONG_AREA')!=-1">
       <a-form-model-item label="所属地区" class="item-con" v-if="propertiesConfig.indexOf('BELONG_AREA')!=-1">

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

@@ -165,11 +165,6 @@ export default {
       this.password = rem.password
       this.password = rem.password
       this.rememberMe = rem.rememberMe
       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: {
   methods: {
     ...mapActions(['Login', 'Logout']),
     ...mapActions(['Login', 'Logout']),

+ 2 - 2
vue.config.js

@@ -92,8 +92,8 @@ const vueConfig = {
         modifyVars: {
         modifyVars: {
           // less vars,customize ant design theme
           // 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'
           // 'border-radius-base': '4px'
         },
         },
         // do not remove this line
         // do not remove this line