Commit Graph

340 Commits (49cb4c86eb77bed6fd45535b27eecfa74b6a5461)

Author SHA1 Message Date
zhengyongxing 49cb4c86eb Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
 Conflicts:
	Application/Home/View/default/Finance/withdrawRecord.html
zhengyongxing 97b9a06e69 推广后台bug修正
ELF 5602892a8f Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
ELF bc92414aab 修改bug
chenxiaojun 576efcb3eb 推广平台->财务管理--更新
chenxiaojun 662eb93763 推广平台->财务管理--更新
zhengyongxing 0b15e9edd5 推广后台管理中心修正
zhengyongxing 0b93ee2db9 推广后台订单查询隐藏操作
zhengyongxing 77da9cf429 推广后台bug修正
zhengchanglong e7985f366b 管理中心菜单权限开放
zhengchanglong 531494029f 管理中心菜单权限开放
zhengyongxing aa5eadaa02 扶持号管理更名为测试号管理
zhengyongxing e5d425cd47 订单查询订单信息隐藏,扶持号管理更名为测试号管理
sunke 165718170a 平台币按钮权限
zhengyongxing 29e71cc4fa 文章详情返回按钮回到主页
zhengyongxing 37eda1113d 推广页面图标修改
zhengyongxing 176efd1a88 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhengyongxing c88e759e3b 推广后台bug修复
sunke d55c4220a1 查询
ELF 6920cecd99 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
ELF 634ade3ecd 修改bug
sunke c3caed08b3 bug
yulingwei c6779497c2 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
yulingwei d90186b301 付款订单有效性问题
sunke cf1449f09a 安全下载中心
ELF 90d5d53994 解决冲突
ELF 9d19a2ce6b 修改冲突
ELF c1d05093e1 修改bug
ELF 4f41651654 修改bug
sunke 1f34a3a0ce 平台币明细,sdk菜单图片上传
chenxiaojun 731d7cb482 推广平台->平台币管理->我的平台币->检索样式调整
ELF 219aae771e Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
ELF 2c608a73c9 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
ELF 1a0175e583 修改结构
chenxiaojun f8abfa9995 推广平台--日期检索调整
zhengchanglong 5a56b41330 Merge branch 'feature/promote' into dev
chenxiaojun db249a776e 推广平台->财务管理->提现记录->提现明细--检索调整
chenxiaojun fa2efa0431 推广平台->游戏管理->我的游戏--检索样式调整
sunke e28a33f6e6 设置同意协议
zhengchanglong 16d54e6add Merge branch 'feature/promote' into dev
sunke 5bba1e5df4 游戏推广协议
chenxiaojun ee97f42261 推广平台->数据管理->数据汇总--检索更新
sunke 97a973079a charge
ELF 175e38f712 修改bug
ELF 5bfecf5fc6 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
chenxiaojun 98f43acc96 推广平台->数据管理--检索样式调整
chenxiaojun 486090ca0a 推广平台->财务管理--时间检索提示调整|数据管理->订单查询|注册明细--检索样式调整
chenxiaojun 4ac069e28a 推广平台->财务管理->结算明细--检索调整
sunke 21782ff951 实时刷新可下载状态
ELF be6357eeac Merge branch 'dev' of 47.111.118.107:/srv/git/platform into feature/promote