diff --git a/api/controllers/wxapp/liche/Car.php b/api/controllers/wxapp/liche/Car.php index 07f141cb..f256f5aa 100644 --- a/api/controllers/wxapp/liche/Car.php +++ b/api/controllers/wxapp/liche/Car.php @@ -191,6 +191,7 @@ class Car extends Wxapp{ $add_data = [ 'app_id' => $this->app_id, 'app_uid' => $this->session['uid'], + 'mch_id' => '1612289137', 'sid' => $params['sid'], 'item_id' => $params['item_id'], 'item_title' => $params['item_title'], diff --git a/api/controllers/wxapp/liche/Contract.php b/api/controllers/wxapp/liche/Contract.php index ed1cc870..7c12211d 100644 --- a/api/controllers/wxapp/liche/Contract.php +++ b/api/controllers/wxapp/liche/Contract.php @@ -104,8 +104,12 @@ class Contract extends Wxapp{ throw new Exception('已签名', API_CODE_INVILD_PARAM); } //获取公司印章 - $biz = $this->biz_model->get(['id'=>$order['biz_id']],'company_id'); - $company = $this->sys_company_model->get(['id'=>$biz['company_id']],'img_seal,id'); + if($type==1){ + $company = $this->sys_company_model->get(["title like '%厦门狸车服务%'"=>null],'img_seal,id'); + }else{ + $biz = $this->biz_model->get(['id'=>$order['biz_id']],'company_id'); + $company = $this->sys_company_model->get(['id'=>$biz['company_id']],'img_seal,id'); + } $img_seal = $company['img_seal'] ? build_qiniu_image_url($company['img_seal']) : ''; if(!$img_seal){ throw new Exception('公司公章未上传', API_CODE_FAIL); diff --git a/api/controllers/wxapp/licheb/Protocol.php b/api/controllers/wxapp/licheb/Protocol.php index 686f2137..016024ac 100644 --- a/api/controllers/wxapp/licheb/Protocol.php +++ b/api/controllers/wxapp/licheb/Protocol.php @@ -48,7 +48,7 @@ class Protocol extends CI_Controller{ //获取门店信息 $biz = $this->biz_model->get(['id'=>$row['biz_id']]); $city = $this->area_model->get(['county_id'=>$biz['county_id']],'city_name,county_name'); - $row['address'] = $city['city_name'].$city['county_name'].'  '.$biz['address']; + $row['address'] = $city['city_name'].$city['county_name'].'  '.$biz['address'] .'  '. $biz['biz_name']; $company = $this->sys_company_model->get(['id'=>$biz['company_id']]); $row['company'] = $company; //获取选择代办包 @@ -66,7 +66,7 @@ class Protocol extends CI_Controller{ $row['price_rmb'] = num_to_rmb($row['price']); $row['cid'] = $contract['cid']; $row['day'] = $contract ? date('Y年m月d日',$contract['c_time']):date('Y年m月d日'); - $row['dep_price'] = number_format(5000,2); //定金 + $row['dep_price'] = number_format($row['deposit'],2); //定金 $folder = $wxapp ? 'protocol' : 'html2pdf'; $this->load->view("wxapp/licheb/{$folder}/car",$row); } @@ -81,12 +81,11 @@ class Protocol extends CI_Controller{ if($row){ //获取门店信息 $biz = $this->biz_model->get(['id'=>$row['biz_id']]); - $company = $this->sys_company_model->get(['id'=>$biz['company_id']]); - $row['company'] = $company; + $row['company'] = $this->sys_company_model->get(["title like '%厦门狸车服务%'"=>null]); //获取服务包 $packs = $this->package_model->get(['id'=>$row['pack_id']],'srv_ids'); if($packs['srv_ids']){ - $row['services'] = $services = $this->services_model->select(["id in ({$packs['srv_ids']})"],'','','','title,field_name'); + $row['services'] = $services = $this->services_model->select(["id in ({$packs['srv_ids']})"=>null],'','','','title,field_name'); } $attrs = "{$row['cor_id']}_{$row['v_id']}_{$row['incor_id']}"; $car = $this->auto_cars_model->get(['attrs'=>$attrs,'s_id'=>$row['s_id']]); @@ -168,7 +167,7 @@ class Protocol extends CI_Controller{ //获取服务包 $packs = $this->package_model->get(['id'=>$row['pack_id']],'srv_ids'); if($packs['srv_ids']){ - $row['services'] = $services = $this->services_model->select(["id in ({$packs['srv_ids']})"],'','','','title,field_name'); + $row['services'] = $services = $this->services_model->select(["id in ({$packs['srv_ids']})"=>null],'','','','title,field_name'); } $attrs = "{$row['cor_id']}_{$row['v_id']}_{$row['incor_id']}"; $car = $this->auto_cars_model->get(['attrs'=>$attrs,'s_id'=>$row['s_id']]); diff --git a/api/controllers/wxapp/licheb/Services.php b/api/controllers/wxapp/licheb/Services.php index 2a3cf0a4..b124384d 100644 --- a/api/controllers/wxapp/licheb/Services.php +++ b/api/controllers/wxapp/licheb/Services.php @@ -10,8 +10,8 @@ defined('BASEPATH') OR exit('No direct script access allowed'); require_once APPPATH.'controllers/wxapp/Wxapp.php'; class Services extends Wxapp{ - public function __construct(){ - parent::__construct(); + function __construct($inputs, $app_key){ + parent::__construct($inputs, $app_key); $this->login_white = array('get_package');//登录白名单 $this->load->model('receiver/receiver_services_model','services_model'); $this->load->model('receiver/receiver_service_package_model','package_model'); @@ -20,12 +20,15 @@ class Services extends Wxapp{ protected function get_package(){ $page = $this->input_param('page'); $size = $this->input_param('size'); + $type = $this->input_param('type'); !$page && $page = 1; !$size && $size = 10; $where = [ 'status' => 1 ]; + $type==1 && $where['id!='] = 3; //全款 + $type==2 && $where['id'] = 3; //分期 $count = $this->package_model->count($where); $list = []; if($count){ diff --git a/api/views/wxapp/licheb/html2pdf/agent.php b/api/views/wxapp/licheb/html2pdf/agent.php index a0f1619e..1b12a930 100644 --- a/api/views/wxapp/licheb/html2pdf/agent.php +++ b/api/views/wxapp/licheb/html2pdf/agent.php @@ -61,7 +61,7 @@
日期：
-
乙方（签名）
+
乙方（）
日期：
diff --git a/api/views/wxapp/licheb/html2pdf/car.php b/api/views/wxapp/licheb/html2pdf/car.php index 2d19544d..9630dffa 100644 --- a/api/views/wxapp/licheb/html2pdf/car.php +++ b/api/views/wxapp/licheb/html2pdf/car.php @@ -70,7 +70,7 @@
车辆单价为车身单价，续航里程为300KM以上的车辆已按扣减国家补贴后的价格结算。不包含车辆购置税、车辆保险费、挂牌杂费等其他费用。乙方如需委托甲方代理上牌、委托运输等服务的，双方应另外签订《委托服务协议》。
第三条付款方式
乙方在签订合同时即付定金人民币：元，定金在结算时冲抵车款。
-
乙方选择
+
乙方选择
第四条 车辆交付
1、交车时间：合同签订之日起 天内。