diff --git a/application/index/view/default/orderaftersale/index.html b/application/index/view/default/orderaftersale/index.html index c5517134a..5fdfb0995 100644 --- a/application/index/view/default/orderaftersale/index.html +++ b/application/index/view/default/orderaftersale/index.html @@ -95,19 +95,39 @@ - - + + - + {{if !empty($data_list)}} {{foreach $data_list as $v}} - + -
商品信息申请信息商品信息申请信息 凭证 状态 快递信息操作操作
商品信息 +
+ + + +
+ {{$v.order_data.items.title}} + {{if !empty($v.order_data.items.spec)}} +
    + {{foreach $v.order_data.items.spec as $spec}} +
  • {{$spec.type}}:{{$spec.value}}
  • + {{/foreach}} +
+ {{/if}} +
+
+ {{if $v.order_data.items.original_price gt 0}} +

¥{{$v.order_data.items.original_price}}

+ {{/if}} +

¥{{$v.order_data.items.price}} x {{$v.order_data.items.buy_number}}

+
类型:{{$v.type_text}}
原因:{{$v.reason}}
@@ -145,7 +165,7 @@ 时间:{{$v.delivery_time_time}} {{/if}}
+ {{if in_array($v['status'], [0,3])}} {{/if}} diff --git a/application/service/OrderAftersaleService.php b/application/service/OrderAftersaleService.php index b1aadfae3..1656c4d22 100644 --- a/application/service/OrderAftersaleService.php +++ b/application/service/OrderAftersaleService.php @@ -327,6 +327,10 @@ class OrderAftersaleService $common_order_aftersale_refundment_list = lang('common_order_aftersale_refundment_list'); foreach($data as &$v) { + // 订单商品 + $order = self::OrdferGoodsRow($v['order_id'], $v['goods_id'], $v['user_id']); + $v['order_data'] = $order['data']; + // 用户信息 $user = UserService::GetUserViewInfo($v['user_id']); if(isset($params['is_public']) && $params['is_public'] == 0) diff --git a/public/static/index/default/css/orderaftersale.aftersale.css b/public/static/index/default/css/orderaftersale.aftersale.css index adfb20646..1465accfc 100644 --- a/public/static/index/default/css/orderaftersale.aftersale.css +++ b/public/static/index/default/css/orderaftersale.aftersale.css @@ -1,7 +1,6 @@ /** * 商品列表 */ -.order-goods .base { width: 50%; } .goods-detail img { width: 80px; height: 80px; position: absolute; border: 1px solid #eee; } .goods-detail { position: relative; min-height: 80px; } .goods-title { display: block; max-height: 36px; overflow: hidden; text-overflow: ellipsis; } @@ -15,7 +14,6 @@ .am-table { margin-bottom: 10px; } .am-table > tbody > tr > td { border-top: 1px solid #F5F5F5; } .am-table > thead > tr > th { border-bottom: 1px solid #f7f7f7; } - @media only screen and (min-width:640px) { .user-content-body table tr .row-base { width: 60%; } .user-content-body table tr .row-price { width: 40%; } diff --git a/public/static/index/default/css/orderaftersale.index.css b/public/static/index/default/css/orderaftersale.index.css index d217ddd6d..7f1a96530 100644 --- a/public/static/index/default/css/orderaftersale.index.css +++ b/public/static/index/default/css/orderaftersale.index.css @@ -1,8 +1,32 @@ +/** + * 商品列表 + */ +.goods-detail img { width: 80px; height: 80px; position: absolute; border: 1px solid #eee; } +.goods-detail { position: relative; min-height: 80px; } +.goods-title { display: block; max-height: 36px; overflow: hidden; text-overflow: ellipsis; } +.goods-title:hover { text-decoration: underline; } +.goods-base {float: left; top: 0; margin-left: 85px; } +.goods-attr { margin-top: 5px; } +.goods-attr li { color: #888; line-height: 16px; } +.original-price, .line-price { font-family: Verdana,Tahoma,arial; } +.original-price { color: #9c9c9c; text-decoration: line-through; } +.line-price { color: #3c3c3c; font-weight: 700; } + +/** + * 列表 + */ +@media only screen and (min-width:640px) { + .user-content-body table tr .row-goods { width: 25%; } + .user-content-body table tr .row-apply { width: 25%; } + .user-content-body table tr .row-operation { width: 85px; } +} +@media only screen and (max-width:640px) { + .user-content-body table tr .row-apply { width: 50%; } + .user-content-body table tr .row-operation { width: 75px; } +} + .data-list .am-slider { - width: 130px; + width: 100px; max-height: 108px; overflow: hidden; } -.data-list .operation { - width: 100px; -} \ No newline at end of file