diff --git a/admin/controllers/receiver/Customer.php b/admin/controllers/receiver/Customer.php index 29788832..14836cdf 100644 --- a/admin/controllers/receiver/Customer.php +++ b/admin/controllers/receiver/Customer.php @@ -56,6 +56,7 @@ class Customer extends HD_Controller } if (false == strpos($_SERVER['HTTP_HOST'], 'dev')) {//dev时不限制 $where['biz_id<>'] = 1; + $where['brand_id<>'] = 3; } if ($params['title']) { $where["{$params['search_tp']} like '%{$params['title']}%'"] = null; diff --git a/api/controllers/wxapp/liche/Contract.php b/api/controllers/wxapp/liche/Contract.php index 3e916b37..989bff4a 100644 --- a/api/controllers/wxapp/liche/Contract.php +++ b/api/controllers/wxapp/liche/Contract.php @@ -200,7 +200,7 @@ class Contract extends Wxapp{ break; case 2: //确认信息 $sign_img = array_pop($imgs); - $height = $order['ifentrust'] ? 670 : 480; + $height = $order['ifentrust'] ? 680 : 490; $jsondata['c_cardid'] && $height += 30; $res = $sign_entity->merge($sign_img,$img,1050,$height,300); if(!$res){ diff --git a/api/controllers/wxapp/licheb/Customers.php b/api/controllers/wxapp/licheb/Customers.php index 8f7517a2..e562e4b5 100644 --- a/api/controllers/wxapp/licheb/Customers.php +++ b/api/controllers/wxapp/licheb/Customers.php @@ -385,7 +385,7 @@ class Customers extends Wxapp $mobile = $this->input_param('mobile'); $cf_clues = $this->input_param('cf_clues');//线索来源 $admin_id = $this->input_param('admin_id'); - $id = $this->input_param('id'); + $id = $this->input_param('cus_id'); !$page && $page = 1; !$size && $size = 10; diff --git a/api/controllers/wxapp/licheb/Protocol.php b/api/controllers/wxapp/licheb/Protocol.php index 696397fe..de9f7d5c 100644 --- a/api/controllers/wxapp/licheb/Protocol.php +++ b/api/controllers/wxapp/licheb/Protocol.php @@ -147,7 +147,9 @@ class Protocol extends CI_Controller{ $brand = $this->auto_brand_model->get(['id'=>$row['brand_id']],'name'); $series = $this->auto_series_model->get(['id'=>$row['s_id']],'name'); $version = $this->auto_attr_model->get(['id'=>$row['v_id']],'title'); - $row['brand_name'] = $brand['name'].$series['name'].' '.$version['title']; + $color = $this->auto_attr_model->get(['id'=>$row['cor_id']],'title'); + $incolor = $this->auto_attr_model->get(['id'=>$row['incor_id']],'title'); + $row['brand_name'] = $brand['name'].$series['name'].' '.$version['title']." {$color['title']}(内饰{$incolor['title']})"; //获取门店信息 $biz = $this->biz_model->get(['id'=>$row['biz_id']]); $company = $this->sys_company_model->get(['id'=>$biz['company_id']]); diff --git a/home/controllers/h5/Toole.php b/home/controllers/h5/Toole.php index a44a0d59..8642310a 100644 --- a/home/controllers/h5/Toole.php +++ b/home/controllers/h5/Toole.php @@ -194,6 +194,8 @@ class Toole extends CI_Controller { $url.="car?id=".$params['oid']; }elseif($params['type']==2){ //服务协议 $url.="agent?id=".$params['oid']; + }elseif($params['type']==3){ + $url.="car_ck?id=".$params['oid']; }else{ $this->show_json(0,'参数错误,未知合同类型'); } diff --git a/home/views/h5/toole/pdf.php b/home/views/h5/toole/pdf.php index 27db9d9e..e2904e3d 100644 --- a/home/views/h5/toole/pdf.php +++ b/home/views/h5/toole/pdf.php @@ -29,6 +29,9 @@ +