diff --git a/src/components/order_list/mall/mall.vue b/src/components/order_list/mall/mall.vue index 1b126b5..783bd75 100644 --- a/src/components/order_list/mall/mall.vue +++ b/src/components/order_list/mall/mall.vue @@ -87,7 +87,6 @@ export default { width: 152upx; height: 152upx; border-radius: 10upx; - background-color: skyblue; } .ri-view{ diff --git a/src/subpackage/order/js/api.js b/src/subpackage/order/js/api.js index b6e128e..696b42c 100644 --- a/src/subpackage/order/js/api.js +++ b/src/subpackage/order/js/api.js @@ -20,6 +20,7 @@ export const ORDER_API = { erpshList:`${ORIGIN}/stadium/erpsh/newList`, // 商城订单管理-统一的仓库列表 shop2OrderLogistics:`${ORIGIN}/admin/shop2/orderLogistics`, // 商城订单管理 - 发货_ logisticsCompanyLs:`${ORIGIN}/shop2/logisticsCompany/List`, // 商城订单管理 - 快递公司列表 + orderGoodsRefund:`${ORIGIN}/admin/shop2/orderGoodsRefund`, // 商城-商品退款_copy } diff --git a/src/subpackage/order/pages/mall/check_logistic/check_logistic.vue b/src/subpackage/order/pages/mall/check_logistic/check_logistic.vue index 33dc2bf..51806b9 100644 --- a/src/subpackage/order/pages/mall/check_logistic/check_logistic.vue +++ b/src/subpackage/order/pages/mall/check_logistic/check_logistic.vue @@ -1,24 +1,64 @@ diff --git a/src/subpackage/order/pages/mall/detail/detail.vue b/src/subpackage/order/pages/mall/detail/detail.vue index 0111c8f..b3d420a 100644 --- a/src/subpackage/order/pages/mall/detail/detail.vue +++ b/src/subpackage/order/pages/mall/detail/detail.vue @@ -2,12 +2,12 @@ {{ orderInfo.status_text || '-' }} - + - 快递:顺丰速递 SF1090317923085 - 复制 + 快递:{{ logisticsInfo.logistics_info.logistics_name || '-' }} {{ logisticsInfo.logistics_info.logistics_no || '-' }} + 复制 - + @@ -19,7 +19,6 @@ 取货码:{{ orderInfo.product_order_self_pickup_info.gcode || '-' }} 取货时间: {{ orderInfo.product_order_self_pickup_info.gtime || '-' }} - 商品信息 @@ -41,7 +40,8 @@ 实付:¥{{ e.product_price_pay || 0 }} - 已退款 + + @@ -80,9 +80,9 @@ - 查看退款 - 主动退款 - 发货 + + 主动退款 + 发货 @@ -91,6 +91,7 @@ @@ -71,7 +178,6 @@ export default { vertical-align: middle; width: 30upx; height: 30upx; - background-color: skyblue; } } .rgi-list{ @@ -83,7 +189,6 @@ export default { width: 152upx; height: 152upx; border-radius: 10upx; - background-color: skyblue; } >view{ diff --git a/src/subpackage/order/pages/mall/send_out/send_out.vue b/src/subpackage/order/pages/mall/send_out/send_out.vue index 4c50b07..e1b3c4c 100644 --- a/src/subpackage/order/pages/mall/send_out/send_out.vue +++ b/src/subpackage/order/pages/mall/send_out/send_out.vue @@ -25,105 +25,108 @@ - - 无已发货 + + 无待发货 - - - *请选择商品发货 - - 全选 - - + + + + *请选择商品发货 + + 全选 + + + - - - - - - - - - {{ e.product_name || '-' }} - - - {{ k + ';' }} - + + + + + + + + {{ e.product_name || '-' }} + + + {{ k + ';' }} + + - - - *发货仓库 - - - - - - - 商品如果不在同一仓库,请分开发货 - - - - 发货物流 - - * 发货方式 - - - - 快递 + + *发货仓库 + + + + - - - 无需快递 - - + + 商品如果不在同一仓库,请分开发货 - + + + 发货物流 - * 物流公司 - - + * 发货方式 + + + + 快递 + + + + 无需快递 + + + + + + * 物流公司 + + + + + + + + + + + * 物流单号 + - - + - + - - - * 物流单号 + + + + + * 备注 - + - - - - - * 备注 - - - - - - - - 确认发货 - + + 确认发货 + + + - + 无已发货 @@ -720,7 +723,6 @@ export default { margin: 0 auto 68upx; width: 260upx; height: 260upx; - background-color: skyblue; } >view{ line-height: 44upx; diff --git a/src/subpackage/order/pages/order_manage/order_manage.vue b/src/subpackage/order/pages/order_manage/order_manage.vue index e303e77..d7f178b 100644 --- a/src/subpackage/order/pages/order_manage/order_manage.vue +++ b/src/subpackage/order/pages/order_manage/order_manage.vue @@ -38,7 +38,7 @@ export default { util.routeTo(getTabRoutePath() + `?order_type=${ele.orderType}`,'nT'); }, isFinish(key){ - let _endKeyArr = [ 1, 2, 3, 4, 5, 7, 9, 10, 14, 16, 15, 13, 6, 8 ]; + let _endKeyArr = [ 1, 2, 3, 4, 5, 7, 9, 10, 14, 16, 15, 13, 6, 8, 11 ]; return _endKeyArr.includes(key); } } diff --git a/src/subpackage/order/static/images/package_icon.png b/src/subpackage/order/static/images/package_icon.png new file mode 100644 index 0000000..a93fe58 Binary files /dev/null and b/src/subpackage/order/static/images/package_icon.png differ