Commit Graph

1925 Commits (c71df1e5433d7cd18c5a58c430cd97803771402b)

Author SHA1 Message Date
candice ed76ed5c07 11 4 years ago
LiaoYijun daa8d51f97 更新面包屑显示标签 4 years ago
LiaoYijun 5e19d6b69a 测试面包屑数据查询功能 4 years ago
candice b559ef76e0 11 4 years ago
candice 12fd644db5 11 4 years ago
candice 2d1814970f 11 4 years ago
赵鹏 93d4fd6ed2 Merge branch 'master' of github.com:hainatravel/information-system 4 years ago
赵鹏 9f4c2119bc TS产品增加快捷预订属性设置 4 years ago
LiaoYijun 1f7c7d2dad 增加结构化标签 Logo, LocalBus 4 years ago
candice 89b0a6d408 22 4 years ago
candice 54aee37558 11 4 years ago
candice 7dc66e5cdf 11 4 years ago
candice 69438e8088 11 4 years ago
candice 7e10a9f181 11 4 years ago
尹诚诚 92b1a8276c 添加why us的tag 4 years ago
赵鹏 e1f6367068 Merge branch 'master' of github.com:hainatravel/information-system 4 years ago
赵鹏 8db05f91aa 添加获取价格接口get_priceinfo 4 years ago
candice 897229fafd 11 4 years ago
candice 86ad1253af 二维码图加链接 4 years ago
赵鹏 a4c8b9c2aa 携程接口的预售期也改为15天,但是接口数据不正常,无法测试。 4 years ago
赵鹏 b7eedd11b1 Merge branch 'master' of github.com:hainatravel/information-system 4 years ago
赵鹏 9bdf3337e2 修改预售期为15天,不再是30天 4 years ago
candice 10286f3469 11 4 years ago
candice dcaa8f15c1 移动端cookie使用提醒删除 4 years ago
candice 9ac8423cc3 11 4 years ago
赵鹏 3e346cfc66 test 4 years ago
赵鹏 da5736c334 火车票搜索框模板 4 years ago
赵鹏 fda1a22ad1 fix 4 years ago
赵鹏 a0e90a2b3e Merge branch 'master' of github.com:hainatravel/information-system 4 years ago
赵鹏 b3335fda31 CH火车信息页面添加搜索框 4 years ago
candice 59d4f2ecdf 11 4 years ago
candice 238a1a84ea 11 4 years ago
candice b1b7df4fb3 火车版块添加链接在导航 4 years ago
candice 33cf381154 11 4 years ago
candice 1cc7de3f07 Merge branch 'master' of github.com:hainatravel/information-system into master 4 years ago
candice 48a99fa26f 11 4 years ago
尹诚诚 758cfc864c 推荐信息的范围内随机不重复处理 4 years ago
尹诚诚 b4f74c0733 调试信息推荐 4 years ago
candice 8c5c3cbd34 11 4 years ago
candice bda427ea06 AH增加推荐至8个 4 years ago
尹诚诚 9b2ef9e847 内容中推荐信息和线路 4 years ago
尹诚诚 d97ddef732 内容中推荐信息和线路 4 years ago
尹诚诚 580f96057d 内容中推荐信息和线路 4 years ago
尹诚诚 1644318fd7 内容中推荐信息和线路 4 years ago
赵鹏 27495aaf52 Merge branch 'master' of ssh://git.hainatravel.com:30001/developers/information-system 4 years ago
赵鹏 7ef47af2ae CT从旧URL导入内容到新信息功能 4 years ago
尹诚诚 ef5e753cb9 随机获取节点,改为用is_path判断,含子节点 4 years ago
尹诚诚 9a76f19974 添加文中线路推荐 4 years ago
candice 59cedae0fb member icon图片修改 4 years ago
尹诚诚 81fb8259f3 添加文中线路推荐 4 years ago
尹诚诚 97ce9facd3 添加文中广告推荐 4 years ago
LiaoYijun 723f036466 增加网站 Cookie 使用声明 4 years ago
尹诚诚 1b1c50c888 添加更多推荐信息和线路框 4 years ago
candice cc7a85ed6a Merge branch 'master' of github.com:hainatravel/information-system into master 4 years ago
赵鹏 74aa0ed5c6 fix 4 years ago
赵鹏 7e946a3d04 Merge branch 'master' of ssh://git.hainatravel.com:30001/developers/information-system 4 years ago
赵鹏 9c4d5f6157 优化产品页面预订按钮及表单。 4 years ago
candice 81e4b67889 Merge branch 'master' of github.com:hainatravel/information-system into master 4 years ago
candice b2bb67b747 底部推荐增加至8条 4 years ago
尹诚诚 f39679f86e 内容图片 4 years ago
尹诚诚 d39b8c3da7 Merge remote-tracking branch 'origin/master' 4 years ago
尹诚诚 a0eec7c646 广告默认模板 4 years ago
赵鹏 fac87c775b Merge branch 'master' of ssh://git.hainatravel.com:30001/developers/information-system 4 years ago
赵鹏 3deafac79e 一日游列表排除重复产品(翰特读取的产品排除已经搬迁到信息平台的。) 4 years ago
LiaoYijun 0a04598ba3 Merge branch 'master' of github.com:hainatravel/information-system 4 years ago
LiaoYijun d1bf4718ea 删除不需要的令牌字段 4 years ago
尹诚诚 5b824b07a9 广告过期提醒颜色 4 years ago
尹诚诚 7e8874dc62 广告和图片选择的便捷化功能开发 4 years ago
尹诚诚 75df6a8a64 取消 gogole reCaptcha V3,自己开发主动防御代码,在提交订单之前修改隐藏表单的值来判断对方是否是机器提交,原理是机器提交是不会执行本地js函数的 4 years ago
candice 772b4b8176 CH头部导航链接更换 4 years ago
59361885@qq.com 1fa7e20bc9 ok 4 years ago
LMR e6071931c9 修复图标 4 years ago
LMR b8172ef289 ok 4 years ago
LMR 6ab6efba43 忽略 JHTPP 4 years ago
LMR 187678c378 ok 4 years ago
candice 4f35f71dee 11 4 years ago
candice de59da674e 11 4 years ago
candice 33c5958e4b 11 4 years ago
candice be2b43d66b 11 4 years ago
LiaoYijun 20a9de0ffe 测试自动部署 4 years ago
LiaoYijun f752540525 增加邮箱验证错误信息 4 years ago
LiaoYijun 21bdb1b426 测试新服务器自动部署 4 years ago
尹诚诚 c303f21c04 延迟加载 gogole reCaptcha V3 脚本 4 years ago
赵鹏 c9cb64b504 Merge branch 'master' of github.com:hainatravel/information-system 4 years ago
赵鹏 e694bb9535 图片无需延迟加载的判断 4 years ago
candice 19ee8b6027 11 4 years ago
candice d6612aede7 Merge branch 'master' of github.com:hainatravel/information-system into master 4 years ago
尹诚诚 0d8bec8fca 防垃圾测试 gogole reCaptcha V3 4 years ago
LMR 39f3ddadfc +1 新窗口打开 4 years ago
LMR 722cb129c2 添加图片上传管理 4 years ago
LMR c859983c1a fix 4 years ago
LMR dbdcc677d7 ok 4 years ago
赵鹏 f27931d894 fix 4 years ago
赵鹏 25853867d1 价格靠9修改参数 4 years ago
赵鹏 f69f98507f Merge branch 'master' of github.com:hainatravel/information-system 4 years ago
赵鹏 13b4b2926c fix 4 years ago
尹诚诚 7e5efb0541 inquiry form表单标签化 4 years ago
赵鹏 ae4d2ea6ef chengdu链接fix 4 years ago
赵鹏 78db95ca6c fix 4 years ago
赵鹏 2817801c39 fix 4 years ago
赵鹏 eb6e695c9c 优化头部导航 4 years ago
candice 87ff06aaff Merge branch 'master' of github.com:hainatravel/information-system into master 4 years ago
candice 7ec3d49ca9 11 4 years ago
赵鹏 21e86a8c19 Merge branch 'master' of github.com:hainatravel/information-system 4 years ago
赵鹏 4362edd646 增加图片批量更新延迟加载及图片设置宽高功能 4 years ago
尹诚诚 1dd1760959 隐藏创建信息分组 4 years ago
candice de5d56adb6 错误链接修改 4 years ago
尹诚诚 057506c230 广告编辑替换多媒体图片临时预览地址 4 years ago
尹诚诚 41d9b6a370 AH模板优先显示视频 4 years ago
candice 978cf60284 链接修改 4 years ago
candice 66eb3c4a51 链接修改 4 years ago
尹诚诚 2c3a0caf6c 注释修改 4 years ago
尹诚诚 f6618739b7 推荐内容的表格错位问题 4 years ago
candice 597f2bda0f 底部推荐表格修改 4 years ago
candice 3c96cb1fef 11 4 years ago
candice 50dbe9d964 底部推荐文章修改 4 years ago
candice bc4b1e939c 11 4 years ago
candice a2d673c4e0 底部推荐线路修改 4 years ago
赵鹏 e9f6a8dfbe Merge branch 'master' of github.com:hainatravel/information-system 4 years ago
赵鹏 3ed13ac8f2 fix 4 years ago
candice d4c5432f3d about us链接修改 4 years ago
赵鹏 902bc8ae57 js加延迟 4 years ago
赵鹏 e1fca99852 Merge branch 'master' of github.com:hainatravel/information-system 4 years ago
赵鹏 9812ebc1c4 底部链接修改。 4 years ago
candice 87ae9f301d 删除链接新窗口打开 4 years ago
尹诚诚 7bbfc81869 广告过期时间可以选择月份和年 4 years ago
尹诚诚 91e8a9e250 文章内容中广告管理和显示 4 years ago
尹诚诚 301a68f88f 文章内容自动添加缓加载 4 years ago
candice c49cce0833 品牌信息位置修改 4 years ago
candice 8ebc302f18 增加品牌信息 4 years ago
赵鹏 3dc8ccafe9 fix 4 years ago
赵鹏 90c8b91717 js加defer 4 years ago
赵鹏 2a25752e54 底部图片延迟加载 4 years ago
赵鹏 2bfb2f4e84 contactus表单添加 4 years ago
赵鹏 cf6a649a40 优化日历样式读取 4 years ago
赵鹏 2556925c14 表单底部特殊处理 4 years ago
赵鹏 31499393d4 fix 4 years ago
赵鹏 db61dde3da 一日游列表图片读取规则更新 4 years ago
赵鹏 84c06cb1da Merge branch 'master' of github.com:hainatravel/information-system 4 years ago
赵鹏 68430b5763 增加表单项 4 years ago
赵鹏 b6fcf2e021 解决旧图片使用data.chinatravel.com的错误 4 years ago
CandiceSong 760af55dd0 11 4 years ago
CandiceSong 007ed6e693 Merge branch 'master' of github.com:hainatravel/information-system 4 years ago
CandiceSong 3813963966 右侧广告调整 4 years ago
ycc b849b0d8b2 Merge remote-tracking branch 'origin/master' 4 years ago
ycc f9d9c6b9d8 范围内随机规则,保存前清除前后空格 4 years ago
CandiceSong 1c5571b912 11 4 years ago
CandiceSong aa3b0a84e2 Merge branch 'master' of github.com:hainatravel/information-system 4 years ago
ycc 6644d63231 范围内随机规则 4 years ago
CandiceSong 153eede0e8 Merge branch 'master' of github.com:hainatravel/information-system 4 years ago
CandiceSong 2460844192 11 4 years ago
ycc 6bcccf02bc 继承上级规则不生效问题 4 years ago
ycc 683494c375 查询条件不生效问题 4 years ago
ycc 31899a1c6e 关闭聚合查询失败日志 4 years ago
ycc c44f0fa941 上线信息推荐管理 4 years ago
CandiceSong 49337b79a2 按钮链接 4 years ago
CandiceSong 927ba4da9b 推荐标题文字修改 4 years ago
ycc faaea8448b 上线信息推荐管理 4 years ago
ycc 7fc90fc197 上线信息推荐管理 4 years ago
ycc 850f9f4d34 上线信息推荐管理 4 years ago
ycc 56a213805d 上线信息推荐管理 4 years ago
ycc be84a8f665 上线信息推荐管理 4 years ago
ycc 33a57226fc 上线信息推荐管理 4 years ago
ycc 83d256f8c4 上线信息推荐管理 4 years ago
ycc a4b2010363 上线信息推荐管理 4 years ago
ycc 13b2454030 上线信息推荐管理 4 years ago
ycc f1954b814e 上线信息推荐管理 4 years ago
ycc 8f50024b8b 上线信息推荐管理 4 years ago
ycc 5c0b4dc627 上线信息推荐管理 4 years ago
赵鹏 26243b5959 lihghthouse pic fix 4 years ago
赵鹏 aa66102a67 lighthouse 图片处理 4 years ago
赵鹏 e6f7373637 Merge branch 'master' of github.com:hainatravel/information-system 4 years ago
赵鹏 5dedd85ffa fix weather 4 years ago
CandiceSong cdce06e160 日历控件 4 years ago
赵鹏 c6ea355881 Merge branch 'master' of github.com:hainatravel/information-system 4 years ago
赵鹏 72eb29cdf5 天气预报添加 4 years ago
CandiceSong 92df5a2763 社媒图片修改 4 years ago
ycc 320261d41e 上线信息推荐管理 4 years ago
CandiceSong 53f63967fe Merge branch 'master' of github.com:hainatravel/information-system 4 years ago
赵鹏 38634f32ca lighthouse优化 4 years ago
赵鹏 8fefc6c09c 根据lighthouse优化按钮,a标签 4 years ago
CandiceSong 9945a61e6c Merge branch 'master' of github.com:hainatravel/information-system 4 years ago
CandiceSong ba4a95758c 加入作者信息 4 years ago
赵鹏 f3cbbbb317 Merge branch 'master' of github.com:hainatravel/information-system 4 years ago
赵鹏 0c436630b1 导航优化 4 years ago
CandiceSong 0e913817bf PC搜索框 4 years ago
CandiceSong 1ba3cc7c8f PC搜索框 4 years ago
CandiceSong 64e43e5680 Merge branch 'master' of github.com:hainatravel/information-system 4 years ago
CandiceSong 0c5529518e 搜索框调整 4 years ago
赵鹏 fd2a487c3d Merge branch 'master' of github.com:hainatravel/information-system 4 years ago
赵鹏 829a054562 显示价格排序 4 years ago
CandiceSong 49ced89a59 11 4 years ago
CandiceSong 35eaf9c51c Merge branch 'master' of github.com:hainatravel/information-system 4 years ago
CandiceSong f43759d085 11 4 years ago
赵鹏 6e8a5a5327 fix 4 years ago
赵鹏 1adfe16118 不分人等价格 4 years ago
赵鹏 f8f68ef6cf Merge branch 'master' of github.com:hainatravel/information-system 4 years ago
赵鹏 3b2dd36d73 获取一日游价格表 4 years ago
CandiceSong ffe13c1e06 模板调整 4 years ago
CandiceSong b1245857a5 模板细节修改 4 years ago
赵鹏 e9c00d8922 线路获取价格fix 4 years ago
赵鹏 38f68af915 线路详细页 4 years ago
赵鹏 9bb91a9125 日历控件优化 4 years ago
赵鹏 2411380993 日历控件集成,减少单独调用时间 4 years ago
赵鹏 33c2f5ab9f Merge branch 'master' of github.com:hainatravel/information-system 4 years ago
赵鹏 7d12b84a69 日历框优化 4 years ago
ycc 07ee0cfb32 Google搜索和add this插件 4 years ago
ycc 43ab202d28 Google搜索和add this插件 4 years ago
ycc 6a97f9e1ad AH移动优先发布 4 years ago
ycc b94b472a83 Merge remote-tracking branch 'origin/master' 4 years ago
ycc 83f4f04c14 AH移动优先发布 4 years ago
赵鹏 a053555080 Merge branch 'master' of github.com:hainatravel/information-system 4 years ago
赵鹏 bd8d5b81cf 一日游详细页模板优化 4 years ago
ycc 1a47f631aa Merge remote-tracking branch 'origin/master' 4 years ago
ycc c456b6a6bd AH移动优先发布 4 years ago
赵鹏 c08a0cdef7 fix 4 years ago
赵鹏 297c94ddb0 fix 4 years ago
赵鹏 4092538385 Merge branch 'master' of github.com:hainatravel/information-system 4 years ago
赵鹏 4fc4f30f31 一日游详细页 4 years ago
ycc 5412018e37 AH移动优先发布 4 years ago
ycc 51634ef805 AH移动优先发布 4 years ago
ycc 69aef86264 Merge remote-tracking branch 'origin/master' 4 years ago
ycc 8e75072c0c AH移动优先发布 4 years ago
赵鹏 de4f2bafa5 Merge branch 'master' of github.com:hainatravel/information-system 4 years ago
赵鹏 b4da297fdf 景点图片获取修复 4 years ago
ycc f5099d8ff2 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	application/controllers/information.php
4 years ago
ycc a2e84142b7 AH移动优先发布 4 years ago
赵鹏 e9e442c4b0 标题不显示修复 4 years ago
赵鹏 d3b7b136b0 信息列表完成 4 years ago
赵鹏 f9f2cad704 底部三个bbc图标去掉链接 4 years ago
赵鹏 7885fde984 底部BBC修改 4 years ago
赵鹏 ee36ab6499 所有调用地址改为网前 4 years ago
赵鹏 281645a224 fix 4 years ago
赵鹏 90774ce3df Merge branch 'ct-mobile-first'
# Conflicts:
#	application/controllers/welcome.php
#	application/views/bootstrap3/information_edit.php
4 years ago
赵鹏 71bc3fda65 上线前新建chinatravel站点配置 4 years ago
赵鹏 61a92f6f9c 完成一日游列表 4 years ago
赵鹏 783b1b4a6b 加线路列表标签 4 years ago
赵鹏 6290c843a6 价格读取完成,并添加CT使用的页面类型 4 years ago
赵鹏 90c6df6bdb 价格读取完成。 4 years ago
ycc b767eb5535 开放广告测试 4 years ago
ycc 4187fd7c56 开放广告测试 4 years ago
ycc 84e168b4da 开放广告测试 4 years ago
ycc 824425cdd8 开放广告测试 4 years ago
ycc 91a8611404 开放广告测试 4 years ago
赵鹏 3eaf46e175 加转美元 4 years ago
ycc cfae4d1241 开放广告选项 4 years ago
赵鹏 21e1bf43a9 CT查询接口 4 years ago
赵鹏 85452f9723 CT缓存路径修改 4 years ago
赵鹏 b46c8b717c fix 4 years ago
ycc 5bdf0b5d2e 改了个链接 4 years ago