diff --git a/api/controllers/wxapp/licheb/Cusorder.php b/api/controllers/wxapp/licheb/Cusorder.php index 107b4e6b..ee3f9ed4 100644 --- a/api/controllers/wxapp/licheb/Cusorder.php +++ b/api/controllers/wxapp/licheb/Cusorder.php @@ -383,29 +383,30 @@ class Cusorder extends Wxapp '购车主体' => ['type' => 'text', 'value' => $val['main_type'] ? '公司' : '个人', 'bg_color' => ''], '品牌' => ['type' => 'text', 'value' => $title, 'bg_color' => ''], '车型' => ['type' => 'text', 'value' => $car_name, 'bg_color' => ''], + '付款方式' => ['type' => 'text', 'value' => $val['payway'] ? '全款' : '按揭', 'bg_color' => ''], ]; if ($val['main_type']) {//公司 $o_data_1['营业执照'] = ['type' => 'text', 'value' => $img_status['business_licence']['text'], 'bg_color' => $img_status['business_licence']['color']]; } else { $o_data_1['客户身份证'] = ['type' => 'text', 'value' => $img_status['cardida']['text'], 'bg_color' => $img_status['cardida']['color']]; } + $o_data_1['订单合同'] = ['type' => 'text', 'value' => $img_status['contract_img']['text'], 'bg_color' => $img_status['contract_img']['color']]; $o_data_1['付款凭证'] = ['type' => 'text', 'value' => $img_status['pay_img']['text'], 'bg_color' => $img_status['pay_img']['color']]; $o_data_1['权益确认书'] = ['type' => 'text', 'value' => $img_status['equity_ck_img']['text'], 'bg_color' => $img_status['equity_ck_img']['color']]; $o_data_2 = [ - '付款方式' => ['type' => 'text', 'value' => $val['payway'] ? '全款' : '按揭', 'bg_color' => ''], '发票' => ['type' => 'text', 'value' => $img_status['bill_img']['text'], 'bg_color' => $img_status['bill_img']['color']] ]; $o_data_3 = [ - '行驶证' => ['type' => 'text', 'value' => $img_status['car_img']['text'], 'bg_color' => $img_status['car_img']['color']], '保单' => ['type' => 'text', 'value' => $img_status['insurance_img']['text'], 'bg_color' => $img_status['insurance_img']['color']], - '交车合照' => ['type' => 'text', 'value' => $img_status['delivery_ck_img']['text'], 'bg_color' => $img_status['delivery_ck_img']['color']] + '行驶证' => ['type' => 'text', 'value' => $img_status['car_img']['text'], 'bg_color' => $img_status['car_img']['color']], + //'交车合照' => ['type' => 'text', 'value' => $img_status['delivery_ck_img']['text'], 'bg_color' => $img_status['delivery_ck_img']['color']] ]; $o_data_4 = []; $val['order_time'] != '0000-00-00 00:00:00' && $o_data_4['下定时间'] = ['type' => 'text', 'value' => date('Y-m-d', strtotime($val['order_time'])), 'bg_color' => '']; - $val['delry_time'] != '0000-00-00 00:00:00' && $o_data_4['期望交付'] = ['type' => 'text', 'value' => date('Y-m-d', strtotime($val['delry_time'])), 'bg_color' => '']; + //$val['delry_time'] != '0000-00-00 00:00:00' && $o_data_4['期望交付'] = ['type' => 'text', 'value' => date('Y-m-d', strtotime($val['delry_time'])), 'bg_color' => '']; if ($map_users[$val['admin_id']]) { - $o_data_4['销售顾问'] = ['type' => 'text', 'value' => $map_users[$val['admin_id']], 'bg_color' => '']; + $o_data_4['车管家'] = ['type' => 'text', 'value' => $map_users[$val['admin_id']], 'bg_color' => '']; } $other_data['o_data_1'] = $o_data_1; $other_data['o_data_2'] = $o_data_2; diff --git a/api/controllers/wxapp/licheb/Sign.php b/api/controllers/wxapp/licheb/Sign.php index 3dda94be..b4bf17f4 100644 --- a/api/controllers/wxapp/licheb/Sign.php +++ b/api/controllers/wxapp/licheb/Sign.php @@ -33,7 +33,7 @@ class Sign extends Wxapp "(province_id={$area['province_id']} or province_id=0)" => null ]; $item_row = $this->item_model->get($where); - $time_out = 3000; + $time_out = 30; $item = []; if ($item_row) { $item['title'] = $item_row['title']; @@ -61,7 +61,6 @@ class Sign extends Wxapp 'qcode' => base64_encode($result['file']), 'qrcode_count_time' => $time_out, 'item' => $item, - 'key' => $key ]; return $data; }