Haina
/
information-system
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,403 Commits
8 Branches
12 Tags
76 MiB
webht/payment
master
hotfix/paypal-note
ct-mobile-first
mobile-first
feature/pay
feature/trippest
hotfix/远程访问多媒体中心
add-auto-ticket
v20170316.1
v20
国际站的图片管理
v20170303.1
CDNsession问题
v20170302.3
v20170302.2
v20170302.1
v20170228.2
v20170228.1
模板名称统一
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'b51c18ac5f'
${ noResults }
Commit Graph

4074 Commits (b51c18ac5fb789bdd5a19cfd9bfc0e14a1d1afc3)

Author SHA1 Message Date
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
candice 77aa8962dc 隐藏27号，28号票余量修改 2 years ago
Jimmy Liow 08815eb19d CH 标签表单增加邮箱提示 2 years ago
Jimmy Liow a98879207b CH Newsletter 表单增加邮箱提示 2 years ago
Jimmy Liow 3c88d6eb6a AH 表单标签增加邮箱自动提示 2 years ago
Jimmy Liow fea7d60c5b 增加注释 2 years ago
Jimmy Liow eecb2a00e4 信息平台的广告管理新增查询功能 2 years ago
Jimmy Liow 6df816833b 增加关键词搜索 SQL 2 years ago
Jimmy Liow f75d6eb20b 增加搜索广告界面 2 years ago
candice 50c815c6a4 隐藏27号VIP票 2 years ago
Jimmy Liow c672a99566 删除原来多媒体中心入口 2 years ago
candice 52fb360a0a head里新增hotjar跟踪JS 2 years ago
candice 69b955b5f3 删除图片尺寸代码 2 years ago
Jimmy Liow a3b43eb9e5 修改 JS 加载位置 2 years ago
Jimmy Liow 2bf54c2485 AH Newsletter 增加邮箱提示 2 years ago
candice b3e1eb2f44 11 2 years ago
candice b13862fdb5 删除广告标题DIV 2 years ago
candice 67a424f9af 11 2 years ago
candice 1af40a150c 文字修改 2 years ago
candice 0b8e302e88 底部模板链接错误修改 2 years ago
candice 0070c869d5 11 2 years ago
candice fe3cb52cd5 取消酒店选项内容 2 years ago
candice c0bcca2a9d 11 2 years ago
candice e69666f5d4 11 2 years ago
candice bf0328a78b 11 2 years ago
candice 3a30813ebe Merge branch 'master' of github.com:hainatravel/information-system into master 2 years ago
candice 319bde188c 11 2 years ago
Jimmy Liow 2924146a95 页面向下滑动时不展示头部导航,向上滑动时出现头部导航 2 years ago
candice fb50e1206f 11 2 years ago
candice 3923affebf 11 2 years ago
candice c4222b5443 表单恢复取消酒店选择 2 years ago
YCC 0eb80276ea bug fix 2 years ago
YCC b68c55f432 fix bug 2 years ago
YCC bd425ee8da AH页面的广告推荐取消重复检测 2 years ago
赵鹏 d27afa52da Merge branch 'master' of github.com:hainatravel/information-system 2 years ago
赵鹏 c0f3f59f6b 修改港澳通行证为回乡证 2 years ago
candice 8e805a4fab 添加酒店选项 2 years ago
candice 266275fbac 11 2 years ago
candice 3f7ba3b016 11 2 years ago
candice 1457c40ad5 添加酒店选项 2 years ago
candice 34ff39b3f4 11 2 years ago
candice 0b539e9c41 11 2 years ago
candice 45ede22fa6 11 2 years ago
candice 84fefcb252 11 2 years ago
candice 2396ff592c 11 2 years ago
Jimmy Liow 4054fb4216 信息表单增加 P-H 选项 2 years ago
Jimmy Liow 626a86561a 增加 P-H 票选项 2 years ago
candice d077fd56df 11 2 years ago
candice 9893decc3b 11 2 years ago
candice ec2dcdab76 11 2 years ago
candice e3013464f5 11 2 years ago
candice 0b9fefc73c 11 2 years ago
candice cf09f97f97 11 2 years ago
Jimmy Liow 689649dfe0 27号V票下架 2 years ago
candice 82f4ee373d 11 2 years ago
candice cb7ae5f523 表单精简 2 years ago
candice a848acb5e0 11 2 years ago
candice 3da241ab45 表单精简 2 years ago
candice 5a46406032 11 2 years ago
candice 9f4661f622 11 2 years ago
Jimmy Liow 8e2ef69c7a 28 号 P 票也需要选择酒店 2 years ago
Jimmy Liow f2750b8108 水灯节表单增加酒店选项 2 years ago
candice 3522ce1d1b 11 2 years ago
candice 6d6663e5db Merge branch 'master' of github.com:hainatravel/information-system into master 2 years ago
candice 7823667f8d 2023修改 2 years ago
Jimmy Liow 0db348593a GP 表单删除价格计算 2 years ago
candice 16159eecf5 2023修改为2024 2 years ago
candice ddc28616a2 2023改为2024 2 years ago
candice ac86594728 票种余量更新 2 years ago
candice b7deb841c9 11 2 years ago
candice cb84e8b8a6 表单简化 2 years ago
candice 2c272539f3 11 2 years ago
Jimmy Liow 0dda4e4199 修复邮件地址 ID 错误 2 years ago
candice 7f313d61dd 11 2 years ago
candice 7bae268938 Merge branch 'master' of github.com:hainatravel/information-system into master 2 years ago
candice f58342d934 去掉table,改为PC端展示6条，移动端展示3条 2 years ago
Jimmy Liow f198ed7ef5 Merge branch 'master' of github.com:hainatravel/information-system 2 years ago
Jimmy Liow c891b5fd3e GH Newsletter 增加邮箱提示 2 years ago
candice 1075853c49 11 2 years ago
candice b9df74e934 Merge branch 'master' of github.com:hainatravel/information-system into master 2 years ago
candice 3206372535 移动端展示3条，隐藏后3条 2 years ago
Jimmy Liow d33e12672e 增加邮箱地址提示 2 years ago
candice 6f34199907 去掉table，改为展示6个 2 years ago
candice f899b5ee32 票种说明文字修改 2 years ago
candice 845ee22e7c 11 2 years ago
candice 5279b792b1 修改票种说明文字 2 years ago
candice 0ff2b9ad48 11 2 years ago
candice 96dcb3cece 11 2 years ago
candice 89a192d6c5 Merge branch 'master' of github.com:hainatravel/information-system into master 2 years ago
candice 13f2b3ff0e 添加酒店星级选择 2 years ago
Jimmy Liow 1f48d91aee 水灯节27号的s和p票都隐藏起来 2 years ago
candice 3e4fc5305b 11 2 years ago
candice b66c7bf2cd 头部导航修改 2 years ago
candice 335c4faba4 11 2 years ago
candice 53c1c04cbe 11 2 years ago
candice 8bc6a9837a 11 2 years ago
candice ebb4ce3fb3 移动端头部导航位置修改 2 years ago
赵鹏 3deee3a0ff Merge branch 'master' of github.com:hainatravel/information-system 2 years ago
赵鹏 6eff706253 火车票出票系统（third_party/trainsystem/）增加登陆验证。 2 years ago
Jimmy Liow c7b1cd9026 Merge branch 'master' of github.com:hainatravel/information-system 2 years ago
Jimmy Liow c8e7871744 水灯节 GP 取消在线支付 2 years ago
赵鹏 9d2b4b1fea Merge branch 'master' of github.com:hainatravel/information-system 2 years ago
赵鹏 9661b23051 fix 2 years ago
candice 36416ca065 删除在线支付引导语 2 years ago
Jimmy Liow f1da41d6e3 GP线路表单撤下在线支付 2 years ago
LMR 9f3021160a fix 2 years ago
LMR d839f712a1 fix usr 2 years ago
Jimmy Liow ec46db2e5b AH移动端头部导航增加浮动和固定切换 2 years ago
赵鹏 5eff49d459 Merge branch 'master' of github.com:hainatravel/information-system 2 years ago
赵鹏 7a897eeaec 根据一哥要求替换GA4代码 2 years ago
candice 6c270919b1 余票量更新 2 years ago
LMR 398a1569b9 fix 2 years ago
candice 347497c6b4 引导文字修改 Your 1:1 travel consultant will reply within 1 working day. Over 50% of our clients complete their bookings within 10 days of submitting their inquiry. 2 years ago
candice f6ee0f3560 文字修改 Your 1:1 travel consultant will reply within 1 working day. Over 50% of our clients complete their bookings within 10 days of submitting their inquiry. 2 years ago
candice b806f81726 余票量更新 2 years ago
Jimmy Liow 8e2d870c96 移动端和桌面端统一使用移动图片 2 years ago
Jimmy Liow 2ea74ec96b AH 统一底部推荐桌面移动端模板 2 years ago
candice 0e3a57fafd 头部导航内容调整 2 years ago
Jimmy Liow 08cead7c3e 水灯节信息也表单增加余票显示 2 years ago
Jimmy Liow 2214d9ab1b 增加默认余票设置 2 years ago
Jimmy Liow 5a8ea8a0ac 水灯节门表单添加余票数量展示 2 years ago
Jimmy Liow f79343b7af 更新为网前正式地址 2 years ago
Jimmy Liow f5ec595a4d 多媒体图片上线测试 2 years ago
赵鹏 0d4502d4c9 TP产品增加张家界类型 2 years ago
Jimmy Liow 4a5587c860 解决 GH 反馈列表没有全宽 2 years ago
赵鹏 fdfb3dde11 fix 2 years ago
赵鹏 7c85d42fb4 Merge branch 'master' of github.com:hainatravel/information-system 2 years ago
赵鹏 3178eda162 CT表单优化 2 years ago
candice 34cf4060c5 11 2 years ago
candice 881fd58c03 11 2 years ago
candice eea1583267 11 2 years ago
candice a2a16ac20b 11 2 years ago
candice 0968e032f5 11 2 years ago
candice ae701fdca8 Merge branch 'master' of github.com:hainatravel/information-system into master 2 years ago
candice c537d89d7f 11 2 years ago
Jimmy Liow 599f6167e0 调整测试链接位置 2 years ago
Jimmy Liow 43ea523022 解决获取站点代码错误 2 years ago
Jimmy Liow 96b0308c9d Merge branch 'master' of github.com:hainatravel/information-system 2 years ago
Jimmy Liow d55316276b 增加多媒体图片测试链接 2 years ago
candice 199c753df9 11 2 years ago
candice e322cf78f0 11 2 years ago
Jimmy Liow 43684ebf03 增加用户 HT SN 2 years ago
candice 53de43660b 11 2 years ago
candice 0d842f7a34 11 2 years ago
candice 277ed075b4 11 2 years ago
candice 83ab7e61ca 11 2 years ago
candice 7daace9fc5 标题文字加链接 2 years ago
candice 3db9c61fa8 修改 <p style="text-align: center;margin-top: 80px;margin-bottom: 0;">China Highlights, Asia Highlights, and Global Highlights collaborate to provide families and couples with personalized and stress-free experiences in diverse destinations.</p> 2 years ago
candice 86f5b85230 <h3 style=" 
text-align: center;
    margin-top: 80px;
