Merge remote-tracking branch 'origin/master'

app/Http/Controllers/Admin/OrderController.php

                         $props_name = $goods_sku_info->propsName;
                         $is_weigh = $goods_sku_info->is_weigh;
                         $weigh_note = $is_weigh==1 ? '重量(斤)':'数量';
-                        if(!$item->is_gift) $v['pre_cost'] += $goods_sku_info->referenceCost * $item->num;
+                        if(!$item->gift_id) $v['pre_cost'] += $goods_sku_info->referenceCost * $item->num;
                     }else{
                         $props_name = '';
                         $weigh_note = '数量';