Merge branch 'zjl_xinkejia_20200313'

public/js/order.js

@@ -1547,9 +1547,25 @@
             changeOrder: function(){
             changeOrder: function(){
                 $('.deletegoods').click(function(){
                 $('.deletegoods').click(function(){
                     var thisobj=$(this);
                     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({
                     layer.open({
                         title: '删除商品'
                         title: '删除商品'
-                        ,content: '<div><textarea type="text" class="reason" style="width:300px;height: 100px"></textarea></div><span class="error">请填写删除商品原因，100字以内</span>'
+                        ,content: content
                         ,btn:['确定', '取消']
                         ,btn:['确定', '取消']
                         ,yes: function(index, layero){
                         ,yes: function(index, layero){
                             if(!$('.reason').val()){
                             if(!$('.reason').val()){
@@ -2066,20 +2082,33 @@
                         }
                         }
                     }
                     }
 
 
-                    var currencySign = currency == 1 ? '￥' : '$';
-                    var goods_amount = parseFloat($('.goods_total').text());
-                    var order_amount = parseFloat($('.total').text());
+                    var currencySign      = currency == 1 ? '￥' : '$';
+                    var goods_amount      = parseFloat($('.goods_total').text());
+                    var order_amount      = parseFloat($('.total').text());
+                    var extra_fee         = $('input[name=extra_fee]').val() ? $('input[name=extra_fee]').val() : 0;
+                    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          = '';
 
 
-                    var extra_fee   = $('input[name=extra_fee]').val() ? $('input[name=extra_fee]').val() : 0;
-                    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); // 实际支付金额
+                    switch (order_type_extend) {
+                        case '1': msg_text = '团购'; break;
+                        case '2': msg_text = '秒杀'; break;
+                        default: msg_text = '新客价'; break;
+                    }
+
+                    var content = '<div class="submit-check">';
 
 
-                    var content = '<div class="submit-check">'+
-                                        '<p class="error">请核对订单金额，谨慎操作！</p>'+
-                                        '<p><label>商品总金额：</label>'+currencySign + goods_amount+'</p>';
+                    if (new_client_price) {
+                        content += '<p class="error">该单为'+msg_text+'订单，如修改涉及订单金额部分，则删除整笔订单的优惠，确认改单吗</p>';
+                    } else {
+                        content += '<p class="error">请核对订单金额，谨慎操作！</p>';
+                    }
+                    
+                    content += '<p><label>商品总金额：</label>'+currencySign + goods_amount+'</p>';
 
 
                     if (new_client_price) {
                     if (new_client_price) {
-                        content += '<p><label>新客价金额：</label>'+new_client_price+'</p>';
+                        content += '<p><label>'+msg_text+'金额：</label>'+new_client_price+'</p>';
                     }
                     }
 
 
                     content += '<p><label>优惠金额：</label>'+discount_amount+'</p>'+
                     content += '<p><label>优惠金额：</label>'+discount_amount+'</p>'+

resources/views/detail/content.blade.php

@@ -22,6 +22,8 @@
         <input type="hidden" class="action_type" value="{{$action_name}}">
         <input type="hidden" class="action_type" value="{{$action_name}}">
         <input type="hidden" id="order_id" name="order_id" value="{{$order_info['order_id']}}">
         <input type="hidden" id="order_id" name="order_id" value="{{$order_info['order_id']}}">
         <input type="hidden" id="user_id" name="user_id" value="{{$order_info['user_id']}}">
         <input type="hidden" id="user_id" name="user_id" value="{{$order_info['user_id']}}">
+        <input type="hidden" id="new_client_price" name="new_client_price" value="{{$order_price_info['new_client_price']}}">
+        <input type="hidden" id="order_type_extend" name="order_type_extend" value="{{$order_info['order_type_extend']}}">
 
 
         <div class="tabs-box table-responsive">
         <div class="tabs-box table-responsive">
             <table class="table table-bordered order-express">
             <table class="table table-bordered order-express">