2728 Commits (ea9981fcc6ded4846e270b9951b451fd9de98f0d)
 

Author SHA1 Message Date
zhanglingsheng a5cc0f339f Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zhanglingsheng 62502f0732 游戏充值预下单 5 years ago
zhengyongxing e6c45bc494 推广补链导出修改 5 years ago
sunke 92523d7429 充值状态 5 years ago
sunke 4c1471f6bb 行为日志 5 years ago
zhengyongxing 6fbf14c9fe Merge branch 'release-1.0.0' of 47.111.118.107:/srv/git/platform into release-1.0.0 5 years ago
zhengchanglong ba4339977e Merge branch 'dev' into release-1.0.0 5 years ago
zhengyongxing 24dab9158b 管理后台bug修改 5 years ago
liuweiwen f5316aee55 Merge branch 'release-1.0.0' into dev
# Conflicts:
#	Application/Home/Controller/QueryController.class.php
5 years ago
zhanglingsheng 812532a52d Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zhanglingsheng 3a20c68117 游戏充值预下单修改 5 years ago
liuweiwen dabfc64dc9 Merge remote-tracking branch 'origin/release-1.0.0' into release-1.0.0 5 years ago
liuweiwen 146b9e518a 解决落地页视频不置顶无视频显示视频框,滚动层被游戏截图挡住 5 years ago
chenzhi db6131a135 暂存 5 years ago
chenxiaojun 0c33f6a98d 推广平台>数据管理>订单查询--更新 5 years ago
chenxiaojun 01ef816ee1 推广平台>数据管理>订单查询--更新 5 years ago
zhengyongxing 46538019d4 管理后台新开发功能修改 5 years ago
zhengchanglong 6fa8392766 Merge branch 'master_zcl' into release-1.0.0 5 years ago
zhengchanglong ec0fb0d0b4 Merge branch 'master_zcl' into dev 5 years ago
tpingzhang dccb94c779 tab_pay_info 5 years ago
zhengchanglong 65b5fc4a26 隐藏游戏充值列表部分字段 5 years ago
chenxiaojun 69fd83a2f0 推广平台>数据管理>充值玩家--更新 5 years ago
liuweiwen e30f2f9601 Merge branch 'dev' into dev_lww
# Conflicts:
#	Application/Admin/Controller/FileController.class.php
#	Application/Admin/Controller/GameController.class.php
#	Application/Admin/View/Game/edit.html
#	Application/Home/Controller/HomeController.class.php
#	Application/Home/View/default/Home/landingPage.html
#	Public/Home/css/index2.css
5 years ago
chenxiaojun f05034486c 推广平台>数据管理>充值玩家 5 years ago
sunke 660397bf4f 双乾支付 5 years ago
sunke 2cef293427 Merge branch 'release-1.0.0' of 47.111.118.107:/srv/git/platform into release-1.0.0 5 years ago
sunke 2c17a4c24f 双乾支付 5 years ago
zhengchanglong 4e8abd5975 Merge branch 'master_zcl' into release-1.0.0
# Conflicts:
#	Application/Admin/Common/function.php
#	Application/Admin/Controller/MemberController.class.php
5 years ago
zhengchanglong 996b9bceac Merge branch 'master_zcl' into dev
# Conflicts:
#	Application/Admin/Common/function.php
#	Application/Admin/Controller/MemberController.class.php
5 years ago
chenxiaojun 86fff37201 推广平台>落地页--更新 5 years ago
chenxiaojun d6186a9579 推广平台>落地页--更新 5 years ago
chenxiaojun e6bdac2f26 推广平台>落地页--更新 5 years ago
chenxiaojun be9619e25a 推广平台>落地页--更新 5 years ago
zhengchanglong d265c9b03f 管理后台-用户组-玩家列表敏感信息加密显示 5 years ago
chenxiaojun 25ea7569cd 推广平台>落地页--更新 5 years ago
zhengchanglong 381fa8d633 管理后台-用户组-玩家列表敏感信息加密显示 5 years ago
zhengchanglong ed584bfb2f 管理后台-用户组-玩家列表敏感信息加密显示 5 years ago
zhengchanglong a55efe582b 管理后台-用户组-玩家列表敏感信息加密显示 5 years ago
chenxiaojun aa67148398 推广平台>落地页--更新 5 years ago
chenxiaojun a93d11d871 推广平台>落地页--更新 5 years ago
chenxiaojun 44e912d9dc 推广平台>落地页--更新 5 years ago
chenxiaojun 50e0d22a8f 推广平台>落地页--更新 5 years ago
chenxiaojun 3719548d78 推广平台>落地页--更新 5 years ago
chenxiaojun 5a4d26a6e5 推广平台>落地页--更新 5 years ago
chenxiaojun 9d3a818fab 推广平台>落地页--更新 5 years ago
chenxiaojun aebd5bd396 推广平台>落地页--更新 5 years ago
zhengchanglong c32c1780e6 管理后台-用户组-玩家列表敏感信息加密显示 5 years ago
chenxiaojun 3f2433fa4a 推广平台>落地页--更新 5 years ago
chenxiaojun d4d3d3fe5d 推广平台>落地页--更新 5 years ago
chenzhi ab29dafffc 补链旧数据脚本 5 years ago