From 75df6a8a64a5eecc5badde64e7996b48d6f8722e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=B9=E8=AF=9A=E8=AF=9A?= Date: Tue, 1 Jun 2021 10:45:39 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E5=8F=96=E6=B6=88=20gogole=20reCaptcha=20V?= =?UTF-8?q?3=EF=BC=8C=E8=87=AA=E5=B7=B1=E5=BC=80=E5=8F=91=E4=B8=BB?= =?UTF-8?q?=E5=8A=A8=E9=98=B2=E5=BE=A1=E4=BB=A3=E7=A0=81=EF=BC=8C=E5=9C=A8?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E8=AE=A2=E5=8D=95=E4=B9=8B=E5=89=8D=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E9=9A=90=E8=97=8F=E8=A1=A8=E5=8D=95=E7=9A=84=E5=80=BC?= =?UTF-8?q?=E6=9D=A5=E5=88=A4=E6=96=AD=E5=AF=B9=E6=96=B9=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E6=98=AF=E6=9C=BA=E5=99=A8=E6=8F=90=E4=BA=A4=EF=BC=8C=E5=8E=9F?= =?UTF-8?q?=E7=90=86=E6=98=AF=E6=9C=BA=E5=99=A8=E6=8F=90=E4=BA=A4=E6=98=AF?= =?UTF-8?q?=E4=B8=8D=E4=BC=9A=E6=89=A7=E8=A1=8C=E6=9C=AC=E5=9C=B0js?= =?UTF-8?q?=E5=87=BD=E6=95=B0=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/views/mobile_first/ch-inquiry-form.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/application/views/mobile_first/ch-inquiry-form.php b/application/views/mobile_first/ch-inquiry-form.php index a56e95fa..e208bcf9 100644 --- a/application/views/mobile_first/ch-inquiry-form.php +++ b/application/views/mobile_first/ch-inquiry-form.php @@ -50,6 +50,4 @@ Inquiry - - - \ No newline at end of file + \ No newline at end of file From 7e8874dc62a429c26bd08dc3e0d738cb7cae99a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=B9=E8=AF=9A=E8=AF=9A?= Date: Wed, 2 Jun 2021 14:42:48 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E5=B9=BF=E5=91=8A=E5=92=8C=E5=9B=BE?= =?UTF-8?q?=E7=89=87=E9=80=89=E6=8B=A9=E7=9A=84=E4=BE=BF=E6=8D=B7=E5=8C=96?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../third_party/recommend/controllers/tips.php | 2 +- application/third_party/recommend/views/welcome.php | 13 ++++--------- application/views/bootstrap3/header.php | 4 ++-- wysiwyg/config.js | 4 ++-- 4 files changed, 9 insertions(+), 14 deletions(-) diff --git a/application/third_party/recommend/controllers/tips.php b/application/third_party/recommend/controllers/tips.php index 42ca9e1c..304cad97 100644 --- a/application/third_party/recommend/controllers/tips.php +++ b/application/third_party/recommend/controllers/tips.php @@ -26,7 +26,7 @@ class Tips extends CI_Controller $infoTip = new StdClass; $infoTip->it_title = '新广告'; $infoTip->it_expires = time(); - $infoTip->it_content = ''; + $infoTip->it_content = $this->load->view('templates', false,true);; $infoTip->it_code = ''; $infoTip->it_datetime = time(); $infoTip->it_sitecode = $this->config->item('site_code'); diff --git a/application/third_party/recommend/views/welcome.php b/application/third_party/recommend/views/welcome.php index 4c8efefa..eb10a2b1 100644 --- a/application/third_party/recommend/views/welcome.php +++ b/application/third_party/recommend/views/welcome.php @@ -4,7 +4,7 @@
-

广告管理

+

广告管理 添加广告

