Merge branch 'zjl_iteration_20191028'

resources/views/detail/content.blade.php

@@ -503,16 +503,16 @@
                             <td>{{$v['brand_name']}}</td>
                             <td id="goods_number_{{$v['rec_id']}}">{{$v['goods_number']}}</td>
                             <td>
-                                <span id="{{$v['rec_id']}}">{{$v['goods_price_format']}}</span>
+                                <span id="{{$v['rec_id']}}">{{$v['goods_price']}}</span>
                             </td>
                             
                             @if (in_array($order_info['order_type'], [2, 3]))
-                                <td>{{ $currency . number_format($v['goods_price'] * $v['goods_number'], 4, '.', '') }}</td>
+                                <td>{{ $currency . number_format($v['goods_price'] * $v['goods_number'], 2, '.', '') }}</td>
                             @elseif ($username != 'vpadmin@ichunt.com')
                                 <td>{{$v['single_pre_price_format']}}</td>
                                 <td>{{$v['single_pre_price_amount']}}</td>
                             @else
-                                <td>{{ $currency . number_format($v['goods_price'] * $v['goods_number'], 4, '.', '') }}</td>
+                                <td>{{ $currency . number_format($v['goods_price'] * $v['goods_number'], 2, '.', '') }}</td>
                             @endif
 
                             <td>{{$v['delivery_time']}}</td>