3408 Commits (542ab35cad40b1bfec9c38983d64a45099e0f8b9)

Author SHA1 Message Date
chenxiaojun 9a4a50fb9c 市场总监联系方式 5 years ago
chenxiaojun cd13156221 市场部联系方式 5 years ago
ELF 79f9801351 修改落地页/下载页 5 years ago
chenxiaojun 535f185e37 推广员指标管理 5 years ago
yulingwei 55ef999729 upt 5 years ago
yulingwei 6daf38aa43 upt 5 years ago
yulingwei dfd274a667 Merge branch 'release' into feature/game_divide_warn 5 years ago
yulingwei 0ebe11027e upt 5 years ago
zhengyongxing ef41dbfcee 下游输出错误修改 5 years ago
zhengyongxing 561e6bd84c 下游输出错误修改 5 years ago
sunke d2b7e91a64 推广配置 5 years ago
liuweiwen 490b6a3369 工会归属隐藏导出 5 years ago
ELF c01b0f1083 发送短信添加ip地址 5 years ago
liuweiwen ccca9fb0bd 管理后台-》推广员列表可关键内外团搜索 5 years ago
liuweiwen 38c64f5430 管理后台-》推广员列表可关键内外团搜索 5 years ago
yulingwei 076b4393eb upt 5 years ago
yulingwei aafc877e71 merghe 5 years ago
yulingwei d33d0c3f46 upt 5 years ago
liuweiwen 92900a57f0 Merge remote-tracking branch 'origin/release' into release 5 years ago
liuweiwen 323facd599 管理后台推广员添加时手机号码不可重复 5 years ago
sunke 10f3f8609d 手机号去重 5 years ago
zhengyongxing d727794e0a Merge branch 'release' of 47.111.118.107:wmtx/platform into release 5 years ago
zhengyongxing 46a3028fc9 输出删除 5 years ago
chenxiaojun c58e1c57de 财务管理--更新 5 years ago
chenxiaojun b7dd9c5b45 财务管理--更新 5 years ago
sunke dbf04c25c5 错误修改 5 years ago
zhengyongxing 75f2d09b10 Merge remote-tracking branch 'origin/release' into release 5 years ago
zhengyongxing 3fca3c89ad 短信验证码提交 5 years ago
chenxiaojun df97ff401a 财务管理--更新 5 years ago
sunke 126c7755db 资料填写地址默认 5 years ago
chenxiaojun 693f8c9991 财务管理--更新 5 years ago
zhengyongxing 3741b0d27f 市场结算修正 5 years ago
chenxiaojun 42e07d0f2f 结算管理--更新 5 years ago
chenxiaojun 66a238dfd4 结算管理--更新 5 years ago
ELF 5c0a38c02a Merge branch 'feature/site_sms' into release 5 years ago
ELF 9b3f105e5a 修改bug 5 years ago
ELF 14e65c8314 修改短信发送bug 5 years ago
zhengyongxing 1ba566a02c 市场结算修正 5 years ago
zhengyongxing a68858d4ed Merge branch 'release' of 47.111.118.107:wmtx/platform into release 5 years ago
zhengyongxing 9d5b877220 市场结算生成下游代码修改 5 years ago
ELF 828252cee9 修改短信发送bug 5 years ago
sunke 7ac22521dd 姓名只留姓 5 years ago
chenxiaojun 71e02a4add 结算管理--更新 5 years ago
ELF afa7aa8988 修改短信服务bug 5 years ago
ELF f6eb5d8008 修改bug 5 years ago
chenxiaojun 258e10c9d1 结算管理--更新 5 years ago
zhengyongxing 4c42ee90e3 市场结算生成下游对账单代码优化 5 years ago
sunke 4793665896 充值信息根据会长权限显示导出部分 5 years ago
zhengyongxing 136f565f9f 市场结算管理设备类型条件修正 5 years ago
chenxiaojun 4f63f45374 推广平台>数据管理>每日概况|数据汇总--更新 5 years ago
yulingwei 569fc37e40 Merge branch 'feature/promote_perm' of 47.111.118.107:wmtx/platform into feature/promote_perm 5 years ago
yulingwei 23f2334e45 新增充值权限查看 5 years ago
ELF 7a1cd5bc94 添加完整的权限判断 5 years ago
zhengyongxing f86265d38c 市场结算管理设备类型条件修正 5 years ago
ELF f0acbc1c24 充值信息根据会长权限显示 5 years ago
sunke 9152a3ef59 推广配置导入功能 5 years ago
zhengyongxing 38cea3f972 用户列表导出锁定备注bug修正 5 years ago
chenxiaojun 63d947f754 推广提现--更新 5 years ago
chenxiaojun 517d4ec05f 公会分成管理--更新 5 years ago
chenxiaojun 48ca90bbf3 公会分成管理--更新 5 years ago
ELF e4daff1be8 修改短信接口 5 years ago
zhengyongxing 43a335bc28 市场结算管理总流水弹窗优化 5 years ago
liuweiwen c8b184b877 Merge remote-tracking branch 'origin/release' into release 5 years ago
liuweiwen 86fe5f1f9f 工会归属admin不加密推广员账号 5 years ago
zhengyongxing 16814af0d2 市场结算管理总流水弹窗优化 5 years ago
zhengyongxing 3559d91a32 Merge branch 'release' of 47.111.118.107:wmtx/platform into release 5 years ago
zhengyongxing 7770fc13c8 市场结算管理总流水弹窗优化 5 years ago
liuweiwen d1022c85fd Merge remote-tracking branch 'origin/release' into release 5 years ago
liuweiwen 5a633ccb49 工会归属申请时间日期格式化 5 years ago
zhengyongxing 8cbf3574e3 市场结算管理总流水弹窗优化 5 years ago
zhengyongxing f4b6fa4738 用户信息小号隐藏 5 years ago
liuweiwen 822ec35ff8 Merge branch 'feature/group_type' into release 5 years ago
liuweiwen 2b3099a2d8 工会归属会长不可编辑 5 years ago
ELF c6d99af7a1 Merge branch 'hotfix/shift_player_selle' into release 5 years ago
ELF a31e42b7c4 Merge branch 'hotfix/link_info' into release 5 years ago
ELF f27728b9dd Merge branch 'hotfix/change_btn_color' into release 5 years ago
ELF f7a53c7562 Merge branch 'feature/account_safe' into release 5 years ago
ELF 1ba77738f3 解决冲突 5 years ago
ELF b0bc4c0496 解决冲突 5 years ago
ELF 0f44d9e95c 解决冲突 5 years ago
zhengchanglong bb08c723a3 Merge branch 'feature/group_type' into release-1.0.1 5 years ago
ELF 152ccbc210 修改落地页按钮颜色 5 years ago
liuweiwen 08f8c518a6 从dev复制代码 5 years ago
liuweiwen 7431072bbf 从dev复制代码 5 years ago
chenzhi 33be79e5cf Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type 5 years ago
chenzhi f34b71114f 优化数字提示 5 years ago
zhengyongxing 13d1da8733 Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type 5 years ago
zhengyongxing 63b44a78ff 下游订单生成bug修正 5 years ago
chenzhi e5d8710f0a 优化罚款保存后数据不对 5 years ago
liuweiwen a26b0ab53f Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type 5 years ago
liuweiwen 6f7dcb9ca5 修改上下游对账单导出文件名 5 years ago
chenxiaojun 6012fdbdf1 公会分成管理--更新 5 years ago
chenxiaojun 365a276b95 公会分成管理--更新 5 years ago
zhengyongxing 122a27634b Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type 5 years ago
zhengyongxing e73d795ace 生成下游结算单下拉选项框优化 5 years ago
chenzhi ce92602ca0 优化生成上游订单重复提醒 5 years ago
liuweiwen 6caf99e984 对账系统登录界面修改 5 years ago
zhengyongxing c09c3a591e 结算单bug修正 5 years ago
chenzhi cdb0b10c9a 结算列表新增对账单地址 5 years ago
chenzhi d889bef13d 优化上游时间选择提示 5 years ago
chenzhi c3848e5b55 优化上游信息提示 5 years ago
zhengyongxing a2ce005497 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type 5 years ago
zhengyongxing 71f2d75b8e 市场结算管理总流水点击查看各个渠道的流水 5 years ago
sunke 5f6611fc30 资质认证 5 years ago
chenxiaojun d615a1402f 公会分成管理--更新 5 years ago
liuweiwen b8e36847a3 cp对账系统退出 5 years ago
liuweiwen 57a1d8ed8c 对账系统 5 years ago
zhengyongxing f36202486d 生成上游订单修改 5 years ago
zhengyongxing 2f1d5fbd38 生成上游订单修改 5 years ago
chenzhi 0f8da4afac 优化页面显示 5 years ago
chenzhi 9c1cb95290 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type 5 years ago
chenzhi 41421a9b10 优化页面显示 5 years ago
liuweiwen ed706c1b86 公司信息管理加提示 5 years ago
zhengyongxing 7f99dafb2c 市场结算管理 上游结算流水bug修正 5 years ago
liuweiwen a7e9f62367 对账系统自动登录 5 years ago
liuweiwen 51844a824e 工会归属会长必填 5 years ago
liuweiwen e2095af7a8 Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type 5 years ago
liuweiwen 49e0e19cc8 推广员与合作公司只能看到自己的公司的对账记录 5 years ago
zhengchanglong 6e405febc1 设置分成比例安卓IOS同步更新 5 years ago
zhengyongxing 8b4c641f02 Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type 5 years ago
zhengyongxing 3c9a828537 市场结算官方渠道检索修正 5 years ago
chenzhi 5996b5f45e Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type 5 years ago
chenzhi cc653c2d2d 优化tp1.id错误 5 years ago
zhengyongxing a4b53c4e9a 结算单管理字段名修正 5 years ago
zhengyongxing 0c403ddf57 结算单管理字段名修正 5 years ago
zhengyongxing 4d6a45657c Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type 5 years ago
zhengyongxing 73578f1b64 生成下游订单修改 5 years ago
chenzhi 864e8d693a 优化前端浮点数计算 5 years ago
zhengyongxing 6baba8db28 Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type 5 years ago
zhengyongxing 135cba359e 菜单高亮修改 5 years ago
liuweiwen 7f0dbe1112 Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type 5 years ago
liuweiwen 1e4b7f69d5 cp/工会对账系统 5 years ago
zhengyongxing c27518b988 市场结算添加编辑添加户名 5 years ago
zhengyongxing 26c7190654 Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type 5 years ago
zhengyongxing ef53562d06 市场结算添加编辑添加户名 5 years ago
chenzhi 8ff8d1dab8 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type 5 years ago
chenzhi ac0405329f 优化编辑 5 years ago
liuweiwen 21ee77609c cp/工会对账系统 5 years ago
chenxiaojun bfc93e0626 公会分成管理--更新 5 years ago
chenxiaojun 1594500eca 资质认证--更新 5 years ago
zhengyongxing 547b0439e3 市场结算添加编辑添加户名 5 years ago
chenzhi 1275c740d5 新增cp对账单删除 5 years ago
zhengyongxing da420ceb5c 市场结算添加编辑添加户名 5 years ago
zhengyongxing b74ac306ae 市场结算添加编辑添加户名 5 years ago
chenzhi 1bb038db4e 优化查看2 5 years ago
chenzhi 89d21c6218 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type 5 years ago
chenzhi f06cddc093 优化查看 5 years ago
zhengyongxing 2b335ec910 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type 5 years ago
zhengyongxing 45ea27fd1f 市场结算列表删除操作 5 years ago
chenzhi cba3fc898c 新增查看 5 years ago
liuweiwen fc5db0b298 Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type
# Conflicts:
#	Application/Admin/Controller/AjaxController.class.php
#	Data/update.sql
5 years ago
liuweiwen 394a3e4bb5 cp/工会对账系统 5 years ago
zhengyongxing 6bda9fe842 市场结算管理代码编辑完善 5 years ago
zhengyongxing ad901c31db 市场结算管理代码编辑完善 5 years ago
chenxiaojun 7550bafdf7 充值玩家--更新 5 years ago
zhengyongxing 99f23254ed 市场结算管理代码提交 5 years ago
zhengyongxing 68312cc277 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type 5 years ago
zhengyongxing 71b1498c71 市场结算管理代码提交 5 years ago
chenzhi 25240227e4 新增编辑 5 years ago
chenxiaojun 82784f9da9 推广提现--更新 5 years ago
yulingwei 9910485523 修改 5 years ago
chenxiaojun 9b47108400 推广提现--更新 5 years ago
chenxiaojun 843c54ced5 推广提现--更新 5 years ago
yulingwei 7ea2a465bf 修复问题 5 years ago
chenzhi 72405e45f5 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type 5 years ago
chenzhi ea6d820408 优化页面显示 5 years ago
chenxiaojun 4286817dea 推广提现--更新 5 years ago
zhengchanglong 066fe46064 Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type 5 years ago
zhengchanglong eb114b33b3 游戏分成比例设定体验优化 5 years ago
zhengyongxing dddd640f9f 结算单管理列表修改 5 years ago
chenzhi d484c96744 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type 5 years ago
chenzhi cccbc3bfa8 新增cp结算单判断是否已经有交叉时间 5 years ago
zhengchanglong b34eec98ee 游戏分成比例设定体验优化 5 years ago
chenxiaojun dcea6b7e05 推广提现--更新 5 years ago
zhengchanglong 5ac23b6a5b Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type 5 years ago
zhengchanglong de8386c0cb 游戏用户锁定备注显示 5 years ago
chenzhi 0934cd472a 新增cp结算单到列表中 5 years ago
zhengyongxing 2154899a6a Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type 5 years ago
zhengyongxing f87026a32c 结算单管理生成下游订单 5 years ago
chenzhi cda9d0c1a8 合并 5 years ago
chenzhi cd427a9409 新增添加cp上游对账单 5 years ago
zhengchanglong 87096e180e 游戏用户锁定备注显示 5 years ago
zhengchanglong 93fe724c15 游戏用户锁定备注显示 5 years ago
zhengchanglong 941978bb07 【游戏】-【合作方管理】,联系人改为必填项,必填项前面加红色※号 5 years ago
chenxiaojun 08dd26f942 推广提现--更新 5 years ago
zhengchanglong e914fde68d 玩家列表账号锁定添加备注 5 years ago
chenxiaojun cf0680eddf 开服预告正序显示 5 years ago
yulingwei 56b0216ff0 修改问题 5 years ago
chenxiaojun 0c0d59dd43 财务管理--更新 5 years ago
chenxiaojun ad80923bed 更新 5 years ago
chenxiaojun f244b42ab7 推广结算--更新 5 years ago
yulingwei ed9ddd2d67 修复检索问题 5 years ago
yulingwei e3f0a24e43 弹窗推广后台更新 5 years ago
zhengchanglong 326d9e5a12 管理后台-游戏-游戏编辑:参数配置-新增CP游戏分成比例 5 years ago
zhengyongxing ea140a430f 导出模板方法上传 5 years ago
liuweiwen 602fb33fcc 新增需求:管理后台-》系统-》扩展工具-》公司信息管理 5 years ago
yulingwei 5542994e36 upt 5 years ago
zhengyongxing c6f798dc47 市场结算管理bug修正 5 years ago
zhengyongxing f124e4b7ff Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type 5 years ago
zhengyongxing 7adb991d0e 市场结算管理上传 5 years ago
zhengyongxing ba158e6b9a 市场结算管理上传 5 years ago
ELF 500d0fdc2c 后台管理系统登录后改变session_id 5 years ago
chenzhi ff67974413 修复获取推广员统计bug 5 years ago
zhengyongxing 5e14eaf4c9 新增市场结算管理完善 5 years ago
liuweiwen 50320be1d2 新增需求:管理后台-》推广公会归属管理,列表,新增,编辑,审批 5 years ago
zhengyongxing 4fb2806656 新增市场结算管理 5 years ago
chenxiaojun f1e8811df3 推广结算--更新 5 years ago
chenzhi c711601fdf Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type 5 years ago
chenzhi 216321f46b 优化换绑逻辑判断是否订单在审核中 5 years ago
zhengyongxing 89883d2005 新增市场结算管理 5 years ago
chenxiaojun 0927417ce9 推广结算--更新 5 years ago
ELF fb64d574cb 修改包下载bug 5 years ago
ELF 710ef727e4 Merge branch 'master' of 47.111.118.107:wmtx/platform into hotfix/shift-player 5 years ago
chenzhi 414f326cf4 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type 5 years ago
ELF 04fccce6dc 修改上传网络请求限制 5 years ago
zhengyongxing f1a48fbdaa 权限分配 — 未给下级渠道分配(游戏充值)查看权限时,页面展示(游戏充值页面)修正 5 years ago
chenzhi 1295857697 优化工会统计各级检索条件结束 5 years ago
chenzhi 0561d8ff15 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type 5 years ago
chenzhi f95d23b091 优化公会统计各级条件展示 5 years ago
ELF fe68d8e8c9 修改oss上传返回结果 5 years ago
liuweiwen 4892db340e 管理后台-》游戏-》合作方管理-》列表增加字段联系人,联系电话,邮寄地址。公司税号,收款方名称,银行账号,开户行 5 years ago
ELF e6c891a945 修改 5 years ago
ELF f472f5e9d3 文件保存改成cdn 5 years ago
chenzhi 9e2eb46904 公会统计游戏统计新增多重搜索 5 years ago
chenxiaojun 962c284467 推广结算--更新 5 years ago
liuweiwen fa3adf2e0b 新增合作方时,新增录入内容
新增联系人,联系电话,邮寄地址。公司税号,收款方名称,
银行账号,开户行
5 years ago
chenzhi c20d507df6 优化订单判断 5 years ago
chenzhi 878badef43 换绑新增判断渠道是否已经结算 5 years ago
ELF 91d4c9f753 补链/玩家迁移排除已结算订单(cp结算) 5 years ago
chenzhi 876952f3b4 公会统计新增内外团检索 5 years ago
chenxiaojun 89965bd8fb 导出 5 years ago
chenxiaojun 631c23568d 上传汇款证明--调整 5 years ago
chenxiaojun 90eed6f5ca 结算管理--更新 5 years ago
chenxiaojun c074b5fb86 结算管理--更新 5 years ago
chenzhi a37d0d6ec4 优化推广员充值统计排序问题 5 years ago
chenzhi 43774e9099 推广员充值统计新增官方渠道统计 5 years ago
chenzhi 14fa967f00 优化推广员统计数据 5 years ago
chenxiaojun 0ff9f77181 推广员资质认证 5 years ago
zhengyongxing 302ee7a2ca Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type 5 years ago
zhengyongxing 5343ef2162 工会统计新增内外团 5 years ago
chenzhi 0caa548525 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type 5 years ago
chenzhi 836eccfa78 支付渠道新增支付渠道比 5 years ago
zhengyongxing acd816c766 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type 5 years ago
zhengyongxing cc0f5a03c4 工会统计新增内外团导出 5 years ago
chenzhi 07f6e9919d 区服列表 区服名称改区服id 5 years ago
chenzhi 0f7134c838 游戏充值 区服名称改区服id 5 years ago
chenzhi 3bf288fa41 优化登陆记录区服名称为区服id 5 years ago
chenzhi 5e08bda6c2 优化行为日志区服名称为区服id 5 years ago
ELF 0a0cedafd5 各个系统登录提示安全优化,sessionon_id变更 5 years ago
chenzhi 432c84ba01 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type 5 years ago