diff --git a/template/admin/src/pages/order/orderList/handle/orderDetails.vue b/template/admin/src/pages/order/orderList/handle/orderDetails.vue index 597336acd..e74eff00e 100644 --- a/template/admin/src/pages/order/orderList/handle/orderDetails.vue +++ b/template/admin/src/pages/order/orderList/handle/orderDetails.vue @@ -57,7 +57,7 @@ 退回积分:{{ parseFloat(orderDatalist.orderInfo.back_integral) }} - 赠送积分:{{ parseFloat(orderDatalist.orderInfo.gain_integral) }} 创建时间:{{ orderDatalist.orderInfo._add_time }} diff --git a/template/admin/vue.config.js b/template/admin/vue.config.js index 14dc7ac7f..87b7397cb 100644 --- a/template/admin/vue.config.js +++ b/template/admin/vue.config.js @@ -18,7 +18,7 @@ const resolve = (dir) => { // 例如:https://www.foobar.com/my-app/ // 需要将它改为'/my-app/' // iview-admin线上演示打包路径: https://file.iviewui.com/admin-dist/ -const BASE_URL = process.env.NODE_ENV === 'production' ? '/' : '/'; +// const BASE_URL = process.env.NODE_ENV === 'production' ? '/' : '/'; const env = process.env.NODE_ENV; module.exports = { // Project deployment base @@ -31,7 +31,7 @@ module.exports = { outputDir: Setting.outputDir, runtimeCompiler: true, productionSourceMap: false, //关闭生产环境下的SourceMap映射文件 - baseUrl: BASE_URL, + baseUrl: '/', // tweak internal webpack configuration. // see https://github.com/vuejs/vue-cli/blob/dev/docs/webpack.md // 如果你不需要使用eslint,把lintOnSave设为false即可 diff --git a/template/uni-app/pages/points_mall/integral_order_details.vue b/template/uni-app/pages/points_mall/integral_order_details.vue index a91b7b9a7..63584e2a5 100644 --- a/template/uni-app/pages/points_mall/integral_order_details.vue +++ b/template/uni-app/pages/points_mall/integral_order_details.vue @@ -22,7 +22,7 @@ {{cartInfo.store_name}} x {{cartInfo.total_num}} - {{cartInfo.attrInfo.suk}} + {{cartInfo.suk}} {{cartInfo.price}}{{$t(`积分`)}} diff --git a/template/uni-app/pages/points_mall/integral_order_status.vue b/template/uni-app/pages/points_mall/integral_order_status.vue index 946f7abab..900289ebe 100644 --- a/template/uni-app/pages/points_mall/integral_order_status.vue +++ b/template/uni-app/pages/points_mall/integral_order_status.vue @@ -21,7 +21,7 @@ {{$t(`积分兑换`)}} - {{$t(`兑换积分`)}} + {{$t(`支付积分`)}} {{order_pay_info.total_price}}