Merge branch 'zjl_iteration_20191226'

app/Http/Controllers/OrderController.php

@@ -2114,6 +2114,7 @@ Class OrderController extends Controller
         $data['toUser'] = $send_mail_array; // 收件人
         $data['toUser'] = $send_mail_array; // 收件人
         
         
         $cc_send_mail_array = Config('config.cc_email'); // 固定抄送人
         $cc_send_mail_array = Config('config.cc_email'); // 固定抄送人
+        $cc_send_mail_array[] = $request->user->email; // 默认抄送给自己
 
 
         $cc_email_arr = [];
         $cc_email_arr = [];
 
 

resources/views/detail/content.blade.php

@@ -1125,8 +1125,8 @@
             html += '<option value="'+cc_sales[i].userId+'">'+cc_sales[i].name+'</option>';
             html += '<option value="'+cc_sales[i].userId+'">'+cc_sales[i].name+'</option>';
         }
         }
         var content = '<div class="form-group">\
         var content = '<div class="form-group">\
-                            <label class="col-sm-3 control-label">请选择抄送人：</label>\
-                            <div class="col-sm-9">\
+                            <label class="col-sm-4 control-label">请选择额外抄送人：</label>\
+                            <div class="col-sm-8">\
                                 <select id="cc_email" name="cc_email" class="form-control cc_email selectpicker" data-live-search="true" data-size="7" title="全部" multiple>\
                                 <select id="cc_email" name="cc_email" class="form-control cc_email selectpicker" data-live-search="true" data-size="7" title="全部" multiple>\
                                     '+html+'\
                                     '+html+'\
                                 </select>\
                                 </select>\