Merge branch 'zjl_new_client_20200423'

public/js/order.js

@@ -1673,20 +1673,10 @@
             changeOrder: function(){
                 $('.deletegoods').click(function(){
                     var thisobj=$(this);
-                    var new_client_price = $('#new_client_price').val();
                     var order_type_extend = $('#order_type_extend').val();
                     var content = '';
                     var msg_text = '';
 
-                    if (new_client_price) {
-                        switch (order_type_extend) {
-                            case '1': msg_text = '团购'; break;
-                            case '2': msg_text = '秒杀'; break;
-                            default: msg_text = '新客价'; break;
-                        }
-                        content = '<i class="error">* 该单为'+msg_text+'订单，如修改涉及订单金额部分，则删除整笔订单的优惠，确认改单吗</i>';
-                    }
-
                     content += '<div><textarea type="text" class="reason" style="width:300px;height: 100px"></textarea></div><span class="error">请填写删除商品原因，100字以内</span>';
 
                     layer.open({
@@ -2223,28 +2213,13 @@
                     var freight_fee       = $('input[name=freight_fee]').val() ? $('input[name=freight_fee]').val() : 0;
                     var last_paid         = parseFloat(order_amount + parseFloat(pay_preferential)).toFixed(2); // 实际支付金额
                     var order_type_extend = $('#order_type_extend').val();
-                    var msg_text          = '';
-
-                    switch (order_type_extend) {
-                        case '1': msg_text = '团购'; break;
-                        case '2': msg_text = '秒杀'; break;
-                        default: msg_text = '新客价'; break;
-                    }
 
                     var content = '<div class="submit-check">';
 
-                    if (new_client_price) {
-                        content += '<p class="error">该单为'+msg_text+'订单，如修改涉及订单金额部分，则删除整笔订单的优惠，确认改单吗</p>';
-                    } else {
-                        content += '<p class="error">请核对订单金额，谨慎操作！</p>';
-                    }
+                    content += '<p class="error">请核对订单金额，谨慎操作！</p>';
                     
                     content += '<p><label>商品总金额：</label>'+currencySign + goods_amount+'</p>';
 
-                    if (new_client_price) {
-                        content += '<p><label>'+msg_text+'金额：</label>'+new_client_price+'</p>';
-                    }
-
                     content += '<p><label>优惠金额：</label>'+discount_amount+'</p>'+
                                 '<p><label>附加费金额：</label>'+extra_fee+'</p>'+
                                 '<p><label>运费金额：</label>'+freight_fee+'</p>'+