1408 Commits (854ab9f509b7238a769c83e5e6703f7620fdd116)

Author SHA1 Message Date
zhengyongxing 56ecea6998 下游个人结算单生成代码上传 5 years ago
zhengchanglong 254d29f3f2 测试订单录入 5 years ago
chenxiaojun 89c7855337 管理后台>推广员>结算管理>公会分成管理--更新 5 years ago
chenxiaojun 66d68b0b49 管理后台>推广员>结算管理>公会分成管理--更新 5 years ago
sunke f92533e6a5 渠道计算修复 5 years ago
sunke 8db53afc8b 电子文档及公司录入信息 5 years ago
sunke 5fe238ccbd 渠道流水计算 5 years ago
liuweiwen 319dde1090 奖罚记录管理根据公司类型搜索 5 years ago
ELF bc2f5dd117 Merge branch 'release' of 47.111.118.107:wmtx/platform into release 5 years ago
ELF bbb31890f6 未收押金会长禁用落地页/下载页 5 years ago
sunke 7f169dc211 渠道流水计算 5 years ago
ELF ed25d54dc8 解决冲突 5 years ago
ELF 501b8099d4 解决冲突 5 years ago
chenzhi 2fe965749e 财务汇总ok 5 years ago
chenxiaojun b7d2931106 管理后台--更新 5 years ago
chenxiaojun e9dae29deb 管理后台>推广员>推广员管理>推广员列表--新增资质认证 5 years ago
chenxiaojun e9581a2e04 管理后台>推广员>结算管理>推广提现--更新 5 years ago
sunke 56981a0acc 渠道计算 5 years ago
yulingwei 0983ea1027 Merge branch 'feature/admin_optimize' into feature/ylw 5 years ago
yulingwei 2cd5574de7 新增审核时间 5 years ago
yulingwei 6b6baa4f92 合并 5 years ago
ELF 69185016a0 修改 5 years ago
liuweiwen dfd198e9b7 对账系统增加奖罚数据 5 years ago
zhengyongxing 5ab9f2cc1c 下游个人结算单生成代码上传 5 years ago
liuweiwen 2ba96aa424 Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize 5 years ago
liuweiwen ce960beb6d 合作方手机格式验证修改 5 years ago
chenxiaojun 2c52bccaf7 管理后台>推广员>结算管理>推广提现>自动审核管理--更新 5 years ago
chenxiaojun d5a63a7849 管理后台>推广员>结算管理>推广提现>自动审核管理--更新 5 years ago
liuweiwen e6cbcd86d3 Merge branch 'release' into feature/admin_optimize 5 years ago
liuweiwen 2af2505819 合并热修复 5 years ago
liuweiwen 2ed47500f0 Merge branch 'hotfix/recharge_statistics' into feature/admin_optimize 5 years ago
liaojinling e596d11cee 会长押金 5 years ago
zyx 079027a778 Merge branch 'hotfix/dopositCpModify' into release 5 years ago
zyx a9cae8424b 游戏充值bug修改 5 years ago
zyx c2b54611b7 Merge branch 'hotfix/dopositCpModify' into release 5 years ago
zyx 1cfc48ded2 游戏充值cp订单号修改 5 years ago
liuweiwen 2bffe498bf 奖罚记录管理优化 5 years ago
zyx 0aad9c4735 下游结算单生成功能上传 5 years ago
chenzhi aaf67b85cc 新增旧月份统计方法 5 years ago
jbRotk a6b1194be0 解决冲突 5 years ago
jbRotk 5d315d4182 添加工会类型 5 years ago
chenzhi 57e979408e 优化奖罚规则 5 years ago
chenzhi 3703d7040b 财务分类统计脚本1.0 5 years ago
chenzhi 1f5944c0a4 优化奖罚符号问题 5 years ago
zhengchanglong 24d1366d0a Merge branch 'hotfix/recharge_statistics' into release 5 years ago
liuweiwen b94bf93823 0点游戏统计 5 years ago
chenzhi 29618ce878 Merge branch 'feature/admin_optimize' of 47.111.118.107:wmtx/platform into feature/admin_optimize 5 years ago
chenzhi 58eb6a0e12 新增cp公司优化奖罚自动获取 5 years ago
liuweiwen 2b51122d13 Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize 5 years ago
liuweiwen 9e9a925429 奖罚记录管理 5 years ago
chenxiaojun a7891d6b57 管理后台>推广员>结算管理>推广提现--部分功能优化 5 years ago
jbRotk 72cfd9ec64 新增渠道费率 5 years ago
zhengchanglong 4aeaf8f74c Merge branch 'feature/admin_optimize' into release 5 years ago
liuweiwen 51d2d91671 验证手机号码格式修改 5 years ago
chenzhi 7657db3b18 财务分类-支付渠道/支付类型 5 years ago
jbRotk c84cde9567 Merge branch 'feature/ylw' into feature/admin_optimize 5 years ago
jbRotk 5f510cd4d9 新增奖惩时间 5 years ago
liuweiwen 289fd24ab6 内部公司信息管理 5 years ago
liuweiwen b444a3546b Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize
# Conflicts:
#	Data/update.sql
5 years ago
liuweiwen c92fa425d2 内部公司信息管理 5 years ago
chenzhi cb4e457ace 财务汇总-按合作方类型 5 years ago
jbRotk c968e54cf8 解决冲突 5 years ago
jbRotk 94afe49b0c upt 5 years ago
chenzhi 993bedc98f 收入类型-测试收入 5 years ago
chenzhi 8c756d61d9 cp分成增加符号后上游比例获取修正 5 years ago
jbRotk 35b6d25ebc upt 5 years ago
chenzhi 5eaadd974a 财务分类汇总-按收入类型1 5 years ago
chenzhi aba7ed22d1 财务汇总分类脚本-按收入类型 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
zyx 07279467ca 管理后台部分限制规则修改 / 开放甲乙方都能为万盟天下后,无法检索出万盟天下 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 56a97f7eef 修改bug 5 years ago
ELF e8a0975981 解决冲突 5 years ago
ELF 6993d164a3 解决冲突 5 years ago
ELF d3a3b8cdb7 修改 5 years ago
yulingwei 22addc182c 修改检索问题 5 years ago
sunke 0e0c1798f4 推广导入空数据初始化 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
ELF 2195bb4c55 修改短信发送 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
sunke d2b7e91a64 推广配置 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 38c64f5430 管理后台-》推广员列表可关键内外团搜索 5 years ago
yulingwei 076b4393eb upt 5 years ago
yulingwei aafc877e71 merghe 5 years ago
yulingwei d33d0c3f46 upt 5 years ago
liuweiwen 323facd599 管理后台推广员添加时手机号码不可重复 5 years ago
zhengyongxing 46a3028fc9 输出删除 5 years ago
chenxiaojun 29789f5ef6 公会分成管理--更新 5 years ago
zhengyongxing 3fca3c89ad 短信验证码提交 5 years ago
chenxiaojun b367b4a8d3 公会分成管理--更新 5 years ago
zhengyongxing 3741b0d27f 市场结算修正 5 years ago
chenxiaojun 42e07d0f2f 结算管理--更新 5 years ago
chenxiaojun 66a238dfd4 结算管理--更新 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
chenxiaojun 6e05546db6 公会分成管理--更新 5 years ago
chenxiaojun 28897755c9 结算管理--更新 5 years ago
chenxiaojun 258e10c9d1 结算管理--更新 5 years ago
zhengyongxing 4c42ee90e3 市场结算生成下游对账单代码优化 5 years ago
yulingwei 23f2334e45 新增充值权限查看 5 years ago
zhengyongxing f86265d38c 市场结算管理设备类型条件修正 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
zhengyongxing 43a335bc28 市场结算管理总流水弹窗优化 5 years ago
liuweiwen 86fe5f1f9f 工会归属admin不加密推广员账号 5 years ago
zhengyongxing f4b6fa4738 用户信息小号隐藏 5 years ago
zhengyongxing 076daf0d4e query冲突解决 5 years ago
ELF a31e42b7c4 Merge branch 'hotfix/link_info' into release 5 years ago
ELF f7a53c7562 Merge branch 'feature/account_safe' into release 5 years ago