">China Highlights, Asia Highlights, and Global Highlights collaborate to provide families and couples with personalized and stress-free experiences in diverse destinations.</h3>
 2 years ago
candice 3f72058fb2 11 2 years ago
candice fd47e69c6c 标题修改 <h3 style=" 
text-align: center;
    margin-bottom: 0;
    margin-top: 80px;
">China Highlights, Asia Highlights, and Global Highlights collaborate to provide families and couples with personalized and stress-free experiences in diverse destinations.</h3>
 2 years ago
赵鹏 17a0d23704 Merge branch 'master' of github.com:hainatravel/information-system 2 years ago
赵鹏 e0b97aaaab 上海站模板fix 2 years ago
candice 8ee27034fa id值修改 2 years ago
candice 364cd63038 去掉table代码 2 years ago
Jimmy Liow c3f001bde2 AH 推荐信息增加移动端和 PC 头部大图 2 years ago
candice 57a876cd4c 11 2 years ago
candice a899971024 11 2 years ago
candice d14a1f2c87 Merge branch 'master' of github.com:hainatravel/information-system into master 2 years ago
candice be9e9125db 删除H2 2 years ago
LMR f97251ecbe res -> cdn 替换二级域名 2 years ago
LMR a73e47ae72 fix 2 years ago
Jimmy Liow 20f1852ee1 AH GP 表单增加 Booking Yi Peng Festival Mini-Group Tour 2 years ago