Commit Graph

4548 Commits (0ad4ef25394c7491b2d95b4212a59d46445de5a9)

Author SHA1 Message Date
LMR 609b972176 fix header('Access-Control-Allow-Origin:*'); 1 year ago
LMR a329b45f19 返回值 1 year ago
LMR 2dba5aad3f fix up 2 1 year ago
LMR 0f4136181d fix strpos($keys, 'undefined') !== false 1 year ago
LMR 10c9024ccd fix 1 year ago
LMR 4719149e4c infox 1 year ago
LMR 9bff796497 add force ic_url 1 year ago
LMR 76f1d93ce6 add log 1 year ago
LMR e14baeecfa fix 30 1 year ago
LMR 3bbb1c0257 fix 1 year ago
LMR 59d0ea01b3 Merge branch 'master' of https://github.com/hainatravel/information-system 1 year ago
LMR 466e8f197f todo: list_info_by_keys 1 year ago
Jimmy Liow 33bd626cdb 水灯节表单禁用地点 Heritage 1 year ago
candice 5a6e974d8a 11 1 year ago
candice f64a59cdb4 样式细节修改 1 year ago
candice 5e3d382c3c 联系方式删减 1 year ago
candice 90cdb1880a 联系方式删减 1 year ago
candice 622e79fcf0 联系方式删减 1 year ago
LMR 0b49bff650 yrdy 1 year ago
LMR 7a6c6409a3 fix 1 year ago
LMR d3fc334525 fix 1 year ago
LMR 29218c5c9d fix2 1 year ago
LMR 19c0f5258b fix 1 1 year ago
LMR 6f8a287ac1 fix 1 year ago
LMR 3645a67b45 add infofix 1 year ago
Jimmy Liow 91387297e0 CH、GH 统一使用 optimize 目录的图片 1 year ago
Jimmy Liow 8b1a5d01c7 image 目录统一使用 chinahighlights 1 year ago
Jimmy Liow acbf779d0b 使用 optimize 做获取图片宽高目录 1 year ago
candice 894bbbc585 底部模板删除our differences链接 1 year ago
LMR 8b74fa95f0 fix index.htm 1 year ago
LMR dab7a9f50d Merge branch 'master' of https://github.com/hainatravel/information-system 1 year ago
LMR 114becf0e2 formate code 1 year ago
Jimmy Liow 8f6395303c Merge branch 'master' of github.com:hainatravel/information-system 1 year ago
Jimmy Liow 46a2bf2e55 客人信息表单日期不能超过四位数 1 year ago
LMR c1dcd41570 add pd tour 1 year ago
LMR 93d0f928c1 Merge branch 'master' of https://github.com/hainatravel/information-system 1 year ago
LMR 7b2877e911 da 1 year ago
candice 31bd67da9e 样式细节调整 1 year ago
candice e47d303d89 新增国家号选择 1 year ago
candice 5b3969f55e Merge branch 'master' of github.com:hainatravel/information-system into master 1 year ago
Jimmy Liow 8d282612a8 合并区号和手机号保存 1 year ago
candice c484005bf1 新增国家号选择 1 year ago
candice 5aac2e3387 样式细节调整 1 year ago
candice caa735c708 新增国家号选择 1 year ago
candice 2b630a31df 样式细节修改 1 year ago
candice bf6986e05f 电话框引导语修改,去掉lable,换成placeholder 1 year ago
candice 6fc73567ec 电话框引导语修改,去掉lable,换成placeholder 1 year ago
candice ce8cdfa4d0 添加国家号 1 year ago
candice 1af4a8671a 添加国家号 1 year ago
candice a8679db263 恢复国籍选择,取消区号 1 year ago
candice dbb057384c 添加国家号 1 year ago
candice c89e3d53b5 电话号码添加国家号 1 year ago
Jimmy Liow 80375f3d69 删除 AH、CH、GH 机票信息必填 1 year ago
Jimmy Liow 573e2a8a01 删除机票必填验证和无用的jQuery日历 1 year ago
赵鹏 1c80267de8 修复预售时间表有重复站点的话无法获取数据的错误 1 year ago
赵鹏 1768776156 自动出票排序先按日期,再按预售时间。这样可以优先预售期内的先出。 1 year ago
赵鹏 ecdbe13813 优化自动出票sql,兼容多条收款记录的订单。 1 year ago
赵鹏 e36f5f885d 自动出票排序重新修改。(我记得改过了的,不知道怎么不见了。) 1 year ago
赵鹏 de21b4e693 超过12个小时才停止抢票 1 year ago
赵鹏 5c1d5c3877 Merge branch 'master' of github.com:hainatravel/information-system 1 year ago
赵鹏 fbfbbe2581 设置自动出票运行时间为3分钟 1 year ago
LMR b195f05e8f add log 1 year ago
赵鹏 4fbebb3b2e Merge branch 'master' of github.com:hainatravel/information-system 1 year ago
赵鹏 4c2414805f 自动出票符合条件出票时加日志,用来判断订单自动出票中哪一步出问题。 1 year ago
candice a19b664015 11 1 year ago
candice f359270696 Merge branch 'master' of github.com:hainatravel/information-system into master
# Conflicts:
#	application/views/mobile_first/ah-lantern-form-info-page.php
#	application/views/mobile_first/ah-lantern-form.php
1 year ago
candice 6a5523bdb2 11 1 year ago
candice 278d9bfb47 11 1 year ago
candice 05167e09c7 头部导航删除zodiac signs和dream meaning 1 year ago
Jimmy Liow a7341b4854 Heritage只有15号的票 1 year ago
Jimmy Liow 23981900c9 解决默认价格设置错误 1 year ago
Jimmy Liow 5d2cb7931c 水灯节信息页表单改版 1 year ago
Jimmy Liow 43e53085eb 增加十人以上价格优惠 1 year ago
Jimmy Liow 8c30de1ff9 AH 水灯节表单新优化 1 year ago
赵鹏 5f406b87f5 TA加nofollow 1 year ago
赵鹏 23f627eef7 预售日志关闭 1 year ago
赵鹏 9e0e5235c8 safri锚点问题 1 year ago
赵鹏 012980f612 证件号判断错误。 1 year ago
赵鹏 6ece6fb525 自动出票开启预售期的日志,检查8点整的订单为何没有自动出票。 1 year ago
赵鹏 ee2c60ee06 Merge branch 'master' of github.com:hainatravel/information-system 1 year ago
赵鹏 7729fb8da5 购物车加rel="nofollow" target="blank" 1 year ago
Jimmy Liow 22739403f8 航班日期超出 SQL Datetime 范围则设置为空 1 year ago
赵鹏 8e79ad252d Merge branch 'master' of github.com:hainatravel/information-system 1 year ago
赵鹏 213744009d 自动出票的订单根据出发城市的预售时间来排序。 1 year ago
Jimmy Liow 40ed5237a8 Merge branch 'master' of github.com:hainatravel/information-system 1 year ago
Jimmy Liow 8bea117546 客人信息表单增加日期范围限制 1 year ago
赵鹏 1624e36ad3 自动出票关闭预售期的测试日志 1 year ago
赵鹏 6d640bee99 fix 1 year ago
赵鹏 d1dec4bfd5 fix 1 year ago
赵鹏 2d3902209c 1. 火车搜索框替换标签<!--@TRAINSEARCH-FORM@--> 2.可以设置默认城市 1 year ago
赵鹏 814157ed87 Merge branch 'master' of github.com:hainatravel/information-system 1 year ago
赵鹏 318d4bd5a8 fix 1 year ago
LMR 463000da50 Merge branch 'master' of https://github.com/hainatravel/information-system 1 year ago
LMR 56cf181551 fix cache path 1 year ago
赵鹏 8a65396a35 自动出票优化 1 year ago
赵鹏 05ac02142b Merge branch 'master' of github.com:hainatravel/information-system 1 year ago
赵鹏 09e547096f 上海站静态话fix 1 year ago
LMR 2e932db6a2 fix 1 year ago
LMR 00718cf541 fuda 1 year ago
LMR b365bc5073 opt bad cache 1 year ago
赵鹏 e0633c07c3 fix 1 year ago
赵鹏 f67786c967 预售日支持自动出票 1 year ago
赵鹏 810cf54752 Merge branch 'master' of github.com:hainatravel/information-system 1 year ago
赵鹏 589c897c0d CH站TP版块调用自己的样式https://proxy-data.chinahighlights.com/css/daytrip/tpbase.css 1 year ago
candice ecbb96c8fd 新增三站 线路卡片 模板代码 1 year ago
candice 3d086bb0c2 添加提示语 1 year ago
赵鹏 3db8fe5513 Merge branch 'master' of github.com:hainatravel/information-system 1 year ago
赵鹏 139911b721 TP的详细页加限制,翰特找不到产品信息不出预订表单 1 year ago
candice d46627faca 样式细节调整 1 year ago
赵鹏 df8df51bbf Merge branch 'master' of github.com:hainatravel/information-system 1 year ago
赵鹏 470590af01 火车预售时间修改功能上线 1 year ago
candice 2aa44e9845 样式细节修改 1 year ago
candice f82f8c95a0 样式细节修改 1 year ago
candice 1609cf908b 细节样式添加 1 year ago
candice 90dc5d9243 票种部分文字加粗 1 year ago
Jimmy Liow f9cbccd499 Merge branch 'master' of github.com:hainatravel/information-system 1 year ago
Jimmy Liow 4087e73ff5 AH CAD 跨年表单 1 year ago
黄文强@HWQ-PC 08bbf9666f 增加ah和ph是否显示广告里面对空逻辑的判断 1 year ago
黄文强@HWQ-PC 4b17fa89ad Merge branch 'master' of github.com:hainatravel/information-system 1 year ago
黄文强@HWQ-PC d6b0503dc0 修改判断是否展示广告忘记加empty($meta_show_advertise)判断条件逻辑 1 year ago
赵鹏 ba98a93f2a Merge branch 'master' of github.com:hainatravel/information-system 1 year ago
赵鹏 39f6f144db 火车预售时间维护功能。 1 year ago
黄文强@HWQ-PC 165bb2a8d4 把“是否展示广告提示”改为“是否展示右侧广告” 1 year ago
黄文强@HWQ-PC 2e12851439 修改判断是否显示广告的逻辑错误 1 year ago
黄文强@HWQ-PC 35aa4ba386 Merge branch 'master' of github.com:hainatravel/information-system 1 year ago
黄文强@HWQ-PC e250747476 把是否展示广告的0-1判断逻辑改为"yes"-"no" 1 year ago
candice 39a90562d5 补附加样式和JS 1 year ago
candice 845c0b0f37 JS恢复 1 year ago
candice f408a7636f JS精简 1 year ago
candice 1c052d21de Merge branch 'master' of github.com:hainatravel/information-system into master 1 year ago
candice bc9bb92838 JS精简 1 year ago
黄文强@HWQ-PC ef523066c5 Merge branch 'master' of github.com:hainatravel/information-system 1 year ago
黄文强@HWQ-PC e3fc1423b3 修改依然显示class=right_brand_info的广告div 1 year ago
candice 3be7953948 JS精简 1 year ago
candice e70b8e38b3 Merge branch 'master' of github.com:hainatravel/information-system into master 1 year ago
candice 06b6824312 JS精简 1 year ago
黄文强@HWQ-PC bb83cf650a Merge branch 'master' of github.com:hainatravel/information-system 1 year ago
黄文强@HWQ-PC de54f8417c 信息平台增加是否显示右侧广告按钮 1 year ago
Jimmy Liow a9aac74fad 调整机票提醒位置 1 year ago
candice 3020b581f1 样式调整 1 year ago
candice 43dc57353d 删除 <script src="https://data.asiahighlights.com/min/?f=/js/jquery-1.8.2.min.js,/js/jquery.mailAutoComplete-4.0.min.js"></script> 1 year ago
candice 71eef37ba2 删除 <script src="https://data.asiahighlights.com/min/?f=/js/jquery-1.8.2.min.js,/js/jquery.mailAutoComplete-4.0.min.js"></script> 1 year ago
candice 0e2a702f14 删除 <script src="https://data.asiahighlights.com/min/?f=/js/jquery-1.8.2.min.js,/js/jquery.mailAutoComplete-4.0.min.js"></script> 1 year ago
candice 9feaa0804d 删除 <script src="https://data.asiahighlights.com/min/?f=/js/jquery-1.8.2.min.js,/js/jquery.mailAutoComplete-4.0.min.js"></script> 1 year ago
candice ffb803c6ea 删除 <script src="https://data.asiahighlights.com/min/?f=/js/jquery-1.8.2.min.js,/js/jquery.mailAutoComplete-4.0.min.js"></script> 1 year ago
candice a9c30cfcee 删除 <script src="https://data.asiahighlights.com/min/?f=/js/jquery-1.8.2.min.js,/js/jquery.mailAutoComplete-4.0.min.js"></script> 1 year ago
candice 3506a266e4 Merge branch 'master' of github.com:hainatravel/information-system into master 1 year ago
candice 48c2ca28b6 删除 <script src="https://data.asiahighlights.com/min/?f=/js/jquery-1.8.2.min.js,/js/jquery.mailAutoComplete-4.0.min.js"></script> 1 year ago
黄文强@HWQ-PC 10397e5c65 Merge branch 'master' of github.com:hainatravel/information-system 1 year ago
黄文强@HWQ-PC e68dff1005 修改gh-h1没加strtotime方法 1 year ago
candice c2f7301bb9 添加 <script src="https://data.asiahighlights.com/min/?f=/js/jquery-1.8.2.min.js,/js/jquery.mailAutoComplete-4.0.min.js"></script> 1 year ago
candice f4bf6b544c Merge branch 'master' of github.com:hainatravel/information-system into master 1 year ago
candice c0015a3523 添加 <script src="https://data.asiahighlights.com/min/?f=/js/jquery-1.8.2.min.js,/js/jquery.mailAutoComplete-4.0.min.js"></script> 1 year ago
黄文强@HWQ-PC 1d890a2387 Merge branch 'master' of github.com:hainatravel/information-system
# Conflicts:
#	application/controllers/information.php
#	application/views/mobile_first/ah-h1.php
1 year ago
黄文强@HWQ-PC 471b425861 增加ch和gh的发布日期功能 1 year ago
candice 13f6fb25e0 添加 <script src="https://data.asiahighlights.com/min/?f=/js/jquery-1.8.2.min.js,/js/jquery.mailAutoComplete-4.0.min.js"></script> 1 year ago
candice 4cfaf25162 移除 <script src="https://data.asiahighlights.com/min/?f=/js/jquery-1.8.2.min.js,/js/jquery.mailAutoComplete-4.0.min.js"></script> 至表单文件 1 year ago
candice 54dfe2bfc0 Merge branch 'master' of github.com:hainatravel/information-system into master 1 year ago
candice 3b95fccfde 移除 <script src="https://data.asiahighlights.com/min/?f=/js/jquery-1.8.2.min.js,/js/jquery.mailAutoComplete-4.0.min.js"></script> 至表单文件 1 year ago
Jimmy Liow 96b2131bec 客人信息表单增加机票提示 1 year ago
Jimmy Liow 917f449f04 取消发布日期默认值 1 year ago
Jimmy Liow faac9b862e AH 增加发布日期判断 1 year ago
黄文强@HWQ-PC dcb914b432 信息平台右侧增加发布日期框 1 year ago
candice 32afc727e4 底部模板history更换为loyalty program 1 year ago
Jimmy Liow 2a4a951a05 Merge branch 'master' of github.com:hainatravel/information-system 1 year ago
Jimmy Liow 60f57b38bd 删除 GH GG 广告代码 1 year ago
candice 0f40b89266 div精简 1 year ago
candice 963d40cc65 11 1 year ago
candice 935349967d div精简 1 year ago
candice b40ee07d4e 精简div 1 year ago
candice f849fb0a9c 11 1 year ago
candice 3b9afaf4d0 Merge branch 'master' of github.com:hainatravel/information-system into master 1 year ago
candice 18914682c4 div精简 1 year ago
Jimmy Liow 60e8599713 Merge branch 'master' of github.com:hainatravel/information-system 1 year ago
Jimmy Liow c1f4b2252a CH、GH底部图片加上延迟加载 1 year ago
candice bf430dfa91 div层级精简 1 year ago
candice 27212765cc Merge branch 'master' of github.com:hainatravel/information-system into master 1 year ago
candice 6265bbaad6 div层级精简 1 year ago
Jimmy Liow b4db47988f AH、CH、GH删除Google广告代码 1 year ago
candice 3211da0de1 png替换为jpg 1 year ago
candice 26fb30483b 底部why us图片添加宽和高 1 year ago
candice 05623249a8 png替换为jpg 1 year ago
candice 26fc372223 png替换为jpg 1 year ago
candice d8eeaad001 png替换为jpg 1 year ago
candice 785769e54b png图更换为jpg 1 year ago
Jimmy Liow b4e4496188 AH PC 端增加延迟加载 1 year ago
Jimmy Liow 59a7a91f87 AH 底部图片加上延迟加载 1 year ago
candice 61d1d7e08a 底部whyus内容修改 1 year ago
赵鹏 eb946c99f8 Merge branch 'master' of github.com:hainatravel/information-system 1 year ago
赵鹏 941555a4a6 更改火车票自动出票信息平台页面的价格显示栏目为销售的名字 1 year ago
candice 0afde5af9e 样式修改 1 year ago
Jimmy Liow cfc08936bc 精简CH、GH网站reviews个数 1 year ago
candice bc14f704bb TP分数修改 2 years ago
candice 9da5fe82c5 底部推荐位置更换 2 years ago
candice d14fc3dc49 底部推荐只保留4个位置 2 years ago
candice d4dc052240 11 2 years ago
candice 036194fad0 Merge branch 'master' of github.com:hainatravel/information-system into master 2 years ago
candice 734f11ab18 11 2 years ago
Jimmy Liow 49888b4e84 Merge branch 'master' of github.com:hainatravel/information-system 2 years ago
Jimmy Liow a95f0410a9 Merge branch 'master' of github.com:hainatravel/information-system 2 years ago
candice f774e8d5a9 底部推荐只保留4个位置 2 years ago
Jimmy Liow 638ede80d4 信息平台启用meta robots设置 2 years ago
candice 3889c6ea01 底部推荐只保留4个位置 2 years ago
candice fc6410b256 Merge branch 'master' of github.com:hainatravel/information-system into master 2 years ago
candice f36babb1fb 底部推荐只保留4个位置 2 years ago
Jimmy Liow 840f7e5b9f 修复AH目的地Review为三个 2 years ago
Jimmy Liow 46457a8785 精简AH网站reviews个数 2 years ago
candice 4398870a4b 右侧反馈标签删除 2 years ago
candice 671fdf9785 外链添加nofollow 2 years ago
赵鹏 f8ab581d34 还原回去先,不然TP网站无法使用 2 years ago
赵鹏 68a7a74c0f TP产品读取229的数据库链接改为和火车自动出票的链接,目前GH的网站上没有229 2 years ago
LMR 725ffb663e Merge branch 'master' of https://github.com/hainatravel/information-system 2 years ago
LMR 7f3fe43362 fix curl 2 years ago
LMR 2d4ad93a94 add curl header 2 years ago
candice 5b429599eb newsletter jquery删除 2 years ago
赵鹏 b03a126698 解决冲突 2 years ago
赵鹏 c600f95b47 火车首页fix 2 years ago
赵鹏 7c4080ab0d Merge branch 'master' of github.com:hainatravel/information-system
# Conflicts:
#	application/controllers/information.php
2 years ago
赵鹏 3622569c3b CH火车首页改版,去掉top banner 2 years ago
candice a269b1fdf4 头部导航增加about us 2 years ago
LMR 6c7d943631 fix 2 years ago
LMR f7cdf689b5 da 2 years ago
LMR a136eefbe6 tewt 2 years ago
LMR 359df1fd8e Merge branch 'master' of https://github.com/hainatravel/information-system 2 years ago
LMR 33d83cc68a fix 2 years ago
Jimmy Liow 94d4f1e1bb CH 删除头部视频模板 2 years ago
candice f2cda3dfaa 11 2 years ago
candice 08e87a3802 底部newsletter表单移至信息平台,替换为链接 2 years ago
candice 94574e015d 删除头部图片 2 years ago
赵鹏 b0aa3bf4e3 Merge branch 'master' of github.com:hainatravel/information-system 2 years ago
赵鹏 483dda454d 香港,台湾,澳门三地携程出票时,地区代码传CN 2 years ago
Jimmy Liow 6b2f5f0671 合并产品页信息页头部 2 years ago
Jimmy Liow d2b39cdaf9 CH 删除头部大图模板 2 years ago
Jimmy Liow 174937c6cc CH 删除头部大图模板 2 years ago
candice 8621609ed9 头部大图删除 2 years ago
candice 3da7745c6e 删除底部newsletter表单和相关JS 2 years ago
candice 8594ba2400 票价修改,增加泰铢价格 2 years ago
Jimmy Liow cac450b43f AH 撤下GG Ads 2 years ago
Jimmy Liow 4f8f5465b8 增加 Google Ad 代码 2 years ago
Jimmy Liow 9057b6c687 AH、CH、GH 撤下页头的单元广告 2 years ago
candice 668658776e 11 2 years ago
candice 8ee88e233b 11 2 years ago
candice 07f42b2051 11 2 years ago
candice 4700c8d0d0 新增rel="nofollow" 2 years ago
candice 38d6e033e8 新增 rel="nofollow" 2 years ago
candice 46aa1cada2 添加 rel="nofollow" 2 years ago
candice 991e8971a1 11 2 years ago
candice d0794575e0 11 2 years ago
candice 26098a350b 11 2 years ago
LMR e85bb4c117 fix 2 years ago