diff --git a/common/models/CaiwuT.php b/common/models/CaiwuT.php
index 18837f1..b3c93fd 100644
--- a/common/models/CaiwuT.php
+++ b/common/models/CaiwuT.php
@@ -120,4 +120,9 @@ class CaiwuT extends \common\models\Base
     {
         return $this->hasOne(OrderT::className(),['id'=>'order_id']);
     }
+
+    public function getOrderCaiwu()
+    {
+        return $this->hasOne(OrderCaiwuT::className(),['order_id'=>'order_id']);
+    }
 }
diff --git a/common/models/OrderCaiwuT.php b/common/models/OrderCaiwuT.php
index 8052ded..209962d 100644
--- a/common/models/OrderCaiwuT.php
+++ b/common/models/OrderCaiwuT.php
@@ -155,4 +155,13 @@ class OrderCaiwuT extends \common\models\Base
         }
         return $pay_money;
     }
+    //非车险的钱计算
+    public function getNonPay($rate) {
+        $pay_money = 0;
+        $order_info = $this->order;
+        if($rate > 0) {
+            $pay_money = round($order_info->non_baofei * $rate/100,2);
+        }
+        return $pay_money;
+    }
 }
diff --git a/common/models/OrderT.php b/common/models/OrderT.php
index 57a2554..df1a216 100644
--- a/common/models/OrderT.php
+++ b/common/models/OrderT.php
@@ -139,7 +139,6 @@ class OrderT extends \common\models\Base
             'id_man' => 'Id Man',
             'id_number' => 'Id Number',
             'link_man' => 'Link Man',
-            'link_phone' => 'Link Phone',
             'insurer1_begin_date' => 'Insurer1 Begin Date',
             'insurer1_end_date' => 'Insurer1 End Date',
             'insurer2_begin_date' => 'Insurer2 Begin Date',
diff --git a/frontend/controllers/CarController.php b/frontend/controllers/CarController.php
index 2551a9e..1ea872b 100644
--- a/frontend/controllers/CarController.php
+++ b/frontend/controllers/CarController.php
@@ -1107,8 +1107,6 @@ class CarController extends BaseController
         //获取业务分组
         $business_group = BusinessGroupT::find()->all();
 
