1442 Commits (fbdd7a43395ba05f83f4a46d06a92a5f960f297a)

Author SHA1 Message Date
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
ELF c4934613ae 解决冲突 5 years ago
ELF b0bc4c0496 解决冲突 5 years ago
ELF 0f44d9e95c 解决冲突 5 years ago
liuweiwen 08f8c518a6 从dev复制代码 5 years ago
liuweiwen 7431072bbf 从dev复制代码 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
zhengyongxing c07167e784 结算单bug修正 5 years ago
zhengyongxing 943969bddd Merge branch 'feature/group_type' into dev 5 years ago
zhengyongxing c09c3a591e 结算单bug修正 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
chenxiaojun ba9b5e33d1 更新 5 years ago
chenxiaojun d615a1402f 公会分成管理--更新 5 years ago
liuweiwen f480c20fb7 Merge branch 'feature/group_type' into dev 5 years ago
liuweiwen 57a1d8ed8c 对账系统 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
zhengchanglong 6e405febc1 设置分成比例安卓IOS同步更新 5 years ago
zhanglingsheng 4043cc04e6 支付设置--添加支付限额 5 years ago
zhengyongxing ae2ad86247 Merge branch 'feature/group_type' into dev 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 4cd3d5b618 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into dev 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
liuweiwen 64cdea78a3 工会归属管理 5 years ago
zhengchanglong 868fde2d07 Merge branch 'feature/group_type' into dev 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
zhengchanglong 1c00290da9 Merge branch 'feature/group_type' into dev
# Conflicts:
#	Data/update.sql
5 years ago
chenxiaojun 6a8e58325c 更新 5 years ago
chenxiaojun bfc93e0626 公会分成管理--更新 5 years ago
chenxiaojun d995675829 更新 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 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
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
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 4a53915c22 更新 5 years ago
chenxiaojun 82784f9da9 推广提现--更新 5 years ago
yulingwei 9fe9a47b6f Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev 5 years ago
chenxiaojun 56956d90de 更新 5 years ago
chenxiaojun 9b47108400 推广提现--更新 5 years ago
chenxiaojun a6b9e5e39f 更新 5 years ago
chenxiaojun 843c54ced5 推广提现--更新 5 years ago
yulingwei b5d71ae215 Merge branch 'feature/pop_rules' into dev 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 009842c218 更新 5 years ago
chenxiaojun 4286817dea 推广提现--更新 5 years ago
zhengchanglong 9952029e6c Merge branch 'feature/group_type' into dev 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
chenzhi cccbc3bfa8 新增cp结算单判断是否已经有交叉时间 5 years ago
zhengchanglong 89d9b79930 Merge branch 'feature/group_type' into dev 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 7e1b90fc19 Merge branch 'feature/group_type' into dev 5 years ago
zhengchanglong 93fe724c15 游戏用户锁定备注显示 5 years ago
chenxiaojun a0bcdb2c04 更新 5 years ago
chenxiaojun 08dd26f942 推广提现--更新 5 years ago
zhengchanglong 8144e3c50f Merge branch 'feature/group_type' into dev 5 years ago
zhengchanglong e914fde68d 玩家列表账号锁定添加备注 5 years ago
chenxiaojun 3a9a7177fe 推广结算--更新 5 years ago
chenxiaojun ad80923bed 更新 5 years ago
chenxiaojun 114cb2f7a5 更新 5 years ago
chenxiaojun f244b42ab7 推广结算--更新 5 years ago
yulingwei 37156e0dce Merge branch 'feature/pop_rules' into dev 5 years ago
yulingwei ed9ddd2d67 修复检索问题 5 years ago
zhengchanglong 505e12beab Merge branch 'feature/group_type' into dev 5 years ago
zhengchanglong 326d9e5a12 管理后台-游戏-游戏编辑:参数配置-新增CP游戏分成比例 5 years ago
liuweiwen 602fb33fcc 新增需求:管理后台-》系统-》扩展工具-》公司信息管理 5 years ago
yulingwei 249044b0de Merge branch 'feature/pop_rules' into dev 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
chenzhi 377bdaee72 合并gt 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 c8fd6309a7 更新 5 years ago
chenxiaojun f1e8811df3 推广结算--更新 5 years ago
chenzhi 5326ef28db 合并 5 years ago
chenzhi 94243a5ea6 修改update冲突 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 f2e0cec5aa 更新 5 years ago
chenxiaojun 0927417ce9 推广结算--更新 5 years ago
万盟天下 e6d4304d74 Merge branch 'hotfix/shift-player' of wmtx/platform into release
还原补链限制
5 years ago
chenzhi dfdad21d8e Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into dev 5 years ago
chenzhi 414f326cf4 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type 5 years ago
chenzhi 0039431ccb Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into dev 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
liuweiwen 4892db340e 管理后台-》游戏-》合作方管理-》列表增加字段联系人,联系电话,邮寄地址。公司税号,收款方名称,银行账号,开户行 5 years ago
chenzhi 9e2eb46904 公会统计游戏统计新增多重搜索 5 years ago
chenxiaojun 09f2ca4ab6 更新 5 years ago
chenxiaojun 962c284467 推广结算--更新 5 years ago
liuweiwen fa3adf2e0b 新增合作方时,新增录入内容
新增联系人,联系电话,邮寄地址。公司税号,收款方名称,
银行账号,开户行
5 years ago
chenzhi c20d507df6 优化订单判断 5 years ago
chenzhi 9faec272e3 优化订单判断 5 years ago
chenzhi 3e54338685 取消多个推广员无法补链注释 5 years ago
chenzhi 3f53bc266b Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into dev 5 years ago
chenzhi 878badef43 换绑新增判断渠道是否已经结算 5 years ago
chenzhi bb7e1c269c Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into dev 5 years ago
chenzhi 876952f3b4 公会统计新增内外团检索 5 years ago
chenxiaojun 89965bd8fb 导出 5 years ago
chenxiaojun a636c2dcf6 导出 5 years ago
zhengchanglong 715abb2b3e Merge branch 'hotfix/fix_get_gameist' into dev 5 years ago
liuweiwen fe0f308e54 财务管理下的ajax请求不判断权限 5 years ago
chenxiaojun d792e34348 结算管理--更新 5 years ago
chenxiaojun 90eed6f5ca 结算管理--更新 5 years ago
chenxiaojun 461e80bd30 结算管理--更新 5 years ago
chenxiaojun 3faf5db4f7 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev 5 years ago
chenxiaojun c074b5fb86 结算管理--更新 5 years ago
chenzhi 3840959f05 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into dev 5 years ago
chenzhi a37d0d6ec4 优化推广员充值统计排序问题 5 years ago
chenzhi 9cef29ebeb Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into dev 5 years ago
chenzhi 43774e9099 推广员充值统计新增官方渠道统计 5 years ago
chenxiaojun 4721e60d32 推广员资质认证 5 years ago
chenzhi 4ba400fa78 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into dev 5 years ago
chenzhi 14fa967f00 优化推广员统计数据 5 years ago
chenxiaojun 0ff9f77181 推广员资质认证 5 years ago
zhengchanglong 7c1593e0e1 Merge branch 'feature/group_type' into dev 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