优化

app/Http/Controllers/OrderController.php

@@ -518,7 +518,6 @@ Class OrderController extends Controller
             array('company_name',   '供应商'),
             array('sale_name',       $sale_name),
             array('adtags',         'adtags来源'),
-            array('is_new_client',  '是否为新用户'),
             array('client_source',  '新用户来源'),
             array('cancel_reason',  '取消原因'),
         );
@@ -772,7 +771,6 @@ Class OrderController extends Controller
                 $tmp[$i]['company_name'] = '';
                 $tmp[$i]['sale_name'] = '';  // 推送业务员
                 $tmp[$i]['adtags'] = '';
-                $tmp[$i]['is_new_client'] = '';
                 $tmp[$i]['client_source'] = '';
                 $tmp[$i]['cancel_reason'] = '';
             } else {
@@ -795,7 +793,6 @@ Class OrderController extends Controller
                 $tmp[$i]['company_name'] = $order[$i]->supplier_name;
                 $tmp[$i]['sale_name'] = isset($sales) ? $sales->name : '';  // 推送业务员
                 $tmp[$i]['adtags'] = $order[$i]->order_source;
-                $tmp[$i]['is_new_client'] = $order[$i]->is_newclient == 1 ? '是' : '否';
                 $tmp[$i]['client_source'] = $order[$i]->client_source;
                 $tmp[$i]['cancel_reason'] = $order[$i]->cancel_reason;
             }
@@ -954,6 +951,8 @@ Class OrderController extends Controller
             $check['k1']  = time();
             $check['k2']  = md5(md5($check['k1']).'fh6y5t4rr351d2c3bryi');
 
+            $client_source = $request->input('client_source') == 1 ? $request->input('input-other-source') : $request->input('client_source');
+
             $resData = [
                 "cancel_reason"  => $request->input('cancel_reason', ''), 
                 "sale_id"        => $request->input('sale_id', ''), 
@@ -973,8 +972,8 @@ Class OrderController extends Controller
                 "pf"             => 1, 
                 "k1"             => $check['k1'], 
                 "k2"             => $check['k2'],
-                "is_newClient"   => $request->input('is_newClient', ''),
-                "client_source"   => $request->input('client_source') == 1 ? $request->input('input-other-source') : $request->input('client_source'),
+                "is_newClient"   => !empty($client_source) ? 1 : 0,
+                "client_source"  => $client_source,
             ];
 
             $temp = json_decode(curlApi($url, $resData, "POST"), true);

public/js/order.js

@@ -1057,15 +1057,6 @@
                 //     // }
                 // })
 
-                // 用户来源
-                $('input[name="is_newClient"]').parent().on('click', function(){
-                    if($(this).find('input').val() == 1){
-                        $('.client_source_row').show();
-                    } else {
-                        $('.client_source_row').hide();
-                    }
-                });
-
                 // 用户来源 -- 其他
                 $('input[name="client_source"]').on('click', function(){
                     if($(this).val() == 1){
@@ -1161,13 +1152,6 @@
                     }
 
                     if (isNewClient) { 
-                        // 用户来源
-                        if (is_newClient == null) {
-                            layer.msg('请选择用户来源！');
-                            return false;
-                        }
-
-                        if (is_newClient == 1) {
                        if (client_source == null) {
                             layer.msg('请选择用户来源渠道！');
                             return false;
@@ -1178,7 +1162,6 @@
                             }
                         }                        
                     }   
-                    }   
                     
                     // 审核不通过
                     if (order_status == -1) {

resources/views/detail/changeOrder.blade.php

@@ -19,15 +19,8 @@
             <!-- 用户来源 -->
             <p>用户来源</p>
             <table class="table table-bordered table-hover check-table">
-                <tr>
-                    <td class="check-table-title" width="20%">是否为新用户：</td>
-                    <td class="check-select">
-                        <label><input class="is_newClient" type="radio" name="is_newClient" value="1">是</label>
-                        <label><input class="is_newClient" type="radio" name="is_newClient" value="0">否</label>
-                    </td>
-                </tr>
-                <tr class="client_source_row" style="display: none;">
-                    <td class="check-table-title">用户来源：</td>
+                <tr class="client_source_row">
+                    <td class="check-table-title" width="20%">用户来源：</td>
                     <td>  
                         <div class="multi-reason">
                             <label><input type="radio" name="client_source" value="QQ群">QQ群</label>

resources/views/detail/content.blade.php

@@ -476,17 +476,13 @@
             </div>
         </div>
         
-        @if ((!empty($order_temp_info) && $order_temp_info['status'] == 2) || $order_info['status'] == -1)
+        @if ((!empty($order_temp_info) && $order_temp_info['status'] == 2 && !empty($order_temp_info['client_source'])) || $order_info['status'] == -1)
             <div class="tabs-box">
                 <table  class="table table-bordered table-hover">
-                    @if (!empty($order_temp_info) && $order_temp_info['status'] == 2)
+                    @if (!empty($order_temp_info) && $order_temp_info['status'] == 2 && !empty($order_temp_info['client_source']))
                     <tr>
-                        <td width="10%">是否为新用户：</td>
-                        <td width="40%">{{ $order_temp_info['is_newclient'] == 1 ? '是' : '否' }}</td>
-                        @if ($order_temp_info['is_newclient'] == 1)
                         <td width="10%">用户来源：</td>
-                        <td>{{ $order_temp_info['client_source'] }}</td>
-                        @endif
+                        <td colspan="3">{{ $order_temp_info['client_source'] }}</td>
                     </tr>
                     @endif