Merge branch 'master' of github.com:hainatravel/information-system

hotfix/paypal-note
LMR 2 years ago
commit 979746bde0

@ -983,6 +983,20 @@ class Information extends CI_Controller
file_put_contents($html_path, $template, LOCK_EX);
}
public function test_recommand()
{
$information = $this->Information_model->Detail($this->input->get('is_id'));
$recommand_information = $this->recommand_information($information);
$tipsRightList = [];
for ($i=0; $i < 36; $i++) {
$key = 'List Tips Right '.$i;
if (array_key_exists($key, $recommand_information)) {
$tipsRightList[] = $recommand_information[$key];
}
}
var_dump($tipsRightList);
}
public function test_feedback()
{
$feedback_newest = $this->Feedback_model->test_feedback_newest();

@ -109,6 +109,58 @@
</div>
</div>
</div>
<div class="col-md-6">
<div class="panel panel-default">
<div class="panel-heading">Content Article I <a
href="javascript:void(0);"
onclick="show_bind_info(<?php echo $information->is_id; ?>,'Content Article I')"
> <span
class="pull-right glyphicon glyphicon-cog"></span></a></div>
<div class="panel-body">
<?php echo empty($recommends['Content Article I']) ? '继承上级' : $recommends['Content Article I']->ir_rule . '<br/>' . $recommends['Content Article I']->ir_keyword; ?>
</div>
</div>
</div>
<div class="col-md-6">
<div class="panel panel-default">
<div class="panel-heading">Content Article J <a
href="javascript:void(0);"
onclick="show_bind_info(<?php echo $information->is_id; ?>,'Content Article J')"
> <span
class="pull-right glyphicon glyphicon-cog"></span></a></div>
<div class="panel-body">
<?php echo empty($recommends['Content Article J']) ? '继承上级' : $recommends['Content Article J']->ir_rule . '<br/>' . $recommends['Content Article J']->ir_keyword; ?>
</div>
</div>
</div>
<div class="col-md-6">
<div class="panel panel-default">
<div class="panel-heading">Content Article K <a
href="javascript:void(0);"
onclick="show_bind_info(<?php echo $information->is_id; ?>,'Content Article K')"
> <span
class="pull-right glyphicon glyphicon-cog"></span></a></div>
<div class="panel-body">
<?php echo empty($recommends['Content Article K']) ? '继承上级' : $recommends['Content Article K']->ir_rule . '<br/>' . $recommends['Content Article K']->ir_keyword; ?>
</div>
</div>
</div>
<div class="col-md-6">
<div class="panel panel-default">
<div class="panel-heading">Content Article L <a
href="javascript:void(0);"
onclick="show_bind_info(<?php echo $information->is_id; ?>,'Content Article L')"
> <span
class="pull-right glyphicon glyphicon-cog"></span></a></div>
<div class="panel-body">
<?php echo empty($recommends['Content Article L']) ? '继承上级' : $recommends['Content Article L']->ir_rule . '<br/>' . $recommends['Content Article L']->ir_keyword; ?>
</div>
</div>
</div>
</div>
<!-- 文中信息推荐 end -->
@ -164,10 +216,7 @@
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="panel panel-default">
<div class="panel-heading">Content Tour E<a
@ -216,6 +265,56 @@
</div>
</div>
<div class="col-md-6">
<div class="panel panel-default">
<div class="panel-heading">Content Tour I<a
href="javascript:void(0);"
onclick="show_bind_info(<?php echo $information->is_id; ?>,'Content Tour I')">
<span class="pull-right glyphicon glyphicon-cog"></span></a></div>
<div class="panel-body">
<?php echo empty($recommends['Content Tour I']) ? '继承上级' : $recommends['Content Tour I']->ir_rule . '<br/>' . $recommends['Content Tour I']->ir_keyword; ?>
</div>
</div>
</div>
<div class="col-md-6">
<div class="panel panel-default">
<div class="panel-heading">Content Tour J<a
href="javascript:void(0);"
onclick="show_bind_info(<?php echo $information->is_id; ?>,'Content Tour J')">
<span class="pull-right glyphicon glyphicon-cog"></span></a></div>
<div class="panel-body">
<?php echo empty($recommends['Content Tour J']) ? '继承上级' : $recommends['Content Tour J']->ir_rule . '<br/>' . $recommends['Content Tour J']->ir_keyword; ?>
</div>
</div>
</div>
<div class="col-md-6">
<div class="panel panel-default">
<div class="panel-heading">Content Tour K<a
href="javascript:void(0);"
onclick="show_bind_info(<?php echo $information->is_id; ?>,'Content Tour K')">
<span class="pull-right glyphicon glyphicon-cog"></span></a></div>
<div class="panel-body">
<?php echo empty($recommends['Content Tour K']) ? '继承上级' : $recommends['Content Tour K']->ir_rule . '<br/>' . $recommends['Content Tour K']->ir_keyword; ?>
</div>
</div>
</div>
<div class="col-md-6">
<div class="panel panel-default">
<div class="panel-heading">Content Tour L<a
href="javascript:void(0);"
onclick="show_bind_info(<?php echo $information->is_id; ?>,'Content Tour L')">
<span class="pull-right glyphicon glyphicon-cog"></span></a></div>
<div class="panel-body">
<?php echo empty($recommends['Content Tour L']) ? '继承上级' : $recommends['Content Tour L']->ir_rule . '<br/>' . $recommends['Content Tour L']->ir_keyword; ?>
</div>
</div>
</div>
</div>
<!-- 文中线路推荐 end -->
@ -248,6 +347,26 @@
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading">右侧列表广告</div>
<div class="panel-body">
<ol>
<?php for ($i=1; $i<=36; $i++) { ?>
<li>
<a
href="javascript:void(0);"
onclick="show_bind_info(<?php echo $information->is_id; ?>,'List Tips Right <?php echo $i ?>')"
>
List Tips Right <?php echo $i ?> <?php echo empty($recommends['List Tips Right '.$i]) ? '继承上级' : $recommends['List Tips Right '.$i]->ir_rule; ?>
</a>
</li>
<?php } ?>
</ol>
</div>
</div>
</div>
</div>
@ -302,10 +421,9 @@
</div>
</div>
</div>
</div>
</div>
<div class="row">
<div class="row">
<div class="col-md-6">
<div class="panel panel-default">
<div class="panel-heading">Article E <a
@ -354,6 +472,61 @@
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="panel panel-default">
<div class="panel-heading">Article I<a
href="javascript:void(0);"
onclick="show_bind_info(<?php echo $information->is_id; ?>,'Article I')"
> <span
class="pull-right glyphicon glyphicon-cog"></span></a></div>
<div class="panel-body">
<?php echo empty($recommends['Article I']) ? '继承上级' : $recommends['Article I']->ir_rule . '<br/>' . $recommends['Article I']->ir_keyword; ?>
</div>
</div>
</div>
<div class="col-md-6">
<div class="panel panel-default">
<div class="panel-heading">Article J<a
href="javascript:void(0);"
onclick="show_bind_info(<?php echo $information->is_id; ?>,'Article J')"
> <span
class="pull-right glyphicon glyphicon-cog"></span></a></div>
<div class="panel-body">
<?php echo empty($recommends['Article J']) ? '继承上级' : $recommends['Article J']->ir_rule . '<br/>' . $recommends['Article J']->ir_keyword; ?>
</div>
</div>
</div>
<div class="col-md-6">
<div class="panel panel-default">
<div class="panel-heading">Article K<a
href="javascript:void(0);"
onclick="show_bind_info(<?php echo $information->is_id; ?>,'Article K')"
> <span
class="pull-right glyphicon glyphicon-cog"></span></a></div>
<div class="panel-body">
<?php echo empty($recommends['Article K']) ? '继承上级' : $recommends['Article K']->ir_rule . '<br/>' . $recommends['Article K']->ir_keyword; ?>
</div>
</div>
</div>
<div class="col-md-6">
<div class="panel panel-default">
<div class="panel-heading">Article L<a
href="javascript:void(0);"
onclick="show_bind_info(<?php echo $information->is_id; ?>,'Article L')"
> <span
class="pull-right glyphicon glyphicon-cog"></span></a></div>
<div class="panel-body">
<?php echo empty($recommends['Article L']) ? '继承上级' : $recommends['Article L']->ir_rule . '<br/>' . $recommends['Article L']->ir_keyword; ?>
</div>
</div>
</div>
</div>
<!-- 信息推荐 end -->
@ -408,10 +581,7 @@
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="panel panel-default">
<div class="panel-heading">Tour E<a
@ -460,6 +630,54 @@
</div>
</div>
<div class="col-md-6">
<div class="panel panel-default">
<div class="panel-heading">Tour I<a
href="javascript:void(0);"
onclick="show_bind_info(<?php echo $information->is_id; ?>,'Tour I')">
<span class="pull-right glyphicon glyphicon-cog"></span></a></div>
<div class="panel-body">
<?php echo empty($recommends['Tour I']) ? '继承上级' : $recommends['Tour I']->ir_rule . '<br/>' . $recommends['Tour I']->ir_keyword; ?>
</div>
</div>
</div>
<div class="col-md-6">
<div class="panel panel-default">
<div class="panel-heading">Tour J<a
href="javascript:void(0);"
onclick="show_bind_info(<?php echo $information->is_id; ?>,'Tour J')">
<span class="pull-right glyphicon glyphicon-cog"></span></a></div>
<div class="panel-body">
<?php echo empty($recommends['Tour J']) ? '继承上级' : $recommends['Tour J']->ir_rule . '<br/>' . $recommends['Tour J']->ir_keyword; ?>
</div>
</div>
</div>
<div class="col-md-6">
<div class="panel panel-default">
<div class="panel-heading">Tour K<a
href="javascript:void(0);"
onclick="show_bind_info(<?php echo $information->is_id; ?>,'Tour K')">
<span class="pull-right glyphicon glyphicon-cog"></span></a></div>
<div class="panel-body">
<?php echo empty($recommends['Tour K']) ? '继承上级' : $recommends['Tour K']->ir_rule . '<br/>' . $recommends['Tour K']->ir_keyword; ?>
</div>
</div>
</div>
<div class="col-md-6">
<div class="panel panel-default">
<div class="panel-heading">Tour L<a
href="javascript:void(0);"
onclick="show_bind_info(<?php echo $information->is_id; ?>,'Tour L')">
<span class="pull-right glyphicon glyphicon-cog"></span></a></div>
<div class="panel-body">
<?php echo empty($recommends['Tour L']) ? '继承上级' : $recommends['Tour L']->ir_rule . '<br/>' . $recommends['Tour L']->ir_keyword; ?>
</div>
</div>
</div>
</div>
<!-- 线路推荐 end -->

@ -0,0 +1,53 @@
<?php
if (!defined('BASEPATH'))
exit('No direct script access allowed');
/*
| -------------------------------------------------------------------
| DATABASE CONNECTIVITY SETTINGS
| -------------------------------------------------------------------
| This file will contain the settings needed to access your database.
|
| For complete instructions please consult the 'Database Connection'
| page of the User Guide.
|
| -------------------------------------------------------------------
| EXPLANATION OF VARIABLES
| -------------------------------------------------------------------
|
| ['hostname'] The hostname of your database server.
| ['username'] The username used to connect to the database
| ['password'] The password used to connect to the database
| ['database'] The name of the database you want to connect to
| ['dbdriver'] The database type. ie: mysql. Currently supported:
mysql, mysqli, postgre, odbc, mssql, sqlite, oci8
| ['dbprefix'] You can add an optional prefix, which will be added
| to the table name when using the Active Record class
| ['pconnect'] TRUE/FALSE - Whether to use a persistent connection
| ['db_debug'] TRUE/FALSE - Whether database errors should be displayed.
| ['cache_on'] TRUE/FALSE - Enables/disables query caching
| ['cachedir'] The path to the folder where cache files should be stored
| ['char_set'] The character set used in communicating with the database
| ['dbcollat'] The character collation used in communicating with the database
| ['swap_pre'] A default table prefix that should be swapped with the dbprefix
| ['autoinit'] Whether or not to automatically initialize the database.
| ['stricton'] TRUE/FALSE - forces 'Strict Mode' connections
| - good for ensuring strict SQL while developing
|
| The $active_group variable lets you choose which connection group to
| make active. By default there is only one group (the 'default' group).
|
| The $active_record variables lets you determine whether or not to load
| the active record class
*/
//选择数据库
$active_group = 'HT';
//是否加载
$active_record = TRUE;
require 'C:/database_conn.php';
//require 'c:/database_conn_local.php';
/* End of file database.php */
/* Location: ./application/config/database.php */

@ -15,9 +15,9 @@ class pages extends CI_Controller{
//首页
public function index($coli_id = null){
if(get_cookie('dingname') == '' && get_cookie('dingunionid') == ''){
redirect('/apps/dinglogin/login/?returnurl=/apps/trainsystem/pages/');
}
// if(get_cookie('dingname') == '' && get_cookie('dingunionid') == ''){
// redirect('/apps/dinglogin/login/?returnurl=/apps/trainsystem/pages/');
// }
if($coli_id == null){
$cols_id = $this->input->post("ht_order");
@ -116,9 +116,9 @@ class pages extends CI_Controller{
//订单详情页面
public function order(){
if(get_cookie('dingname') == '' && get_cookie('dingunionid') == ''){
redirect('/apps/dinglogin/login/?returnurl=/apps/trainsystem/pages/');
}
// if(get_cookie('dingname') == '' && get_cookie('dingunionid') == ''){
// redirect('/apps/dinglogin/login/?returnurl=/apps/trainsystem/pages/');
// }
$ordernumber = $order=$this->input->get("order");
if(empty($ordernumber)){
@ -165,9 +165,9 @@ class pages extends CI_Controller{
//退票页面
public function refund(){
if(get_cookie('dingname') == '' && get_cookie('dingunionid') == ''){
redirect('/apps/dinglogin/login/?returnurl=/apps/trainsystem/pages/');
}
// if(get_cookie('dingname') == '' && get_cookie('dingunionid') == ''){
// redirect('/apps/dinglogin/login/?returnurl=/apps/trainsystem/pages/');
// }
$ordernumber = $order=$this->input->get("order");
if(empty($ordernumber)){

@ -4,8 +4,8 @@ class BIZ_train_model extends CI_Model {
function __construct() {
parent::__construct();
$this->HT = $this->load->database('HT', TRUE);
$this->INFO = $this->load->database('INFO', TRUE);
$this->HT = $this->load->database('TOURMANAGER_LOCAL', TRUE);
$this->INFO = $this->load->database('INFORMATION_LOCAL', TRUE);
}
//传入一组BPE_SN获取乘客信息

@ -5,8 +5,8 @@ class train_system_model extends CI_Model {
function __construct() {
parent::__construct();
$this->HT = $this->load->database('HT', TRUE);
$this->INFO = $this->load->database('INFO', TRUE);
$this->HT = $this->load->database('TOURMANAGER_LOCAL', TRUE);
$this->INFO = $this->load->database('INFORMATION_LOCAL', TRUE);
}
//获取订单(用于订单列表)

Loading…
Cancel
Save