@@ -16,8 +16,9 @@ + $item){ ?> - + - - - - - - - + diff --git a/application/views/bootstrap3/header.php b/application/views/bootstrap3/header.php index 5b9075e0..86d3f99b 100644 --- a/application/views/bootstrap3/header.php +++ b/application/views/bootstrap3/header.php @@ -89,8 +89,8 @@ var use_pictures = $("#use_pictures").val(); if (result != null) { for (var key in result.Pinfo) { - if ('config->item('site_code') ?>' == 'cht') { - editor.insertHtml('
' + result.Pinfo[key].Sinfo + '' + result.Pinfo[key].Sinfo + '
'); + if ('config->item('site_code') ?>' == 'ah') { + editor.insertHtml('
' + result.Pinfo[key].Sinfo + ' ' + result.Pinfo[key].Sinfo + '
'); } else if ('config->item('site_code') ?>' == 'ch') { editor.insertHtml('
' + result.Pinfo[key].Sinfo + '' + result.Pinfo[key].Sinfo + '
'); } else { diff --git a/wysiwyg/config.js b/wysiwyg/config.js index bb7b49d7..1c29a191 100644 --- a/wysiwyg/config.js +++ b/wysiwyg/config.js @@ -42,8 +42,8 @@ CKEDITOR.editorConfig = function( config ) { { name: 'others', groups: [ 'others' ] }, { name: 'about', groups: [ 'about' ] } ]; -//,NumberedList,BulletedList,SpecialChar - config.removeButtons = 'Print,Preview,NewPage,Save,Templates,SelectAll,TextField,Textarea,Select,Button,HiddenField,Form,Checkbox,Radio,CreateDiv,Language,Anchor,Flash,HorizontalRule,Smiley,PageBreak,Iframe,ShowBlocks,About,BidiLtr,BidiRtl,searchCode,Copy,Cut'; +//,NumberedList,BulletedList,SpecialChar ,Templates + config.removeButtons = 'Print,Preview,NewPage,Save,SelectAll,TextField,Textarea,Select,Button,HiddenField,Form,Checkbox,Radio,CreateDiv,Language,Anchor,Flash,HorizontalRule,Smiley,PageBreak,Iframe,ShowBlocks,About,BidiLtr,BidiRtl,searchCode,Copy,Cut'; From 5b824b07a9a5185c4c94c4485a3ba84a9c55caec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=B9=E8=AF=9A=E8=AF=9A?= Date: Wed, 2 Jun 2021 14:44:50 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E5=B9=BF=E5=91=8A=E8=BF=87=E6=9C=9F?= =?UTF-8?q?=E6=8F=90=E9=86=92=E9=A2=9C=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/third_party/recommend/views/welcome.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/third_party/recommend/views/welcome.php b/application/third_party/recommend/views/welcome.php index eb10a2b1..161f894d 100644 --- a/application/third_party/recommend/views/welcome.php +++ b/application/third_party/recommend/views/welcome.php @@ -18,7 +18,7 @@ $item){ ?> - +
it_title; ?> @@ -26,13 +27,7 @@ it_expires); ?>
添加广告
it_title; ?> From d1bf4718eaf5d20448e9c93c2f11e4c448691918 Mon Sep 17 00:00:00 2001 From: LiaoYijun Date: Wed, 2 Jun 2021 14:53:59 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=B8=8D=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E7=9A=84=E4=BB=A4=E7=89=8C=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/views/mobile_first/ch-pc.php | 2 +- application/views/mobile_first/ch.php | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/application/views/mobile_first/ch-pc.php b/application/views/mobile_first/ch-pc.php index 40b2cbf8..44213b61 100644 --- a/application/views/mobile_first/ch-pc.php +++ b/application/views/mobile_first/ch-pc.php @@ -152,7 +152,7 @@ - +
diff --git a/application/views/mobile_first/ch.php b/application/views/mobile_first/ch.php index f27b8343..98482f57 100644 --- a/application/views/mobile_first/ch.php +++ b/application/views/mobile_first/ch.php @@ -49,8 +49,7 @@ - +
From 3deafac79ea407fc8e63b463f3fc7b868d38470f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E9=B9=8F?= Date: Wed, 2 Jun 2021 15:29:59 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E4=B8=80=E6=97=A5=E6=B8=B8=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=8E=92=E9=99=A4=E9=87=8D=E5=A4=8D=E4=BA=A7=E5=93=81?= =?UTF-8?q?=EF=BC=88=E7=BF=B0=E7=89=B9=E8=AF=BB=E5=8F=96=E7=9A=84=E4=BA=A7?= =?UTF-8?q?=E5=93=81=E6=8E=92=E9=99=A4=E5=B7=B2=E7=BB=8F=E6=90=AC=E8=BF=81?= =?UTF-8?q?=E5=88=B0=E4=BF=A1=E6=81=AF=E5=B9=B3=E5=8F=B0=E7=9A=84=E3=80=82?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ctmobilefirst/models/api_model.php | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/application/third_party/ctmobilefirst/models/api_model.php b/application/third_party/ctmobilefirst/models/api_model.php index 90ce19ad..11285278 100644 --- a/application/third_party/ctmobilefirst/models/api_model.php +++ b/application/third_party/ctmobilefirst/models/api_model.php @@ -172,6 +172,18 @@ class Api_model extends CI_Model { WHERE (p2.PAG2_LGC = 104) AND (p1.pag_dei_sn = 17) AND (p2.PAG2_Check = 2) + AND (PAG_Code not in( + SELECT convert(varchar(100),( + SELECT TOP 1 im_value + FROM infoMetas + WHERE im_key = 'meta_product_code' + AND im_ic_id = ic_id + )) AS code + FROM dbo.infoContents + INNER JOIN infoStructures ON ic_id = is_ic_id + WHERE is_sitecode = 'chinatravel'".$whereInfo." + AND ic_status = 1 + )) AND (isnull(P1.DeleteFlag,0) <>1) ".$whereHT." ) Tmp @@ -186,13 +198,13 @@ class Api_model extends CI_Model { FROM dbo.infoContents inner join infoStructures on ic_id=is_ic_id WHERE is_sitecode='chinatravel' ".$whereInfo." - --and ic_status=1 + and ic_status=1 ) as t ) tball where 1=1 ORDER BY tball.sortBy ASC "; - + $query = $this->HT->query($sql); return $query->result(); } From a0eec7c646859b4c09fe515f18bc61ee601e19c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=B9=E8=AF=9A=E8=AF=9A?= Date: Wed, 2 Jun 2021 15:40:40 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E5=B9=BF=E5=91=8A=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../third_party/recommend/views/templates.php | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 application/third_party/recommend/views/templates.php diff --git a/application/third_party/recommend/views/templates.php b/application/third_party/recommend/views/templates.php new file mode 100644 index 00000000..7e07500d --- /dev/null +++ b/application/third_party/recommend/views/templates.php @@ -0,0 +1,17 @@ +

完整的文中广告代码：

+ +
Recommended Itinerary
+ +
7-Day Myanmar Essence Tour + +
+
7-Day Myanmar Essence Tour Yangon, Mandalay, Bagan Tour with e-Visa
+ +
+
+
+ +
+

完整的右侧广告代码：

+ +
5-Day Siem Reap Tour
From f39679f86e593a3e6ade44101f92dc0b73bbef6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=B9=E8=AF=9A=E8=AF=9A?= Date: Wed, 2 Jun 2021 15:57:51 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E5=86=85=E5=AE=B9=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/views/bootstrap3/header.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/views/bootstrap3/header.php b/application/views/bootstrap3/header.php index 86d3f99b..44aee7cc 100644 --- a/application/views/bootstrap3/header.php +++ b/application/views/bootstrap3/header.php @@ -90,7 +90,7 @@ if (result != null) { for (var key in result.Pinfo) { if ('config->item('site_code') ?>' == 'ah') { - editor.insertHtml('
' + result.Pinfo[key].Sinfo + ' ' + result.Pinfo[key].Sinfo + '
'); + editor.insertHtml('
' + result.Pinfo[key].Sinfo + ' ' + result.Pinfo[key].Sinfo + '
'); } else if ('config->item('site_code') ?>' == 'ch') { editor.insertHtml('
' + result.Pinfo[key].Sinfo + '' + result.Pinfo[key].Sinfo + '
'); } else {