From b1aadba300e20aa750e53b6d96ed1b79ba76e891 Mon Sep 17 00:00:00 2001 From: YCC Date: Thu, 8 Jun 2023 11:51:00 +0800 Subject: [PATCH 01/14] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=B9=BF=E5=91=8A?= =?UTF-8?q?=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../third_party/recommend/views/bind.php | 231 +++++++++++++++++- 1 file changed, 222 insertions(+), 9 deletions(-) diff --git a/application/third_party/recommend/views/bind.php b/application/third_party/recommend/views/bind.php index f17378dd..6b9c90e2 100644 --- a/application/third_party/recommend/views/bind.php +++ b/application/third_party/recommend/views/bind.php @@ -109,6 +109,58 @@ + +
+
+
Content Article I
+
+ ir_rule . '
' . $recommends['Content Article I']->ir_keyword; ?> +
+
+
+ +
+
+
Content Article J
+
+ ir_rule . '
' . $recommends['Content Article J']->ir_keyword; ?> +
+
+
+ +
+
+
Content Article K
+
+ ir_rule . '
' . $recommends['Content Article K']->ir_keyword; ?> +
+
+
+ +
+
+
Content Article L
+
+ ir_rule . '
' . $recommends['Content Article L']->ir_keyword; ?> +
+
+
@@ -164,10 +216,7 @@ - - -
Content Tour E
+
+
+
Content Tour I +
+
+ ir_rule . '
' . $recommends['Content Tour I']->ir_keyword; ?> +
+
+
+ + + +
+
+
Content Tour J +
+
+ ir_rule . '
' . $recommends['Content Tour J']->ir_keyword; ?> +
+
+
+ +
+
+
Content Tour K +
+
+ ir_rule . '
' . $recommends['Content Tour K']->ir_keyword; ?> +
+
+
+ +
+
+
Content Tour L +
+
+ ir_rule . '
' . $recommends['Content Tour L']->ir_keyword; ?> +
+
+
+
@@ -248,6 +347,25 @@
+
+
右侧列表广告
+
+
    + +
  1. ir_rule; ?> + +
    2. + +
