Merge branch 'zjl_order_perm_20181024' into development

public/css/detail.css

@@ -155,6 +155,9 @@ li {
 .preferential_price, .extend_fee { /* 优惠金额、附加费 */
 .preferential_price, .extend_fee { /* 优惠金额、附加费 */
 	display: none;
 	display: none;
 }
 }
+.price-line {
+	text-decoration: line-through;
+}
 
 
 /*提交订单成功页面*/
 /*提交订单成功页面*/
 .section-1, .section-3{
 .section-1, .section-3{

public/js/add_order.js

@@ -275,7 +275,7 @@
 
 
                                         if (i == 0) {
                                         if (i == 0) {
                                             if (data.ac_type) {
                                             if (data.ac_type) {
-                                                html += '<td><span class="goods-min-num">'+price_arr[i]['purchases']+'</span></td><td>￥<span class="goods-min-price">'+price_arr[i]['price_cn']+'</span><td>￥<span>'+price_arr[i]['price_ac']+'</span></td>';
+                                                html += '<td><span class="goods-min-num">'+price_arr[i]['purchases']+'</span></td><td>￥<span class="goods-min-price price-line">'+price_arr[i]['price_cn']+'</span><td>￥<span>'+price_arr[i]['price_ac']+'</span></td>';
                                             } else {
                                             } else {
                                                 html += '<td><span class="goods-min-num">'+price_arr[i]['purchases']+'</span></td><td>￥<span class="goods-min-price">'+price_arr[i]['price_cn']+'</span></td>';
                                                 html += '<td><span class="goods-min-num">'+price_arr[i]['purchases']+'</span></td><td>￥<span class="goods-min-price">'+price_arr[i]['price_cn']+'</span></td>';
                                             }
                                             }
@@ -285,7 +285,7 @@
                                             }
                                             }
                                         } else {
                                         } else {
                                             if (data.ac_type) {
                                             if (data.ac_type) {
-                                                html += '<td><span>'+price_arr[i]['purchases']+'</span></td><td>￥<span>'+price_arr[i]['price_cn']+'</span></td><td>￥<span>'+price_arr[i]['price_ac']+'</span></td>';
+                                                html += '<td><span>'+price_arr[i]['purchases']+'</span></td><td>￥<span class="price-line">'+price_arr[i]['price_cn']+'</span></td><td>￥<span>'+price_arr[i]['price_ac']+'</span></td>';
                                             } else {
                                             } else {
                                                 html += '<td><span>'+price_arr[i]['purchases']+'</span></td><td>￥<span>'+price_arr[i]['price_cn']+'</span></td>';
                                                 html += '<td><span>'+price_arr[i]['purchases']+'</span></td><td>￥<span>'+price_arr[i]['price_cn']+'</span></td>';
                                             }
                                             }
@@ -541,7 +541,7 @@
                                     return false;
                                     return false;
                                 }   
                                 }   
 
 
-                                layer.msg(resp.errmsg); 
+                                layer.alert(resp.errmsg); 
                             },
                             },
                         })
                         })
                     } else {
                     } else {