diff --git a/mallplusui-web-admin/config/dev.env.js b/mallplusui-web-admin/config/dev.env.js index 1d2045d..ad226ad 100644 --- a/mallplusui-web-admin/config/dev.env.js +++ b/mallplusui-web-admin/config/dev.env.js @@ -5,5 +5,6 @@ const prodEnv = require('./prod.env') module.exports = merge(prodEnv, { NODE_ENV: '"development"', // BASE_API: '"http://mall.yyundong.com/adminapi"', - BASE_API: '"http://127.0.0.1:8085"' + BASE_API: '"http://192.168.3.9:8085"' + // BASE_API: '"http://127.0.0.1:8085"' }) diff --git a/mallplusui-web-admin/src/views/oms/order/index1.vue b/mallplusui-web-admin/src/views/oms/order/index1.vue index 590f3f0..bc3f3f3 100644 --- a/mallplusui-web-admin/src/views/oms/order/index1.vue +++ b/mallplusui-web-admin/src/views/oms/order/index1.vue @@ -637,8 +637,9 @@ }); }, covertOrder(order) { - let address = order.receiverProvince + order.receiverCity + order.receiverRegion + order + let address = order.receiverRegion + order .receiverDetailAddress; + let listItem = { orderId: order.id, orderSn: order.orderSn,