fix conflict

public/css/detail.css

@@ -152,7 +152,7 @@ li {
     padding: 5px;
     padding: 5px;
     resize: none;
     resize: none;
 }
 }
-.preferential_price{ /* 优惠金额 */
+.preferential_price, .extend_fee { /* 优惠金额、附加费 */
 	display: none;
 	display: none;
 }
 }
 
 

public/js/add_order.js

@@ -669,6 +669,11 @@
                                     $('.preferential_price_val').empty().text(data.preferential_price_format);
                                     $('.preferential_price_val').empty().text(data.preferential_price_format);
                                 }
                                 }
 
 
+                                if (data.extend_fee) {
+                                    $('.extend_fee').show();
+                                    $('.extend_fee_val').empty().text(data.extend_fee_format); // 附加费
+                                }
+
                                 if (goods_type == 2) {
                                 if (goods_type == 2) {
                                     $('.express_fee_val').empty().text(data.finally_shipping_price_format); // 运费
                                     $('.express_fee_val').empty().text(data.finally_shipping_price_format); // 运费
                                 } 
                                 } 

resources/views/addOnline/content.blade.php

@@ -374,6 +374,11 @@
                                     <p class="con-val preferential_price_val">0.00</p>
                                     <p class="con-val preferential_price_val">0.00</p>
                                 </div> 
                                 </div> 
 
 
+                                <div class="row extend_fee">
+                                    <p class="con-title"><span>附加费：</span></p>
+                                    <p class="con-val extend_fee_val">0.00</p>
+                                </div>
+
                                 <div class="row">
                                 <div class="row">
                                     <p class="con-title"><span>运费：</span></p>
                                     <p class="con-title"><span>运费：</span></p>
                                     <p class="con-val express_fee_val">0.00</p>
                                     <p class="con-val express_fee_val">0.00</p>

resources/views/addOrder/content.blade.php

@@ -394,6 +394,11 @@
                                     <p class="con-val preferential_price_val">0.00</p>
                                     <p class="con-val preferential_price_val">0.00</p>
                                 </div> 
                                 </div> 
 
 
+                                <div class="row extend_fee">
+                                    <p class="con-title"><span>附加费：</span></p>
+                                    <p class="con-val extend_fee_val">0.00</p>
+                                </div> 
+
                                 <div class="row">
                                 <div class="row">
                                     <p class="con-title"><span>应付金额：</span></p>
                                     <p class="con-title"><span>应付金额：</span></p>
                                     <p class="con-val text-danger order_amount"></p>
                                     <p class="con-val text-danger order_amount"></p>