样式优化

public/base/js/plugins/datapicker/bootstrap-datepicker.js

@@ -1396,9 +1396,9 @@
 		daysOfWeekDisabled: [],
 		endDate: Infinity,
 		forceParse: true,
-		format: 'mm/dd/yyyy',
+		format: 'yyyy年mm月dd日',
 		keyboardNavigation: true,
-		language: 'en',
+		language: 'zh',
 		minViewMode: 0,
 		multidate: false,
 		multidateSeparator: ',',
@@ -1425,7 +1425,16 @@
 			monthsShort: ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"],
 			today: "Today",
 			clear: "Clear"
-		}
+		},
+        "zh":{
+            days: ["星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六", "星期日"],
+            daysShort: ["周日", "周一", "周二", "周三", "周四", "周五", "周六", "周日"],
+            daysMin: ["日", "一", "二", "三", "四", "五", "六", "日"],
+            months: ["一月份", "二月份", "三月份", "四月份", "五月份", "六月份", "七月份", "八月份", "九月份", "十月份", "十一月份", "十二月份"],
+            monthsShort: ["一月", "二月", "三月", "四月", "五月", "六月", "七月", "八月", "九月", "十月", "十一月", "十二月"],
+            today: "今天",
+            clear: "清空"
+        }
 	};
 
 	var DPGlobal = {

resources/views/admin/base/role/index.blade.php

@@ -21,11 +21,11 @@
                                             <input type="text" class="form-control" value="{{Request::get('keyword')}}"
                                                    placeholder="请输入关键词"
                                                    name="keyword">
+
                                             <span class="input-group-append">
-                                                <button type="submit" class="btn btn-primary"
-                                                        style="height: 100%">搜索</button>
-                                            </span>
+                                                <button type="button" class="btn btn-primary">搜索</button> </span>
                                         </div>
+
                                     </form>
                                 </div>
 

resources/views/admin/call/records/index.blade.php

@@ -17,7 +17,7 @@
                         @if(role('Call/Records/addCallList'))
                             <div class="col-sm-8 pull-right">
                                 <span class="btn btn-primary pull-right fa fa-phone" data-toggle="modal"
-                                      data-target="#myModal2" style="display: none">添加到电话列表</span>
+                                      data-target="#myModal2" style="display: none">添加到待导列表</span>
                             </div>
                         @endif
                         {{--@if(role('Call/Records/create'))--}}
@@ -82,8 +82,8 @@
                                            placeholder="请输入电话号码或标签"
                                            name="phone">
                                     <span class="input-group-append">
-                                                <span class="btn btn-sm btn-default"
-                                                      style="height: 100%" onclick="filter_records()">搜索</span>
+                                                <button class="btn btn-sm btn-default"
+                                                      onclick="filter_records()">搜索</button>
                                             </span>
                                 </div>
                             </div>
@@ -129,8 +129,6 @@
             <div class="modal-dialog">
                 <div class="modal-content animated flipInY">
                     <div class="modal-header">
-                        <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">×</span><span
-                                    class="sr-only">Close</span></button>
                         <h4 class="modal-title">选择拨打的IP</h4></div>
                     <small class="font-bold">
                         <div class="modal-body">

resources/views/admin/company/collection/index.blade.php

@@ -122,9 +122,10 @@
                                                value="{{Request::get('companyName')}}"
                                                placeholder="请输入企业名称"
                                                name="companyName">
+
                                         <span class="input-group-append">
-                                                <span class="btn btn-sm btn-default"
-                                                      style="height: 100%" onclick="filter_company()">搜索</span>
+                                                <button class="btn btn-sm btn-default"
+                                                       onclick="filter_company()">搜索</button>
                                             </span>
                                     </div>
                                 </th>

resources/views/admin/company/info/data.blade.php

@@ -1,10 +1,10 @@
 <div class="row" style=" padding: 10px 0;margin: 10px;font-size: 16px">
-    <div class="col-sm-4 pull-left">
+    <div class="col-md-3 col-sm-6 pull-left">
         共找到<span style="color: red">{{ $list->total() }}</span>个结果
     </div>
 
 
-    <div class="col-sm-7 pull-right">
+    <div class="col-md-7 col-sm-10 pull-right">
         @if(role('Company/Info/import'))
             <form class="form-horizontal" role="form" method="post"
                   enctype="multipart/form-data"
@@ -21,7 +21,7 @@
 
     </div>
 
-    <div class="col-sm-1 pull-right">
+    <div class="col-md-2 col-sm-2 pull-right">
         @if(role('Company/Collection/create'))
             <span class="btn btn-sm btn-warning pull-right" onclick="save_collection()">保存为我的公海</span>
         @endif

resources/views/admin/company/info/index.blade.php

@@ -39,7 +39,7 @@
 
         }
         .bootstrap-tagsinput{
-            width: 90%;
+            width: 80%;
         }
     </style>
 @endsection
