diff --git a/src/main.js b/src/main.js index 20b576e..3b06015 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:0, label:'会员系统'},{value:1, label:'海圣优选'}] +Vue.prototype.systemTypes = [] // 配置全局过滤器,实现数字千分位格式 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/views/goodsManage/goodsList/index.vue b/src/views/goodsManage/goodsList/index.vue index e4dbc00..438c4eb 100644 --- a/src/views/goodsManage/goodsList/index.vue +++ b/src/views/goodsManage/goodsList/index.vue @@ -35,18 +35,6 @@ /> - - - - - - - @@ -502,21 +490,7 @@ prop="actualSales" :label="'实际销量'" /> - - - +