3289 Commits (02150820185fabd61b744c135d81fda0cad2247f)

Author SHA1 Message Date
chenzhi f0d20598de 新增商户权限 4 years ago
chenzhi ef4702fb46 暂存 4 years ago
郑永星 fe4a029ce4 Merge branch 'hotfix/market_percentage' of wmtx/platform into release 4 years ago
zhengyongxing 1372b5b15d Merge remote-tracking branch 'origin/hotfix/market_percentage' into hotfix/market_percentage 4 years ago
zhengyongxing 7aa031bbb4 市场结算管理优化 4 years ago
chenzhi 3b3ed208e2 财务汇总新增测试订单收入 4 years ago
chenzhi 837c09716d 财务汇总-支付时间 4 years ago
廖金灵 37a84b8ce7 Merge branch 'feature/company_game_rotio_perm' of wmtx/platform into release
修改推广游戏分成市场专员权限控制
4 years ago
zhengyongxing f9503182da 市场结算管理优化 4 years ago
廖金灵 613b50eb63 Merge branch 'hotfix/market_percentage' of wmtx/platform into release
支付渠道跳转增加
4 years ago
zyx 2a236849b8 充值信息查看权限默认开启 4 years ago
zhengyongxing f18db12d69 支付渠道跳转增加 4 years ago
廖金灵 c8af2d79ff Merge branch 'feature/deposit' of wmtx/platform into release
修改时间问题
4 years ago
廖金灵 a2474aaa0b Merge branch 'feature/reward' of wmtx/platform into release
修改时间
4 years ago
yulingwei b1a91339cb Merge branch 'feature/deposit' of 47.111.118.107:wmtx/platform into feature/deposit 4 years ago
yulingwei 1634f14fb2 upt 4 years ago
yulingwei a01beb9bc6 upt 4 years ago
郑永星 f01030ffaa Merge branch 'hotfix/market_percentage' of wmtx/platform into release 4 years ago
zhengyongxing d9d66dc5bf 支付渠道跳转增加 4 years ago
陈志 575c074c39 Merge branch 'fix/change_statement_time' of wmtx/platform into release 4 years ago
chenzhi b63369cdba 优化结算方式查询 4 years ago
chenzhi c6b3d1948e 优化打款剔除后显示 4 years ago
廖金灵 697dad95c8 Merge branch 'hotfix/market_percentage' of wmtx/platform into release
支付渠道跳转增加
4 years ago
zhengyongxing 4c582e51c7 支付渠道跳转增加 4 years ago
廖金灵 d6790fdf6c Merge branch 'feature/plateform_statistics' of wmtx/platform into release
修改导出问题
4 years ago
yulingwei 08400bd67a upt 4 years ago
廖金灵 86b8682d02 Merge branch 'hotfix/market_percentage' of wmtx/platform into release
支付渠道跳转增加
4 years ago
zhengyongxing 0c4f1f05bd 支付渠道跳转增加 4 years ago
廖金灵 fc7284de94 Merge branch 'feature/reward' 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 9e53db53cd upt 4 years ago
yulingwei de0fc5e074 upt 4 years ago
chenzhi 205c6a83f8 优化上游结算 4 years ago
chenzhi 6f75b0e6d8 优化结算单无地址 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
廖金灵 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 开启测试验证码 4 years ago
chenzhi b0034d5f19 优化推广公司游戏申请不审核 4 years ago
chenzhi a948986b41 优化上游导出 4 years ago
chenzhi 62f2bc350d 优化时间控件 4 years ago
chenzhi 5c857840a2 分成比例新增生效检索 4 years ago
chenzhi 94a3057013 新增游戏分成比例导出 4 years ago
chenzhi ac65098827 Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/finance_statement723 4 years ago
廖金灵 5f0917220c Merge branch 'feature/platfrom_aggregate_finance' of wmtx/platform into release
推广分成特殊申请
4 years ago
chenzhi 8e4541cb01 推广分成特殊申请 4 years ago
廖金灵 762c93d89e Merge branch 'feature/platfrom_aggregate_finance' of wmtx/platform into release
优化电话不限制
4 years ago
chenzhi b1790a8897 优化手机不限制 4 years ago
廖金灵 c67cbc61c2 Merge branch 'feature/platfrom_aggregate_finance' of wmtx/platform into release
优化电话不限制
4 years ago
chenzhi 0430293bb7 优化电话不限制 4 years ago
chenzhi 1e3b1dad66 优化排序 4 years ago
廖金灵 4869d650d9 Merge branch 'feature/cp_juhe_company' of wmtx/platform into release
时间格式修正,导出格式修改
4 years ago
zhengyongxing 815e2e3b88 时间格式修正,导出格式修改 4 years ago
chenzhi 6024ae342c 优化顺序及导出 4 years ago
zhengyongxing 08e221a53c 商户专员隐藏 4 years ago
chenzhi 8ded1f3169 优化游戏模板显示 4 years ago
chenzhi 4460f8e7cf 新增结算包名 4 years ago
廖金灵 a958f8c043 Merge branch 'feature/cp_juhe_company' of wmtx/platform into release
聚合公司详情详细网址条件修改
4 years ago
zhengyongxing 52fe6d04f8 聚合公司详情详细网址修改 4 years ago
廖金灵 a70a494102 Merge branch 'feature/cp_juhe_company' of wmtx/platform into release
聚合公司详情详细网址修改
4 years ago
zhengyongxing 4325ed23ee 聚合公司详情详细网址修改 4 years ago
chenzhi 3ff79ce6c1 优化公会检索 4 years ago
chenzhi 832f531d20 优化审核通过 4 years ago
廖金灵 b8532da607 Merge branch 'feature/cp_juhe_company' of wmtx/platform into release
聚合公司详情详细地址格式修改
4 years ago
zhengyongxing 5bbdfe7e74 聚合公司详情详细地址修改 4 years ago
ELF 557f0203ac 解决冲突 4 years ago
廖金灵 5d809ae9b8 Merge branch 'feature/platfrom_aggregate_finance' of wmtx/platform into release
优化合同期限查询
4 years ago
chenzhi eaa6762935 优化模板错误 4 years ago
ELF 62d7f15fdc Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/promote_landing_assign 4 years ago
chenzhi 0197743266 优化合同期限查询 4 years ago
zhengyongxing 68f8bb1ce0 聚合公司详情详细地址修改 4 years ago
chenzhi 4dd8526e2b 优化日志 4 years ago
chenzhi 3ad0d447d4 优化显示 4 years ago
chenzhi 4501036ba8 优化导出错误 4 years ago
chenzhi 069cc1599a 优化上游检索 4 years ago
chenzhi 5a962e1b73 新增分成优化 4 years ago
zhengyongxing 26f13922a1 聚合公司时间修正 4 years ago
chenzhi 0237e0ff63 优化导出 4 years ago
chenzhi 6181059faf 优化搜索 4 years ago
chenzhi 945f033df5 Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/platfrom_aggregate_finance 4 years ago
chenzhi 10e56211ce 优化导出提示 4 years ago
chenzhi 1ec951d344 优化空值显示 4 years ago
chenzhi 61e6d8131c 新增支付宝真实名称只能是中文验证 4 years ago
chenzhi f66bce14b2 优化下游列表显示及导出 4 years ago
chenzhi 5894324ca8 旧数据脚本 4 years ago
chenzhi 94cbae1924 优化打款提醒 4 years ago
chenzhi c733fc2e15 优化游戏删除 4 years ago
chenzhi d015bce440 优化推广下游查看 4 years ago
chenzhi 80e8477b51 新增检索 4 years ago
ELF c127ea6139 修改bug 4 years ago
ELF 546d83f4a3 修改bug 4 years ago
ELF bb8052614b 修改推广游戏分成市场专员权限控制 4 years ago
chenzhi a3f28b67a5 新增游戏搜索 4 years ago
zhengyongxing 1fff2e6c09 财务代码搬到新的分支上 4 years ago
zhengyongxing 341fa19b6f 聚合公司功能提交 4 years ago
zhengyongxing 2fe7c864df 聚合公司功能提交 4 years ago
zhengyongxing 420723f593 商户充值汇总更改名称 4 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 6c23a3ee52 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
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