Merge branch 'zjl_self_service_20210420' into development

app/Model/OrderServiceModel.php

@@ -179,7 +179,7 @@ class OrderServiceModel extends Model
 			$post['operator_id'] = $request->user->userId;
 
             $url = Config('website.api_domain').'refund/apply';
-
+// dd(curlApi($url, $post, 'POST'));
             $res = json_decode(curlApi($url, $post, 'POST'), true);
 
             if (!$res) return [-2, '审核通过失败，原因：接口错误']; 

resources/views/detail/order_service.blade.php

@@ -136,7 +136,7 @@
                     <!-- 目前仅支持联营商品退款 -->
                     <?php $goods_count = 0; ?>
                     @foreach ($order_items_info as $k => $v)
-                        @if ($v['order_goods_type'] == 1 && $v['status'] == 1)
+                        @if ($v['status'] == 1)
                         <?php $goods_count++; ?>
                         <tr>
                             <input type="hidden" name="service_item[{{ $v['rec_id'] }}][rec_id]" value="{{ $v['rec_id'] }}">
@@ -153,6 +153,7 @@
                             <input type="hidden" name="service_item[{{ $v['rec_id'] }}][single_pre_price]" value="{{ $v['single_pre_price'] }}">
                             <input type="hidden" name="service_item[{{ $v['rec_id'] }}][goods_number]" value="{{ $v['goods_number'] }}">
                             <input type="hidden" name="service_item[{{ $v['rec_id'] }}][removal_number]" value="{{ $v['fqty'] }}">
+                            <input type="hidden" name="service_item[{{ $v['rec_id'] }}][order_goods_type]" value="{{ $v['order_goods_type'] }}">
                             <td>{{ $goods_count }}</td>
                             <td>{{ $v['goods_name'] }}</td>
                             <td>{{ $v['brand_name'] }}</td>