3650 Commits (58aefd29979993e5f22abc391111493924157600)

Author SHA1 Message Date
liaojinling 6cecac4862 清除推广员注册代码 5 years ago
liaojinling d789a175f8 推广员/组长添加备注 5 years ago
chenxiaojun 4e1d6938f8 推广平台>数据管理>订单查询--bug修复 5 years ago
sk d98bfa04b9 资质认证电子文档 5 years ago
chenxiaojun f1fda49e9e 推广平台>财务管理--更新 5 years ago
chenzhi 39c43c1bee 优化游戏分成比例获取函数备注 5 years ago
zyx b0c225591f Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize 5 years ago
zyx 414d36c373 cp分成比例方法修正 5 years ago
chenzhi f95b084f88 Merge branch 'feature/admin_optimize' of 47.111.118.107:wmtx/platform into feature/admin_optimize 5 years ago
chenzhi 8c756d61d9 cp分成增加符号后上游比例获取修正 5 years ago
zyx 782de31ca8 cp分成比例方法添加 5 years ago
zyx f58f05d00d cp分成比例方法修正 5 years ago
jbRotk 35b6d25ebc upt 5 years ago
zyx 4be5b1ba2c cp分成比例方法添加 5 years ago
chenxiaojun cbe40d4b0f 管理后台更新 5 years ago
chenxiaojun f1b454627e 管理后台更新 5 years ago
sk c612fbc5fd Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/add_promote_company 5 years ago
chenxiaojun 37ab08b9be 管理后台>推广员>结算管理>公会分成管理--规则修改 5 years ago
chenxiaojun a8008fbe05 管理后台>推广员>结算管理>公会分成管理--规则修改 5 years ago
zhengchanglong 58bd9414d6 Merge branch 'hotfix/recharge_statistics' into release 5 years ago
liuweiwen b5a2ddba3c 游戏订单查看,查询时0点属于当天 5 years ago
chenxiaojun 73f1055303 管理后台>推广员>结算管理>推广提现--增加自动审核功能 5 years ago
zhengchanglong 72d222a64a CP分成比例修改 5 years ago
chenzhi 29868a6331 Merge branch 'feature/admin_optimize' of 47.111.118.107:wmtx/platform into feature/admin_optimize 5 years ago
chenzhi 158c56d543 优化甲方可以自由选择 5 years ago
zyx 07279467ca 管理后台部分限制规则修改 / 开放甲乙方都能为万盟天下后,无法检索出万盟天下 5 years ago
chenzhi 332ff4c3c4 优化生成上游对账单手机及银行卡验证规则 5 years ago
zyx fea720339b 结算单功能优化 / 下游结算单:列表展示游戏不区分安卓IOS,直接展示汇总信息 5 years ago
chenxiaojun 10665cc869 管理后台>推广员>结算管理>公会分成管理--更新 5 years ago
廖金灵 f66c6505d1 Merge branch 'hotfix/testWhileList' of wmtx/platform into master
测试外网充值白名单设置BUG修复
5 years ago
sk 636aabb5a0 Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/add_promote_company 5 years ago
zyx d4850b60be Merge branch 'hotfix/testWhiteList' into release 5 years ago
zyx 2ad5017fae 测试白名单编辑修改成删除 5 years ago
sk f93c9c569d Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/add_promote_company 5 years ago
xxxx a85c217c6b OA管理员绑定 5 years ago
zyx aac1d6f7b5 Merge branch 'hotfix/testWhiteList' into release 5 years ago
zyx 7beb0938e3 测试白名单修改 5 years ago
sk ce9faf7271 公司录入 5 years ago
jbRotk 65461ff200 c 5 years ago
liuweiwen 0fba64c6f1 数据展示权限:勾选权限时,*号屏蔽的地方要开放,另没数据权限的地方补上 5 years ago
ELF 9ab7688056 调试 5 years ago
ELF 7928282e99 调试 5 years ago
ELF b79ab76a39 调试 5 years ago
ELF 8ff17d9872 修改bug 5 years ago
ELF 13cb680955 修改bug 5 years ago
ELF 56a97f7eef 修改bug 5 years ago
ELF d0e700d2e8 优化程序 5 years ago
ELF e8a0975981 解决冲突 5 years ago
ELF 8136bff2f9 优化查询 5 years ago
ELF 6993d164a3 解决冲突 5 years ago
sunke 8b82e03328 下载刷新 5 years ago
sunke 5b6e9da5d8 获取区服名 5 years ago
ELF 0f5e3944c0 财务管理加入权限判断 5 years ago
ELF 2b039e2b8a 优化程序 5 years ago
ELF 709094c5be 修改bug 5 years ago
ELF b7cf4c28a7 修改 5 years ago
ELF 3af87434b9 权限判断修改 5 years ago
ELF 526bbc1556 添加ios下载控制功能 5 years ago
sunke 5974047e1c 推广员指标下载 5 years ago
ELF d3a3b8cdb7 修改 5 years ago
yulingwei 22addc182c 修改检索问题 5 years ago
sunke 0e0c1798f4 推广导入空数据初始化 5 years ago
yulingwei ac8d7300ad Merge branch 'feature/game_divide_warn' into dev 5 years ago
yulingwei 33a19fbb6a upt 5 years ago
yulingwei f0109e9554 合并请求 5 years ago
yulingwei 45b3c27292 upt 5 years ago
sunke b9ddc1aafb 推广配置 5 years ago
yulingwei eef229d22d Merge branch 'feature/sms_up' of 47.111.118.107:wmtx/platform into feature/sms_up 5 years ago
chenxiaojun 8c43defff3 推广员指标管理--更新 5 years ago
chenxiaojun 784f416ad5 推广员指标管理--更新 5 years ago
chenxiaojun 5fbe482fba 推广员指标管理--更新 5 years ago
ELF 2195bb4c55 修改短信发送 5 years ago
zhengchanglong e6f3329ac8 内外团归属BUG修复 5 years ago
chenxiaojun 47b7dc0d2f 市场总监联系方式 5 years ago
chenxiaojun 4dd5967be9 推广员指标管理 5 years ago
chenxiaojun 8780b57f45 推广员指标管理--更新 5 years ago
chenxiaojun 30c40d004b 推广员指标管理--更新 5 years ago
chenxiaojun 9a4a50fb9c 市场总监联系方式 5 years ago
chenxiaojun cd13156221 市场部联系方式 5 years ago
ELF 79f9801351 修改落地页/下载页 5 years ago
chenxiaojun 535f185e37 推广员指标管理 5 years ago
zhengchanglong 9961448831 Merge branch 'release' into dev 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
chenzhi 56617b1e25 Merge branch 'feature/ghcount_change' of 47.111.118.107:wmtx/platform into dev 5 years ago
chenzhi fa784fac8a 优化游戏订单导出 5 years ago
chenzhi 54f2e0abcd 游戏统计新增会长和公司 5 years ago
zhengyongxing ef41dbfcee 下游输出错误修改 5 years ago
zhengyongxing 561e6bd84c 下游输出错误修改 5 years ago
sunke d2b7e91a64 推广配置 5 years ago
liuweiwen 490b6a3369 工会归属隐藏导出 5 years ago
ELF 9c493dd8ef Merge branch 'release' into dev 5 years ago
ELF 0d45be780f 解决冲突 5 years ago
ELF c01b0f1083 发送短信添加ip地址 5 years ago
chenxiaojun 5a75ea406a 更新 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 cf66e4323e 公会分成管理--更新 5 years ago
chenxiaojun c58e1c57de 财务管理--更新 5 years ago
chenxiaojun 29789f5ef6 公会分成管理--更新 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 b367b4a8d3 公会分成管理--更新 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 1e232e827b Merge branch 'feature/site_sms' into dev 5 years ago
ELF 9b3f105e5a 修改bug 5 years ago
ELF 1f5dfac6d2 Merge branch 'feature/site_sms' into dev 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
ELF 32c689df21 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev 5 years ago
ELF 04742809f2 Merge branch 'feature/site_sms' into dev 5 years ago
zhengyongxing 9d5b877220 市场结算生成下游代码修改 5 years ago
ELF 828252cee9 修改短信发送bug 5 years ago
chenxiaojun 6e05546db6 公会分成管理--更新 5 years ago
sunke 7ac22521dd 姓名只留姓 5 years ago
chenxiaojun 71e02a4add 结算管理--更新 5 years ago
ELF 70ade1c071 Merge branch 'feature/site_sms' into dev 5 years ago
ELF afa7aa8988 修改短信服务bug 5 years ago
chenxiaojun 28897755c9 结算管理--更新 5 years ago
ELF 33ebc763e6 Merge branch 'feature/site_sms' into dev 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
ELF c4b768879e Merge branch 'feature/site_sms' into dev 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
zhengchanglong d054e70c73 Merge branch 'release' into dev
# Conflicts:
#	Application/Admin/Controller/MemberController.class.php
#	Application/Admin/View/Promote/belong_edit.html
5 years ago
zhengyongxing 38cea3f972 用户列表导出锁定备注bug修正 5 years ago
chenxiaojun 63d947f754 推广提现--更新 5 years ago
chenxiaojun 517d4ec05f 公会分成管理--更新 5 years ago
chenxiaojun 48ca90bbf3 公会分成管理--更新 5 years ago
liuweiwen cdfa8e4eee admin权限 5 years ago
liuweiwen 1b2cf94c9b Merge remote-tracking branch 'origin/dev' into dev 5 years ago
liuweiwen 21806993d4 admin权限 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
zhengyongxing 076daf0d4e query冲突解决 5 years ago
liuweiwen 822ec35ff8 Merge branch 'feature/group_type' into release 5 years ago
liuweiwen 2b3099a2d8 工会归属会长不可编辑 5 years ago
ELF b38eed342f Merge branch 'release' into dev 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 c4934613ae 解决冲突 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 dff83c73d0 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into 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 ec027503cc Merge branch 'feature/group_type' into dev 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 fd36d6e674 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev 5 years ago
chenzhi ee5330bfc9 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into dev 5 years ago
chenzhi e5d8710f0a 优化罚款保存后数据不对 5 years ago
liuweiwen 16d8dd6dcb Merge remote-tracking branch 'origin/dev' into dev 5 years ago
liuweiwen 2d060e6e72 Merge branch 'feature/group_type' into dev 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 6d215bda63 公会分成管理--更新 5 years ago
chenxiaojun 6012fdbdf1 公会分成管理--更新 5 years ago
chenxiaojun 02ccf125dc 公会分成管理--更新 5 years ago
chenxiaojun 365a276b95 公会分成管理--更新 5 years ago
zhengyongxing 1a52a129f2 Merge branch 'feature/group_type' into dev 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 7ff7758df2 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev 5 years ago
chenzhi ef0b3c86f0 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into dev 5 years ago
chenzhi ce92602ca0 优化生成上游订单重复提醒 5 years ago
liuweiwen 9b026796f2 Merge branch 'feature/group_type' into dev 5 years ago
liuweiwen 6caf99e984 对账系统登录界面修改 5 years ago
zhengyongxing c07167e784 结算单bug修正 5 years ago
zhengyongxing 943969bddd Merge branch 'feature/group_type' into dev 5 years ago
zhengyongxing c09c3a591e 结算单bug修正 5 years ago
chenzhi b566a2352a Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into dev 5 years ago
chenzhi cdb0b10c9a 结算列表新增对账单地址 5 years ago
chenzhi fd18ed01fe 合并 5 years ago
chenzhi dbc0e00132 合并 5 years ago
chenzhi d889bef13d 优化上游时间选择提示 5 years ago
chenzhi c3848e5b55 优化上游信息提示 5 years ago
zhengyongxing 8965fe8201 Merge branch 'feature/group_type' into dev
# Conflicts:
#	Application/Admin/Controller/QueryController.class.php
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 ba9b5e33d1 更新 5 years ago
chenxiaojun d615a1402f 公会分成管理--更新 5 years ago
liuweiwen bbc1b05e1c Merge branch 'feature/group_type' into dev 5 years ago
liuweiwen b8e36847a3 cp对账系统退出 5 years ago
liuweiwen f480c20fb7 Merge branch 'feature/group_type' into dev 5 years ago
liuweiwen 57a1d8ed8c 对账系统 5 years ago
zhengyongxing a51291216a Merge branch 'feature/group_type' into dev 5 years ago
zhengyongxing f36202486d 生成上游订单修改 5 years ago
zhengyongxing abfc54a0af Merge branch 'feature/group_type' into dev 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 0fa27e9c03 Merge branch 'feature/group_type' into dev 5 years ago
liuweiwen ed706c1b86 公司信息管理加提示 5 years ago
zhengyongxing b735706006 Merge branch 'feature/group_type' into dev 5 years ago
zhengyongxing 7f99dafb2c 市场结算管理 上游结算流水bug修正 5 years ago
liuweiwen af28ff9155 工会归属查询 5 years ago
liuweiwen c7b9e2a7d6 Merge branch 'feature/group_type' into dev 5 years ago
liuweiwen a7e9f62367 对账系统自动登录 5 years ago
liuweiwen 3f5791ff3f Merge branch 'feature/group_type' into dev 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 a67ffa18d6 Merge branch 'feature/group_type' into dev 5 years ago