+ + +
+
+ @@ -302,10 +420,7 @@ - - -
Article E
+ +
+
+
Article I
+
+ ir_rule . '
' . $recommends['Article I']->ir_keyword; ?> +
+
+
+ +
+
+
Article J
+
+ ir_rule . '
' . $recommends['Article J']->ir_keyword; ?> +
+
+
+ +
+
+
Article K
+
+ ir_rule . '
' . $recommends['Article K']->ir_keyword; ?> +
+
+
+ +
+
+
Article L
+
+ ir_rule . '
' . $recommends['Article L']->ir_keyword; ?> +
+
+
+
@@ -408,10 +576,7 @@
- - -
Tour E
+
+
+
Tour I +
+
+ ir_rule . '
' . $recommends['Tour I']->ir_keyword; ?> +
+
+
+ +
+
+
Tour J +
+
+ ir_rule . '
' . $recommends['Tour J']->ir_keyword; ?> +
+
+
+ +
+
+
Tour K +
+
+ ir_rule . '
' . $recommends['Tour K']->ir_keyword; ?> +
+
+
+ +
+
+
Tour L +
+
+ ir_rule . '
' . $recommends['Tour L']->ir_keyword; ?> +
+
+
+
From 7bedcb7a320fdc649a53b388e7f5183a6d81dbac Mon Sep 17 00:00:00 2001 From: YCC Date: Thu, 8 Jun 2023 11:57:04 +0800 Subject: [PATCH 02/14] =?UTF-8?q?=E8=AF=AD=E6=B3=95=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/third_party/recommend/views/bind.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/third_party/recommend/views/bind.php b/application/third_party/recommend/views/bind.php index 6b9c90e2..5006be33 100644 --- a/application/third_party/recommend/views/bind.php +++ b/application/third_party/recommend/views/bind.php @@ -355,7 +355,7 @@
  • ir_rule; ?>
    • From 19d6699a92cca3f162036b70e74119f9e71de937 Mon Sep 17 00:00:00 2001 From: YCC Date: Thu, 8 Jun 2023 12:01:20 +0800 Subject: [PATCH 03/14] =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=B9=BF=E5=91=8AID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/third_party/recommend/views/bind.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/application/third_party/recommend/views/bind.php b/application/third_party/recommend/views/bind.php index 5006be33..a9a3acfb 100644 --- a/application/third_party/recommend/views/bind.php +++ b/application/third_party/recommend/views/bind.php @@ -352,12 +352,13 @@
      -
    1. ir_rule; ?> +
    2. + > + List Tips Right ir_rule; ?> +
    From afc838102647df4e85ec993af11e7792cbd71986 Mon Sep 17 00:00:00 2001 From: YCC Date: Thu, 8 Jun 2023 13:43:16 +0800 Subject: [PATCH 04/14] fix --- application/third_party/recommend/views/bind.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/application/third_party/recommend/views/bind.php b/application/third_party/recommend/views/bind.php index a9a3acfb..4ac6433c 100644 --- a/application/third_party/recommend/views/bind.php +++ b/application/third_party/recommend/views/bind.php @@ -421,6 +421,8 @@
    + +
    @@ -470,6 +472,8 @@
    + +
    From 2c695b08547267a3c1cb07102971a2cb9f54d9e8 Mon Sep 17 00:00:00 2001 From: YCC Date: Thu, 8 Jun 2023 14:12:50 +0800 Subject: [PATCH 05/14] =?UTF-8?q?36=E4=B8=AA=E5=B9=BF=E5=91=8A=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/third_party/recommend/views/bind.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/third_party/recommend/views/bind.php b/application/third_party/recommend/views/bind.php index 4ac6433c..e572dfa4 100644 --- a/application/third_party/recommend/views/bind.php +++ b/application/third_party/recommend/views/bind.php @@ -351,7 +351,7 @@
    右侧列表广告
      - +
    1. Date: Thu, 8 Jun 2023 14:37:31 +0800 Subject: [PATCH 06/14] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8E=A8=E8=8D=90?= =?UTF-8?q?=E5=B9=BF=E5=91=8A=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/information.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/application/controllers/information.php b/application/controllers/information.php index ec0fafad..a5d8262b 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -983,6 +983,13 @@ class Information extends CI_Controller file_put_contents($html_path, $template, LOCK_EX); } + public function test_recommand() + { + $information = $this->Information_model->Detail('278001480'); + $recommand_information = $this->recommand_information($information); + var_dump($recommand_information); + } + public function test_feedback() { $feedback_newest = $this->Feedback_model->test_feedback_newest(); From b9f9a7eace89aefcbbbf6b794e59519e1a3e677d Mon Sep 17 00:00:00 2001 From: Jimmy Liow <18777396951@163.com> Date: Thu, 8 Jun 2023 14:42:36 +0800 Subject: [PATCH 07/14] =?UTF-8?q?=E6=8E=A8=E8=8D=90=E5=B9=BF=E5=91=8A?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20is=5Fid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/information.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/application/controllers/information.php b/application/controllers/information.php index a5d8262b..1c1ea289 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -985,7 +985,8 @@ class Information extends CI_Controller public function test_recommand() { - $information = $this->Information_model->Detail('278001480'); + + $information = $this->Information_model->Detail($this->input->get('is_id')); $recommand_information = $this->recommand_information($information); var_dump($recommand_information); } From 9717b93c9ea53330a66966ed1b92adeb326f652d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E9=B9=8F?= Date: Thu, 8 Jun 2023 15:28:14 +0800 Subject: [PATCH 08/14] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E9=AA=8C=E8=AF=81?= =?UTF-8?q?=EF=BC=8C=E5=A4=96=E7=BD=91=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../trainsystem/controllers/pages.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/application/third_party/trainsystem/controllers/pages.php b/application/third_party/trainsystem/controllers/pages.php index a27c4bb0..dda502bd 100644 --- a/application/third_party/trainsystem/controllers/pages.php +++ b/application/third_party/trainsystem/controllers/pages.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)){ From f50b4455e4596ad477ed32111a877a67ce8948f4 Mon Sep 17 00:00:00 2001 From: Jimmy Liow <18777396951@163.com> Date: Thu, 8 Jun 2023 15:53:40 +0800 Subject: [PATCH 09/14] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20List=20Tips=20Right?= =?UTF-8?q?=20=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/information.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/application/controllers/information.php b/application/controllers/information.php index 1c1ea289..6a02012b 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -985,10 +985,16 @@ class Information extends CI_Controller public function test_recommand() { - $information = $this->Information_model->Detail($this->input->get('is_id')); $recommand_information = $this->recommand_information($information); - var_dump($recommand_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() From 54cff40d723efa90b13b54503f1e9d2b15018ac0 Mon Sep 17 00:00:00 2001 From: Jimmy Liow <18777396951@163.com> Date: Thu, 8 Jun 2023 15:55:10 +0800 Subject: [PATCH 10/14] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20for=20=E5=BE=AA?= =?UTF-8?q?=E7=8E=AF=E5=87=BA=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/information.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/controllers/information.php b/application/controllers/information.php index 6a02012b..a9231e06 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -989,7 +989,7 @@ class Information extends CI_Controller $recommand_information = $this->recommand_information($information); $tipsRightList = []; for ($i=0; $i < 36; $i++) { - $key = 'List Tips Right '.i; + $key = 'List Tips Right '.$i; if (array_key_exists($key, $recommand_information)) { $tipsRightList[] = $recommand_information[$key]; } From 4286bc825c9567a4b4fdc76ce6fac935f51cfa21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E9=B9=8F?= Date: Thu, 8 Jun 2023 15:59:45 +0800 Subject: [PATCH 11/14] =?UTF-8?q?=E7=81=AB=E8=BD=A6=E7=A5=A8=E5=87=BA?= =?UTF-8?q?=E7=A5=A8=E6=B5=8B=E8=AF=95=E6=96=B0=E9=93=BE=E6=8E=A5=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../third_party/trainsystem/models/BIZ_train_model.php | 4 ++-- .../third_party/trainsystem/models/train_system_model.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/application/third_party/trainsystem/models/BIZ_train_model.php b/application/third_party/trainsystem/models/BIZ_train_model.php index 321e6e49..2c449e91 100644 --- a/application/third_party/trainsystem/models/BIZ_train_model.php +++ b/application/third_party/trainsystem/models/BIZ_train_model.php @@ -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获取乘客信息 diff --git a/application/third_party/trainsystem/models/train_system_model.php b/application/third_party/trainsystem/models/train_system_model.php index 1553074d..f32b5631 100644 --- a/application/third_party/trainsystem/models/train_system_model.php +++ b/application/third_party/trainsystem/models/train_system_model.php @@ -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); } //获取订单(用于订单列表) From 6c9e947e5098a80325c0c076ca1dffc549342ab9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E9=B9=8F?= Date: Thu, 8 Jun 2023 16:07:10 +0800 Subject: [PATCH 12/14] =?UTF-8?q?=E7=81=AB=E8=BD=A6=E7=A5=A8=E5=87=BA?= =?UTF-8?q?=E7=A5=A8=E7=94=A8=E8=87=AA=E5=B7=B1=E7=9A=84=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93=E9=93=BE=E6=8E=A5=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../trainsystem/config/database.php | 53 +++++++++++++++++++ .../trainsystem/models/BIZ_train_model.php | 4 +- .../trainsystem/models/train_system_model.php | 4 +- 3 files changed, 57 insertions(+), 4 deletions(-) create mode 100644 application/third_party/trainsystem/config/database.php diff --git a/application/third_party/trainsystem/config/database.php b/application/third_party/trainsystem/config/database.php new file mode 100644 index 00000000..25178930 --- /dev/null +++ b/application/third_party/trainsystem/config/database.php @@ -0,0 +1,53 @@ +HT = $this->load->database('TOURMANAGER_LOCAL', TRUE); - $this->INFO = $this->load->database('INFORMATION_LOCAL', TRUE); + $this->HT = $this->load->database('HT', TRUE); + $this->INFO = $this->load->database('INFO', TRUE); } //传入一组BPE_SN获取乘客信息 diff --git a/application/third_party/trainsystem/models/train_system_model.php b/application/third_party/trainsystem/models/train_system_model.php index f32b5631..1553074d 100644 --- a/application/third_party/trainsystem/models/train_system_model.php +++ b/application/third_party/trainsystem/models/train_system_model.php @@ -5,8 +5,8 @@ class train_system_model extends CI_Model { function __construct() { parent::__construct(); - $this->HT = $this->load->database('TOURMANAGER_LOCAL', TRUE); - $this->INFO = $this->load->database('INFORMATION_LOCAL', TRUE); + $this->HT = $this->load->database('HT', TRUE); + $this->INFO = $this->load->database('INFO', TRUE); } //获取订单(用于订单列表) From efdc11571f97c1954d8e0c29efc50a1bd2983e33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E9=B9=8F?= Date: Thu, 8 Jun 2023 16:08:54 +0800 Subject: [PATCH 13/14] fix --- application/third_party/trainsystem/config/database.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/third_party/trainsystem/config/database.php b/application/third_party/trainsystem/config/database.php index 25178930..4636ba56 100644 --- a/application/third_party/trainsystem/config/database.php +++ b/application/third_party/trainsystem/config/database.php @@ -47,7 +47,7 @@ $active_group = 'HT'; $active_record = TRUE; //require 'C:/database_conn_ct.php'; -require 'database_conn_local.php'; +require 'c:/database_conn_local.php'; /* End of file database.php */ /* Location: ./application/config/database.php */ \ No newline at end of file From 9ae755fdb4286014305c0716daf6eb04bfe724ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E9=B9=8F?= Date: Thu, 8 Jun 2023 16:20:41 +0800 Subject: [PATCH 14/14] fix --- application/third_party/trainsystem/config/database.php | 4 ++-- .../third_party/trainsystem/models/BIZ_train_model.php | 4 ++-- .../third_party/trainsystem/models/train_system_model.php | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/application/third_party/trainsystem/config/database.php b/application/third_party/trainsystem/config/database.php index 4636ba56..c975c7a0 100644 --- a/application/third_party/trainsystem/config/database.php +++ b/application/third_party/trainsystem/config/database.php @@ -46,8 +46,8 @@ $active_group = 'HT'; //是否加载 $active_record = TRUE; -//require 'C:/database_conn_ct.php'; -require 'c:/database_conn_local.php'; +require 'C:/database_conn.php'; +//require 'c:/database_conn_local.php'; /* End of file database.php */ /* Location: ./application/config/database.php */ \ No newline at end of file diff --git a/application/third_party/trainsystem/models/BIZ_train_model.php b/application/third_party/trainsystem/models/BIZ_train_model.php index 321e6e49..2c449e91 100644 --- a/application/third_party/trainsystem/models/BIZ_train_model.php +++ b/application/third_party/trainsystem/models/BIZ_train_model.php @@ -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获取乘客信息 diff --git a/application/third_party/trainsystem/models/train_system_model.php b/application/third_party/trainsystem/models/train_system_model.php index 1553074d..f32b5631 100644 --- a/application/third_party/trainsystem/models/train_system_model.php +++ b/application/third_party/trainsystem/models/train_system_model.php @@ -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); } //获取订单(用于订单列表)