Commit Graph

437 Commits (2437d613bbeccac656c4b34ed22b7cf12403b29d)

Author SHA1 Message Date
chenzhi 2a417c2746 123
ELF 2254610041 修改bug
zhanglingsheng fb85d32c87 合并分支
yulingwei 38680ddb05 更新
zhengyongxing 1626123074 数据统计7日平均时长修正
zhengchanglong f8008a4b5e Merge branch 'dev_zyx' into dev_zcl
# Conflicts:
#	Data/update.sql
zhengyongxing 64c059cccc Merge branches 'dev' and 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
 Conflicts:
	Data/update.sql
yulingwei 24d3e6ab07 修改bug
yulingwei 046beee6be 修改bug
zhengchanglong a4dc55f4e3 Merge branch 'dev_zyx' into dev_zcl
# Conflicts:
#	Data/update.sql
zhengchanglong 974a9d93e4 Merge branch 'dev-cz' into dev_zcl
# Conflicts:
#	Data/update.sql
zhengyongxing f4cb9a98c8 数据管理启动机型代码优化
zhengyongxing 2fb1effdcd 后台数据分析应用概况优化
chenzhi 6e522e08cd Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
chenzhi a6f52ccdb8 优化注册管理员提示信息
zhanglingsheng a514e5b5dc 支付方式添加快捷
zhanglingsheng e07e1ff2aa 支付方式添加快捷
chenzhi 360cf3f3ba 优化前端展示
chenzhi 04c5f17790 优化脚本
sunke b64882554a 管理后台增加资质审核检索
chenzhi 37d8f72c6d 优化首页展示
sunke 0b8f3450c6 审核后台
chenzhi e1739209e3 1
chenzhi 521a343fc3 123
chenzhi 39e682e69e Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz
sunke d2d211737f bug
sunke eac235d498 身份认证后台
zhengchanglong d95fd1b1a7 Merge branch 'dev_zcl' into dev
zhanglingsheng d0a0068039 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhanglingsheng 94cc0bacbf SDK菜单链接修改
chenxiaojun 9933463c70 管理后台->推广员->财务管理->推广提现--结算详情分页
chenxiaojun f9d26bab7c 管理后台->推广员->财务管理->推广提现--结算详情分页
zhanglingsheng 21b02ca200 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhanglingsheng f074ce853b sdk菜单配置修改
yulingwei 82bdfadb7d Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
yulingwei 2e0a8d2ad0 更新统计数据
zhanglingsheng 5b3c01e1ba Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhanglingsheng 3453de757f sdk菜单配置修改
chenxiaojun 5e3cc42bc1 管理后台->推广员->推广员编辑--二级密码名词解释更改
chenxiaojun cc572ca66e 管理后台->推广员->推广员编辑--二级密码名词解释更改
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修正
chenxiaojun f7d0109ee7 管理后台->充值->平台币订单->平台币回收--更新
chenxiaojun 5caf75afb9 管理后台->充值->平台币订单->平台币回收--更新
chenxiaojun 8ac33bb9e4 管理后台->充值->平台币订单->平台币回收--更新
chenxiaojun fd53997094 管理后台->充值->平台币订单->平台币回收--更新
zhengchanglong 0b8dfcdc89 管理后台时时实时注册查询修改
chenxiaojun e96bd42ef6 管理后台->游戏--去除CP分成比例同步
chenxiaojun 25b319f87c 管理后台->游戏--去除CP分成比例同步
chenxiaojun 6ad8277aa0 管理后台--更新
chenxiaojun 2e7ecfa53c 管理后台--更新
sunke ee8a954566 查看消费记录滚动
yulingwei a7f6d8b7a4 upt
elf@home 06486d458c 修改bug
elf@home 1036589f3b 修改代码
zhengchanglong ab46f9f6ec Merge branch 'feature/promote' into dev
chenxiaojun a84ea0e679 管理后台->游戏订单->游戏充值--日期检索更新
chenxiaojun 55fe6a2c7d 管理后台->游戏订单->游戏充值--日期检索更新
chenxiaojun 638ceba6cc 管理后台->游戏订单->游戏充值--日期检索更新
chenxiaojun 9075730d83 管理后台->游戏订单->游戏充值--更新
chenxiaojun f473c0abc1 管理后台->游戏订单->游戏充值--列表样式调整
chenxiaojun 3fbdc9daa0 管理后台->游戏订单->游戏充值--sql优化
chenxiaojun 83e8427c8b cs
ELF 1c11622eb2 修改bug
ELF b0b0056c43 修改bug
ELF e942f378c6 修改bug
zhanglingsheng 656e9b7231 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhanglingsheng fb0808445f 悬浮球加类型
sunke 1f34a3a0ce 平台币明细,sdk菜单图片上传
yulingwei 44954031bf upt
yulingwei 0d258c1d8d upt
ELF e2d75ec2c6 修改推广后台首页
yulingwei 5a2e6c2b63 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
yulingwei 6ea4c72416 修改部分导出报表问题
ELF 905efbfd9a Merge branch 'dev' of 47.111.118.107:/srv/git/platform into feature/promote
ELF 9fde84f6ca Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
jbrazz c8f072f983 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
jbrazz 2a6d9b7571 推广员名称
chenxiaojun 9d3dfd622b 推广平台->退出登录--更新
ELF d112a3c7ff Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
ELF e58b20b576 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
ELF e27c5a5266 修改bug
jbrazz 5deb0c2b05 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
jbrazz 8a513767dd upt
chenxiaojun 467b193037 推广平台->退出登录--更新
sunke 9e2bb1e809 安全管理admin后台
chenxiaojun 773ffb5160 管理后台->游戏编辑--更新推广充值CPS比例时同步未提现订单的分成比例
推广平台->数据管理->每日概况|数据汇总--检索日期间隔调整为31天
推广平台->财务管理->结算中心->提现--权限更新
ELF d9419ae64e Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
chenxiaojun 6307625efc 管理后台->推广员->结算管理->推广提现->--更新
ELF 84b36e2d78 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
ELF 784de48bf9 修改bug
jbrazz 8be3ee9560 upt
jbrazz 31948423e0 upt
jbrazz 20c168a537 三级改四级配置
chenxiaojun c8281d2bb2 管理后台->推广员->结算管理->推广提现->上传汇款证明--更新
chenxiaojun 5afd0ffd63 管理后台->推广员->结算管理->推广提现->上传汇款证明--更新
ELF 6f4ec4ff30 Merge branch 'feature/promote' into dev
ELF f1625fec2d Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
ELF afb6de56f8 添加3级变四级脚本
chenxiaojun c057c5cf47 管理后台->推广员->结算管理->推广提现->上传汇款证明--格式限制