From 0bae215e032804400db1a1c03d571fbfb498df28 Mon Sep 17 00:00:00 2001 From: Jimmy Liow Date: Tue, 13 Aug 2024 15:52:14 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=BB=B7=E6=A0=BC?= =?UTF-8?q?=E6=9C=AA=E6=9B=B4=E6=96=B0=E5=88=B0=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/views/mobile_first/ah-lantern-form.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/views/mobile_first/ah-lantern-form.php b/application/views/mobile_first/ah-lantern-form.php index 8cf72a1d..e5f3f658 100644 --- a/application/views/mobile_first/ah-lantern-form.php +++ b/application/views/mobile_first/ah-lantern-form.php @@ -444,7 +444,7 @@ vip_khomloy_input.checked = true; currentTicketPrice = parseInt(vip_khomloy_input.getAttribute('data-price')); adultNumberValue = parseInt(adultNumberNode.value); - calcTotalPrice(dataPrice, adultNumberValue); + calcTotalPrice(currentTicketPrice, adultNumberValue); }); ticket_date_november16th.addEventListener('click', function () { @@ -459,7 +459,7 @@ premium_khomloy_input.checked = true; currentTicketPrice = parseInt(premium_khomloy_input.getAttribute('data-price')); adultNumberValue = parseInt(adultNumberNode.value); - calcTotalPrice(dataPrice, adultNumberValue); + calcTotalPrice(currentTicketPrice, adultNumberValue); }); }); From 38b54ebf692de1dbd61fc934ef9901f1bc1319a4 Mon Sep 17 00:00:00 2001 From: candice Date: Tue, 13 Aug 2024 16:03:44 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=80=BC=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/views/mobile_first/ah-lantern-form.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/views/mobile_first/ah-lantern-form.php b/application/views/mobile_first/ah-lantern-form.php index e5f3f658..0e56ac53 100644 --- a/application/views/mobile_first/ah-lantern-form.php +++ b/application/views/mobile_first/ah-lantern-form.php @@ -39,7 +39,7 @@
US$179
-
93 left
+
65 left
@@ -49,7 +49,7 @@
US$139
-
Sold out
+
57 left
From b09b79331e415c1601c3c4494c6467f87c3c9354 Mon Sep 17 00:00:00 2001 From: Jimmy Liow Date: Tue, 13 Aug 2024 16:28:08 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E9=80=89=E4=B8=AD=E4=BB=B7=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/views/mobile_first/ah-lantern-form.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/views/mobile_first/ah-lantern-form.php b/application/views/mobile_first/ah-lantern-form.php index 0e56ac53..7bb894cf 100644 --- a/application/views/mobile_first/ah-lantern-form.php +++ b/application/views/mobile_first/ah-lantern-form.php @@ -430,7 +430,7 @@ premium_khomloy_input.disabled = true; vip_khomloy_input.disabled = false; - standard_khomloy_input.disabled = true; + standard_khomloy_input.disabled = false; ticket_date_november15th.addEventListener('click', function () { premium_khomloy_left.innerText ='Sold out' From 25dc17281330b2d02bd98742dd15f9865cfe2949 Mon Sep 17 00:00:00 2001 From: LMR <59361885@qq.com> Date: Wed, 14 Aug 2024 09:33:56 +0800 Subject: [PATCH 4/7] add get_by_icid --- application/controllers/infofix.php | 38 ++++++++++++++++++++++------- 1 file changed, 29 insertions(+), 9 deletions(-) diff --git a/application/controllers/infofix.php b/application/controllers/infofix.php index 016ed03d..3286f291 100644 --- a/application/controllers/infofix.php +++ b/application/controllers/infofix.php @@ -47,8 +47,8 @@ class infofix extends CI_Controller // 链接 $sub_url = mb_stripos($info->ic_url, $key) !== false ? $info->ic_url : ''; if ($sub_url) { - $sub_url = str_replace($key,'@@@'.$key.'@@@',$sub_url); - $sub_url = explode('@@@',$sub_url); + $sub_url = str_replace($key, '@@@' . $key . '@@@', $sub_url); + $sub_url = explode('@@@', $sub_url); } $limitStr = 100; @@ -58,8 +58,8 @@ class infofix extends CI_Controller $sub_content = array(); while ($pos_content) { $_str = '[...' . mb_substr($info->ic_content, $pos_content - $limitStr, mb_strlen($key) + $limitStr * 2) . '...]'; - $_str = str_replace($key,'@@@'.$key.'@@@',$_str); - $_str = explode('@@@',$_str); + $_str = str_replace($key, '@@@' . $key . '@@@', $_str); + $_str = explode('@@@', $_str); array_push($sub_content, $_str); $pos_content = mb_stripos($info->ic_content, $key, $pos_content + mb_strlen($key)); } @@ -72,8 +72,8 @@ class infofix extends CI_Controller $pos_content2 = mb_stripos($info->amp_json, $key); while ($pos_content2) { $_str = '[...' . mb_substr($info->amp_json, $pos_content2 - $limitStr, mb_strlen($key) + $limitStr * 2) . '...]'; - $_str = str_replace($key,'@@@'.$key.'@@@',$_str); - $_str = explode('@@@',$_str); + $_str = str_replace($key, '@@@' . $key . '@@@', $_str); + $_str = explode('@@@', $_str); array_push($sub_content2, $_str); $pos_content2 = mb_stripos($info->amp_json, $key, $pos_content2 + mb_strlen($key)); } @@ -86,8 +86,8 @@ class infofix extends CI_Controller $pos_content3 = mb_stripos($info->amp_body, $key); while ($pos_content3) { $_str = '[...' . mb_substr($info->amp_body, $pos_content3 - $limitStr, mb_strlen($key) + $limitStr * 2) . '...]'; - $_str = str_replace($key,'@@@'.$key.'@@@',$_str); - $_str = explode('@@@',$_str); + $_str = str_replace($key, '@@@' . $key . '@@@', $_str); + $_str = explode('@@@', $_str); array_push($sub_content3, $_str); $pos_content3 = mb_stripos($info->amp_body, $key, $pos_content3 + mb_strlen($key)); } @@ -183,7 +183,27 @@ class infofix extends CI_Controller } echo json_encode($keyArr); - + + } + + function get_by_icid($ic_id) + { + $ic = $this->infoContents_model->get_ic_contents2($ic_id); + if ($ic) { + echo json_encode( + array( + 'state' => 0, + 'data' => $ic + ) + ); + } else { + echo json_encode( + array( + 'state' => -1, + 'msg' => 'not content by ' . $ic_id + ) + ); + } } } From c08a33053ed57940fdf46ca9bb4c68d9362ce127 Mon Sep 17 00:00:00 2001 From: LMR <59361885@qq.com> Date: Wed, 14 Aug 2024 09:36:23 +0800 Subject: [PATCH 5/7] add update_by_icid --- application/controllers/infofix.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/application/controllers/infofix.php b/application/controllers/infofix.php index 3286f291..36145817 100644 --- a/application/controllers/infofix.php +++ b/application/controllers/infofix.php @@ -206,5 +206,12 @@ class infofix extends CI_Controller } } + function update_by_icid() + { + $ic_id = $this->input->get_post('ic_id'); + $ic_content = $this->input->get_post('ic_content'); + $this->infoContents_model->force_update($ic_id, $ic_content); + } + } //end of infofix \ No newline at end of file From 6f2fe4207f01c8cbc5794f6eea6b7f83976bd77f Mon Sep 17 00:00:00 2001 From: LMR <59361885@qq.com> Date: Thu, 15 Aug 2024 10:41:57 +0800 Subject: [PATCH 6/7] da --- application/controllers/infofix.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/application/controllers/infofix.php b/application/controllers/infofix.php index 36145817..d4a90c6a 100644 --- a/application/controllers/infofix.php +++ b/application/controllers/infofix.php @@ -186,6 +186,11 @@ class infofix extends CI_Controller } + /** + * 无条件获取内容 + * @param mixed $ic_id + * @return void + */ function get_by_icid($ic_id) { $ic = $this->infoContents_model->get_ic_contents2($ic_id); From 89083cc115eb06a0aacbb48ca4eba7cf6e652148 Mon Sep 17 00:00:00 2001 From: LMR <59361885@qq.com> Date: Thu, 15 Aug 2024 11:40:11 +0800 Subject: [PATCH 7/7] fiux --- application/controllers/infofix.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/application/controllers/infofix.php b/application/controllers/infofix.php index d4a90c6a..adbe94b4 100644 --- a/application/controllers/infofix.php +++ b/application/controllers/infofix.php @@ -194,11 +194,13 @@ class infofix extends CI_Controller function get_by_icid($ic_id) { $ic = $this->infoContents_model->get_ic_contents2($ic_id); + $json = $this->infoMetas_model->get($ic_id, 'AMP_JSON'); if ($ic) { echo json_encode( array( 'state' => 0, - 'data' => $ic + 'ic_content' => $ic->ic_content, + 'json' => $json ) ); } else {