david 2 роки тому
батько
коміт
f7869c54aa
5 змінених файлів з 7 додано та 4 видалено
  1. 2 2
      .env.development
  2. 2 1
      src/components/FilterUser.vue
  3. 1 0
      src/lang/en.js
  4. 1 0
      src/lang/zh.js
  5. 1 1
      vue.config.js

+ 2 - 2
.env.development

@@ -2,11 +2,11 @@
 ENV='development'
 
 # api请求地址
-VUE_APP_BASE_API='http://172.17.45.3:9970'
+VUE_APP_BASE_API='http://172.25.123.82:9970'
 # 文件下载地址
 VUE_APP_BASE_DO_API='http://local.ng.backend.api.com'
 # CDN文件地址
-VUE_APP_CDN_API='http://172.17.45.3:9970'
+VUE_APP_CDN_API='http://172.25.123.82:9970'
 # 页面地址
 VUE_APP_BASE_WEBSITE='http://local.ng.backend.ele.com'
 # 会员端地址

+ 2 - 1
src/components/FilterUser.vue

@@ -54,7 +54,7 @@
         <el-select
           v-model="filterValue"
           class="filter-item"
-          :placeholder="`请选择${allFilterTypes[filterType].name}`"
+          :placeholder="`${pleaseSelect}${allFilterTypes[filterType].name}`"
         >
           <el-option
             v-for="(item,key) in allFilterTypes[filterType].selectData"
@@ -274,6 +274,7 @@ export default {
       },
       allFilterTypes: this.filterTypes,
       filterType: '',
+      pleaseSelect:this.$t('filter.pleaseSelectNotice'),
       filterSymbol: '',
       // filterSymbols: {
       //   '=': this.$t('filter.eq'),

+ 1 - 0
src/lang/en.js

@@ -398,6 +398,7 @@ export default {
     addAt: 'Join time',
     pleaseSelectDecLevel: 'Please select order level',
     pleaseSelectEmpLevel: 'Please select level',
+    pleaseSelectNotice:'Please select ',
     eq: 'Equal',
     like: 'Include',
     noeq: 'Not equal to',

+ 1 - 0
src/lang/zh.js

@@ -400,6 +400,7 @@ export default {
     addAt: '加入时间',
     pleaseSelectDecLevel: '请选择报单级别',
     pleaseSelectEmpLevel: '请选择级别',
+    pleaseSelectNotice:'请选择 ',
     eq: '等于',
     like: '包含',
     noeq: '不等于',

+ 1 - 1
vue.config.js

@@ -39,7 +39,7 @@ module.exports = {
     },
     proxy: {
       [process.env.VUE_APP_BASE_API]:{
-        target:"http://172.17.45.3:9970",
+        target:"http://172.25.123.82:9970",
         changeOrigin:true,
         pathRewrite:{
           ["^" + process.env.VUE_APP_BASE_API] : ""