@@ -58,7 +58,7 @@
                 </div>
                 <div class="ibox-content">
 
-                    <div class="col-xl-7 col-lg-10" id="filter_table">
+                    <div class="col-xl-9 col-lg-10" id="filter_table">
                         <form method="GET" action="" accept-charset="UTF-8" id="filter_company">
                             {{ csrf_field() }}
                             <div class="row" style="margin-bottom: 20px">
@@ -135,7 +135,7 @@
 
                     </div>
 
-                    <div id="company-list" class="col-xl-7 col-lg-10" style="margin: auto">
+                    <div id="company-list" class="col-xl-9 col-lg-10" style="margin: auto">
                         @include('admin.company.info.data')
                     </div>
 

resources/views/admin/company/info/search.blade.php

@@ -15,8 +15,8 @@
 
         .ibox-content > div {
             margin: auto;
-            margin-top: 120px;
-            padding: 50px;
+            margin-top: 80px;
+            padding: 30px;
             background-color: #ffffff
         }
 

resources/views/admin/company/info/view.blade.php

@@ -81,8 +81,15 @@
 
         .ibox-content .panel-body {
             background-color: #ffffff;
-            height: 100%;
-            overflow-y: auto;
+        }
+
+        .contacts-count {
+            background-color: #ccc;
+            border-radius: 40%;
+            display: inline-block;
+            padding: 2px 5px;
+            font-size: 12px;
+            color: #fff
         }
     </style>
 @endsection
@@ -105,14 +112,14 @@
                     <div class="col-md-12">
 
                         <div class="row">
-                            <div class="col-xl-10 col-lg-9 col-md-8">
+                            <div class="col-lg-9 col-md-8">
                                 <div class="panel-body">
                                     <div class="row" style="margin-bottom: 10px">
-                                        <div class="col-xl-1 col-lg-2 col-md-3">
+                                        <div class="col-lg-2 col-md-3">
                                             <img src="/base/img/companyAvatar.82b6c75.png" alt="">
                                         </div>
 
-                                        <div class="col-xl-11 col-lg-10 col-md-9">
+                                        <div class="col-lg-10 col-md-9">
                                             <div class="row">
                                                 <div class="col-md-6">
                                                     <h3 style="font-weight: 700">{{ $data->companyName }}</h3>
@@ -120,7 +127,7 @@
 
                                                 @if(!$data->isThread())
                                                     <div class="col-md-6">
-                                                        <h3 class="pull-right" style="color: coral">请选择联系方式，添加为我的线索</h3>
+                                                        <h3 class="pull-right" style="color: coral;font-size: 14px">请选择联系方式，添加为我的线索</h3>
                                                     </div>
                                                 @endif
                                             </div>
@@ -329,7 +336,10 @@
                                                     {{-- 企业年报 --}}
                                                     <div id="tab-3" class="tab-pane">
                                                         <div class="panel-body">
-                                                            <strong>企业年报</strong>
+                                                            <h3>企业年报</h3>
+                                                            <p style="text-align: center;color: #ccc;font-weight: 500;">
+                                                                暂无相关内容
+                                                            </p>
                                                         </div>
                                                     </div>
 
@@ -337,14 +347,20 @@
                                                     {{-- 知识产权 --}}
                                                     <div id="tab-4" class="tab-pane">
                                                         <div class="panel-body">
-                                                            <strong>知识产权</strong>
+                                                            <h3>知识产权</h3>
+                                                            <p style="text-align: center;color: #ccc;font-weight: 500;">
+                                                                暂无相关内容
+                                                            </p>
                                                         </div>
                                                     </div>
 
                                                     {{-- 招聘信息 --}}
                                                     <div id="tab-5" class="tab-pane">
                                                         <div class="panel-body">
-                                                            <strong>招聘信息</strong>
+                                                            <h3>招聘信息</h3>
+                                                            <p style="text-align: center;color: #ccc;font-weight: 500;">
+                                                                暂无相关内容
+                                                            </p>
                                                         </div>
                                                     </div>
                                                 </div>
