Commit 64ff8254 by 朱继来

Merge branch 'zjl_order_source_20180904' into development

parents edf36381 4d0e4693
Showing with 4 additions and 4 deletions
...@@ -109,7 +109,9 @@ ...@@ -109,7 +109,9 @@
</tbody> </tbody>
</table> </table>
@if ($order_temp_info['extend_fee_items']) <?php $extend_fee_items = json_decode($order_temp_info['extend_fee_items'], true); ?>
@if ($extend_fee_items)
<hr/> <hr/>
<p>附加费设置</p> <p>附加费设置</p>
<table class="table table-bordered table-hover extend-fee-table"> <table class="table table-bordered table-hover extend-fee-table">
...@@ -120,8 +122,6 @@ ...@@ -120,8 +122,6 @@
</thead> </thead>
<tbody> <tbody>
<?php $extend_fee_items = json_decode($order_temp_info['extend_fee_items'], true); ?>
@foreach ($extend_fee_items as $k => $v) @foreach ($extend_fee_items as $k => $v)
<tr data-sup="{{$k}}"> <tr data-sup="{{$k}}">
<td> <td>
...@@ -167,7 +167,7 @@ ...@@ -167,7 +167,7 @@
<th width="20%">附加费金额</th> <th width="20%">附加费金额</th>
<td> <td>
<p class="text-danger">{{$currency}}<span class="extra_fee">{{$order_price_info['ext_price'] ? $order_price_info['ext_price'] : 0}}</span></p> <p class="text-danger">{{$currency}}<span class="extra_fee">{{$order_price_info['ext_price'] ? $order_price_info['ext_price'] : 0}}</span></p>
<input type="hidden" name="extra_fee" autocomplete="off" value="{{$order_price_info['ext_price']}}"> <input type="hidden" name="extra_fee" autocomplete="off" value="{{$order_price_info['ext_price'] ? $order_price_info['ext_price'] : 0}}">
</td> </td>
<!-- <td><input type="text" name="extra_fee" autocomplete="off" value="{{$order_price_info['ext_price']}}" class="only_number"></td> --> <!-- <td><input type="text" name="extra_fee" autocomplete="off" value="{{$order_price_info['ext_price']}}" class="only_number"></td> -->
</tr> </tr>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment