5604 Commits (ceef36a7d10206337f7c2ed40d2f8c34e1030e46)

Author SHA1 Message Date
zhengyongxing 0c4f1f05bd 支付渠道跳转增加 4 years ago
廖金灵 f543804c87 Merge branch 'feature/promote_base_info' of wmtx/platform into release
用户信息
4 years ago
yulingwei deaa20c5bf upt 4 years ago
廖金灵 fc7284de94 Merge branch 'feature/reward' of wmtx/platform into release
奖罚样式问题
4 years ago
廖金灵 c114446d55 Merge branch 'feature/promote_base_info' of wmtx/platform into release
用户基本信息
4 years ago
廖金灵 d73ab9c4cd Merge branch 'feature/payment_merchant' of wmtx/platform into release
完善支付商户操作日志
4 years ago
陈志 f63985ece1 Merge branch 'hotfix/market_percentage' of wmtx/platform into release
市场结算管理bug修改
4 years ago
ELF a4d4a51a2c 完善支付商户操作日志 4 years ago
chenzhi 3318298d2e 优化上下游导出时间 4 years ago
zhengyongxing 9a722d5b45 市场结算管理bug修改 4 years ago
yulingwei c308bbbd6c upt 4 years ago
yulingwei 9e53db53cd upt 4 years ago
yulingwei de0fc5e074 upt 4 years ago
chenzhi 205c6a83f8 优化上游结算 4 years ago
chenzhi 6f75b0e6d8 优化结算单无地址 4 years ago
yulingwei 19c3aeec50 Merge branch 'feature/promote_base_info' of 47.111.118.107:wmtx/platform into feature/promote_base_info 4 years ago
yulingwei a88b182641 upt 4 years ago
chenzhi 493197fed2 优化重新结算 4 years ago
chenzhi 91510679b0 Merge branch 'fix/change_compnay_info0729' of 47.111.118.107:wmtx/platform into fix/change_statement_time 4 years ago
chenzhi aabc0703df 优化结算时间选择 4 years ago
chenzhi 8b8b0721b3 优化结算时间 4 years ago
chenzhi 853c938edb 优化下游个人结算时间 4 years ago
chenzhi 92ccc96dcd 优化下游公司结算时间审核 4 years ago
chenzhi a14f0abb88 上游新增结算时间判断 4 years ago
廖金灵 57ea4efb72 Merge branch 'hotfix/market_percentage' of wmtx/platform into release
充值订单bug修改
4 years ago
zhengyongxing 8c237e19fe 充值订单bug修改 4 years ago
廖金灵 79f038d62a Merge branch 'hotfix/market_percentage' of wmtx/platform into release
付商户bug修改
4 years ago
zhengyongxing 24bcd381a0 支付商户bug修改 4 years ago
廖金灵 782f2ae51b Merge branch 'hotfix/market_percentage' of wmtx/platform into release
支付商户bug修改
4 years ago
廖金灵 3c4cf05a72 Merge branch 'feature/reward' of wmtx/platform into release
列表样式
4 years ago
zhengyongxing eb66cfd5d4 支付商户bug修改 4 years ago
yulingwei d46fa808c0 upt 4 years ago
陈志 67dc1b58e6 Merge branch 'fix/change_statement_time' of wmtx/platform into release 4 years ago
chenzhi 0f284cf9b3 优化游戏绑定,已经绑定不出现 4 years ago
廖金灵 4b6218f1aa Merge branch 'feature/reward' of wmtx/platform into release
修改选择样式
4 years ago
廖金灵 bd00e90c26 Merge branch 'feature/payment_merchant' of wmtx/platform into release
修改文字bug
4 years ago
ELF bc193e648e 修改 4 years ago
yulingwei f598b19957 Merge branch 'feature/reward' of 47.111.118.107:wmtx/platform into feature/reward 4 years ago
yulingwei b995ba34d9 upt 4 years ago
zhengyongxing 19f59d6482 菜单栏修改 4 years ago
zhengyongxing eebb38dc8c 商户列表字段名称修改 4 years ago
zhengyongxing 9d28947f9b 商户bug修改 4 years ago
zhengyongxing a960e0a7e4 商户bug修改 4 years ago
zhengyongxing 624a2b7cde 商户bug修改 4 years ago
zhengyongxing 9a202a393e 商户bug修改 4 years ago
zhengyongxing ee5fc4c7c8 Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/market_percentage
 Conflicts:
	Application/Admin/View/Spend/lists.html
4 years ago
zhengyongxing 9670bf86b6 商户bug修改 4 years ago
廖金灵 6faa6e0a33 Merge branch 'feature/finance_statement723' of wmtx/platform into release
优化订单列表长cp订单显示
4 years ago
廖金灵 7340d5b4fd Merge branch 'hotfix/market_percentage' of wmtx/platform into release
手机号码重复验证
4 years ago
chenzhi 2a99226dd7 优化订单列表长cp订单显示 4 years ago
zhengyongxing 45d124b4cd 手机号码重复验证 4 years ago
廖金灵 47c565e31c Merge branch 'hotfix/market_percentage' of wmtx/platform into release
下游公司字段与上游公司字段一致
4 years ago
zhengyongxing 57903e8a13 下游公司字段与上游公司字段一致 4 years ago
ELF edb090feca 解决冲突 4 years ago
ELF 004b540a63 解决冲突 4 years ago
ELF 0803b686c3 解决冲突 4 years ago
ELF 49ea782f7c 解决冲突 4 years ago
廖金灵 9e3de695ca Merge branch 'feature/plateform_statistics' of wmtx/platform into release
市场部统计修改
4 years ago
廖金灵 e4ab39bf64 Merge branch 'feature/ip_search' of wmtx/platform into release
IP查询
4 years ago
zhengyongxing ea2683716f 下游公司字段与上游公司字段一致 4 years ago
廖金灵 54ad7191b1 Merge branch 'hotfix/market_percentage' of wmtx/platform into release
聚合公司及增加手机登录功能
4 years ago
廖金灵 2ea819c585 Merge branch 'feature/finance_statement723' of wmtx/platform into release
新增防止并发请求数据
4 years ago
廖金灵 949570abf4 Merge branch 'feature/game_agg' of wmtx/platform into release
游戏统计显示聚合数据
4 years ago
ELF ff47282287 修改 4 years ago
chenzhi 5ef1aa6e22 新增防止并发请求数据 4 years ago
ELF e0f71b67c5 处理 4 years ago
zhengyongxing 4f681f7d72 Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/market_percentage
 Conflicts:
	Data/update.sql
4 years ago
zhengyongxing 09629a12a8 下游公司字段与上游公司字段一致 4 years ago
陈志 d5c54234b3 Merge branch 'feature/finance_statement723' of wmtx/platform into release 4 years ago
chenzhi e3022cb6c2 关闭测试验证码 4 years ago
ELF 6f8b93a26b 修改 4 years ago
zhengyongxing 11ff884e6a Merge branch 'feature/cp_juhe_company' into hotfix/market_percentage
# Conflicts:
#	Application/Admin/Common/extend.php
#	Application/Admin/Controller/AggregateFinanceSetController.class.php
#	Application/Admin/Controller/CpJuheCompanyController.class.php
#	Application/Admin/View/CpJuheCompany/detail.html
#	Application/Admin/View/CpJuheCompany/export.html
#	Data/update.sql
4 years ago
zhengyongxing 91178308f9 下游公司字段与上游公司字段一致 4 years ago
陈志 e01c7e4e01 Merge branch 'feature/finance_statement723' of wmtx/platform into release 4 years ago
chenzhi 69615c1459 优化脚本执行 4 years ago
chenzhi 0e8730b810 优化重算需重新确认 4 years ago
ELF 56282658fc 解决冲突 4 years ago
ELF 0206a422f9 解决冲突 4 years ago
chenzhi fb9deff8b7 优化新增生效的默认时间 4 years ago
chenzhi 0f023bed36 优化结算提示 4 years ago
ELF fbe8d7a351 修改bug 4 years ago
chenzhi e2bd47ac2d 优化按钮太挤 4 years ago
chenzhi fe1853065a 优化结算原包名显示 4 years ago
chenzhi b9604c162a 优化操作时间判断 4 years ago
chenzhi 8de452c8f7 优化名称显示 4 years ago
chenzhi f4be3972b2 优化结算单确认 4 years ago
chenzhi b7409ab069 优化导出 4 years ago
chenzhi eb311348a8 优化检索 4 years ago
chenzhi 47b54d336c 优化汇总撤回 4 years ago
chenzhi 4d65542338 优化结算包名文字 4 years ago
chenzhi 2a303cf0f5 优化审核流程 4 years ago
chenzhi 0aac0cfad7 新增结算类型 4 years ago
chenzhi 31b1c771a1 新增全量查看 4 years ago
chenzhi a69b21dd14 汇总单新增周月结审核 4 years ago
chenzhi 3ef8061e3e 优化个人0值重算 4 years ago
chenzhi 6b9358c651 优化结算 4 years ago
chenzhi 3cbc769bce 优化个人结算 4 years ago
chenzhi f70d8cb8a7 优化个人结算 4 years ago
chenzhi 7f01c3ff39 优化上游结算方式 4 years ago
chenzhi f91b2a5dce 优化下游结算 4 years ago
chenzhi d946a4c91c 优化下游公司结算 4 years ago
chenzhi 8e77f3ed4d 优化上游结算 4 years ago
chenzhi 16a3bea172 优化上游新增服务器费用结算包名 4 years ago
chenzhi 51c4b07eea 优化上游结算包名 4 years ago
chenzhi 2de8e4a313 开启测试验证码 5 years ago
chenzhi b0034d5f19 优化推广公司游戏申请不审核 5 years ago
chenzhi a948986b41 优化上游导出 5 years ago
chenzhi 62f2bc350d 优化时间控件 5 years ago
chenzhi 5c857840a2 分成比例新增生效检索 5 years ago
chenzhi 94a3057013 新增游戏分成比例导出 5 years ago
chenzhi ac65098827 Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/finance_statement723 5 years ago
廖金灵 5f0917220c Merge branch 'feature/platfrom_aggregate_finance' of wmtx/platform into release
推广分成特殊申请
5 years ago
chenzhi 8e4541cb01 推广分成特殊申请 5 years ago
廖金灵 762c93d89e Merge branch 'feature/platfrom_aggregate_finance' of wmtx/platform into release
优化电话不限制
5 years ago
chenzhi b1790a8897 优化手机不限制 5 years ago
廖金灵 c67cbc61c2 Merge branch 'feature/platfrom_aggregate_finance' of wmtx/platform into release
优化电话不限制
5 years ago
chenzhi 0430293bb7 优化电话不限制 5 years ago
chenzhi 1e3b1dad66 优化排序 5 years ago
廖金灵 4869d650d9 Merge branch 'feature/cp_juhe_company' of wmtx/platform into release
时间格式修正,导出格式修改
5 years ago
zhengyongxing 815e2e3b88 时间格式修正,导出格式修改 5 years ago
chenzhi 6024ae342c 优化顺序及导出 5 years ago
zhengyongxing 08e221a53c 商户专员隐藏 5 years ago
chenzhi 8ded1f3169 优化游戏模板显示 5 years ago
chenzhi 4460f8e7cf 新增结算包名 5 years ago
廖金灵 a958f8c043 Merge branch 'feature/cp_juhe_company' of wmtx/platform into release
聚合公司详情详细网址条件修改
5 years ago
zhengyongxing 52fe6d04f8 聚合公司详情详细网址修改 5 years ago
廖金灵 a70a494102 Merge branch 'feature/cp_juhe_company' of wmtx/platform into release
聚合公司详情详细网址修改
5 years ago
zhengyongxing 4325ed23ee 聚合公司详情详细网址修改 5 years ago
chenzhi 3ff79ce6c1 优化公会检索 5 years ago
chenzhi 832f531d20 优化审核通过 5 years ago
廖金灵 b8532da607 Merge branch 'feature/cp_juhe_company' of wmtx/platform into release
聚合公司详情详细地址格式修改
5 years ago
zhengyongxing 5bbdfe7e74 聚合公司详情详细地址修改 5 years ago
ELF 557f0203ac 解决冲突 5 years ago
廖金灵 5d809ae9b8 Merge branch 'feature/platfrom_aggregate_finance' of wmtx/platform into release
优化合同期限查询
5 years ago
chenzhi eaa6762935 优化模板错误 5 years ago
ELF 62d7f15fdc Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/promote_landing_assign 5 years ago
chenzhi 0197743266 优化合同期限查询 5 years ago
zhengyongxing 68f8bb1ce0 聚合公司详情详细地址修改 5 years ago
chenzhi 4dd8526e2b 优化日志 5 years ago
chenzhi 3ad0d447d4 优化显示 5 years ago
chenzhi 4501036ba8 优化导出错误 5 years ago
chenzhi 069cc1599a 优化上游检索 5 years ago
chenzhi 5a962e1b73 新增分成优化 5 years ago
zhengyongxing 26f13922a1 聚合公司时间修正 5 years ago
chenzhi 0237e0ff63 优化导出 5 years ago
chenzhi 6181059faf 优化搜索 5 years ago
chenzhi 945f033df5 Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/platfrom_aggregate_finance 5 years ago
chenzhi 10e56211ce 优化导出提示 5 years ago
chenzhi 1ec951d344 优化空值显示 5 years ago
chenzhi 61e6d8131c 新增支付宝真实名称只能是中文验证 5 years ago
chenzhi f66bce14b2 优化下游列表显示及导出 5 years ago
chenzhi 5894324ca8 旧数据脚本 5 years ago
chenzhi 94cbae1924 优化打款提醒 5 years ago
chenzhi c733fc2e15 优化游戏删除 5 years ago
chenzhi d015bce440 优化推广下游查看 5 years ago
chenzhi 80e8477b51 新增检索 5 years ago
ELF c127ea6139 修改bug 5 years ago
ELF 546d83f4a3 修改bug 5 years ago
ELF bb8052614b 修改推广游戏分成市场专员权限控制 5 years ago
chenzhi a3f28b67a5 新增游戏搜索 5 years ago
zhengyongxing 1fff2e6c09 财务代码搬到新的分支上 5 years ago
zhengyongxing 341fa19b6f 聚合公司功能提交 5 years ago
zhengyongxing 2fe7c864df 聚合公司功能提交 5 years ago
zhengyongxing 420723f593 商户充值汇总更改名称 5 years ago
zhengyongxing 4c3112b70e 充值信息查看权限添加 5 years ago
zhengyongxing 837358f86b 支付商户统计字段展示修改 5 years ago
chenzhi d91d8346b9 优化下游导出 5 years ago
yulingwei 1c633e60cb upt 5 years ago
ELF 27ccee9b20 修改 5 years ago
ELF 46fc13a91e 修改 5 years ago
yulingwei 6ffd3de128 upt 5 years ago
yulingwei 781f63146f upt 5 years ago
yulingwei 6c23a3ee52 upt 5 years ago
yulingwei 90e0f00579 upt 5 years ago
yulingwei 9641aecde0 upt 5 years ago
yulingwei 151346d69f upt 5 years ago
yulingwei 9a380d7756 upt 5 years ago
ELF 1bec15c186 修改迁移bug 5 years ago
chenzhi 8ac604be33 优化导出 5 years ago
chenzhi 6bb398bcc3 优化下游显示 5 years ago
yulingwei 7b9bb91e16 upt 5 years ago
ELF cefed5c559 修改 5 years ago
zhengyongxing a09da4a184 聚合下游公司列表导出修正 5 years ago
zhengyongxing 1ff82cce20 聚合下游公司列表添加 5 years ago
chenzhi 8c191c2f05 优化推广员公司列表 5 years ago
yulingwei 1bd33daa54 upt 5 years ago
chenzhi 5367ea4aae 优化前端 5 years ago
ELF f3b323bda8 修改 5 years ago
yulingwei e5996b47cc upt 5 years ago
yulingwei 0a9e7ed3ef upt 5 years ago
yulingwei e789c941ed upt 5 years ago
yulingwei 7830cef93d upt 5 years ago
chenzhi bffbd6a2b1 优化ok 5 years ago
chenzhi 2619e598e8 合并marster 5 years ago
chenzhi 22a65f8404 优化下游支付宝导出 5 years ago
yulingwei e0d74cbffd upt 5 years ago
chenzhi 1bc3dab93c 新增下游渠道比例 5 years ago
yulingwei 066610f236 upt 5 years ago
yulingwei 877a53e892 upt 5 years ago
yulingwei f373bd2025 upt 5 years ago
yulingwei deac7da5ff upt 5 years ago
yulingwei 25dec010be upt 5 years ago
yulingwei 28a44019e4 upt 5 years ago
yulingwei eaa25ebcda feature/desposit 5 years ago
zhengyongxing cacb1e4cf4 商户统计结算功能添加 5 years ago
ELF 096e32d581 商户配置 5 years ago
yulingwei 2fbea72d26 up 5 years ago
chenzhi b4c6f4316a 优化显示 5 years ago
chenzhi afac0376be 新增下游审批 5 years ago
chenzhi 7d404c6904 优化查看 5 years ago
chenzhi cafdc39f2a 优化添加 5 years ago
zhengyongxing cb0ceda1cb 聚合财务导出模板修正 5 years ago
zhengyongxing ee6be3b45b 市场业绩提成当流水不足起提流水时,税后毛利不予展示 5 years ago
chenzhi d662c89b7e zancun 5 years ago
zhengyongxing 960903a31c 新功能添加 5 years ago
chenzhi f731a417bd 优化工会关系 5 years ago
chenzhi d9d55a3bcb 优化新增下游公司 5 years ago
zhengyongxing 1abaa7c646 支付渠道名称修改 5 years ago
zhengyongxing 729136a95c 聚合订单代码导出,及重算功能修改 5 years ago
ELF e8a925b64c 游戏统计添加聚合充值数据 5 years ago
chenzhi 69adcbabf8 优化推广公司 5 years ago
chenzhi 5aa7427504 新增公司信息编辑 5 years ago
chenzhi c708fb6d11 优化CP搜索 5 years ago
yulingwei 20ac65f12a upt 5 years ago
yulingwei dda43c7289 Merge branch 'feature/deposit' of 47.111.118.107:wmtx/platform into feature/deposit 5 years ago
yulingwei 555fd052fe upt 5 years ago
chenzhi 35f2fe3f05 优化公司显示 5 years ago
yulingwei e337ecac5e upt 5 years ago
yulingwei c8bd476a60 upt 5 years ago
zhengyongxing 2fefd44d0c 公会统计推广员支付时间修正 5 years ago
chenzhi f7d90780aa 新增CP公司审核 5 years ago
zhengyongxing cd8f64c7e6 游戏详情订单修改 5 years ago
chenzhi 33cf2cf8a6 新增审核列表 5 years ago
yulingwei adc3acd992 upt 5 years ago
yulingwei 33049f5a9f upt 5 years ago
ELF 05fac79ed3 修改 5 years ago
chenzhi 0c2e2db65d 新增税费费率 5 years ago
zhengyongxing 288f121955 添加手机登录的功能 5 years ago
yulingwei e155c92ed6 1 5 years ago
zhengyongxing 114e51ebe2 Merge branch 'master' of 47.111.118.107:wmtx/platform into hotfix/market_percentage 5 years ago
chenzhi 58c8508ce4 新增cp导出 5 years ago
chenzhi bd3510581f 新增CP导出生效时间 5 years ago
chenzhi f66ec6d1ff 优化函数 5 years ago
chenzhi 296b5a0d8f 优化关系函数 5 years ago
chenzhi 3349304e10 新增上游预警金额读取 5 years ago
万盟天下 2528313ba0 Merge branch 'hotfix/promote_achievement' of wmtx/platform into master
修改推广员业绩查询默认值
5 years ago
ELF aeade79e67 修改 5 years ago
ELF 80cb58cdc9 推广员业绩查询时间范围限制为31天 5 years ago
ELF c87b61d94b 修改发票类型 5 years ago
ELF 0f0d52c78f 修改 5 years ago
ELF b448f0829e 修改公司绑定默认值 5 years ago
yulingwei 98413791aa repair 5 years ago
ELF 451b2b3105 修改 5 years ago
廖金灵 80e89c651a Merge branch 'feature/excel_payment' of wmtx/platform into master
优化手机设置
5 years ago
chenzhi ad2078cfbe 优化手机设置 5 years ago
万盟天下 32d4450e4a Merge branch 'featurn/markets' of wmtx/platform into master
名字增加修改
5 years ago
zhengyongxing 53f490ea20 名字增加修改 5 years ago
万盟天下 00d99897b0 Merge branch 'hotfix/gitbag_op' of wmtx/platform into master
优化后台礼包
5 years ago
ELF 007b7b5c1f 优化后台 5 years ago
chenzhi 4b2995f279 Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/excel_payment 5 years ago
ELF 15d0b454a4 修改 5 years ago
万盟天下 72115a9ede Merge branch 'feature/promote_statistics' of wmtx/platform into release
推广员统计修改
5 years ago
yulingwei 64bb801be2 1 5 years ago
yulingwei 6390d680ec upt 5 years ago
yulingwei 96327507f4 upt 5 years ago
chenzhi ba4d08cc8b 取消线上打款权限 5 years ago
万盟天下 0885bbdcb7 Merge branch 'feature/excel_payment' of wmtx/platform into release
打款账号
5 years ago
yulingwei 52b478f570 upt 5 years ago
chenzhi 5231b508e6 优化打款权限 5 years ago
chenzhi 213b152398 优化打款权限 5 years ago
chenzhi bed393c5a0 打款账号 5 years ago
yulingwei 7fc6609d78 upt 5 years ago
yulingwei aa77fb7821 upt 5 years ago
chenzhi fd706fb314 优化打款列表 5 years ago
万盟天下 093d73e883 Merge branch 'feature/excel_payment' of wmtx/platform into release
优化打款
5 years ago
chenzhi 628a58d5e1 取消测试环境 5 years ago
chenzhi f58154a07a 优化打款 5 years ago
chenzhi 309300299d 新增显示全部 5 years ago
zhengyongxing 2220a6cfec 财务支付时间修改,增加手机登录验证,及开发推广员列表名称 5 years ago
chenzhi 60e89f6868 修改导出 5 years ago
chenzhi 52b1168930 优化打款记录 5 years ago
yulingwei 51a1c9c707 upt 5 years ago
yulingwei b9dfe08177 upt 5 years ago
chenzhi b460b7409f 优化打款系统登陆 5 years ago
chenzhi e9c3355c90 优化打款名称 5 years ago
yulingwei 1119e8faf9 upt 5 years ago
chenzhi 84f5592359 Merge branch 'hotfix/shift_promote' of 47.111.118.107:wmtx/platform into hotfix2/shift_promote 5 years ago
chenzhi 2f9269f29f 取消默认选择时间 5 years ago
chenzhi 17aea456e5 Merge branch 'hotfix/shift_promote' of 47.111.118.107:wmtx/platform into hotfix2/shift_promote 5 years ago
chenzhi 6c1f898fb9 优化换绑时间 5 years ago
yulingwei 80597c4894 upt 5 years ago
chenzhi db64bea72f 优化提醒 5 years ago
chenzhi b1c09b698d Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix2/shift_promote 5 years ago
chenzhi 617cfbd4bf 优化换绑 5 years ago
yulingwei 5e5aa8ca3f upt 5 years ago
yulingwei 0b54c71cb0 upt 5 years ago
chenzhi d6ec8e0248 新增导出 5 years ago
廖金灵 831c87c9ee Merge branch 'hotfix/market_percentage' of wmtx/platform into master
优化公会统计
5 years ago
廖金灵 420c3454fc Merge branch 'hotfix/fan_promote' of wmtx/platform into master
优化公会统计
5 years ago
廖金灵 3065ba060f Merge branch 'hotfix/market_percentage' of wmtx/platform into release
条数修改
5 years ago
zhengyongxing fd926a0795 条数修改 5 years ago
郑永星 b77a3a1136 Merge branch 'hotfix/market_percentage' of wmtx/platform into release
groupby市场专员id添加
5 years ago
zhengyongxing 5ea0f21574 groupby市场专员id添加 5 years ago
廖金灵 3095270a84 Merge branch 'hotfix/fan_promote' of wmtx/platform into release
修改工会统计
5 years ago
ELF f167d63c4a 修改 5 years ago
chenzhi 0c91774854 解决冲突 5 years ago
chenzhi 17e1f4b1fa 优化前端提醒 5 years ago
郑永星 8076e22b2f Merge branch 'hotfix/market_percentage' of wmtx/platform into release 5 years ago
zhengyongxing ce2540919c 市场专员筛选 5 years ago
郑永星 c036175a14 Merge branch 'hotfix/market_percentage' of wmtx/platform into release
市场专员筛选,月份跳转,及时间筛选修正
5 years ago
zhengyongxing 039b496b28 市场专员筛选,月份跳转,及时间筛选修正 5 years ago
zhengyongxing 96f68c4f50 市场专员筛选,月份跳转,及时间筛选修正 5 years ago
elf@home fb87be0b43 修改 5 years ago
廖金灵 83a1f15de5 Merge branch 'feature/market_percentage' of wmtx/platform into release
跳转汇总结算单默认事件添加
5 years ago
zhengyongxing cd208fbfd7 跳转汇总结算单默认事件添加 5 years ago
廖金灵 6f3a94a31b Merge branch 'feature/market_percentage' of wmtx/platform into release
跳转汇总结算单默认事件添加
5 years ago
zhengyongxing 19c2f8b2de 跳转汇总结算单默认事件添加 5 years ago
廖金灵 98dab102f4 Merge branch 'feature/market_percentage' of wmtx/platform into release
跳转汇总结算单跳转修正,添加筛选发放状态的代码
5 years ago
zhengyongxing ced9d51845 跳转汇总结算单跳转修正,添加筛选发放状态的代码 5 years ago
廖金灵 6af9e39ec9 Merge branch 'feature/market_percentage' of wmtx/platform into release
重算展示权限添加
5 years ago
zhengyongxing dae421270f 重算展示权限添加 5 years ago
廖金灵 262940a42f Merge branch 'feature/market_percentage' of wmtx/platform into release
列表全部开发给市场专员,其他人员的数据隐
5 years ago
zhengyongxing 53979941a0 列表全部开发给市场专员,其他人员的数据隐藏 5 years ago
chenzhi a0b04cf81e 优化公司为模糊搜索 5 years ago
chenzhi 41f214c7e7 优化基础参数 5 years ago
chenzhi 5362c1e9e4 优化批量导出 5 years ago
chenzhi 2104a3e4b6 优化批次号 5 years ago
廖金灵 1ec683a86e Merge branch 'feature/market_percentage' of wmtx/platform into release
市场业绩提成市场总监管理组添加查看全部用户的权限
5 years ago
chenzhi 9cbcbc7013 优化打款 5 years ago
chenzhi 9ff3153f57 打款ok 5 years ago
zhengyongxing 1acef89380 市场业绩提成市场总监管理组添加查看全部用户的权限 5 years ago
廖金灵 27f14f0292 Merge branch 'feature/market_percentage' of wmtx/platform into release
市场业绩提成bug修改
5 years ago
zhengyongxing bded27756e 市场业绩提成bug修改 5 years ago
廖金灵 c008157b0a Merge branch 'feature/market_percentage' of wmtx/platform into release
市场业绩提成bug修改
5 years ago
zhengyongxing 0c5e857ca2 市场业绩提成bug修改 5 years ago
廖金灵 6deed99b79 Merge branch 'feature/market_percentage' of wmtx/platform into release
市场业绩提成bug修改
5 years ago
zhengyongxing 5ab96edd8f 市场业绩提成bug修改 5 years ago
chenzhi 9292aa7862 优化打款 5 years ago
zhengyongxing 8f4505205b 市场业绩提成优时间大小判断 5 years ago
廖金灵 b58f66f9b8 Merge branch 'feature/market_percentage' of wmtx/platform into release
市场业绩提成优化
5 years ago
zhengyongxing b64e5858ea 市场业绩提成优化 5 years ago
zhengyongxing 5f113b8bfc 市场业绩提成优化 5 years ago
廖金灵 886c70665c Merge branch 'feature/market_percentage' of wmtx/platform into release
市场业绩提成优化
5 years ago
zhengyongxing 2975b9fe35 市场业绩提成优化 5 years ago
chenzhi 9cb0e33531 znac 5 years ago
chenzhi 74e39c7b20 excel打款列表 5 years ago
chenzhi 24f2b76bd6 新增导入 5 years ago
廖金灵 31de395c6e Merge branch 'feature/market_percentage' of wmtx/platform into release
提现汇总表时间检索bug修正
5 years ago
zhengyongxing cbb0e82db1 提现汇总表时间检索bug修正 5 years ago
郑永星 a9e8905e27 Merge branch 'feature/market_percentage' of wmtx/platform into release
提现汇总表时间检索bug修正
5 years ago
zhengyongxing 3eeeb449de 提现汇总表时间检索bug修正 5 years ago
zhengyongxing 4e562ffcc4 提现汇总表时间检索bug修正 5 years ago
廖金灵 8ad5533c53 Merge branch 'feature/market_percentage' of wmtx/platform into release
汇率逻辑修改
5 years ago
zhengyongxing 0ac831dece 汇率逻辑修改 5 years ago
廖金灵 aebc8b9f70 Merge branch 'feature/market_percentage' of wmtx/platform into release
编辑汇率时间控件修改
5 years ago
zhengyongxing a1df3c547e 编辑汇率时间控件修改 5 years ago
廖金灵 7576434beb Merge branch 'feature/market_percentage' of wmtx/platform into release
时间控件修改
5 years ago
zhengyongxing 5dc5222091 时间控件修改 5 years ago
chenzhi 399c3b37cf 新增文件读取 5 years ago
郑永星 7608fb3b99 Merge branch 'feature/market_percentage' of wmtx/platform into release 5 years ago
zhengyongxing c637d7a1d7 离职发放发放完成隐藏 5 years ago
廖金灵 6d6ec065b2 Merge branch 'hotfix/retention_down' of wmtx/platform into release
修改导出bug
5 years ago
ELF a17bb698dc 修改bug 5 years ago
廖金灵 39af00fe0e Merge branch 'hotfix/retention_down' of wmtx/platform into release
修改bug
5 years ago
ELF 2dadc11d09 修改bug 5 years ago
廖金灵 578087e50e Merge branch 'hotfix/retention_down' of wmtx/platform into release
修改留存率
5 years ago
ELF fa4de7ece5 修改 5 years ago
zhengyongxing 585f523984 arpu分析bug修正 5 years ago
zhengyongxing a6dd2a9830 市场专员业绩导出公式添加 5 years ago
zhengyongxing f4789a1534 市场专员业绩提成bug修正 5 years ago
zhengyongxing 3603f5fa21 市场专员业绩提成bug修正 5 years ago
zhengyongxing 944a424b3c 市场专员业绩提成bug修正 5 years ago
chenzhi 8d32b5104e 新增excel打款 5 years ago
zhengyongxing 44feb6957d 市场专员业绩提成bug修正 5 years ago
zhengyongxing e4d1ced122 市场专员业绩提成bug修正 5 years ago
zhengyongxing b9255647f7 市场专员业绩提成汇总单检索
修正
5 years ago
zhengyongxing 0ca629518d 市场专员业绩结算结构修改 5 years ago
zhengyongxing 5c76d1180d 市场专员业绩结算结构修改 5 years ago
zhengyongxing 4bfa0dfa2f 市场专员业绩结算结构修改 5 years ago
zhengyongxing d40ce89901 市场专员业绩结算发放时间选项修改 5 years ago
zhengyongxing 8053806801 市场专员业绩bug修改 5 years ago
zhengyongxing f7c11991ca 市场专员业绩bug修改 5 years ago
chenzhi 2a4541569d 优化列表显示 5 years ago
zhengyongxing 2303c439aa 市场专员业绩计页面修改 5 years ago
chenzhi c11266291f Merge branch 'master' of 47.111.118.107:wmtx/platform into hotfix/change_cp_time 5 years ago
chenzhi 63054ac0d8 优化订单校验 5 years ago
zhengyongxing de3d7d52b7 市场专员业绩计bug修正 5 years ago
chenzhi 04e13844c3 zancun 5 years ago
zhengyongxing 962d140d80 Merge branch 'hotfix/pay_channel_modify' into feature/market_percentage 5 years ago
zhengyongxing 043ee29f54 市场专员业绩计bug修正 5 years ago
zhengyongxing 8430444b8e 市场专员业绩计bug修正 5 years ago
zhengyongxing 2da9821caf 市场专员业绩计算修正 5 years ago
zhengyongxing 9a23b5588b 市场专员业绩计算修正 5 years ago
zhengyongxing ea21948984 支付渠道bug修改 5 years ago
zhengyongxing 97161900ac 市场专员业绩管理bug修改 5 years ago
chenzhi c9d6b9859d 合并热更 5 years ago
chenzhi c18eb439c5 优化游戏获取逻辑 5 years ago
zhengyongxing 1c535ee74b 市场专员业绩管理 重算调用脚本命令修改 5 years ago
zhengyongxing bdeacbd718 市场专员业绩管理 重算调用脚本命令修改 5 years ago
zhengyongxing c96340afa9 市场专员业绩管理bug修改 5 years ago
chenzhi 048931ce9e 优化搜索3 5 years ago
chenzhi 35380ae9b0 优化搜索2 5 years ago
chenzhi 587d7913ca 优化检索 5 years ago
zhengyongxing 1e80004e3e 市场专员业绩管理bug修改 5 years ago
zhengyongxing 17ff8d9029 市场专员业绩管理模板指定 5 years ago
zhengyongxing 70d6c3c7bf 市场专员业绩管理权限判断 5 years ago
zhengyongxing 80dc2b860c Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/market_percentage
 Conflicts:
	Application/Admin/Common/extend.php
	Application/Admin/Controller/TimingController.class.php
	Data/update.sql