@@ -357,20 +373,20 @@
                                 </div>
                             </div>
 
-                            <div class="col-xl-2 col-lg-3 col-md-4">
-                                <div class="panel-body">
-                                    <h3>联系方式：</h3>
+                            <div class="col-lg-3 col-md-4">
+                                <div class="panel-body" style="overflow-y: auto">
+                                    <h3>联系方式 <span class="contacts-count">{{ count($contacts) }}</span></h3>
 
-                                    <div class="col-md-11 col-sm-12" style="padding-right: 0;">
+                                    <div class="col-sm-12" style="padding: 0;">
                                         <ul class="sortable-list connectList agile-list ui-sortable"
                                             style="height: 780px">
                                             @if(count($contacts))
                                                 @foreach($contacts as $item)
                                                     <li class="success-element">
                                                         <div class="agile-detail">
-                                                            <div><label><i class="fa fa-phone"
-                                                                           style="font-size: 20px;margin-right: 50px"></i></label>
-                                                                <span> {{ $item->phone }}</span>
+                                                            <div>
+                                                                <label><i class="fa fa-phone" style="font-size: 20px;margin-right: 20px;vertical-align: middle"></i></label>
+                                                                <span style="color: #0e9aef"> {{ $item->phone }}</span>
 
                                                             </div>
 
@@ -382,8 +398,14 @@
                                                             <div><label>电子邮箱：</label><span>{{ $item->email }}</span>
                                                             </div>
 
+                                                            <div><label>来源：</label><span>{{ $item->viaLink }}</span>
+                                                            </div>
+
+                                                            <div><label>联系地址：</label><span>{{ $item->address }}</span>
+                                                            </div>
+
                                                             {{--<label>备注：</label><input type="text" style="width: 70%" name="remark" value="{{ $item->remark }}">--}}
-                                                            <div class="row">
+                                                            <div class="row" style="margin-bottom: .5rem">
                                                                 <label class="col-sm-3"
                                                                        style="padding-right: 0">备注：</label>
                                                                 <div class="col-sm-6" style="padding-left: 0">
@@ -458,7 +480,8 @@
                     {"word": "空号"},
                     {"word": "关机"},
                     {"word": "无人接听"},
-                    {"word": "已接通"}
+                    {"word": "已接通"},
+                    {"word": "接通并挂断"}
                 ], "defaults": "已接通"
             }
         });

resources/views/admin/layouts/app.blade.php

@@ -73,7 +73,6 @@
 
 <!-- DatePicker -->
 <script src="/base/js/plugins/datapicker/bootstrap-datepicker.js"></script>
-
 <script src="/base/js/jquery.tablesort.js"></script>
 
 <script>

resources/views/admin/user/threads/index.blade.php

@@ -20,7 +20,7 @@
                             <div class="col-sm-8 pull-right">
                                     <span class="btn btn-primary pull-right fa fa-phone"
                                           data-toggle="modal"
-                                          data-target="#myModal2" style="display: none">添加到电话列表</span>
+                                          data-target="#myModal2" style="display: none">添加到待导列表</span>
 
                                 <span class="btn btn-success pull-right fa fa-table"
                                       style="display: none" data-toggle="modal"
@@ -45,13 +45,14 @@
 
                             <th>
 
+
                                 <div class="input-group">
                                     <input type="text" class="form-control" value="{{Request::get('keyword')}}"
                                            placeholder="请输入企业名称或电话"
                                            name="keyword">
                                     <span class="input-group-append">
-                                                <span class="btn btn-sm btn-default"
-                                                      style="height: 100%" onclick="filter_threads()">搜索</span>
+                                                <button class="btn btn-sm btn-default"
+                                                       onclick="filter_threads()">搜索</button>
                                             </span>
                                 </div>
 
@@ -71,8 +72,6 @@
             <div class="modal-dialog">
                 <div class="modal-content animated flipInY">
                     <div class="modal-header">
-                        <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">×</span><span
-                                    class="sr-only">Close</span></button>
                         <h4 class="modal-title">选择拨打的IP</h4></div>
                     <small class="font-bold">
                         <div class="modal-body">
@@ -115,8 +114,6 @@
             <div class="modal-dialog">
                 <div class="modal-content animated flipInY">
                     <div class="modal-header">
-                        <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">×</span><span
-                                    class="sr-only">Close</span></button>
                         <h4 class="modal-title">选择要导出的字段</h4></div>
                     <small class="font-bold">
                         <div class="modal-body">