Commit Graph

3936 Commits (3a508cea723af8e4ae5f901b00aaf15897e68f52)

Author SHA1 Message Date
LMR 71f9e187aa fux 2 years ago
LMR c3543627ae fix 2 years ago
LMR 3eadc7fe03 fix 2 years ago
LMR dae813af5b fix 2 years ago
LMR 6a25f9be8a fkx 2 years ago
LMR 396d7cf402 Merge branch 'master' of github.com:hainatravel/information-system 2 years ago
LMR 479025ecf2 fix 2 years ago
candice 1b0af1f0c9 11 2 years ago
candice 3a7ca3ead8 国籍下拉框修改 2 years ago
Jimmy Liow 51bfadbe4f 航班信息改为必填 2 years ago
candice 54ddeec02d 解决冲突 2 years ago
candice 4e34e194bd 解决冲突 2 years ago
candice 65708169e7 Merge branch 'master' of github.com:hainatravel/information-system into master
# Conflicts:
#	application/third_party/order/views/ah/confirm_order.php
#	application/third_party/order/views/gh/confirm_order.php
2 years ago
candice babd2c3097 电话等内容修改 2 years ago
candice 297c2ea402 电话等内容修改 2 years ago
LMR bef3803745 Merge branch 'master' of github.com:hainatravel/information-system 2 years ago
LMR 9dfbb11f8d fix 2 years ago
Jimmy Liow 0e5f3e708d 客人信息收集表单优化需求 2 years ago
LMR a9354ae961 Merge branch 'master' of github.com:hainatravel/information-system 2 years ago
LMR 000fca2deb TODO: 非子节点信息 2 years ago
candice feff834a80 紧急联系人optional删除,必填 2 years ago
LMR 582a46e6f8 Merge branch 'master' of github.com:hainatravel/information-system 2 years ago
LMR 776b0b6d86 test 2 years ago
candice a7d2eb6c86 国籍选项内容修改 2 years ago
candice bef99e193c Merge branch 'master' of github.com:hainatravel/information-system into master 2 years ago
candice f3d202f6b0 国籍选项内容修改 2 years ago
LMR eb244f7cab Merge branch 'master' of github.com:hainatravel/information-system 2 years ago
LMR 281b6d0415 add get detail 2 years ago
candice 723deb7019 样式细节修改 2 years ago
candice 7b4605c9fd 新增delete功能 2 years ago
candice 4aaaf80bb5 11 2 years ago
candice e5baebe3cf 11 2 years ago
candice 5f7d2b012a Merge branch 'master' of github.com:hainatravel/information-system into master 2 years ago
candice c9040c2411 图片读取修改 2 years ago
LMR 7ba0cb58cc copy 1 2 years ago
LMR 8f105938c3 fix 2 years ago
LMR 03fa80f1c9 Merge branch 'master' of github.com:hainatravel/information-system 2 years ago
LMR e829cbeadd fix 2 years ago
candice 2ff5fcea5f 11 2 years ago
candice 05b7dc61ff 11 2 years ago
candice 827d546759 电话地址等内容修改 2 years ago
candice 49d3d160f3 下线cookie相关内容,新增google广告代码 2 years ago
candice e8d3d61187 下线cookie相关内容 2 years ago
candice 8e5176b037 下线cookie相关内容 2 years ago
YCC 64b4dae2e3 Merge branch 'master' of github.com:hainatravel/information-system 2 years ago
YCC aefdcaba02 允许ch和gh的广告重复出现 2 years ago
Jimmy Liow ade5a9d80a 更新客人信息表单机票信息 2 years ago
LMR b77654226d fix 2 years ago
LMR 39e8ef7fad fix 2 years ago
LMR b0089add28 fix 2 years ago
LMR 9d024e8436 add gh cache cfg 2 years ago
LMR 7aa376e4ab Merge branch 'master' of github.com:hainatravel/information-system 2 years ago
LMR 2b26461811 add gh_vac cache 2 years ago
赵鹏 5a68e26218 /forms/customize.html修改 2 years ago
赵鹏 00c95a53f9 Merge branch 'master' of github.com:hainatravel/information-system 2 years ago
赵鹏 38e1ffbb30 fix 2 years ago
Jimmy Liow 6c850b26bf 好评测试去除详细内容 2 years ago
Jimmy Liow 4712eadd7c 增加测试最新好评数据 2 years ago
赵鹏 66ece67c57 fix 2 years ago
赵鹏 47611d2d89 fix 2 years ago
赵鹏 df82ff0abc Merge branch 'master' of github.com:hainatravel/information-system 2 years ago
赵鹏 9429cf4a27 CT新的预订表单。 2 years ago
candice f57386990c 11 2 years ago
candice 63d6a0a2c5 Merge branch 'master' of github.com:hainatravel/information-system into master 2 years ago
candice 95dac34c4d 人数选择细节修改 2 years ago
Jimmy Liow 3b266c537d 更新价格代码测试 2 years ago
candice 2b4bab2f33 11 2 years ago
candice 5ca832448a 11 2 years ago
candice 06ccc62ec6 人数选择细节修改 2 years ago
candice bf72bd6f2f 11 2 years ago
candice fdfad34b1e 11 2 years ago
candice 8fff23a748 人数选择细节修改 2 years ago
candice d8b96f5780 11 2 years ago
candice 05c6e555e1 11 2 years ago
candice 3edb6fc7cf 11 2 years ago
candice 6a722fd2c2 Merge branch 'master' of github.com:hainatravel/information-system into master 2 years ago
candice 835bedd96a 文中线路推荐缩减为4个 2 years ago
赵鹏 4b3556602d Merge branch 'master' of github.com:hainatravel/information-system 2 years ago
赵鹏 6a3ae2369d fix 2 years ago
candice 74e43f5d97 11 2 years ago
candice 93d64398e7 Merge branch 'master' of github.com:hainatravel/information-system into master 2 years ago
candice 2ba4e41e54 11 2 years ago
candice 0f2ade8c1b Merge branch 'master' of github.com:hainatravel/information-system into master 2 years ago
candice 9ed8b8faae 11 2 years ago
赵鹏 d3f389e625 精华线路价格默认读取4星价 2 years ago
Jimmy Liow 2cb5f82ddc GH 表单成人累加规则变更 2 years ago
candice 85fb3c9d8c 11 2 years ago
candice 643a977af5 11 2 years ago
candice c029ec33ed Merge branch 'master' of github.com:hainatravel/information-system into master 2 years ago
candice 577b8cc578 人数选择修改 2 years ago
Jimmy Liow 445b25721c CH 表单成人累加规则变更 2 years ago
candice 857ac518ac 人数选择修改 2 years ago
Jimmy Liow 829cf99066 更新儿童人数选择 2 years ago
Jimmy Liow 8e48d62ffc AH 表单人数、天数改版 2 years ago
candice 9c60959461 人数选择修改 2 years ago
Jimmy Liow 1fce62f3be 站外好评只显示审核通过 2 years ago
Jimmy Liow a33d58eb25 Merge branch 'master' of github.com:hainatravel/information-system 2 years ago
Jimmy Liow e52bfb9208 测试站外好评只显示审核通过 2 years ago
candice 2ff1d7298d 头部导航修改 2 years ago
LMR 428f30e17d fix is_series_site 2 years ago
LMR 2217500854 add gh site 2 years ago
candice 010a598fb9 11 2 years ago
Jimmy Liow 2ea1785d18 AH CH GH PC端导航自动隐藏 2 years ago
candice 2abb1b26dd 11 2 years ago
candice 53093ce817 11 2 years ago
candice a408bd84e0 11 2 years ago
YCC 7a2a073306 ch和gh的广告不检测重复 2 years ago
candice 00de574fbf AH页面右侧模板展示10条反馈 2 years ago
candice 0e19c53664 11 2 years ago
candice 55c225b899 更新2024票种信息 2 years ago
candice 6a17476a7a 11 2 years ago
candice 97a5a93410 11 2 years ago
candice 1bc40ae8ef 更新2024票种信息 2 years ago
Jimmy Liow 07471ce439 Merge branch 'master' of github.com:hainatravel/information-system 2 years ago
Jimmy Liow 08aa0a6cfa 解决广告没有设置链接时页面出错 2 years ago
candice 9f7f1652e2 11 2 years ago
candice 8588acfbb2 11 2 years ago
candice c70217071b 韩国链接修改为 /south-korea 2 years ago
Jimmy Liow 2cf63bab82 广告管理可以应用产品价格代码 2 years ago
candice 72cec5586a 28号V S票售罄 2 years ago
Jimmy Liow 5151fedb39 AH水灯节表单添加票种必选判断 2 years ago
赵鹏 4ec557afcc Merge branch 'master' of github.com:hainatravel/information-system 2 years ago
赵鹏 366f05580b 按人计算的支付规则 2 years ago
candice 71f9e1a942 28号P票售罄 2 years ago
Jimmy Liow cd61f8662b Merge branch 'master' of github.com:hainatravel/information-system 2 years ago
Jimmy Liow 91329d4a0e 全文搜索增加图片链接 2 years ago
candice a4fa5b99d1 11 2 years ago
candice ad633cc7d7 Merge branch 'master' of github.com:hainatravel/information-system into master 2 years ago
candice daa91e6334 11 2 years ago
赵鹏 09d418d838 fix 2 years ago
赵鹏 6cb671ee0d Merge branch 'master' of github.com:hainatravel/information-system 2 years ago
赵鹏 a044f3de3a 计算总额单独出来,有些分销商的计算非常复杂 2 years ago
candice 0293092eca 文中广告添加ID值 2 years ago
赵鹏 3d25adf592 CT分销商系统的接口文件 2 years ago
candice 83f8351ffe 头部导航日本下链接修改 2 years ago
Jimmy Liow 00a4029054 调整按钮样式使用小屏幕 2 years ago
Jimmy Liow 55e48c2340 修改关键词位置 2 years ago
Jimmy Liow 71fe63bf4a 增加 SQL like 转义处理 2 years ago
Jimmy Liow 5194a9152c 增加转义防止 SQL 出错 2 years ago
Jimmy Liow addfb51185 增加保留查询条件 2 years ago
Jimmy Liow 47c762d26a Merge branch 'master' of github.com:hainatravel/information-system 2 years ago
Jimmy Liow 1a40cb100d 广告增加按类别搜索 2 years ago
candice 6bdc0040c2 11 2 years ago
Jimmy Liow 622ca4878e 代码改为标签 2 years ago
Jimmy Liow 9968607033 更新水灯节售票规则 2 years ago
candice 5e1e2c790b 11 2 years ago
candice 72a6bd7ea6 27号票余量更新 2 years ago
candice 78dd8837aa 添加不跟踪代码rel="nofollow" 2 years ago
candice 8a3692f731 11 2 years ago
candice e63888a938 Merge branch 'master' of github.com:hainatravel/information-system into master 2 years ago