diff --git a/.env.development b/.env.development index f6fd8e6..7676df2 100644 --- a/.env.development +++ b/.env.development @@ -3,3 +3,4 @@ ENV = 'development' VUE_APP_BASE_API = '/prod-api' VUE_APP_ADDRESS1 = 'http://t-app.beida777.com/#/' +VUE_APP_SYSTEM_TYPE = 'KG' diff --git a/.env.production b/.env.production index 2938eda..4bdf988 100644 --- a/.env.production +++ b/.env.production @@ -4,3 +4,4 @@ ENV = 'production' # base api VUE_APP_BASE_API = '/prod-api' VUE_APP_ADDRESS1 = 'http://t-app.beida777.com/#/' +VUE_APP_SYSTEM_TYPE = 'KG' diff --git a/src/main.js b/src/main.js index fb22034..b05292b 100644 --- a/src/main.js +++ b/src/main.js @@ -26,21 +26,20 @@ import App from './App' import store from './store' import router from './router' import './utils/rem' -import Pagination from "@/components/Pagination"; +import Pagination from '@/components/Pagination' import '@/icons' // icon import '@/permission' // permission control -//国际化 +// 国际化 // import i18n from './i18n/index' import i18n from '@/assets/i18n/index' import permission from './directive/permission' -import * as echarts from 'echarts'; +import * as echarts from 'echarts' -import moment from "moment" -Vue.prototype.$moment = moment; +import moment from 'moment' +Vue.prototype.$moment = moment import noImgEditor from '@/components/noImgEditor' - // 下载 // import { download } from "@/utils/ruoyi"; /** @@ -59,7 +58,7 @@ if (process.env.NODE_ENV === 'production') { Vue.component('Pagination', Pagination) Vue.component('noImgEditor', noImgEditor) -import { download } from '@/utils/request'; +import { download } from '@/utils/request' Vue.prototype.download = download // set ElementUI lang to EN @@ -67,19 +66,19 @@ Vue.use(ElementUI, { locale }) // 如果想要中文版 element-ui,按如下方式声明 // Vue.use(ElementUI) -import { numberToCurrencyNo, isDollar, isLocal,stateFormat,isLocalSymbol } from '@/utils/numberToCurrency' +import { numberToCurrencyNo, isDollar, isLocal, stateFormat, isLocalSymbol } from '@/utils/numberToCurrency' Vue.prototype.stateFormat = stateFormat Vue.prototype.isLocalSymbol = isLocalSymbol -Vue.prototype.systemTypes = [{value:2, label:'新零售'}] +Vue.prototype.systemTypes = [{ value: 2, label: '新零售' }] // 配置全局过滤器,实现数字千分位格式 Vue.filter('numberToCurrency', numberToCurrencyNo) -//海外pv添加美元 +// 海外pv添加美元 Vue.filter('isDollar', isDollar) // 海外添加当地币 Vue.filter('isLocal', isLocal) Vue.use(permission) -Vue.prototype.$echarts = echarts; +Vue.prototype.$echarts = echarts Vue.config.productionTip = false diff --git a/src/router/index.js b/src/router/index.js index 6e1bd93..cb55b1d 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1549,7 +1549,7 @@ export const constantRoutes = [ }, { path: 'retailLevel', name: 'RetailLevel', - meta: { title: i18n.t('新零售级别配置') }, + meta: { title: i18n.t('级别配置') }, component: ParentView, redirect: 'retailLevel/index', children: [ @@ -1557,7 +1557,7 @@ export const constantRoutes = [ path: 'retailLevel', name: 'RetailLevelPage', component: () => import('@/views/configManage/retailLevel/index'), - meta: { title: i18n.t('新零售级别配置') } + meta: { title: i18n.t('级别配置') } }, { path: 'retailJxpz', @@ -1683,12 +1683,12 @@ export const constantRoutes = [ component: () => import('@/views/configManage/systemconfiguration/index'), meta: { title: '体系配置' } }, - { - path: 'groupConfiguration', - name: 'GroupConfigurationList', - component: () => import('@/views/configManage/systemconfiguration/groupConfiguration'), - meta: { title: '区域体系分组' } - }, + // { + // path: 'groupConfiguration', + // name: 'GroupConfigurationList', + // component: () => import('@/views/configManage/systemconfiguration/groupConfiguration'), + // meta: { title: '区域体系分组' } + // }, { path: 'vertexAwardConfiguration', name: 'VertexAwardConfiguration', @@ -2112,37 +2112,37 @@ export const constantRoutes = [ ] }, - { - path: 'memberRetailRegion', - name: 'memberRetailRegion', - meta: { title: i18n.t('收益区域配置') }, - component: ParentView, - redirect: 'memberRetailRegion/index', - children: [ - { - path: 'memberRetailRegion', - name: 'memberRetailRegion', - component: () => import('@/views/configManage/memberRetailRegion/index'), - meta: { title: i18n.t('收益区域配置') } - } + // { + // path: 'memberRetailRegion', + // name: 'memberRetailRegion', + // meta: { title: i18n.t('收益区域配置') }, + // component: ParentView, + // redirect: 'memberRetailRegion/index', + // children: [ + // { + // path: 'memberRetailRegion', + // name: 'memberRetailRegion', + // component: () => import('@/views/configManage/memberRetailRegion/index'), + // meta: { title: i18n.t('收益区域配置') } + // } - ] - }, { - path: 'cuMemberRetailRegion', - name: 'cuMemberRetailRegion', - meta: { title: i18n.t('未配置区域') }, - component: ParentView, - redirect: 'cuMemberRetailRegion/index', - children: [ - { - path: 'cuMemberRetailRegion', - name: 'cuMemberRetailRegion', - component: () => import('@/views/configManage/cuMemberRetailRegion/index'), - meta: { title: i18n.t('未配置区域') } - } + // ] + // }, { + // path: 'cuMemberRetailRegion', + // name: 'cuMemberRetailRegion', + // meta: { title: i18n.t('未配置区域') }, + // component: ParentView, + // redirect: 'cuMemberRetailRegion/index', + // children: [ + // { + // path: 'cuMemberRetailRegion', + // name: 'cuMemberRetailRegion', + // component: () => import('@/views/configManage/cuMemberRetailRegion/index'), + // meta: { title: i18n.t('未配置区域') } + // } - ] - }, + // ] + // }, { path: 'freePostageAreas', name: 'FreePostageAreas', diff --git a/src/views/configManage/systemconfiguration/index.vue b/src/views/configManage/systemconfiguration/index.vue index d5db85d..2d1cac2 100644 --- a/src/views/configManage/systemconfiguration/index.vue +++ b/src/views/configManage/systemconfiguration/index.vue @@ -13,13 +13,13 @@ - + - + diff --git a/src/views/information/specialBusiness/waterInjection/index.vue b/src/views/information/specialBusiness/waterInjection/index.vue index 373165e..741f7c8 100644 --- a/src/views/information/specialBusiness/waterInjection/index.vue +++ b/src/views/information/specialBusiness/waterInjection/index.vue @@ -392,7 +392,7 @@ export default { this.download( '/bonus/manage/special/download', {}, - `${this.$t('新零售注水业绩')}${new Date().getTime()}.xlsx` + `${this.$t('注水业绩')}${new Date().getTime()}.xlsx` ) }, addRules() { diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 8e94439..8545397 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -1,7 +1,7 @@