Commit Graph

2432 Commits (5b3969f55e70779683b17638ab2753d3ccfe18f9)

Author SHA1 Message Date
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
赵鹏 9e0e5235c8 safri锚点问题 1 year ago
赵鹏 7729fb8da5 购物车加rel="nofollow" target="blank" 1 year ago
赵鹏 2d3902209c 1. 火车搜索框替换标签<!--@TRAINSEARCH-FORM@--> 2.可以设置默认城市 1 year ago
LMR 2e932db6a2 fix 1 year ago
LMR 00718cf541 fuda 1 year ago
LMR b365bc5073 opt bad cache 1 year ago
candice d46627faca 样式细节调整 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 165bb2a8d4 把“是否展示广告提示”改为“是否展示右侧广告” 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
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