2804 Commits (5034cb863bae3537224c08b47c284eff9ba253b1)
 

Author SHA1 Message Date
zhengyongxing d545c22c3b 数据管理功能提交 5 years ago
liuweiwen 166a868543 Merge remote-tracking branch 'origin/dev' into dev_lww 5 years ago
zhengyongxing 5df3a59df4 扶持发放添加导出功能 5 years ago
chenxiaojun e0f5404a83 推广平台>落地页--更新 5 years ago
chenxiaojun 462dd061b7 推广平台>落地页--更新 5 years ago
chenxiaojun b5b4f020a7 推广平台>落地页--更新 5 years ago
chenxiaojun 78b0f66d37 推广平台>落地页--更新 5 years ago
zhengyongxing 6f584f8323 数据权限功能提交 5 years ago
chenzhi c251867ba6 修改用户列表重复搜索区服不存在bug 5 years ago
liuweiwen 46aa23514e Merge remote-tracking branch 'origin/dev' into dev 5 years ago
chenxiaojun 7cfa9175da 管理后台>游戏>新增落地页视频封面 推广平台>落地页--更新 5 years ago
chenxiaojun b21ec3859f 管理后台>游戏>新增落地页视频封面 推广平台>落地页--更新 5 years ago
liuweiwen cdf8f51007 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
chenxiaojun d6b7bc811d 管理后台>游戏>新增落地页视频封面 推广平台>落地页--更新 5 years ago
chenxiaojun ea07864f98 管理后台>游戏>新增落地页视频封面 推广平台>落地页--更新 5 years ago
sunke b47eced096 日志分页 5 years ago
liuweiwen 1686c7c3c0 Merge branch 'release-1.0.0' into dev 5 years ago
liuweiwen 587da83973 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
zhanglingsheng 43d49b10a0 Merge branch 'release-1.0.0' of 47.111.118.107:/srv/git/platform into release-1.0.0 5 years ago
zhanglingsheng 5d01cb1ff5 游戏充值预下单 5 years ago
liuweiwen c6ffac041f 官网充值页面弹窗提示修改:alert改为popmsg.msg 5 years ago
zhanglingsheng 50dbc200e5 时间转换函数全部精确到秒 5 years ago
sunke 0cb7a40ea9 行为日志角色id 5 years ago
zhanglingsheng 6d2c4fc3a2 游戏充值预下单 5 years ago
zhengyongxing 7ec754e0eb Merge branches 'dev' and 'release-1.0.0' of 47.111.118.107:/srv/git/platform into dev 5 years ago
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