Jimmy Liow
|
323823197e
|
Merge branch 'master' of github.com:hainatravel/information-system
|
2 years ago |
|
Jimmy Liow
|
0bae215e03
|
解决价格未更新到页面
|
2 years ago |
赵鹏
|
ce79335102
|
Merge branch 'master' of github.com:hainatravel/information-system
|
2 years ago |
|
赵鹏
|
a4627555ac
|
Merge branch 'master' of github.com:hainatravel/information-system
|
2 years ago |
|
Jimmy Liow
|
10ea6e4269
|
修复日期切换默认价格错误
|
2 years ago |
|
赵鹏
|
016a8ac5d0
|
澜海出票返回结果优化
|
2 years ago |
|
Jimmy Liow
|
fcf33477ba
|
水灯节15号Standard票重新开放
|
2 years ago |
candice
|
728df071b0
|
删除updated news
|
2 years ago |
|
赵鹏
|
b689adea83
|
Merge branch 'master' of github.com:hainatravel/information-system
|
2 years ago |
|
赵鹏
|
0901389701
|
火车接口时效30分钟
|
2 years ago |
|
Jimmy Liow
|
ffb9eac9c3
|
修改切换日期默认价格获取方式
|
2 years ago |
|
Jimmy Liow
|
3fa789bd2c
|
修复水灯节表单可以多选价格
|
2 years ago |
|
Jimmy Liow
|
43ce2e052b
|
Merge branch 'master' of github.com:hainatravel/information-system
|
2 years ago |
|
Jimmy Liow
|
8a8e065bde
|
解决可以同时选择S+V票
|
2 years ago |
|
赵鹏
|
edad5e19d2
|
Merge branch 'master' of github.com:hainatravel/information-system
|
2 years ago |
|
赵鹏
|
48b55ab955
|
//英国传GB
|
2 years ago |
|
Jimmy Liow
|
41f8539467
|
Merge branch 'master' of github.com:hainatravel/information-system
|
2 years ago |
|
Jimmy Liow
|
161af09d13
|
解决16号P票问题
|
2 years ago |
|
candice
|
12f0396f14
|
P票刷灰
|
2 years ago |
|
candice
|
f8e82bbd1d
|
票种余量信息更新
|
2 years ago |
|
赵鹏
|
336d8c54ca
|
CT站新导航
|
2 years ago |
|
赵鹏
|
55fc1ec7d6
|
Merge branch 'master' of github.com:hainatravel/information-system
|
2 years ago |
|
赵鹏
|
c760080141
|
新增澜海接口的查询出票信息，退票信息及账单列表信息。因为那边没后台查看。。。
|
2 years ago |
|
candice
|
41e84116f1
|
底部logo添加alt文字
|
2 years ago |
|
赵鹏
|
a8b567abf3
|
Merge branch 'master' of github.com:hainatravel/information-system
|
2 years ago |
|
赵鹏
|
53bf5d6dd1
|
改用澜海接口
|
2 years ago |
|
candice
|
8cad2785f8
|
S票加value值 Standard+Transfer+Dinner
|
2 years ago |
|
candice
|
8f4ea7c012
|
tickets文字删除
|
2 years ago |
黄文强@HWQ-PC
|
22899ec657
|
更改水灯节表单15号Standard+Transfer+Dinner不可选
|
2 years ago |
|
黄文强@HWQ-PC
|
e0d15de79f
|
增加水灯节表单16号Standard+Transfer+Dinner余票
|
2 years ago |
|
黄文强@HWQ-PC
|
0bf582cd7c
|
Merge branch 'master' of github.com:hainatravel/information-system
# Conflicts:
# application/views/mobile_first/ah-lantern-form.php
|
2 years ago |
|
黄文强@HWQ-PC
|
d8103fd078
|
水灯节表单改正重复显示余票信息
|
2 years ago |
|
candice
|
5146886e75
|
余量样式细节修改
|
2 years ago |
|
candice
|
126b285955
|
泰铢价格删除
|
2 years ago |
|
candice
|
6f5326d4b0
|
价格修改
|
2 years ago |
|
candice
|
33d90a570d
|
价格修改
|
2 years ago |
|
黄文强@HWQ-PC
|
688be20f80
|
Merge branch 'master' of github.com:hainatravel/information-system
# Conflicts:
# application/views/mobile_first/ah-lantern-form.php
|
2 years ago |
|
黄文强@HWQ-PC
|
7f74d2b195
|
增加水灯节表单 恢复余量信息
|
2 years ago |
|
candice
|
bf3bf3cad6
|
价格修改
|
2 years ago |
|
candice
|
ccfc82551f
|
11
|
2 years ago |
|
candice
|
fcd020811b
|
价格修改
|
2 years ago |
|
candice
|
04b02c4440
|
11
|
2 years ago |
|
candice
|
d3bd7a7965
|
11
|
2 years ago |
|
candice
|
9d33b2e70a
|
删除头条广告
|
2 years ago |
|
candice
|
3b4b6cfad4
|
11
|
2 years ago |
|
candice
|
8f81abed34
|
Merge branch 'master' of github.com:hainatravel/information-system into master
|
2 years ago |
|
candice
|
61d1718e14
|
头部导航链接修改
|
2 years ago |
|
赵鹏
|
e590ae3984
|
fix
|
2 years ago |
|
赵鹏
|
ba9bc0a862
|
Merge branch 'master' of github.com:hainatravel/information-system
|
2 years ago |
|
赵鹏
|
123b9de006
|
澜海正式接口上线。
|
2 years ago |
|
candice
|
481c2b9a25
|
11
|
2 years ago |
|
candice
|
f49f79e3b5
|
11
|
2 years ago |
|
candice
|
eab9eeea4a
|
11
|
2 years ago |
|
candice
|
34f2fbd3fa
|
11
|
2 years ago |
|
candice
|
8c91de2b94
|
11
|
2 years ago |
|
candice
|
becd3ddc21
|
11
|
2 years ago |
|
candice
|
27add997b6
|
11
|
2 years ago |
|
candice
|
6467ab8328
|
标题大小写修改
|
2 years ago |
|
黄文强@HWQ-PC
|
f6533071b9
|
删除顾问头<p>标签
|
2 years ago |
|
黄文强@HWQ-PC
|
078c79b3b8
|
增加顾问反馈H2标签
|
2 years ago |
|
黄文强@HWQ-PC
|
7e18183df1
|
更改顾问反馈标题
|
2 years ago |
|
candice
|
06759d35a4
|
h2标题修改
|
2 years ago |
|
赵鹏
|
277aeebe30
|
Merge branch 'master' of github.com:hainatravel/information-system
|
2 years ago |
|
赵鹏
|
a6aabc22ab
|
澜海火车票功能完成并测试完成。但还是测试接口。
|
2 years ago |
|
黄文强@HWQ-PC
|
8dd89abc0e
|
修改gh顾问反馈的标签
|
2 years ago |
|
黄文强@HWQ-PC
|
f3f63a65ec
|
增加在GH网站根据顾问名字读取专属于顾问的反馈标签的功能
|
2 years ago |
|
黄文强@HWQ-PC
|
d2a928510a
|
Merge branch 'master' of github.com:hainatravel/information-system
|
2 years ago |
|
黄文强@HWQ-PC
|
440ed664c2
|
修改水灯节票种“Standard+Transfer+Dinner”可以选择
|
2 years ago |
|
candice
|
eb4fbfe261
|
年份改为2025
|
2 years ago |
|
candice
|
16cfad4a5e
|
头部导航删除china tours 2024/2025
|
2 years ago |
|
黄文强@HWQ-PC
|
77d96e9a10
|
Merge branch 'master' of github.com:hainatravel/information-system
|
2 years ago |
|
黄文强@HWQ-PC
|
3f21ab7a50
|
水灯节标签修改
|
2 years ago |
|
Jimmy Liow
|
40a6e04bc2
|
Merge branch 'master' of github.com:hainatravel/information-system
|
2 years ago |
|
Jimmy Liow
|
edbe59fc97
|
CH信息平台文件夹结构调整
|
2 years ago |
|
黄文强@HWQ-PC
|
be8c909d51
|
增加25年水灯节表单模板
|
2 years ago |
|
黄文强@HWQ-PC
|
45fa4dffd7
|
Merge branch 'master' of github.com:hainatravel/information-system
|
2 years ago |
|
黄文强@HWQ-PC
|
0f7969af7e
|
增加ah，ch，gh对$OPI_Code的初始化处理
|
2 years ago |
|
赵鹏
|
d2ee307924
|
Merge branch 'master' of github.com:hainatravel/information-system
|
2 years ago |
|
赵鹏
|
86ac718797
|
换回携程接口
|
2 years ago |
|
黄文强@HWQ-PC
|
d4b5a169ba
|
更改gh-h1多了">"的问题
|
2 years ago |
|
黄文强@HWQ-PC
|
eabbd75aff
|
修复gh作者名字加链接的bug
|
2 years ago |
|
黄文强@HWQ-PC
|
427158c92c
|
增加ah，ch，gh作者名字添加链接
|
2 years ago |
|
黄文强@HWQ-PC
|
6fd63be9f8
|
增加ch作者介绍链接逻辑
|
2 years ago |
|
黄文强@HWQ-PC
|
81219c12a9
|
修改ch作者介绍链接逻辑
|
2 years ago |
|
黄文强@HWQ-PC
|
e37f0f07d8
|
Merge branch 'master' of github.com:hainatravel/information-system
|
2 years ago |
|
黄文强@HWQ-PC
|
4be635abdb
|
增加ch作者名字添加链接
|
2 years ago |
LMR
|
042c54cb3d
|
add gm to series site
|
2 years ago |
|
candice
|
51c45667f1
|
11
|
2 years ago |
|
candice
|
fe789b1d15
|
Merge branch 'master' of github.com:hainatravel/information-system into master
|
2 years ago |
|
candice
|
82909b5a9f
|
导航按钮添加title
|
2 years ago |
|
Jimmy Liow
|
55e7e47418
|
右侧推荐删除 aside 标签
|
2 years ago |
|
candice
|
a66966400b
|
11
|
2 years ago |
|
candice
|
4f4182ae4f
|
Merge branch 'master' of github.com:hainatravel/information-system into master
|
2 years ago |
|
candice
|
f27fe67244
|
aside main nav标签添加
|
2 years ago |
|
Jimmy Liow
|
639688a626
|
AH 水灯节下线 Standard 类型
|
2 years ago |
|
Jimmy Liow
|
804446ac24
|
删除水灯节在信息页面表单
|
2 years ago |
|
candice
|
2751bf3c94
|
删除keywords一项
|
2 years ago |
|
赵鹏
|
5eb7be4755
|
fix
|
2 years ago |
|
赵鹏
|
ae3daef11b
|
fix
|
2 years ago |
|
赵鹏
|
a541af9a47
|
fix
|
2 years ago |
|
赵鹏
|
f94c092f06
|
fix
|
2 years ago |
|
赵鹏
|
123ed3a245
|
CT左右结构新表单
|
2 years ago |
|
赵鹏
|
b38799aeaa
|
fix
|
2 years ago |
|
赵鹏
|
38935fcd0a
|
Merge branch 'master' of github.com:hainatravel/information-system
|
2 years ago |
|
赵鹏
|
15bb56eebc
|
CT产品页表单兼容左右结构。
|
2 years ago |
|
candice
|
f9ad1b5470
|
11
|
2 years ago |
|
candice
|
b7d3eebd18
|
电话框type值改为tel
|
2 years ago |
|
candice
|
17c4fd81f9
|
表单内容精简，删除CAD选项
|
2 years ago |
|
candice
|
b111edf848
|
11
|
2 years ago |
|
赵鹏
|
7bcb6fe2c7
|
TS网站及手机端接口改澜海接口测试。
|
2 years ago |
|
赵鹏
|
4e5cac7adc
|
Merge branch 'master' of github.com:hainatravel/information-system
|
2 years ago |
|
赵鹏
|
b5e58abbdb
|
澜海火车票接口上线
|
2 years ago |
|
candice
|
9f93b9d0af
|
TA获奖图标更新为2024
|
2 years ago |
|
candice
|
7a282a7a3f
|
TA获奖图标更新为2024
|
2 years ago |
|
candice
|
0c50e78ce2
|
TA获奖图标更新为2024
|
2 years ago |
|
赵鹏
|
c88477d5bc
|
tp产品预订日期fix
|
2 years ago |
|
赵鹏
|
00569cef02
|
新增澜海火车票查询接口。
|
2 years ago |
|
赵鹏
|
81b0822beb
|
Merge branch 'master' of github.com:hainatravel/information-system
|
2 years ago |
|
赵鹏
|
681ec822b6
|
CH上的TP产品默认日期修改。
|
2 years ago |
|
LMR
|
0f4ac70071
|
fix icid
|
2 years ago |
|
LMR
|
67a4e3dc99
|
fix meta
|
2 years ago |
|
LMR
|
ae1395684f
|
test meta
|
2 years ago |
|
candice
|
91fa4f5c21
|
电话号码输入框type改为number
|
2 years ago |
|
赵鹏
|
4be99b2d9c
|
Merge branch 'master' of github.com:hainatravel/information-system
|
2 years ago |
|
赵鹏
|
1423dc855f
|
上海站表单fix
|
2 years ago |
YCC
|
ee3079bba6
|
客运来源的订单访问路径抓取
|
2 years ago |
|
赵鹏
|
009c11098a
|
上海站线路表单
|
2 years ago |
|
赵鹏
|
f91ffc880e
|
上海站详细页加表单
|
2 years ago |
|
赵鹏
|
fbae81a8b7
|
上海站线路详细页不调用表单。
|
2 years ago |
|
candice
|
a8e3dba319
|
搜索框按钮图片添加alt文字 alt="site search button"
|
2 years ago |
|
Jimmy Liow
|
af8327ca7d
|
CT站删除谷歌广告代码
|
2 years ago |
|
LMR
|
63225aa81d
|
test order path
|
2 years ago |
|
candice
|
3605c9a6eb
|
图片添加alt文字
|
2 years ago |
|
YCC
|
93072cc51c
|
添加香港到一日游导航入口
|
2 years ago |
|
YCC
|
a8c1549ce0
|
添加导航入口
|
2 years ago |
|
candice
|
9c387fa2ce
|
图片添加alt文字
|
2 years ago |
|
candice
|
25cca56090
|
添加alt文字
|
2 years ago |
|
candice
|
ffb9629cbd
|
图片添加alt文字
|
2 years ago |
|
candice
|
53924c2450
|
底部TM按钮链接修改为 /forms/create-my-trip.htm
|
2 years ago |
|
candice
|
d28e6ab06c
|
删除头部导航跨国链接
|
2 years ago |
|
LMR
|
3c198cb7d1
|
注释 sms 1
|
2 years ago |
|
赵鹏
|
b43cc94794
|
Merge branch 'master' of github.com:hainatravel/information-system
|
2 years ago |
|
赵鹏
|
5f1a375473
|
CT站手动设置信息发布时间
|
2 years ago |
|
黄文强@HWQ-PC
|
1c8ef378e6
|
CH成本换算成美元，增加判断是否是ch的逻辑
|
2 years ago |
|
黄文强@HWQ-PC
|
4335e66225
|
CH成本币种换算成用美元
|
2 years ago |
|
LMR
|
f846137062
|
fix
|
2 years ago |
|
LMR
|
fb2b5de674
|
format
|
2 years ago |
|
LMR
|
077712eaab
|
fix show
|
2 years ago |
|
LMR
|
0161f333c2
|
rm log
|
2 years ago |
|
LMR
|
ff16807980
|
test amp_json
|
2 years ago |
|
LMR
|
07b6937f5f
|
fix 50 txt
|
2 years ago |
|
LMR
|
ebf7170e51
|
fix url
|
2 years ago |
|
LMR
|
bd5eecc3c6
|
fix test
|
2 years ago |
|
LMR
|
9432e6f43f
|
Merge branch 'master' of https://github.com/hainatravel/information-system
|
2 years ago |
|
LMR
|
0f4e4faf9d
|
add @@@
|
2 years ago |
|
LMR
|
a94c6fdcd3
|
format
|
2 years ago |
|
candice
|
a47335949e
|
底部社媒推荐添加链接
|
2 years ago |
|
candice
|
63adaebf5a
|
底部社媒推荐添加链接
|
2 years ago |
|
candice
|
5e1cac893a
|
底部社媒推荐添加链接
|
2 years ago |
|
LMR
|
4e35f0282e
|
echo json_encode(array('err'=>'容错1'));
|
2 years ago |
|
LMR
|
516181d9f4
|
容错2
|
2 years ago |
|
LMR
|
7b07b5a141
|
容错2
|
2 years ago |
|
LMR
|
5b9b199ce4
|
fix update_info_by_keys
|
2 years ago |
|
LMR
|
609b972176
|
fix header('Access-Control-Allow-Origin:*');
|
2 years ago |
|
LMR
|
a329b45f19
|
返回值
|
2 years ago |
|
LMR
|
2dba5aad3f
|
fix up 2
|
2 years ago |
|
LMR
|
0f4136181d
|
fix strpos($keys, 'undefined') !== false
|
2 years ago |
|
LMR
|
10c9024ccd
|
fix
|
2 years ago |
|
LMR
|
4719149e4c
|
infox
|
2 years ago |
|
LMR
|
9bff796497
|
add force ic_url
|
2 years ago |
|
LMR
|
76f1d93ce6
|
add log
|
2 years ago |
|
LMR
|
e14baeecfa
|
fix 30
|
2 years ago |
|
LMR
|
3bbb1c0257
|
fix
|
2 years ago |
|
LMR
|
59d0ea01b3
|
Merge branch 'master' of https://github.com/hainatravel/information-system
|
2 years ago |
|
LMR
|
466e8f197f
|
todo: list_info_by_keys
|
2 years ago |
|
Jimmy Liow
|
33bd626cdb
|
水灯节表单禁用地点 Heritage
|
2 years ago |
|
candice
|
5a6e974d8a
|
11
|
2 years ago |
|
candice
|
f64a59cdb4
|
样式细节修改
|
2 years ago |
|
candice
|
5e3d382c3c
|
联系方式删减
|
2 years ago |
|
candice
|
90cdb1880a
|
联系方式删减
|
2 years ago |
|
candice
|
622e79fcf0
|
联系方式删减
|
2 years ago |
|
LMR
|
0b49bff650
|
yrdy
|
2 years ago |
|
LMR
|
7a6c6409a3
|
fix
|
2 years ago |
|
LMR
|
d3fc334525
|
fix
|
2 years ago |
|
LMR
|
29218c5c9d
|
fix2
|
2 years ago |
|
LMR
|
19c0f5258b
|
fix 1
|
2 years ago |
|
LMR
|
6f8a287ac1
|
fix
|
2 years ago |
|
LMR
|
3645a67b45
|
add infofix
|
2 years ago |
|
Jimmy Liow
|
91387297e0
|
CH、GH 统一使用 optimize 目录的图片
|
2 years ago |
|
Jimmy Liow
|
8b1a5d01c7
|
image 目录统一使用 chinahighlights
|
2 years ago |
|
Jimmy Liow
|
acbf779d0b
|
使用 optimize 做获取图片宽高目录
|
2 years ago |
|
candice
|
894bbbc585
|
底部模板删除our differences链接
|
2 years ago |
|
LMR
|
8b74fa95f0
|
fix index.htm
|
2 years ago |
|
LMR
|
dab7a9f50d
|
Merge branch 'master' of https://github.com/hainatravel/information-system
|
2 years ago |
|
LMR
|
114becf0e2
|
formate code
|
2 years ago |
|
Jimmy Liow
|
8f6395303c
|
Merge branch 'master' of github.com:hainatravel/information-system
|
2 years ago |
|
Jimmy Liow
|
46a2bf2e55
|
客人信息表单日期不能超过四位数
|
2 years ago |
|
LMR
|
c1dcd41570
|
add pd tour
|
2 years ago |
|
LMR
|
93d0f928c1
|
Merge branch 'master' of https://github.com/hainatravel/information-system
|
2 years ago |
|
LMR
|
7b2877e911
|
da
|
2 years ago |
|
candice
|
31bd67da9e
|
样式细节调整
|
2 years ago |
|
candice
|
e47d303d89
|
新增国家号选择
|
2 years ago |
|
candice
|
5b3969f55e
|
Merge branch 'master' of github.com:hainatravel/information-system into master
|
2 years ago |
|
Jimmy Liow
|
8d282612a8
|
合并区号和手机号保存
|
2 years ago |
|
candice
|
c484005bf1
|
新增国家号选择
|
2 years ago |
|
candice
|
5aac2e3387
|
样式细节调整
|
2 years ago |
|
candice
|
caa735c708
|
新增国家号选择
|
2 years ago |
|
candice
|
2b630a31df
|
样式细节修改
|
2 years ago |
|
candice
|
bf6986e05f
|
电话框引导语修改，去掉lable,换成placeholder
|
2 years ago |
|
candice
|
6fc73567ec
|
电话框引导语修改，去掉lable,换成placeholder
|
2 years ago |
|
candice
|
ce8cdfa4d0
|
添加国家号
|
2 years ago |
|
candice
|
1af4a8671a
|
添加国家号
|
2 years ago |
|
candice
|
a8679db263
|
恢复国籍选择，取消区号
|
2 years ago |
|
candice
|
dbb057384c
|
添加国家号
|
2 years ago |
|
candice
|
c89e3d53b5
|
电话号码添加国家号
|
2 years ago |
|
Jimmy Liow
|
80375f3d69
|
删除 AH、CH、GH 机票信息必填
|
2 years ago |
|
Jimmy Liow
|
573e2a8a01
|
删除机票必填验证和无用的jQuery日历
|
2 years ago |
|
赵鹏
|
1c80267de8
|
修复预售时间表有重复站点的话无法获取数据的错误
|
2 years ago |
|
赵鹏
|
1768776156
|
自动出票排序先按日期，再按预售时间。这样可以优先预售期内的先出。
|
2 years ago |
|
赵鹏
|
ecdbe13813
|
优化自动出票sql,兼容多条收款记录的订单。
|
2 years ago |
|
赵鹏
|
e36f5f885d
|
自动出票排序重新修改。（我记得改过了的，不知道怎么不见了。）
|
2 years ago |
|
赵鹏
|
de21b4e693
|
超过12个小时才停止抢票
|
2 years ago |
|
赵鹏
|
5c1d5c3877
|
Merge branch 'master' of github.com:hainatravel/information-system
|
2 years ago |
|
赵鹏
|
fbfbbe2581
|
设置自动出票运行时间为3分钟
|
2 years ago |
|
LMR
|
b195f05e8f
|
add log
|
2 years ago |
|
赵鹏
|
4fbebb3b2e
|
Merge branch 'master' of github.com:hainatravel/information-system
|
2 years ago |
|
赵鹏
|
4c2414805f
|
自动出票符合条件出票时加日志，用来判断订单自动出票中哪一步出问题。
|
2 years ago |
|
candice
|
a19b664015
|
11
|
2 years 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
|
2 years ago |
|
candice
|
6a5523bdb2
|
11
|
2 years ago |
|
candice
|
278d9bfb47
|
11
|
2 years ago |
|
candice
|
05167e09c7
|
头部导航删除zodiac signs和dream meaning
|
2 years ago |
|
Jimmy Liow
|
a7341b4854
|
Heritage只有15号的票
|
2 years ago |
|
Jimmy Liow
|
23981900c9
|
解决默认价格设置错误
|
2 years ago |
|
Jimmy Liow
|
5d2cb7931c
|
水灯节信息页表单改版
|
2 years ago |
|
Jimmy Liow
|
43e53085eb
|
增加十人以上价格优惠
|
2 years ago |
|
Jimmy Liow
|
8c30de1ff9
|
AH 水灯节表单新优化
|
2 years ago |
|
赵鹏
|
5f406b87f5
|
TA加nofollow
|
2 years ago |
|
赵鹏
|
23f627eef7
|
预售日志关闭
|
2 years ago |
|
赵鹏
|
9e0e5235c8
|
safri锚点问题
|
2 years ago |
|
赵鹏
|
012980f612
|
证件号判断错误。
|
2 years ago |
|
赵鹏
|
6ece6fb525
|
自动出票开启预售期的日志，检查8点整的订单为何没有自动出票。
|
2 years ago |
|
赵鹏
|
ee2c60ee06
|
Merge branch 'master' of github.com:hainatravel/information-system
|
2 years ago |
|
赵鹏
|
7729fb8da5
|
购物车加rel="nofollow" target="blank"
|
2 years ago |
|
Jimmy Liow
|
22739403f8
|
航班日期超出 SQL Datetime 范围则设置为空
|
2 years ago |
|
赵鹏
|
8e79ad252d
|
Merge branch 'master' of github.com:hainatravel/information-system
|
2 years ago |
|
赵鹏
|
213744009d
|
自动出票的订单根据出发城市的预售时间来排序。
|
2 years ago |
|
Jimmy Liow
|
40ed5237a8
|
Merge branch 'master' of github.com:hainatravel/information-system
|
2 years ago |
|
Jimmy Liow
|
8bea117546
|
客人信息表单增加日期范围限制
|
2 years ago |
|
赵鹏
|
1624e36ad3
|
自动出票关闭预售期的测试日志
|
2 years ago |
|
赵鹏
|
6d640bee99
|
fix
|
2 years ago |
|
赵鹏
|
d1dec4bfd5
|
fix
|
2 years ago |
|
赵鹏
|
2d3902209c
|
1. 火车搜索框替换标签<!--@TRAINSEARCH-FORM@--> 2.可以设置默认城市
|
2 years ago |
|
赵鹏
|
814157ed87
|
Merge branch 'master' of github.com:hainatravel/information-system
|
2 years ago |
|
赵鹏
|
318d4bd5a8
|
fix
|
2 years ago |
|
LMR
|
463000da50
|
Merge branch 'master' of https://github.com/hainatravel/information-system
|
2 years ago |
|
LMR
|
56cf181551
|
fix cache path
|
2 years ago |
|
赵鹏
|
8a65396a35
|
自动出票优化
|
2 years ago |
|
赵鹏
|
05ac02142b
|
Merge branch 'master' of github.com:hainatravel/information-system
|
2 years ago |
|
赵鹏
|
09e547096f
|
上海站静态话fix
|
2 years ago |
|
LMR
|
2e932db6a2
|
fix
|
2 years ago |
|
LMR
|
00718cf541
|
fuda
|
2 years ago |
|
LMR
|
b365bc5073
|
opt bad cache
|
2 years ago |
|
赵鹏
|
e0633c07c3
|
fix
|
2 years ago |
|
赵鹏
|
f67786c967
|
预售日支持自动出票
|
2 years ago |
|
赵鹏
|
810cf54752
|
Merge branch 'master' of github.com:hainatravel/information-system
|
2 years ago |
|
赵鹏
|
589c897c0d
|
CH站TP版块调用自己的样式https://proxy-data.chinahighlights.com/css/daytrip/tpbase.css
|
2 years ago |
|
candice
|
ecbb96c8fd
|
新增三站 线路卡片 模板代码
|
2 years ago |
|
candice
|
3d086bb0c2
|
添加提示语
|
2 years ago |
|
赵鹏
|
3db8fe5513
|
Merge branch 'master' of github.com:hainatravel/information-system
|
2 years ago |
|
赵鹏
|
139911b721
|
TP的详细页加限制，翰特找不到产品信息不出预订表单
|
2 years ago |
|
candice
|
d46627faca
|
样式细节调整
|
2 years ago |
|
赵鹏
|
df8df51bbf
|
Merge branch 'master' of github.com:hainatravel/information-system
|
2 years ago |
|
赵鹏
|
470590af01
|
火车预售时间修改功能上线
|
2 years ago |
|
candice
|
2aa44e9845
|
样式细节修改
|
2 years ago |
|
candice
|
f82f8c95a0
|
样式细节修改
|
2 years ago |
|
candice
|
1609cf908b
|
细节样式添加
|
2 years ago |
|
candice
|
90dc5d9243
|
票种部分文字加粗
|
2 years ago |
|
Jimmy Liow
|
f9cbccd499
|
Merge branch 'master' of github.com:hainatravel/information-system
|
2 years ago |
|
Jimmy Liow
|
4087e73ff5
|
AH CAD 跨年表单
|
2 years ago |
|
黄文强@HWQ-PC
|
08bbf9666f
|
增加ah和ph是否显示广告里面对空逻辑的判断
|
2 years ago |
|
黄文强@HWQ-PC
|
4b17fa89ad
|
Merge branch 'master' of github.com:hainatravel/information-system
|
2 years ago |
|
黄文强@HWQ-PC
|
d6b0503dc0
|
修改判断是否展示广告忘记加empty($meta_show_advertise)判断条件逻辑
|
2 years ago |
|
赵鹏
|
ba98a93f2a
|
Merge branch 'master' of github.com:hainatravel/information-system
|
2 years ago |
|
赵鹏
|
39f6f144db
|
火车预售时间维护功能。
|
2 years ago |
|
黄文强@HWQ-PC
|
165bb2a8d4
|
把“是否展示广告提示”改为“是否展示右侧广告”
|
2 years ago |
|
黄文强@HWQ-PC
|
2e12851439
|
修改判断是否显示广告的逻辑错误
|
2 years ago |
|
黄文强@HWQ-PC
|
35aa4ba386
|
Merge branch 'master' of github.com:hainatravel/information-system
|
2 years ago |
|
黄文强@HWQ-PC
|
e250747476
|
把是否展示广告的0-1判断逻辑改为"yes"-"no"
|
2 years ago |
|
candice
|
39a90562d5
|
补附加样式和JS
|
2 years ago |
|
candice
|
845c0b0f37
|
JS恢复
|
2 years ago |
|
candice
|
f408a7636f
|
JS精简
|
2 years ago |
|
candice
|
1c052d21de
|
Merge branch 'master' of github.com:hainatravel/information-system into master
|
2 years ago |
|
candice
|
bc9bb92838
|
JS精简
|
2 years ago |
|
黄文强@HWQ-PC
|
ef523066c5
|
Merge branch 'master' of github.com:hainatravel/information-system
|
2 years ago |
|
黄文强@HWQ-PC
|
e3fc1423b3
|
修改依然显示class=right_brand_info的广告div
|
2 years ago |
|
candice
|
3be7953948
|
JS精简
|
2 years ago |
|
candice
|
e70b8e38b3
|
Merge branch 'master' of github.com:hainatravel/information-system into master
|
2 years ago |
|
candice
|
06b6824312
|
JS精简
|
2 years ago |
|
黄文强@HWQ-PC
|
bb83cf650a
|
Merge branch 'master' of github.com:hainatravel/information-system
|
2 years ago |
|
黄文强@HWQ-PC
|
de54f8417c
|
信息平台增加是否显示右侧广告按钮
|
2 years ago |
|
Jimmy Liow
|
a9aac74fad
|
调整机票提醒位置
|
2 years ago |
|
candice
|
3020b581f1
|
样式调整
|
2 years 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>
|
2 years 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>
|
2 years 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>
|
2 years 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>
|
2 years 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>
|
2 years 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>
|
2 years ago |
|
candice
|
3506a266e4
|
Merge branch 'master' of github.com:hainatravel/information-system into master
|
2 years 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>
|
2 years ago |
|
黄文强@HWQ-PC
|
10397e5c65
|
Merge branch 'master' of github.com:hainatravel/information-system
|
2 years ago |
|
黄文强@HWQ-PC
|
e68dff1005
|
修改gh-h1没加strtotime方法
|
2 years 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>
|
2 years ago |
|
candice
|
f4bf6b544c
|
Merge branch 'master' of github.com:hainatravel/information-system into master
|
2 years ago |
|
candice
|
c0015a3523
|
添加 <script src="https://data.asiahighlights.com/min/?f=/js/jquery-1.8.2.min.js,/js/jquery.mailAutoComplete-4.0.min.js"></script>
|
2 years ago |
|
黄文强@HWQ-PC
|
1d890a2387
|
Merge branch 'master' of github.com:hainatravel/information-system
# Conflicts:
# application/controllers/information.php
# application/views/mobile_first/ah-h1.php
|
2 years ago |
|
黄文强@HWQ-PC
|
471b425861
|
增加ch和gh的发布日期功能
|
2 years ago |
|
candice
|
13f6fb25e0
|
添加 <script src="https://data.asiahighlights.com/min/?f=/js/jquery-1.8.2.min.js,/js/jquery.mailAutoComplete-4.0.min.js"></script>
|
2 years ago |
|
candice
|
4cfaf25162
|
移除 <script src="https://data.asiahighlights.com/min/?f=/js/jquery-1.8.2.min.js,/js/jquery.mailAutoComplete-4.0.min.js"></script> 至表单文件
|
2 years ago |
|
candice
|
54dfe2bfc0
|
Merge branch 'master' of github.com:hainatravel/information-system into master
|
2 years ago |
|
candice
|
3b95fccfde
|
移除 <script src="https://data.asiahighlights.com/min/?f=/js/jquery-1.8.2.min.js,/js/jquery.mailAutoComplete-4.0.min.js"></script> 至表单文件
|
2 years ago |
|
Jimmy Liow
|
96b2131bec
|
客人信息表单增加机票提示
|
2 years ago |
|
Jimmy Liow
|
917f449f04
|
取消发布日期默认值
|
2 years ago |
|
Jimmy Liow
|
faac9b862e
|
AH 增加发布日期判断
|
2 years ago |
|
黄文强@HWQ-PC
|
dcb914b432
|
信息平台右侧增加发布日期框
|
2 years ago |
|
candice
|
32afc727e4
|
底部模板history更换为loyalty program
|
2 years ago |
|
Jimmy Liow
|
2a4a951a05
|
Merge branch 'master' of github.com:hainatravel/information-system
|
2 years ago |
|
Jimmy Liow
|
60f57b38bd
|
删除 GH GG 广告代码
|
2 years ago |
|
candice
|
0f40b89266
|
div精简
|
2 years ago |
|
candice
|
963d40cc65
|
11
|
2 years ago |
|
candice
|
935349967d
|
div精简
|
2 years ago |
|
candice
|
b40ee07d4e
|
精简div
|
2 years ago |
|
candice
|
f849fb0a9c
|
11
|
2 years ago |
|
candice
|
3b9afaf4d0
|
Merge branch 'master' of github.com:hainatravel/information-system into master
|
2 years ago |
|
candice
|
18914682c4
|
div精简
|
2 years ago |
|
Jimmy Liow
|
60e8599713
|
Merge branch 'master' of github.com:hainatravel/information-system
|
2 years ago |
|
Jimmy Liow
|
c1f4b2252a
|
CH、GH底部图片加上延迟加载
|
2 years ago |
|
candice
|
bf430dfa91
|
div层级精简
|
2 years ago |
|
candice
|
27212765cc
|
Merge branch 'master' of github.com:hainatravel/information-system into master
|
2 years ago |
|
candice
|
6265bbaad6
|
div层级精简
|
2 years ago |
|
Jimmy Liow
|
b4db47988f
|
AH、CH、GH删除Google广告代码
|
2 years ago |
|
candice
|
3211da0de1
|
png替换为jpg
|
2 years ago |
|
candice
|
26fb30483b
|
底部why us图片添加宽和高
|
2 years ago |
|
candice
|
05623249a8
|
png替换为jpg
|
2 years ago |
|
candice
|
26fc372223
|
png替换为jpg
|
2 years ago |
|
candice
|
d8eeaad001
|
png替换为jpg
|
2 years ago |
|
candice
|
785769e54b
|
png图更换为jpg
|
2 years ago |
|
Jimmy Liow
|
b4e4496188
|
AH PC 端增加延迟加载
|
2 years ago |
|
Jimmy Liow
|
59a7a91f87
|
AH 底部图片加上延迟加载
|
2 years ago |
|
candice
|
61d1d7e08a
|
底部whyus内容修改
|
2 years ago |
|
赵鹏
|
eb946c99f8
|
Merge branch 'master' of github.com:hainatravel/information-system
|
2 years ago |
|
赵鹏
|
941555a4a6
|
更改火车票自动出票信息平台页面的价格显示栏目为销售的名字
|
2 years ago |
|
candice
|
0afde5af9e
|
样式修改
|
2 years ago |
|
Jimmy Liow
|
cfc08936bc
|
精简CH、GH网站reviews个数
|
2 years ago |
|
candice
|
bc14f704bb
|
TP分数修改
|
2 years ago |
|
candice
|
9da5fe82c5
|
底部推荐位置更换
|
2 years ago |
|
candice
|
d14fc3dc49
|
底部推荐只保留4个位置
|
2 years ago |
|
candice
|
d4dc052240
|
11
|
2 years ago |
|
candice
|
036194fad0
|
Merge branch 'master' of github.com:hainatravel/information-system into master
|
2 years ago |
|
candice
|
734f11ab18
|
11
|
2 years ago |
|
Jimmy Liow
|
49888b4e84
|
Merge branch 'master' of github.com:hainatravel/information-system
|
2 years ago |
|
Jimmy Liow
|
a95f0410a9
|
Merge branch 'master' of github.com:hainatravel/information-system
|
2 years ago |
|
candice
|
f774e8d5a9
|
底部推荐只保留4个位置
|
2 years ago |
|
Jimmy Liow
|
638ede80d4
|
信息平台启用meta robots设置
|
2 years ago |
|
candice
|
3889c6ea01
|
底部推荐只保留4个位置
|
2 years ago |
|
candice
|
fc6410b256
|
Merge branch 'master' of github.com:hainatravel/information-system into master
|
2 years ago |
|
candice
|
f36babb1fb
|
底部推荐只保留4个位置
|
2 years ago |
|
Jimmy Liow
|
840f7e5b9f
|
修复AH目的地Review为三个
|
2 years ago |
|
Jimmy Liow
|
46457a8785
|
精简AH网站reviews个数
|
2 years ago |
|
candice
|
4398870a4b
|
右侧反馈标签删除
|
2 years ago |
|
candice
|
671fdf9785
|
外链添加nofollow
|
2 years ago |
|
赵鹏
|
f8ab581d34
|
还原回去先，不然TP网站无法使用
|
2 years ago |
|
赵鹏
|
68a7a74c0f
|
TP产品读取229的数据库链接改为和火车自动出票的链接，目前GH的网站上没有229
|
2 years ago |
|
LMR
|
725ffb663e
|
Merge branch 'master' of https://github.com/hainatravel/information-system
|
2 years ago |
|
LMR
|
7f3fe43362
|
fix curl
|
2 years ago |
|
LMR
|
2d4ad93a94
|
add curl header
|
2 years ago |
|
candice
|
5b429599eb
|
newsletter jquery删除
|
2 years ago |
|
赵鹏
|
b03a126698
|
解决冲突
|
2 years ago |
|
赵鹏
|
c600f95b47
|
火车首页fix
|
2 years ago |
|
赵鹏
|
7c4080ab0d
|
Merge branch 'master' of github.com:hainatravel/information-system
# Conflicts:
# application/controllers/information.php
|
2 years ago |
|
赵鹏
|
3622569c3b
|
CH火车首页改版，去掉top banner
|
2 years ago |
|
candice
|
a269b1fdf4
|
头部导航增加about us
|
2 years ago |
|
LMR
|
6c7d943631
|
fix
|
2 years ago |
|
LMR
|
f7cdf689b5
|
da
|
2 years ago |
|
LMR
|
a136eefbe6
|
tewt
|
2 years ago |
|
LMR
|
359df1fd8e
|
Merge branch 'master' of https://github.com/hainatravel/information-system
|
2 years ago |
|
LMR
|
33d83cc68a
|
fix
|
2 years ago |
|
Jimmy Liow
|
94d4f1e1bb
|
CH 删除头部视频模板
|
2 years ago |
|
candice
|
f2cda3dfaa
|
11
|
2 years ago |
|
candice
|
08e87a3802
|
底部newsletter表单移至信息平台，替换为链接
|
2 years ago |
|
candice
|
94574e015d
|
删除头部图片
|
2 years ago |
|
赵鹏
|
b0aa3bf4e3
|
Merge branch 'master' of github.com:hainatravel/information-system
|
2 years ago |
|
赵鹏
|
483dda454d
|
香港，台湾，澳门三地携程出票时，地区代码传CN
|
2 years ago |
|
Jimmy Liow
|
6b2f5f0671
|
合并产品页信息页头部
|
2 years ago |
|
Jimmy Liow
|
d2b39cdaf9
|
CH 删除头部大图模板
|
2 years ago |
|
Jimmy Liow
|
174937c6cc
|
CH 删除头部大图模板
|
2 years ago |
|
candice
|
8621609ed9
|
头部大图删除
|
2 years ago |
|
candice
|
3da7745c6e
|
删除底部newsletter表单和相关JS
|
2 years ago |
|
candice
|
8594ba2400
|
票价修改，增加泰铢价格
|
2 years ago |
|
Jimmy Liow
|
cac450b43f
|
AH 撤下GG Ads
|
2 years ago |
|
Jimmy Liow
|
4f8f5465b8
|
增加 Google Ad 代码
|
2 years ago |
|
Jimmy Liow
|
9057b6c687
|
AH、CH、GH 撤下页头的单元广告
|
2 years ago |
|
candice
|
668658776e
|
11
|
2 years ago |
|
candice
|
8ee88e233b
|
11
|
2 years ago |
|
candice
|
07f42b2051
|
11
|
2 years ago |
|
candice
|
4700c8d0d0
|
新增rel="nofollow"
|
2 years ago |
|
candice
|
38d6e033e8
|
新增 rel="nofollow"
|
2 years ago |
|
candice
|
46aa1cada2
|
添加 rel="nofollow"
|
2 years ago |
|
candice
|
991e8971a1
|
11
|
2 years ago |
|
candice
|
d0794575e0
|
11
|
2 years ago |
|
candice
|
26098a350b
|
11
|
2 years ago |
|
LMR
|
e85bb4c117
|
fix
|
2 years ago |
|
LMR
|
cb12995763
|
fix
|
2 years ago |
|
LMR
|
c31bd10968
|
add gj_gm update cache
|
2 years ago |
|
LMR
|
460d640211
|
up 3
|
2 years ago |
|
LMR
|
f7b7fd5e74
|
v3
|
2 years ago |
|
LMR
|
58e99b79f4
|
+2
|
2 years ago |
|
LMR
|
d07f37173a
|
test link gm database
|
2 years ago |
|
LMR
|
e54fd396d3
|
add test gm database
|
2 years ago |
|
LMR
|
fbad1da0e0
|
fix gh_gm tpl
|
2 years ago |
|
candice
|
e8d79dd3ab
|
11
|
2 years ago |
|
candice
|
80838a76b9
|
人数选择恢复恢复为加减
|
2 years ago |
|
candice
|
4d8f4ae958
|
人数删除0选项
|
2 years ago |
Layne
|
506039d094
|
更改结构化标签的传递数据
|
2 years ago |
|
Layne
|
d711e5e333
|
更正结构化标签代码错误
|
2 years ago |
|
Layne
|
23ff03d4e4
|
结构化标签新增在线作者判断
|
2 years ago |
|
candice
|
747effe3e3
|
人数选择改为下拉框
|
2 years ago |
|
LMR
|
09c61276c1
|
fix
|
2 years ago |
|
LMR
|
df70c3512c
|
Merge branch 'master' of https://github.com/hainatravel/information-system
|
2 years ago |
|
LMR
|
ae6c935207
|
add gm copy
|
2 years ago |
|
candice
|
6f7136f5af
|
11
|
2 years ago |
|
candice
|
2fec3cafc4
|
11
|
2 years ago |
|
candice
|
bcf9bdccd1
|
头部导航logo调整
|
2 years ago |
|
candice
|
75d0f6ec4c
|
头部导航Logo调整
|
2 years ago |
|
candice
|
171dc0481e
|
11
|
2 years ago |
|
candice
|
3f6a3b9656
|
模糊出发日期修改
|
2 years ago |
|
candice
|
b51c18ac5f
|
邮箱自动出现和相关样式删除
|
2 years ago |
|
candice
|
027ba24b24
|
删除头部大图，PC和移动端一体
|
2 years ago |
|
candice
|
ad26727400
|
底部newsletter表单删除，替换为按钮，相关JS删除
|
2 years ago |
|
candice
|
fca64df64d
|
html结构调整
|
2 years ago |
|
candice
|
3fd1a82def
|
右侧品牌内容修改
|
2 years ago |
|
candice
|
0999f5fbcd
|
右侧品牌内容修改
|
2 years ago |
|
赵鹏
|
a157ca3983
|
Merge branch 'master' of github.com:hainatravel/information-system
|
2 years ago |
|
赵鹏
|
5ae28c8d0e
|
顺途接口升级，根据要求增加人员国籍的数据
|
2 years ago |
|
candice
|
bc6f7a519a
|
11
|
2 years ago |
|
candice
|
311817f9dc
|
11
|
2 years ago |
|
candice
|
bf0434bb87
|
11
|
2 years ago |
|
candice
|
cb016ba41c
|
11
|
2 years ago |
|
candice
|
edc98f3eaf
|
11
|
2 years ago |