5 years ago
zhengyongxing 83717b64ae 市场专员业绩管理优化 5 years ago
chenzhi 5fc03a14a4 优化cp添加 5 years ago
chenzhi 0dda3b1c61 优化合同不需要限制时间 5 years ago
chenzhi 490197a490 移除合作方合同时间限制 5 years ago
chenzhi 03f4130e9e 新增上游合作 5 years ago
廖金灵 89edac1fee Merge branch 'hotfix/market_name' of wmtx/platform into master
市场专员识别
5 years ago
廖金灵 56619e58b7 Merge branch 'hotfix/market_name' of wmtx/platform into release
市场专员识别
5 years ago
ELF 3f42d2967c 修改 5 years ago
ELF 70c9e26ce4 修改bug 5 years ago
zhengyongxing 06bd0bf848 市场专员业绩管理代码提交 5 years ago
chenzhi d52ab03714 新增推广公司游戏选择 5 years ago
廖金灵 4a755d2269 Merge branch 'feature/market_admin' of wmtx/platform into release
修改换绑bug
5 years ago
ELF ecc228409d 修改 5 years ago
廖金灵 ed9d193531 Merge branch 'feature/promote_statistics' of wmtx/platform into release
推广员充值换榜定时器优化
5 years ago
zhengyongxing 3128c079d3 推广员充值换榜定时器优化 5 years ago
zhengyongxing ef8d16fc6e 推广员充值换榜定时器优化 5 years ago
zhengyongxing acc45f5911 江息网络漏掉的修改 5 years ago
chenzhi bc75da8c14 解决冲突 5 years ago
zhengyongxing 15b9efcd7e 江息网络漏掉的修改 5 years ago
zhengyongxing 1234349844 市场专员业绩计算修改 5 years ago
chenzhi f62cfca22b 隐藏推广公司分成比例 5 years ago
zhengyongxing dbad9a08db Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/promote_statistics
 Conflicts:
	Application/Admin/Common/function.php
	Application/Admin/Controller/TimingController.class.php
