Merge branch 'zjl_export_20180730' into development

app/Http/Controllers/OrderController.php

@@ -193,6 +193,14 @@ function isNewClient($user_id)
     return $count == 1 ? true : false;
     return $count == 1 ? true : false;
 }
 }
 
 
+// 用户来源
+function clientSource($user_id)
+{
+    $user = DB::connection('order')->table('lie_user_main')->where('user_id', $user_id)->select('client_source')->first();
+
+    return $user->client_source;
+}
+
 Class OrderController extends Controller
 Class OrderController extends Controller
 {
 {
     // 首页
     // 首页
@@ -929,14 +937,6 @@ Class OrderController extends Controller
                 return array('errcode'=>Error::E_PARAM, 'errmsg'=>'订单参数有误！');
                 return array('errcode'=>Error::E_PARAM, 'errmsg'=>'订单参数有误！');
             }
             }
 
 
-            // $order_info = DB::connection('order')->table('lie_order')->where('order_id', $order_id)->first();
-
-            // $info = $this->getPageInfo($request);
-
-            // if ($order_info->status == 1 && $order_info->adjust_count <= 2 && !in_array($info['role'], array(1, 2))) {
-            //     return array('errcode'=>-10010,'errmsg'=>'没有权限进行二次调价');
-            // }
-
             if (!$request->input('pay_time_limit')) {
             if (!$request->input('pay_time_limit')) {
                 $payTime      = $request->input('payTime', '');
                 $payTime      = $request->input('payTime', '');
                 $payTimeOther = $request->input('payTimeOther', '');
                 $payTimeOther = $request->input('payTimeOther', '');
@@ -954,6 +954,7 @@ Class OrderController extends Controller
             $client_source = $request->input('client_source') == 1 ? $request->input('input-other-source') : $request->input('client_source');
             $client_source = $request->input('client_source') == 1 ? $request->input('input-other-source') : $request->input('client_source');
 
 
             $resData = [
             $resData = [
+                "user_id"        => $request->input('user_id', ''), 
                 "cancel_reason"  => $request->input('cancel_reason', ''), 
                 "cancel_reason"  => $request->input('cancel_reason', ''), 
                 "sale_id"        => $request->input('sale_id', ''), 
                 "sale_id"        => $request->input('sale_id', ''), 
                 "order_pay_type" => $request->input('order_pay_type', ''),
                 "order_pay_type" => $request->input('order_pay_type', ''),
@@ -972,7 +973,6 @@ Class OrderController extends Controller
                 "pf"             => 1, 
                 "pf"             => 1, 
                 "k1"             => $check['k1'], 
                 "k1"             => $check['k1'], 
                 "k2"             => $check['k2'],
                 "k2"             => $check['k2'],
-                "is_newClient"   => !empty($client_source) ? 1 : 0,
                 "client_source"  => $client_source,
                 "client_source"  => $client_source,
             ];
             ];
 
 

resources/views/detail/changeOrder.blade.php

@@ -4,6 +4,7 @@
         @if ($order_info['status'] == 1)
         @if ($order_info['status'] == 1)
         <form id="checkOrderForm" class="form-horizontal">
         <form id="checkOrderForm" class="form-horizontal">
             <input type="hidden" name="order_sn" value="{{$order_info['order_sn']}}">
             <input type="hidden" name="order_sn" value="{{$order_info['order_sn']}}">
+            <input type="hidden" name="user_id" value="{{$order_info['user_id']}}">
             <input type="hidden" name="order_id" value="{{$order_info['order_id']}}">
             <input type="hidden" name="order_id" value="{{$order_info['order_id']}}">
             <input type="hidden" name="sale_id" value="{{$order_info['sale_id']}}">
             <input type="hidden" name="sale_id" value="{{$order_info['sale_id']}}">
             <input type="hidden" name="goods_amount" value="{{$order_price_info['goods_price']}}">
             <input type="hidden" name="goods_amount" value="{{$order_price_info['goods_price']}}">

resources/views/detail/content.blade.php

@@ -476,13 +476,14 @@
             </div>
             </div>
         </div>
         </div>
         
         
-        @if ((!empty($order_temp_info) && $order_temp_info['status'] == 2 && !empty($order_temp_info['client_source'])) || $order_info['status'] == -1)
+        <?php $client_source = App\Http\Controllers\clientSource($order_info['user_id']); ?>
+        @if (!empty($client_source) || $order_info['status'] == -1)
             <div class="tabs-box">
             <div class="tabs-box">
                 <table  class="table table-bordered table-hover">
                 <table  class="table table-bordered table-hover">
-                    @if (!empty($order_temp_info) && $order_temp_info['status'] == 2 && !empty($order_temp_info['client_source']))
+                    @if (!empty($client_source))
                     <tr>
                     <tr>
                         <td width="10%">用户来源：</td>
                         <td width="10%">用户来源：</td>
-                        <td colspan="3">{{ $order_temp_info['client_source'] }}</td>
+                        <td colspan="3">{{ $client_source }}</td>
                     </tr>
                     </tr>
                     @endif
                     @endif