赵鹏
|
14272edd1e
|
Merge branch 'master' of github.com:hainatravel/information-system
# Conflicts:
# application/views/bootstrap3/information_edit.php
|
2 years ago |
|
赵鹏
|
0f700d97c8
|
北京站移动化优先完成上线。
|
2 years ago |
LMR
|
050f0a876b
|
list_use_hb
|
2 years ago |
|
LMR
|
f657130093
|
ds
|
2 years ago |
|
LMR
|
757c4f9614
|
da
|
2 years ago |
|
LMR
|
0b707063c5
|
da
|
2 years ago |
|
LMR
|
56183dd304
|
fix
|
2 years ago |
|
LMR
|
ef6c32141c
|
fix
|
2 years ago |
|
LMR
|
0ad4ef2539
|
sleep2
|
2 years ago |
|
LMR
|
44f33a72d4
|
fix
|
2 years ago |
|
LMR
|
d948a78039
|
d
|
2 years ago |
|
LMR
|
fc0fdb4d1d
|
da
|
2 years ago |
|
LMR
|
01d126c115
|
ft
|
2 years ago |
|
LMR
|
25727d79c2
|
fix
|
2 years ago |
|
LMR
|
f460db514c
|
add backup
|
2 years ago |
|
LMR
|
b2fd56e4f0
|
da
|
2 years ago |
|
LMR
|
56dd146567
|
f4
|
2 years ago |
|
LMR
|
4cf7db8c78
|
f3
|
2 years ago |
|
LMR
|
101450ae52
|
fix bug 2
|
2 years ago |
|
LMR
|
ee7cbadeba
|
add list_use_hb
|
2 years ago |
|
LMR
|
5a1f579d0b
|
infofix fix
|
2 years ago |
|
LMR
|
4c7411cd5d
|
fix json
|
2 years ago |
|
LMR
|
2d42fab88c
|
fix
|
2 years ago |
|
LMR
|
8674ef54f7
|
fix
|
2 years ago |
|
LMR
|
42b43d1edd
|
s
|
2 years ago |
|
LMR
|
89083cc115
|
fiux
|
2 years ago |
|
LMR
|
6f2fe4207f
|
da
|
2 years ago |
|
LMR
|
80bebefca3
|
Merge branch 'master' of https://github.com/hainatravel/information-system
|
2 years ago |
|
LMR
|
c08a33053e
|
add update_by_icid
|
2 years ago |
|
LMR
|
25dc172813
|
add get_by_icid
|
2 years ago |
黄文强@HWQ-PC
|
7e18183df1
|
更改顾问反馈标题
|
2 years ago |
|
黄文强@HWQ-PC
|
8dd89abc0e
|
修改gh顾问反馈的标签
|
2 years ago |
|
黄文强@HWQ-PC
|
f3f63a65ec
|
增加在GH网站根据顾问名字读取专属于顾问的反馈标签的功能
|
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
|
0f7969af7e
|
增加ah，ch，gh对$OPI_Code的初始化处理
|
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 |
|
Jimmy Liow
|
55e7e47418
|
右侧推荐删除 aside 标签
|
2 years ago |
|
Jimmy Liow
|
804446ac24
|
删除水灯节在信息页面表单
|
2 years ago |
|
赵鹏
|
ae3daef11b
|
fix
|
2 years ago |
|
赵鹏
|
a541af9a47
|
fix
|
2 years ago |
|
赵鹏
|
b38799aeaa
|
fix
|
2 years ago |
|
赵鹏
|
15bb56eebc
|
CT产品页表单兼容左右结构。
|
2 years ago |
|
LMR
|
0f4ac70071
|
fix icid
|
2 years ago |
|
LMR
|
67a4e3dc99
|
fix meta
|
2 years ago |
|
LMR
|
ae1395684f
|
test meta
|
2 years ago |
|
赵鹏
|
1423dc855f
|
上海站表单fix
|
2 years ago |
|
赵鹏
|
009c11098a
|
上海站线路表单
|
2 years ago |
|
赵鹏
|
f91ffc880e
|
上海站详细页加表单
|
2 years ago |
|
赵鹏
|
fbae81a8b7
|
上海站线路详细页不调用表单。
|
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
|
0f4e4faf9d
|
add @@@
|
2 years ago |
|
LMR
|
a94c6fdcd3
|
format
|
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
|
466e8f197f
|
todo: list_info_by_keys
|
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
|
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 |
|
LMR
|
8b74fa95f0
|
fix index.htm
|
2 years ago |
|
LMR
|
c1dcd41570
|
add pd tour
|
2 years ago |
|
LMR
|
7b2877e911
|
da
|
2 years ago |
|
LMR
|
b195f05e8f
|
add log
|
2 years ago |
|
赵鹏
|
6d640bee99
|
fix
|
2 years ago |
|
赵鹏
|
d1dec4bfd5
|
fix
|
2 years ago |
|
赵鹏
|
2d3902209c
|
1. 火车搜索框替换标签<!--@TRAINSEARCH-FORM@--> 2.可以设置默认城市
|
2 years ago |
|
赵鹏
|
09e547096f
|
上海站静态话fix
|
2 years ago |
|
赵鹏
|
589c897c0d
|
CH站TP版块调用自己的样式https://proxy-data.chinahighlights.com/css/daytrip/tpbase.css
|
2 years ago |
|
赵鹏
|
139911b721
|
TP的详细页加限制，翰特找不到产品信息不出预订表单
|
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
|
d6b0503dc0
|
修改判断是否展示广告忘记加empty($meta_show_advertise)判断条件逻辑
|
2 years ago |
|
黄文强@HWQ-PC
|
2e12851439
|
修改判断是否显示广告的逻辑错误
|
2 years ago |
|
黄文强@HWQ-PC
|
e250747476
|
把是否展示广告的0-1判断逻辑改为"yes"-"no"
|
2 years ago |
|
黄文强@HWQ-PC
|
e3fc1423b3
|
修改依然显示class=right_brand_info的广告div
|
2 years ago |
|
黄文强@HWQ-PC
|
de54f8417c
|
信息平台增加是否显示右侧广告按钮
|
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 |
|
Jimmy Liow
|
917f449f04
|
取消发布日期默认值
|
2 years ago |
|
Jimmy Liow
|
faac9b862e
|
AH 增加发布日期判断
|
2 years ago |
|
黄文强@HWQ-PC
|
dcb914b432
|
信息平台右侧增加发布日期框
|
2 years ago |
|
Jimmy Liow
|
cfc08936bc
|
精简CH、GH网站reviews个数
|
2 years ago |
|
Jimmy Liow
|
638ede80d4
|
信息平台启用meta robots设置
|
2 years ago |
|
Jimmy Liow
|
840f7e5b9f
|
修复AH目的地Review为三个
|
2 years ago |
|
Jimmy Liow
|
46457a8785
|
精简AH网站reviews个数
|
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 |
|
Jimmy Liow
|
94d4f1e1bb
|
CH 删除头部视频模板
|
2 years ago |
|
Jimmy Liow
|
6b2f5f0671
|
合并产品页信息页头部
|
2 years ago |
|
Jimmy Liow
|
d2b39cdaf9
|
CH 删除头部大图模板
|
2 years ago |
|
Jimmy Liow
|
174937c6cc
|
CH 删除头部大图模板
|
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 |
Layne
|
506039d094
|
更改结构化标签的传递数据
|
2 years ago |
|
Layne
|
d711e5e333
|
更正结构化标签代码错误
|
2 years ago |
|
Layne
|
23ff03d4e4
|
结构化标签新增在线作者判断
|
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 |
|
Layne
|
1634128338
|
gh google adsense 代码位置修改
|
2 years ago |
|
Layne
|
8bfafd1eef
|
gh 新增 google adsense 判断
|
2 years ago |
|
Jimmy Liow
|
f3a857cfbd
|
CH H1 兼容没有域名的图片地址
|
2 years ago |
|
LMR
|
cf72526b46
|
fix gm update cache
|
2 years ago |
YCC
|
14e3e2577c
|
修改搜索记录数
|
2 years ago |
|
YCC
|
9604461cad
|
修改搜索结果项为48
|
2 years ago |
|
Jimmy Liow
|
dbed84450c
|
测试带星号反馈列表
|
2 years ago |
|
hainatravel
|
b477be6c85
|
Update information.php
开放广告重复显示
|
2 years ago |
|
Jimmy Liow
|
02ffa70913
|
删除无效的SQL测试
|
2 years ago |
|
Jimmy Liow
|
16adc76d7b
|
GH和CH网站实现线路价格代码
|
2 years ago |
|
Jimmy Liow
|
2f29332245
|
解析价格标签增加 $dept_sn
|
2 years ago |
|
Jimmy Liow
|
06f5b90258
|
Merge branch 'master' of github.com:hainatravel/information-system
|
2 years ago |
|
Jimmy Liow
|
9223a52a00
|
增加测试分段
|
2 years ago |
|
LMR
|
7c369b4b11
|
dd
|
2 years ago |
|
LMR
|
3c84380182
|
fix
|
2 years ago |
|
Jimmy Liow
|
a88cae1b95
|
价格增加事业部参数
|
2 years ago |
|
Jimmy Liow
|
aee1411ec3
|
使用 BASE64 传参
|
2 years ago |
|
Jimmy Liow
|
99bfe0f593
|
增加动态测试价格标签
|
2 years ago |
|
LMR
|
b9ccf8f151
|
fix
|
2 years ago |
|
Jimmy Liow
|
4200778a5f
|
增加价格测试方法
|
2 years ago |
|
Jimmy Liow
|
52fbb9ab14
|
Merge branch 'master' of github.com:hainatravel/information-system
|
2 years ago |
|
Jimmy Liow
|
a9d7b36717
|
#ah-mtc-3,st,2#
|
2 years ago |
|
LMR
|
1d87b70c63
|
add config gh
|
2 years ago |
|
Jimmy Liow
|
8aeabebfb5
|
Merge branch 'master' of github.com:hainatravel/information-system
|
2 years ago |
|
Jimmy Liow
|
848c49f44c
|
test_get_feedback_by_city_name
|
2 years ago |
|
LMR
|
b4b8f26dde
|
fix
|
2 years ago |
|
Jimmy Liow
|
eb2354e756
|
修复标签没有生效
|
2 years ago |
|
Jimmy Liow
|
8fc3933256
|
增加标签 NEWEST_FEEDBACK_10
|
2 years ago |
|
Jimmy Liow
|
b9eaff1db5
|
修改测试调用方法
|
2 years ago |
|
Jimmy Liow
|
a422d10148
|
Merge branch 'master' of github.com:hainatravel/information-system
|
2 years ago |
|
Jimmy Liow
|
da2af2a259
|
最新反馈增加默认条数
|
2 years ago |
|
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 |
|
LMR
|
9dfbb11f8d
|
fix
|
2 years ago |
|
LMR
|
000fca2deb
|
TODO: 非子节点信息
|
2 years ago |
|
LMR
|
776b0b6d86
|
test
|
2 years ago |
|
LMR
|
281b6d0415
|
add get detail
|
2 years ago |
|
LMR
|
7ba0cb58cc
|
copy 1
|
2 years ago |
|
LMR
|
8f105938c3
|
fix
|
2 years ago |
|
LMR
|
e829cbeadd
|
fix
|
2 years ago |
|
LMR
|
b77654226d
|
fix
|
2 years ago |
|
LMR
|
39e8ef7fad
|
fix
|
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 |
|
赵鹏
|
47611d2d89
|
fix
|
2 years ago |
|
Jimmy Liow
|
3b266c537d
|
更新价格代码测试
|
2 years ago |
|
LMR
|
428f30e17d
|
fix is_series_site
|
2 years ago |
|
YCC
|
7a2a073306
|
ch和gh的广告不检测重复
|
2 years ago |
|
Jimmy Liow
|
2cf63bab82
|
广告管理可以应用产品价格代码
|
2 years ago |
|
YCC
|
0eb80276ea
|
bug fix
|
2 years ago |
|
YCC
|
b68c55f432
|
fix bug
|
2 years ago |
|
YCC
|
bd425ee8da
|
AH页面的广告推荐取消重复检测
|
2 years ago |
|
赵鹏
|
6eff706253
|
火车票出票系统（third_party/trainsystem/）增加登陆验证。
|
3 years ago |