5 years ago
chenzhi 21a738054a 隐藏推广公司比例 5 years ago
zhengyongxing 39e2bce6dd 推广员充值统计提交 5 years ago
zhengyongxing 2bc4bf79d9 市场结算管理公司税率提交 5 years ago
ELF 990a2bd206 解决冲突 5 years ago
chenzhi a020cb26df 新增不验证手机 己方 5 years ago
chenzhi 91ae987c3c 优化游戏比例分成无需大于 5 years ago
chenzhi 9dd4a507e9 隐藏模板批量操作 5 years ago
chenzhi f1824fd7b3 优化新增名称 5 years ago
ELF 7c3a001e25 修改 5 years ago
chenzhi 4fde001d4e 优化游戏分成比例不受档位限制 5 years ago
zhengyongxing 682ce333b1 市场结算管理公司税率提交 5 years ago
ELF 102e77267d 修改bug 5 years ago
chenzhi c76cf038cd 己方公司 5 years ago
ELF e94b6418f1 修改 5 years ago
ELF 8224cfb362 修改 5 years ago
ELF 77c692c44d 修改 5 years ago
zhengyongxing ca5c68d078 推广公司编辑添加合并错误去除 5 years ago
zhengyongxing f63b115641 Merge remote-tracking branch 'origin/feature/platfrom_aggregate_finance' into feature/platfrom_aggregate_finance
# Conflicts:
#	Application/Admin/View/PromoteCompany/add.html
#	Application/Admin/View/PromoteCompany/edit.html
5 years ago
zhengyongxing 2fae4219df 公会统计去除 5 years ago
zhengyongxing a8f4f16349 Merge branch 'feature/juhe_sms' into feature/platfrom_aggregate_finance
# Conflicts:
#	Application/Admin/View/PromoteCompany/view.html
#	Data/update.sql
5 years ago
zhengyongxing cd0d9e295f 市场专员结算代码上传 5 years ago
zhengyongxing 379716298a 市场专员结算代码上传 5 years ago
ELF e3b53e7df1 修改 5 years ago
ELF 73f5f4f5ea 修改 5 years ago
ELF 38c10a0f7a 修改 5 years ago
ELF 10aed50db7 修改 5 years ago
ELF f9b054e1cb 修改 5 years ago
ELF 34691d6baa 修改 5 years ago
ELF f0a8b6bc3b 修改 5 years ago
ELF 6f2f588617 优化 5 years ago
yulingwei 2680f92079 1 5 years ago
yulingwei 4058eb3963 1 5 years ago
ELF 76fcfec7c2 修改 5 years ago
yulingwei 22ac6bf293 修复问题 5 years ago
ELF 5f5a6ee1af 修改 5 years ago
zhengyongxing a2408407b7 上传市场专员结算代码 5 years ago
廖金灵 c1163e7b22 Merge branch 'release' of wmtx/platform into master
版本更新2020.06.24
5 years ago
廖金灵 4989deb7be Merge branch 'feature/loginInfo' of wmtx/platform into release
验证码提示样式修改
5 years ago
yulingwei efe84158da 修改错误样式 5 years ago
zhengyongxing c3956f7ed2 平台币金额解释添加 5 years ago
廖金灵 bc00b1112f Merge branch 'feature/apply_game' of wmtx/platform into release
task440
5 years ago
廖金灵 1907985e7b Merge branch 'feature/ylw-06-10' of wmtx/platform into release
新增公司选择默认模板
5 years ago
廖金灵 2fe024f696 Merge branch 'feature/loginInfo' of wmtx/platform into release
新增手机号限制
5 years ago
yulingwei ff9b2249b8 新增公司默认选择默认模板 5 years ago
yulingwei 34df4e5a8e upt 5 years ago
廖金灵 db32f11215 Merge branch 'feature/platfrom_aggregate_finance' of wmtx/platform into release
取消测试的虚拟验证码
5 years ago
chenzhi 7d8dca7421 取消测试的虚拟验证码 5 years ago
chenzhi 95d9f45612 新增检索 5 years ago
廖金灵 a808b86865 Merge branch 'feature/paytime_summary' of wmtx/platform into release
汇付宝
5 years ago
廖金灵 20b401fe85 Merge branch 'feature/promote_withdraw' of wmtx/platform into release
结算中心提现总金额等4个功能隐藏
5 years ago
zhengyongxing bdc5d3a385 结算中心提现总金额等4个功能隐藏 5 years ago
yulingwei c8924779c4 Merge branch 'release' into feature/ylw-06-17 5 years ago
yulingwei 8c18f2aa1d 1 5 years ago
廖金灵 c4ec5753f0 Merge branch 'feature/loginInfo' of wmtx/platform into release
手机验证码登录推广后台
5 years ago
ELF 2d872ed710 解决冲突 5 years ago
ELF 2589806e62 解决冲突 5 years ago
yulingwei 3f4406a1ee Merge branch 'release' into feature/ylw-06-17 5 years ago
yulingwei 0decb03cb1 merge 5 years ago
ELF a153fb9a0e 修改 5 years ago
chenzhi ad801a37fb 优化前端 5 years ago
yulingwei b2b28bce07 upt 5 years ago
yulingwei 5b604ab073 upt 5 years ago
yulingwei cdf2d903cd upt 5 years ago
chenzhi ca551b9c50 己方公司新增搜索项目 5 years ago
chenzhi e0b588be11 新加加载load 5 years ago
chenzhi c335c1f0b3 优化补点和月结集合 5 years ago
chenzhi bffc9a32f1 数据迁移 5 years ago
chenzhi 26ccc9c450 优化导出权限 5 years ago
yulingwei e4a29b8bb4 upt 5 years ago
chenzhi b8610e3490 永星-优化提现提醒 5 years ago
chenzhi 2229e16a9d 永星-优化前端请求 5 years ago