elf
/
qy-platform
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,232 Commits
1 Branch
0 Tags
173 MiB
Commit Graph

935 Commits (5468239cf338024c13919f4b5e2cb6e98ebd2d2e)

Author SHA1 Message Date
zhengyongxing 7770fc13c8 市场结算管理总流水弹窗优化
liuweiwen d1022c85fd Merge remote-tracking branch 'origin/release' into release
liuweiwen 5a633ccb49 工会归属申请时间日期格式化
zhengyongxing 8cbf3574e3 市场结算管理总流水弹窗优化
liuweiwen 822ec35ff8 Merge branch 'feature/group_type' into release
liuweiwen 2b3099a2d8 工会归属会长不可编辑
ELF a31e42b7c4 Merge branch 'hotfix/link_info' into release
ELF b0bc4c0496 解决冲突
ELF 0f44d9e95c 解决冲突
liuweiwen 7431072bbf 从dev复制代码
chenzhi dff83c73d0 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into dev
chenzhi 33be79e5cf Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
chenzhi f34b71114f 优化数字提示
zhengyongxing ec027503cc Merge branch 'feature/group_type' into dev
zhengyongxing 13d1da8733 Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type
zhengyongxing 63b44a78ff 下游订单生成bug修正
chenzhi fd36d6e674 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
chenzhi ee5330bfc9 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into dev
chenzhi e5d8710f0a 优化罚款保存后数据不对
chenxiaojun 02ccf125dc 公会分成管理--更新
chenxiaojun 365a276b95 公会分成管理--更新
zhengyongxing 1a52a129f2 Merge branch 'feature/group_type' into dev
zhengyongxing 122a27634b Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
zhengyongxing e73d795ace 生成下游结算单下拉选项框优化
chenzhi ef0b3c86f0 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into dev
liuweiwen 6caf99e984 对账系统登录界面修改
zhengyongxing c09c3a591e 结算单bug修正
chenzhi b566a2352a Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into dev
chenzhi cdb0b10c9a 结算列表新增对账单地址
chenzhi fd18ed01fe 合并
chenzhi dbc0e00132 合并
chenzhi d889bef13d 优化上游时间选择提示
chenzhi c3848e5b55 优化上游信息提示
zhengyongxing 8965fe8201 Merge branch 'feature/group_type' into dev 
# Conflicts:
#	Application/Admin/Controller/QueryController.class.php
zhengyongxing a2ce005497 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
zhengyongxing 71f2d75b8e 市场结算管理总流水点击查看各个渠道的流水
liuweiwen bbc1b05e1c Merge branch 'feature/group_type' into dev
liuweiwen b8e36847a3 cp对账系统退出
zhengyongxing a51291216a Merge branch 'feature/group_type' into dev
zhengyongxing f36202486d 生成上游订单修改
zhengyongxing abfc54a0af Merge branch 'feature/group_type' into dev
zhengyongxing 2f1d5fbd38 生成上游订单修改
chenzhi 0f8da4afac 优化页面显示
chenzhi 9c1cb95290 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
chenzhi 41421a9b10 优化页面显示
liuweiwen 0fa27e9c03 Merge branch 'feature/group_type' into dev
liuweiwen ed706c1b86 公司信息管理加提示
liuweiwen af28ff9155 工会归属查询
zhanglingsheng 4043cc04e6 支付设置--添加支付限额
zhengyongxing e637c90021 Merge branch 'feature/group_type' into dev
zhengyongxing a4b53c4e9a 结算单管理字段名修正
zhengyongxing 72455ab625 Merge branch 'feature/group_type' into dev
zhengyongxing 4d6a45657c Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type
zhengyongxing 73578f1b64 生成下游订单修改
chenzhi 96466100bb Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into dev
chenzhi 864e8d693a 优化前端浮点数计算
zhengyongxing 135cba359e 菜单高亮修改
zhengchanglong 73fb719628 Merge branch 'feature/group_type' into dev
zhengyongxing c27518b988 市场结算添加编辑添加户名
zhengchanglong 868fde2d07 Merge branch 'feature/group_type' into dev
zhengyongxing 26c7190654 Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type
zhengyongxing ef53562d06 市场结算添加编辑添加户名
liuweiwen 21ee77609c cp/工会对账系统
zhengchanglong 1c00290da9 Merge branch 'feature/group_type' into dev 
# Conflicts:
#	Data/update.sql
chenxiaojun d995675829 更新
chenxiaojun 1594500eca 资质认证--更新
zhengyongxing 547b0439e3 市场结算添加编辑添加户名
chenzhi 1275c740d5 新增cp对账单删除
zhengyongxing b74ac306ae 市场结算添加编辑添加户名
chenzhi 1bb038db4e 优化查看2
chenzhi f06cddc093 优化查看
chenzhi cba3fc898c 新增查看
liuweiwen fc5db0b298 Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type 
# Conflicts:
#	Application/Admin/Controller/AjaxController.class.php
#	Data/update.sql
liuweiwen 394a3e4bb5 cp/工会对账系统
zhengyongxing ad901c31db 市场结算管理代码编辑完善
zhengyongxing 99f23254ed 市场结算管理代码提交
zhengyongxing 68312cc277 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
zhengyongxing 71b1498c71 市场结算管理代码提交
chenzhi 25240227e4 新增编辑
yulingwei b5d71ae215 Merge branch 'feature/pop_rules' into dev
yulingwei 7ea2a465bf 修复问题
chenzhi ea6d820408 优化页面显示
chenxiaojun 009842c218 更新
chenxiaojun 4286817dea 推广提现--更新
zhengchanglong 9952029e6c Merge branch 'feature/group_type' into dev
zhengyongxing dddd640f9f 结算单管理列表修改
chenzhi d484c96744 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
chenzhi cccbc3bfa8 新增cp结算单判断是否已经有交叉时间
zhengchanglong 10f2caefca Merge branch 'feature/group_type' into dev
zhengchanglong b34eec98ee 游戏分成比例设定体验优化
chenxiaojun 2d0143a378 更新
chenxiaojun dcea6b7e05 推广提现--更新
zhengchanglong 89d9b79930 Merge branch 'feature/group_type' into dev
zhengchanglong 5ac23b6a5b Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type
zhengchanglong de8386c0cb 游戏用户锁定备注显示
chenzhi 0934cd472a 新增cp结算单到列表中
zhengyongxing 2154899a6a Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
zhengyongxing f87026a32c 结算单管理生成下游订单
chenzhi cda9d0c1a8 合并
chenzhi cd427a9409 新增添加cp上游对账单
zhengchanglong 437800b30b Merge branch 'feature/group_type' into dev
zhengchanglong 87096e180e 游戏用户锁定备注显示
zhengchanglong 7e1b90fc19 Merge branch 'feature/group_type' into dev
zhengchanglong 93fe724c15 游戏用户锁定备注显示
zhengchanglong ba4d2a4a2e Merge branch 'feature/group_type' into dev
zhengchanglong 941978bb07 【游戏】-【合作方管理】，联系人改为必填项，必填项前面加红色※号
zhengchanglong 8144e3c50f Merge branch 'feature/group_type' into dev
zhengchanglong e914fde68d 玩家列表账号锁定添加备注
chenxiaojun 3a9a7177fe 推广结算--更新
chenxiaojun ad80923bed 更新
chenxiaojun 114cb2f7a5 更新
chenxiaojun f244b42ab7 推广结算--更新
yulingwei 5cb129e95f 修复冲突
yulingwei e3f0a24e43 弹窗推广后台更新
zhengchanglong 505e12beab Merge branch 'feature/group_type' into dev
zhengchanglong 326d9e5a12 管理后台-游戏-游戏编辑：参数配置-新增CP游戏分成比例
liuweiwen 602fb33fcc 新增需求：管理后台-》系统-》扩展工具-》公司信息管理
yulingwei 249044b0de Merge branch 'feature/pop_rules' into dev
yulingwei 5542994e36 upt
zhengyongxing 7adb991d0e 市场结算管理上传
chenzhi 377bdaee72 合并gt
zhengyongxing 5e14eaf4c9 新增市场结算管理完善
liuweiwen 50320be1d2 新增需求：管理后台-》推广公会归属管理，列表，新增，编辑，审批
chenxiaojun f2e0cec5aa 更新
chenxiaojun 0927417ce9 推广结算--更新
chenzhi dfdad21d8e Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into dev
chenzhi 0039431ccb Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into dev
chenzhi 1295857697 优化工会统计各级检索条件结束
chenzhi 0561d8ff15 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
chenzhi f95d23b091 优化公会统计各级条件展示
liuweiwen 4892db340e 管理后台-》游戏-》合作方管理-》列表增加字段联系人，联系电话，邮寄地址。公司税号，收款方名称，银行账号，开户行
chenzhi 9e2eb46904 公会统计游戏统计新增多重搜索
chenxiaojun 09f2ca4ab6 更新
chenxiaojun 962c284467 推广结算--更新
liuweiwen fa3adf2e0b 新增合作方时，新增录入内容 
新增联系人，联系电话，邮寄地址。公司税号，收款方名称，
银行账号，开户行
chenzhi bb7e1c269c Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into dev
chenzhi 876952f3b4 公会统计新增内外团检索
chenxiaojun 89965bd8fb 导出
chenxiaojun a636c2dcf6 导出
chenxiaojun ba1f6565cc 更新
chenxiaojun 631c23568d 上传汇款证明--调整
chenxiaojun 461e80bd30 结算管理--更新
chenxiaojun c074b5fb86 结算管理--更新
chenxiaojun 4721e60d32 推广员资质认证
chenxiaojun 0ff9f77181 推广员资质认证
zhengchanglong 7c1593e0e1 Merge branch 'feature/group_type' into dev
chenzhi 836eccfa78 支付渠道新增支付渠道比
chenzhi 07f6e9919d 区服列表 区服名称改区服id
chenzhi 0f7134c838 游戏充值 区服名称改区服id
ELF 4fb2c35495 Merge branch 'hotfix/link_info' into dev
chenzhi 3bf288fa41 优化登陆记录区服名称为区服id
chenzhi 5e08bda6c2 优化行为日志区服名称为区服id
zhengchanglong 10c0b3a18a Merge branch 'feature/group_type' into dev 
# Conflicts:
#	Application/Admin/Controller/PromoteController.class.php
#	Data/update.sql
zhanglingsheng 5ea753b595 支付宝设置添加公钥私钥
liuweiwen 4addf4c281 Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type
liuweiwen 0b3ae062b1 优化：推广员新增与编辑的推广公司增加万盟天下科技 
新增需求：推广员增加工会归属和工会关系属性
zhengyongxing 10f6caddfa 工会统计新增内外团占比
chenxiaojun 6054b5f6c0 更新
chenxiaojun 0baf97f717 会长提现--更新
zhengyongxing 0068a0d1c4 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
zhengyongxing f324567258 平台币充值添加推广员充值搜索修改，玩家列表时间检索非必填
zhengyongxing 346bbaa117 平台币充值添加推广员充值搜索修改，玩家列表时间检索非必填
chenxiaojun 5930642f8b 更新
chenxiaojun a12c3ecf9e 会长提现--更新
chenxiaojun e884214546 会长提现|公会分成管理--更新
zhengyongxing 8652c19f5c 平台币充值添加推广员充值搜索
chenxiaojun c329ec09f4 更新
chenxiaojun 0758062837 会长提现--更新
chenxiaojun 73537c120e 更新
chenxiaojun 15174f8547 推广结算--更新
chenxiaojun 053417f7f8 推广结算--更新
chenxiaojun cda8e4c1c0 推广结算--更新
zhengchanglong 0e5be6e4a3 Merge branch 'release-1.0.0' into dev
chenxiaojun 5a0769eb3b 更新
chenxiaojun e447159971 公会分成管理--更新
chenzhi 4d0606d6fc 新增渠道查看公司联动
chenzhi f594e3bb14 公会统计新增公司联动
elf@home 6e354fe3b3 优化链接归属查询
liuweiwen c44e5ee1a7 编辑推广员时，只允许会长修改推广公司，同时更改底下推广员的公司
zhanglingsheng 34020fd725 超级签统计--样式
zhanglingsheng 8a9e0a9a8b Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
zhanglingsheng ca401adbd0 补单记录
ELF a70c1aee21 Merge branch 'release-1.0.0' into dev
chenzhi 04c560312f Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
chenzhi 715a1a8a2c 优化推广统计区服问题
yulingwei f4495f93a9 ltv修改
chenxiaojun 905769f922 Merge remote-tracking branch 'origin/dev' into dev
chenxiaojun 9a0313b763 公会分成管理--更新
sunke 453c0c3682 链接归属名词修改
chenxiaojun e66893dc7f 公会分成管理--更新
yulingwei b868b14273 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
yulingwei 21cc6865d5 Merge branch 'hotfix/ltv' into release-1.0.0
yulingwei 2ed2117b6d 更新
ELF ad67717292 Merge branch 'release-1.0.0' into dev
yulingwei 7d1808a7bf Merge branch 'hotfix/ltv' into dev
chenzhi ff46ab04ca Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
chenzhi f580b44289 优化推广员统计区服选择
zhengyongxing e49ed7aa30 支付渠道统计计添加平台币直充金额说明
sunke dcf7efad6f 下载链接菜单显示bug
chenzhi 1d69c616d6 优化公会统计页面跳转问题
chenzhi c590b948ef 优化推广员充值统计导出
chenzhi 0a006bbcc2 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
chenzhi fd23b640ea 优化推广员充值优化代码
zhengyongxing 7c7971d48e Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release_zyx
zhengyongxing 13f5128dd8 支付渠道统计导出bug修正,游戏充值充值方式检索修正
zhanglingsheng 162e2fe19c Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
zhanglingsheng 5b81f89308 游戏编辑
zhanglingsheng eabf59d3e3 超级签统计
zhengyongxing b5c06df195 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release_zyx
zhengyongxing 4e3206a5c1 支付渠道统计bug修正
zhanglingsheng 1c2bb7e584 超级签统计
zhanglingsheng ae2b498e45 超级签统计
zhanglingsheng 9b65fbaabb 超级签统计
zhanglingsheng 244e036a21 超级签统计
zhanglingsheng 153c397cf6 超级签统计
zhengyongxing b0899f3fc9 支付渠道统计bug修正，官网与推广后台充值计入平台币
ELF 9b5697a859 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
ELF 1fcbe2dd65 Merge branch 'dev' of 47.111.118.107:wmtx/platform into release-1.0.0
zhanglingsheng 59709fa295 游戏--添加支付方式渠道配置
zhanglingsheng 669baefe5e 游戏--添加支付方式渠道配置
chenzhi 0ec79e6cb9 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
chenzhi 24c2ea0031 优化区服预告的区服选择
ELF 8a2f36b5a3 Merge branch 'dev' into release-1.0.0
yulingwei fe8a99b0ec Merge branch 'feature/ltv' into dev
yulingwei 931893640a 修改问题
chenzhi fe06fded2a 优化区服列表，隐藏操作，新增id
zhengyongxing e8313dd92b 支付渠道统计时间筛选历史记录去除
ELF bf5ad7aa85 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
ELF 7f6730a562 修改留存率bug
chenzhi 901d780165 优化公会弹框游戏选择
liuweiwen 8615caa33f 游戏统计-搜索
zhengyongxing 7ed0be2a29 支付渠道统计bug修正
liuweiwen 69013539cd 修改excel路径,自动跳过excel为空的行
liuweiwen 1def746be4 修改excel路径
chenzhi 469db01864 优化玩家列表说明
chenzhi 2433844bf2 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
chenzhi d3ccc3bb5b 暂存
yulingwei d172b0ec8b Merge branch 'feature/ltv' into dev
yulingwei 2f36d3eb1c 新增bata链接和开关
liuweiwen 600ac3fd9e 添加推广员时推广公司必填
zhanglingsheng 39f1ea9d0c 超级签统计--样式
chenzhi c602946088 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
chenzhi 12966e83bd 优化玩家列表数据显示规则
zhanglingsheng 35375a0c01 超级签统计--JS
zhanglingsheng 6ffd20525d Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
zhanglingsheng 3a3afa739c 超级签统计--搜索修改
zhengyongxing 237faf5956 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
zhengyongxing 5f4b02b9c5 超级签订单菜单修正
liuweiwen 3244238849 修改文字
liuweiwen 82c76cbbba Merge remote-tracking branch 'origin/dev' into dev