-        $business_group_id = $this->my->business_group_id;
-
         return $this->render('info-track',[
             'type' => $type,
             'car_info' => $car_info,
@@ -2397,7 +2395,7 @@ class CarController extends BaseController
                 $order_info->insurer1_end_date = $insurer1_end_date;
                 $order_info->insurer2_begin_date = $insurer2_begin_date;
                 $insurer2_end_date = '';
-                if ($insurer2_end_date != '')
+                if ($insurer2_begin_date != '')
                     $insurer2_end_date = date('Y-m-d', strtotime(date('Y-m-d', strtotime($insurer2_begin_date . "+1 year")) . '-1 day'));
                 $order_info->insurer2_end_date = $insurer2_end_date;
                 $order_info->send_date = $send_date;
diff --git a/frontend/controllers/InsurerController.php b/frontend/controllers/InsurerController.php
index d037f45..ba94602 100644
--- a/frontend/controllers/InsurerController.php
+++ b/frontend/controllers/InsurerController.php
@@ -329,7 +329,7 @@ class InsurerController extends BaseController
                 $row->car_frame_no = $car_frame_no;
                 $row->car_man = $car_man;
                 $row->id_man = $id_man;
-                $row->id_number = $id_number;
+//                $row->id_number = $id_number;
                 $row->link_man = $link_man;
                 $row->link_phone = $link_phone;
                 $row->send_date = $send_date;
diff --git a/frontend/views/car/info.php b/frontend/views/car/info.php
index 8f5f957..e44cfc8 100644
--- a/frontend/views/car/info.php
+++ b/frontend/views/car/info.php
@@ -205,7 +205,7 @@ use \common\libs\MyLib;
         var o = {};
         function insurerDlg() {
             title = '投保';
-            layer_show_full(title, '/car/order-add?car_id=<?=$car_info->id?>');
+            layer_show(title, '/car/order-add?car_id=<?=$car_info->id?>');
         }
         function appointmentDlg() {
             title = '添加预约';
diff --git a/frontend/views/car/order-add.php b/frontend/views/car/order-add.php
index 150a132..47605bf 100644
--- a/frontend/views/car/order-add.php
+++ b/frontend/views/car/order-add.php
@@ -197,17 +197,11 @@ use common\models\PriceT;
                     <tr>
                         <th class="bg-warning" nowrap>商业起保日期</th>
                         <td>
-                            <div class="input-group date">
-                                <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-                                <input type="text" name="insurer1_begin_date" class="form-control" value="<?=$order_info->insurer1_begin_date?>">
-                            </div>
+                            <input type="text" id="insurer1_begin_date" name="insurer1_begin_date" class="form-control" value="<?=$order_info->insurer1_begin_date?>" autocomplete="off">
                         </td>
                         <th class="bg-warning" nowrap>交强起保日期</th>
                         <td>
-                            <div class="input-group date">
-                                <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-                                <input type="text" name="insurer2_begin_date" class="form-control" value="<?=$order_info->insurer2_begin_date?>">
-                            </div>
+                            <input type="text" id="insurer2_begin_date" name="insurer2_begin_date" class="form-control" value="<?=$order_info->insurer2_begin_date?>" autocomplete="off">
                         </td>
                         <th class="bg-warning">保险公司</th>
                         <td>
@@ -269,10 +263,7 @@ use common\models\PriceT;
                     <tr>
                         <th class="bg-warning" nowrap>送单日期</th>
                         <td>
-                            <div class="input-group date">
-                                <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-                                <input type="text" name="send_date" class="form-control" value="<?=$order_info->send_date?>">
-                            </div>
+                            <input type="text" id="send_date" name="send_date" class="form-control" value="<?=$order_info->send_date?>" autocomplete="off">
                         </td>
                         <th class="bg-warning">送单地址</th>
                         <td colspan="5" class="form-inline">
@@ -325,6 +316,7 @@ use common\models\PriceT;
 
 
 <?php $this->beginBlock('footer_js'); ?>
+    <script src="/assets/js/plugins/layer/laydate/laydate.js"></script>
     <script>
         var o = {};
         //判断是否填写了选项
@@ -390,13 +382,19 @@ use common\models\PriceT;
             $('#total1_real').blur(function(){
                 calc();
             });
-            $('.date').datepicker({
-                todayBtn: "linked",
-                keyboardNavigation: false,
-                forceParse: false,
-                calendarWeeks: true,
-                autoclose: true
+            laydate({
+                elem:'#send_date',
+                format: 'YYYY-MM-DD'
             });
+            laydate({
+                elem:'#insurer1_begin_date',
+                format: 'YYYY-MM-DD'
+            });
+            laydate({
+                elem:'#insurer2_begin_date',
+                format: 'YYYY-MM-DD'
+            });
+
             //生成短信内容
             $('.sms-make-btn').click(function(){
                 var params = $('#orderFrm').serialize();
diff --git a/frontend/views/insurer/info.php b/frontend/views/insurer/info.php
index 88899b2..28dc74a 100644
--- a/frontend/views/insurer/info.php
+++ b/frontend/views/insurer/info.php
@@ -70,11 +70,11 @@ use \common\models\PriceT;
                                                 <td class="bg_tr">被保险人</td>
                                                 <td class="td_bg"><?=$order_info->id_man?></td>
                                                 <td class="bg_tr">证件号码</td>
-                                                <td class="td_bg"><?=$order_info->id_number?></td>
+                                                <td class="td_bg"><?=$order_info->id_man_number?></td>
                                                 <td width="60" class="bg_tr">联系人</td>
                                                 <td class="td_bg"><?=$order_info->link_man?></td>
                                                 <td width="60" class="bg_tr">联系电话</td>
-                                                <td class="td_bg"><?=$order_info->link_phone?></td>
+                                                <td class="td_bg"><?=$order_info->link_man_phone?></td>
                                             </tr>
                                             <tr>
                                                 <td class="bg_tr">送单日期</td>
@@ -117,11 +117,6 @@ use \common\models\PriceT;
                                             <tr>
                                                 <td class="bg_tr">送单地址</td>
                                                 <td colspan="3" class="td_bg">
-                                                    <?=$order_info->direction1?$order_info->direction1->name:''?>
-                                                    <?=$order_info->range1?$order_info->range1->name:''?>
-                                                    <?=$order_info->city1?$order_info->city1->name:''?>
-                                                    <?=$order_info->district1?$order_info->district1->name:''?>
-                                                    <?=$order_info->send_address1?>
                                                 </td>
                                                 <td rowspan="2" class="bg_tr" valign="center">备注</td>
                                                 <td colspan="3" rowspan="3" valign="top" class="td_bg"><?=$order_info->remark?></td>