Commit Graph

4627 Commits (d1fb26ff4e6374eb212f01e2a8a04395448143b6)

Author SHA1 Message Date
黄文强@HWQ-PC e37f0f07d8 Merge branch 'master' of github.com:hainatravel/information-system 2 years ago
黄文强@HWQ-PC 4be635abdb 增加ch作者名字添加链接 2 years ago
LMR 042c54cb3d add gm to series site 2 years ago
candice 51c45667f1 11 2 years ago
candice fe789b1d15 Merge branch 'master' of github.com:hainatravel/information-system into master 2 years ago
candice 82909b5a9f 导航按钮添加title 2 years ago
Jimmy Liow 55e7e47418 右侧推荐删除 aside 标签 2 years ago
candice a66966400b 11 2 years ago
candice 4f4182ae4f Merge branch 'master' of github.com:hainatravel/information-system into master 2 years ago
candice f27fe67244 aside main nav标签添加 2 years ago
Jimmy Liow 639688a626 AH 水灯节下线 Standard 类型 2 years ago
Jimmy Liow 804446ac24 删除水灯节在信息页面表单 2 years ago
candice 2751bf3c94 删除keywords一项 2 years ago
赵鹏 5eb7be4755 fix 2 years ago
赵鹏 ae3daef11b fix 2 years ago
赵鹏 a541af9a47 fix 2 years ago
赵鹏 f94c092f06 fix 2 years ago
赵鹏 123ed3a245 CT左右结构新表单 2 years ago
赵鹏 b38799aeaa fix 2 years ago
赵鹏 38935fcd0a Merge branch 'master' of github.com:hainatravel/information-system 2 years ago
赵鹏 15bb56eebc CT产品页表单兼容左右结构。 2 years ago
candice f9ad1b5470 11 2 years ago
candice b7d3eebd18 电话框type值改为tel 2 years ago
candice 17c4fd81f9 表单内容精简,删除CAD选项 2 years ago
candice b111edf848 11 2 years ago
赵鹏 7bcb6fe2c7 TS网站及手机端接口改澜海接口测试。 2 years ago
赵鹏 4e5cac7adc Merge branch 'master' of github.com:hainatravel/information-system 2 years ago
赵鹏 b5e58abbdb 澜海火车票接口上线 2 years ago
candice 9f93b9d0af TA获奖图标更新为2024 2 years ago
candice 7a282a7a3f TA获奖图标更新为2024 2 years ago
candice 0c50e78ce2 TA获奖图标更新为2024 2 years ago
赵鹏 c88477d5bc tp产品预订日期fix 2 years ago
赵鹏 00569cef02 新增澜海火车票查询接口。 2 years ago
赵鹏 81b0822beb Merge branch 'master' of github.com:hainatravel/information-system 2 years ago
赵鹏 681ec822b6 CH上的TP产品默认日期修改。 2 years ago
LMR 0f4ac70071 fix icid 2 years ago
LMR 67a4e3dc99 fix meta 2 years ago
LMR ae1395684f test meta 2 years ago
candice 91fa4f5c21 电话号码输入框type改为number 2 years ago
赵鹏 4be99b2d9c Merge branch 'master' of github.com:hainatravel/information-system 2 years ago
赵鹏 1423dc855f 上海站表单fix 2 years ago
YCC ee3079bba6 客运来源的订单访问路径抓取 2 years ago
赵鹏 009c11098a 上海站线路表单 2 years ago
赵鹏 f91ffc880e 上海站详细页加表单 2 years ago
赵鹏 fbae81a8b7 上海站线路详细页不调用表单。 2 years ago
candice a8e3dba319 搜索框按钮图片添加alt文字 alt="site search button" 2 years ago
Jimmy Liow af8327ca7d CT站删除谷歌广告代码 2 years ago
LMR 63225aa81d test order path 2 years ago
candice 3605c9a6eb 图片添加alt文字 2 years ago
YCC 93072cc51c 添加香港到一日游导航入口 2 years ago
YCC a8c1549ce0 添加导航入口 2 years ago
candice 9c387fa2ce 图片添加alt文字 2 years ago
candice 25cca56090 添加alt文字 2 years ago
candice ffb9629cbd 图片添加alt文字 2 years ago
candice 53924c2450 底部TM按钮链接修改为 /forms/create-my-trip.htm 2 years ago
candice d28e6ab06c 删除头部导航跨国链接 2 years ago
LMR 3c198cb7d1 注释 sms 1 2 years ago
赵鹏 b43cc94794 Merge branch 'master' of github.com:hainatravel/information-system 2 years ago
赵鹏 5f1a375473 CT站手动设置信息发布时间 2 years ago
黄文强@HWQ-PC 1c8ef378e6 CH成本换算成美元,增加判断是否是ch的逻辑 2 years ago
黄文强@HWQ-PC 4335e66225 CH成本币种换算成用美元 2 years ago
LMR f846137062 fix 2 years ago
LMR fb2b5de674 format 2 years ago
LMR 077712eaab fix show 2 years ago
LMR 0161f333c2 rm log 2 years ago
LMR ff16807980 test amp_json 2 years ago
LMR 07b6937f5f fix 50 txt 2 years ago
LMR ebf7170e51 fix url 2 years ago
LMR bd5eecc3c6 fix test 2 years ago
LMR 9432e6f43f Merge branch 'master' of https://github.com/hainatravel/information-system 2 years ago
LMR 0f4e4faf9d add @@@ 2 years ago
LMR a94c6fdcd3 format 2 years ago
candice a47335949e 底部社媒推荐添加链接 2 years ago
candice 63adaebf5a 底部社媒推荐添加链接 2 years ago
candice 5e1cac893a 底部社媒推荐添加链接 2 years ago
LMR 4e35f0282e echo json_encode(array('err'=>'容错1')); 2 years ago
LMR 516181d9f4 容错2 2 years ago
LMR 7b07b5a141 容错2 2 years ago
LMR 5b9b199ce4 fix update_info_by_keys 2 years ago
LMR 609b972176 fix header('Access-Control-Allow-Origin:*'); 2 years ago
LMR a329b45f19 返回值 2 years ago
LMR 2dba5aad3f fix up 2 2 years ago
LMR 0f4136181d fix strpos($keys, 'undefined') !== false 2 years ago
LMR 10c9024ccd fix 2 years ago
LMR 4719149e4c infox 2 years ago
LMR 9bff796497 add force ic_url 2 years ago
LMR 76f1d93ce6 add log 2 years ago
LMR e14baeecfa fix 30 2 years ago
LMR 3bbb1c0257 fix 2 years ago
LMR 59d0ea01b3 Merge branch 'master' of https://github.com/hainatravel/information-system 2 years ago
LMR 466e8f197f todo: list_info_by_keys 2 years ago
Jimmy Liow 33bd626cdb 水灯节表单禁用地点 Heritage 2 years ago
candice 5a6e974d8a 11 2 years ago
candice f64a59cdb4 样式细节修改 2 years ago
candice 5e3d382c3c 联系方式删减 2 years ago
candice 90cdb1880a 联系方式删减 2 years ago
candice 622e79fcf0 联系方式删减 2 years ago
LMR 0b49bff650 yrdy 2 years ago
LMR 7a6c6409a3 fix 2 years ago
LMR d3fc334525 fix 2 years ago
LMR 29218c5c9d fix2 2 years ago
LMR 19c0f5258b fix 1 2 years ago
LMR 6f8a287ac1 fix 2 years ago
LMR 3645a67b45 add infofix 2 years ago
Jimmy Liow 91387297e0 CH、GH 统一使用 optimize 目录的图片 2 years ago
Jimmy Liow 8b1a5d01c7 image 目录统一使用 chinahighlights 2 years ago
Jimmy Liow acbf779d0b 使用 optimize 做获取图片宽高目录 2 years ago
candice 894bbbc585 底部模板删除our differences链接 2 years ago
LMR 8b74fa95f0 fix index.htm 2 years ago
LMR dab7a9f50d Merge branch 'master' of https://github.com/hainatravel/information-system 2 years ago
LMR 114becf0e2 formate code 2 years ago
Jimmy Liow 8f6395303c Merge branch 'master' of github.com:hainatravel/information-system 2 years ago
Jimmy Liow 46a2bf2e55 客人信息表单日期不能超过四位数 2 years ago
LMR c1dcd41570 add pd tour 2 years ago
LMR 93d0f928c1 Merge branch 'master' of https://github.com/hainatravel/information-system 2 years ago
LMR 7b2877e911 da 2 years ago
candice 31bd67da9e 样式细节调整 2 years ago
candice e47d303d89 新增国家号选择 2 years ago
candice 5b3969f55e Merge branch 'master' of github.com:hainatravel/information-system into master 2 years ago
Jimmy Liow 8d282612a8 合并区号和手机号保存 2 years ago
candice c484005bf1 新增国家号选择 2 years ago
candice 5aac2e3387 样式细节调整 2 years ago
candice caa735c708 新增国家号选择 2 years ago
candice 2b630a31df 样式细节修改 2 years ago
candice bf6986e05f 电话框引导语修改,去掉lable,换成placeholder 2 years ago
candice 6fc73567ec 电话框引导语修改,去掉lable,换成placeholder 2 years ago
candice ce8cdfa4d0 添加国家号 2 years ago
candice 1af4a8671a 添加国家号 2 years ago
candice a8679db263 恢复国籍选择,取消区号 2 years ago
candice dbb057384c 添加国家号 2 years ago
candice c89e3d53b5 电话号码添加国家号 2 years ago
Jimmy Liow 80375f3d69 删除 AH、CH、GH 机票信息必填 2 years ago
Jimmy Liow 573e2a8a01 删除机票必填验证和无用的jQuery日历 2 years ago
赵鹏 1c80267de8 修复预售时间表有重复站点的话无法获取数据的错误 2 years ago
赵鹏 1768776156 自动出票排序先按日期,再按预售时间。这样可以优先预售期内的先出。 2 years ago
赵鹏 ecdbe13813 优化自动出票sql,兼容多条收款记录的订单。 2 years ago
赵鹏 e36f5f885d 自动出票排序重新修改。(我记得改过了的,不知道怎么不见了。) 2 years ago
赵鹏 de21b4e693 超过12个小时才停止抢票 2 years ago
赵鹏 5c1d5c3877 Merge branch 'master' of github.com:hainatravel/information-system 2 years ago
赵鹏 fbfbbe2581 设置自动出票运行时间为3分钟 2 years ago
LMR b195f05e8f add log 2 years ago
赵鹏 4fbebb3b2e Merge branch 'master' of github.com:hainatravel/information-system 2 years ago
赵鹏 4c2414805f 自动出票符合条件出票时加日志,用来判断订单自动出票中哪一步出问题。 2 years ago
candice a19b664015 11 2 years 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
2 years ago
candice 6a5523bdb2 11 2 years ago
candice 278d9bfb47 11 2 years ago
candice 05167e09c7 头部导航删除zodiac signs和dream meaning 2 years ago
Jimmy Liow a7341b4854 Heritage只有15号的票 2 years ago
Jimmy Liow 23981900c9 解决默认价格设置错误 2 years ago
Jimmy Liow 5d2cb7931c 水灯节信息页表单改版 2 years ago
Jimmy Liow 43e53085eb 增加十人以上价格优惠 2 years ago
Jimmy Liow 8c30de1ff9 AH 水灯节表单新优化 2 years ago
赵鹏 5f406b87f5 TA加nofollow 2 years ago
赵鹏 23f627eef7 预售日志关闭 2 years ago
赵鹏 9e0e5235c8 safri锚点问题 2 years ago
赵鹏 012980f612 证件号判断错误。 2 years ago
赵鹏 6ece6fb525 自动出票开启预售期的日志,检查8点整的订单为何没有自动出票。 2 years ago
赵鹏 ee2c60ee06 Merge branch 'master' of github.com:hainatravel/information-system 2 years ago
赵鹏 7729fb8da5 购物车加rel="nofollow" target="blank" 2 years ago
Jimmy Liow 22739403f8 航班日期超出 SQL Datetime 范围则设置为空 2 years ago
赵鹏 8e79ad252d Merge branch 'master' of github.com:hainatravel/information-system 2 years ago
赵鹏 213744009d 自动出票的订单根据出发城市的预售时间来排序。 2 years ago
Jimmy Liow 40ed5237a8 Merge branch 'master' of github.com:hainatravel/information-system 2 years ago
Jimmy Liow 8bea117546 客人信息表单增加日期范围限制 2 years ago
赵鹏 1624e36ad3 自动出票关闭预售期的测试日志 2 years ago
赵鹏 6d640bee99 fix 2 years ago
赵鹏 d1dec4bfd5 fix 2 years ago
赵鹏 2d3902209c 1. 火车搜索框替换标签<!--@TRAINSEARCH-FORM@--> 2.可以设置默认城市 2 years ago
赵鹏 814157ed87 Merge branch 'master' of github.com:hainatravel/information-system 2 years ago
赵鹏 318d4bd5a8 fix 2 years ago
LMR 463000da50 Merge branch 'master' of https://github.com/hainatravel/information-system 2 years ago
LMR 56cf181551 fix cache path 2 years ago
赵鹏 8a65396a35 自动出票优化 2 years ago
赵鹏 05ac02142b Merge branch 'master' of github.com:hainatravel/information-system 2 years ago
赵鹏 09e547096f 上海站静态话fix 2 years ago
LMR 2e932db6a2 fix 2 years ago
LMR 00718cf541 fuda 2 years ago
LMR b365bc5073 opt bad cache 2 years ago
赵鹏 e0633c07c3 fix 2 years ago
赵鹏 f67786c967 预售日支持自动出票 2 years ago
赵鹏 810cf54752 Merge branch 'master' of github.com:hainatravel/information-system 2 years ago
赵鹏 589c897c0d CH站TP版块调用自己的样式https://proxy-data.chinahighlights.com/css/daytrip/tpbase.css 2 years ago
candice ecbb96c8fd 新增三站 线路卡片 模板代码 2 years ago
candice 3d086bb0c2 添加提示语 2 years ago
赵鹏 3db8fe5513 Merge branch 'master' of github.com:hainatravel/information-system 2 years ago
赵鹏 139911b721 TP的详细页加限制,翰特找不到产品信息不出预订表单 2 years ago
candice d46627faca 样式细节调整 2 years ago
赵鹏 df8df51bbf Merge branch 'master' of github.com:hainatravel/information-system 2 years ago
赵鹏 470590af01 火车预售时间修改功能上线 2 years ago
candice 2aa44e9845 样式细节修改 2 years ago
candice f82f8c95a0 样式细节修改 2 years ago
candice 1609cf908b 细节样式添加 2 years ago
candice 90dc5d9243 票种部分文字加粗 2 years ago
Jimmy Liow f9cbccd499 Merge branch 'master' of github.com:hainatravel/information-system 2 years ago
Jimmy Liow 4087e73ff5 AH CAD 跨年表单 2 years ago
黄文强@HWQ-PC 08bbf9666f 增加ah和ph是否显示广告里面对空逻辑的判断 2 years ago
黄文强@HWQ-PC 4b17fa89ad Merge branch 'master' of github.com:hainatravel/information-system 2 years ago
黄文强@HWQ-PC d6b0503dc0 修改判断是否展示广告忘记加empty($meta_show_advertise)判断条件逻辑 2 years ago
赵鹏 ba98a93f2a Merge branch 'master' of github.com:hainatravel/information-system 2 years ago
赵鹏 39f6f144db 火车预售时间维护功能。 2 years ago
黄文强@HWQ-PC 165bb2a8d4 把“是否展示广告提示”改为“是否展示右侧广告” 2 years ago
黄文强@HWQ-PC 2e12851439 修改判断是否显示广告的逻辑错误 2 years ago
黄文强@HWQ-PC 35aa4ba386 Merge branch 'master' of github.com:hainatravel/information-system 2 years ago
黄文强@HWQ-PC e250747476 把是否展示广告的0-1判断逻辑改为"yes"-"no" 2 years ago
candice 39a90562d5 补附加样式和JS 2 years ago
candice 845c0b0f37 JS恢复 2 years ago
candice f408a7636f JS精简 2 years ago
candice 1c052d21de Merge branch 'master' of github.com:hainatravel/information-system into master 2 years ago
candice bc9bb92838 JS精简 2 years ago
黄文强@HWQ-PC ef523066c5 Merge branch 'master' of github.com:hainatravel/information-system 2 years ago
黄文强@HWQ-PC e3fc1423b3 修改依然显示class=right_brand_info的广告div 2 years ago
candice 3be7953948 JS精简 2 years ago
candice e70b8e38b3 Merge branch 'master' of github.com:hainatravel/information-system into master 2 years ago
candice 06b6824312 JS精简 2 years ago
黄文强@HWQ-PC bb83cf650a Merge branch 'master' of github.com:hainatravel/information-system 2 years ago
黄文强@HWQ-PC de54f8417c 信息平台增加是否显示右侧广告按钮 2 years ago
Jimmy Liow a9aac74fad 调整机票提醒位置 2 years ago
candice 3020b581f1 样式调整 2 years 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> 2 years 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> 2 years 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> 2 years 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> 2 years 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> 2 years 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> 2 years ago
candice 3506a266e4 Merge branch 'master' of github.com:hainatravel/information-system into master 2 years 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> 2 years ago
黄文强@HWQ-PC 10397e5c65 Merge branch 'master' of github.com:hainatravel/information-system 2 years ago
黄文强@HWQ-PC e68dff1005 修改gh-h1没加strtotime方法 2 years 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> 2 years ago
candice f4bf6b544c Merge branch 'master' of github.com:hainatravel/information-system into master 2 years 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> 2 years 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
2 years ago
黄文强@HWQ-PC 471b425861 增加ch和gh的发布日期功能 2 years 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> 2 years 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> 至表单文件 2 years ago
candice 54dfe2bfc0 Merge branch 'master' of github.com:hainatravel/information-system into master 2 years 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> 至表单文件 2 years ago
Jimmy Liow 96b2131bec 客人信息表单增加机票提示 2 years ago
Jimmy Liow 917f449f04 取消发布日期默认值 2 years ago
Jimmy Liow faac9b862e AH 增加发布日期判断 2 years ago
黄文强@HWQ-PC dcb914b432 信息平台右侧增加发布日期框 2 years ago
candice 32afc727e4 底部模板history更换为loyalty program 2 years ago
Jimmy Liow 2a4a951a05 Merge branch 'master' of github.com:hainatravel/information-system 2 years ago
Jimmy Liow 60f57b38bd 删除 GH GG 广告代码 2 years ago
candice 0f40b89266 div精简 2 years ago
candice 963d40cc65 11 2 years ago
candice 935349967d div精简 2 years ago
candice b40ee07d4e 精简div 2 years ago
candice f849fb0a9c 11 2 years ago