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(); } 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/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 + +
+ + +
+
+
+ +
+

完整的右侧广告代码:

+ +
5-Day Siem Reap Tour
diff --git a/application/third_party/recommend/views/welcome.php b/application/third_party/recommend/views/welcome.php index 4c8efefa..161f894d 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..44aee7cc 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/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 diff --git a/application/views/mobile_first/ch-pc.php b/application/views/mobile_first/ch-pc.php index 9744b709..e47b8fdb 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 255b8c62..96293498 100644 --- a/application/views/mobile_first/ch.php +++ b/application/views/mobile_first/ch.php @@ -49,8 +49,7 @@ - +
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';
it_title; ?> @@ -26,13 +27,7 @@ it_expires); ?>
添加广告