Commit Graph

4346 Commits (2dba5aad3f9f7061947d5eed9af7ded319bff416)

Author SHA1 Message Date
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