diff --git a/.env.development b/.env.development index 78450b6..c88d252 100644 --- a/.env.development +++ b/.env.development @@ -3,12 +3,12 @@ ENV = 'development' # http://192.168.1.43:8324/admin # http://mer.crmeb.net/admin # base api -# VUE_APP_BASE_API = 'http://192.168.1.9:8080' -VUE_APP_BASE_API = 'https://api.tropjoin.com/' +VUE_APP_BASE_API = 'http://192.168.1.3:8080' +# VUE_APP_BASE_API = 'https://api.tropjoin.com/' # socket 连接地址 -# VUE_APP_WS_URL = 'ws://http://192.168.1.9:8080' -VUE_APP_WS_URL = 'ws://https://api.tropjoin.com/' +VUE_APP_WS_URL = 'ws://http://192.168.1.3:8080' +# VUE_APP_WS_URL = 'ws://https://api.tropjoin.com/' # vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable, # to control whether the babel-plugin-dynamic-import-node plugin is enabled. diff --git a/src/views/order/list/orderDetails.vue b/src/views/order/list/orderDetails.vue index 0ef2080..7a3dde5 100644 --- a/src/views/order/list/orderDetails.vue +++ b/src/views/order/list/orderDetails.vue @@ -111,7 +111,7 @@
  • 抵扣券抵扣:
    -
    使用了{{ orderDetailList.amount_price }}个积分,抵扣了{{ orderDetailList.amount_price }}元
    +
    使用了{{ orderDetailList.amount_price }}个抵扣券,抵扣了{{ orderDetailList.amount_price }}元
  • 订单总价:
    diff --git a/src/views/promoter/order/index.vue b/src/views/promoter/order/index.vue index 68dc08b..c2f4a14 100644 --- a/src/views/promoter/order/index.vue +++ b/src/views/promoter/order/index.vue @@ -499,7 +499,7 @@ export default { if (lebData.export.length) { data = data.concat(lebData.export) excelData.page++ - } + } } createWorkBook(lebData.header, lebData.title, data, lebData.foot,lebData.filename); return