elf
/
cf-platform
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,661 Commits
1 Branch
0 Tags
154 MiB
master
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '9973e72bf3'
${ noResults }
Commit Graph

6551 Commits (9973e72bf3ead121464d12d8d32f0ed6387a7c47)

Author SHA1 Message Date
zhengyongxing 735823d792 工会统计bug修改 4 years ago
elf@home 23643d2e0b 修改 4 years ago
廖金灵 ea21c1ee49 Merge pull request '修改i哎' (#133) from feature/add_promote_level_id into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/133
 4 years ago
ELF 874ba3a705 修改i哎 4 years ago
廖金灵 a217127548 Merge pull request '优化' (#132) from feature/add_promote_level_id into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/132
 4 years ago
ELF 91996da3a2 优化 4 years ago
郑永星 42550a32fb Merge pull request '1.28功能提交' (#131) from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/131
 4 years ago
zhengyongxing 199b5e0f51 1.28功能提交 4 years ago
郑永星 5c5fc23210 Merge pull request '1.28功能提交' (#130) from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/130
 4 years ago
zhengyongxing cd1f84fb37 1.28功能提交 4 years ago
廖金灵 9af9edef0a Merge pull request '优化' (#129) from feature/add_promote_level_id into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/129
 4 years ago
ELF a3d3b5722c 优化 4 years ago
郑永星 a5ed9cf3cf Merge pull request '1.28功能提交' (#128) from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/128
 4 years ago
zhengyongxing a1c809d7eb 1.28功能提交 4 years ago
郑永星 3d09dcf4b5 Merge pull request '1.28功能提交' (#127) from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/127
 4 years ago
zhengyongxing 338c0369d1 1.28功能提交 4 years ago
郑永星 8d9ca939d6 Merge pull request '1.28功能提交' (#126) from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/126
 4 years ago
zhengyongxing 25ec474c1c 1.28功能提交 4 years ago
郑永星 e9be27136f Merge pull request '1.28功能提交' (#121) from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/121
 4 years ago
zhengyongxing 77f7eda10f 1.28功能提交 4 years ago
廖金灵 dcbc152712 Merge pull request '优化' (#125) from feature/add_promote_level_id into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/125
 4 years ago
ELF 4f3c21263d 优化 4 years ago
陈志 dcb2e68346 Merge pull request '优化提示' (#124) from feature/finance_payment_20210115 into release 
优化提示
 4 years ago
chenzhi 3947f12f54 优化提示 4 years ago
陈志 b9f83d7f15 Merge pull request '优化打款信息' (#123) from feature/finance_payment_20210115 into release 
优化打款信息
 4 years ago
chenzhi 9a0ba40d6d 优化打款信息 4 years ago
tping 6ed8fee113 1 4 years ago
tping de31285f85 Merge branch 'release' into feature/0128 4 years ago
tping a865b9d669 文字修改 4 years ago
zhengyongxing 88fc0e2926 1.28功能提交 4 years ago
郑永星 e1a05cb9fe Merge pull request '1.28功能提交' (#120) from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/120
 4 years ago
zhengyongxing 45ed2e7f16 1.28功能提交 4 years ago
郑永星 272eca3f9a Merge pull request '1.28功能提交' (#119) from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/119
 4 years ago
zhengyongxing 7a2e4d9033 1.28功能提交 4 years ago
郑永星 e4fb38e5f7 Merge pull request '1.28功能提交' (#118) from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/118
 4 years ago
zhengyongxing 3c1a7a2e61 1.28功能提交 4 years ago
郑永星 154c0989c8 Merge pull request '1.28功能提交' (#117) from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/117
 4 years ago
zhengyongxing 7e4f8ca78d 1.28功能提交 4 years ago
郑永星 5a232e6bb6 Merge pull request '1.28功能提交' (#116) from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/116
 4 years ago
zhengyongxing 3c566fb2ae 1.28功能提交 4 years ago
tping c59b8d1419 导出所有 4 years ago
tping cfd4368fe5 1 4 years ago
tping 5c22a252a3 Merge branch 'release' into feature/0128 4 years ago
tping a5b977aa00 导出所有 4 years ago
廖金灵 7194d5a945 Merge pull request '优化' (#112) from feature/add_promote_level_id into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/112
 4 years ago
ELF 0aa3c514d7 优化 4 years ago
陈志 14ba644fda Merge pull request '优化提醒名词' (#111) from feature/testing_daily_count into release 
Re优化提醒名词
 4 years ago
chenzhi 9d9ef7a79b 优化提醒名词 4 years ago
陈志 98f9c61104 Merge pull request '优化排序' (#110) from feature/testing_daily_count into release 
优化排序
 4 years ago
chenzhi 746388dd00 优化排序 4 years ago
陈志 b690ef68a2 Merge pull request 'feature/testing_daily_count' (#109) from feature/testing_daily_count into release 
优化菜单适配
 4 years ago
chenzhi 3f88e7dc6f 优化菜单适配 4 years ago
chenzhi b19853edd3 优化菜单 4 years ago
zhengyongxing 8a49578cc4 Merge branch 'release' of 8.136.139.249:wmtx/platform into feature/add_item 4 years ago
zhengyongxing 104051d90f 1.28功能提交 4 years ago
陈志 0b55550a62 Merge pull request 'feature/testing_daily_count' (#107) from feature/testing_daily_count into release 
优化首页提醒
 4 years ago
chenzhi 13d0c6fa59 优化首页提醒 4 years ago
zhengyongxing c7730d5d06 Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/add_item 4 years ago
ELF 9e68e40200 解决冲突 4 years ago
chenzhi 2658c50c3a 新增测试资源统计 4 years ago
ELF 531b94bae8 版本 4 years ago
郑永星 f4bb1cc5e2 Merge pull request '1.28功能提交' (#105) from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/105
 4 years ago
zhengyongxing f710113820 1.28功能提交 4 years ago
郑永星 fec6edf48c Merge pull request '1.28功能提交' (#104) from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/104
 4 years ago
zhengyongxing 14be887ebb 1.28功能提交 4 years ago
郑永星 747082fc0d 1.28功能提交 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/103
 4 years ago
zhengyongxing ee463829d2 1.28功能提交 4 years ago
chenzhi 2e2ff8e1d7 Merge branch 'release' of 8.136.139.249:wmtx/platform into feature/finance_payment_20210115 4 years ago
chenzhi 027c803343 优化打款备注 4 years ago
郑永星 31d831e39a Merge pull request '1.28功能提交' (#101) from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/101
 4 years ago
zhengyongxing 0080dc75d7 1.28功能提交 4 years ago
chenzhi a845ff4d84 Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/finance_payment_20210115 4 years ago
elf@home 34e25f293a 推广员添加每级id 4 years ago
郑永星 6c1c82b649 Merge pull request '1.28功能提交' (#100) from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/100
 4 years ago
zhengyongxing 58e8efbd7f 1.28功能提交 4 years ago
zhengyongxing deff984922 1.28功能提交 4 years ago
廖金灵 e31fec8a5c Merge pull request '修改' (#98) from feature/jpck into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/98
 4 years ago
ELF d08df7feba 修改 4 years ago
陈志 3df6e7246a Merge pull request 'feature/finance_payment_20210115' (#97) from feature/finance_payment_20210115 into release 
新增线上转线下打款
 4 years ago
chenzhi 684ea81b6a 新增线上转线下打款 4 years ago
廖金灵 293f2941be Merge pull request '剑破长空测试资源接口' (#96) from feature/jpck into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/96
 4 years ago
ELF 07c95d2ea7 剑破长空测试资源 4 years ago
chenzhi 7617ee8a4c 优化支付导出 4 years ago
chenzhi 28eedef4ed 优化支付宝信息更新 4 years ago
chenzhi 1427e7e744 新增更新支付信息功能ok 4 years ago
郑永星 af3a48f0d8 Merge pull request '奖惩限制逻辑修改' (#94) from hotfix/reward_limit into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/94
 4 years ago
zhengyongxing 508f4abef1 奖惩限制逻辑修改 4 years ago
zhengyongxing 963e806218 奖惩限制逻辑修改 4 years ago
zhengyongxing 14a0e564e1 Merge branch 'release' of 8.136.139.249:wmtx/platform into hotfix/rewardlimit 4 years ago
zhengyongxing 2366a215a2 奖惩先去除限制逻辑 4 years ago
zhengyongxing b7c671ef1c 结算单汇总功能提交 4 years ago
chenzhi c45d82ff75 取消打款查看 4 years ago
zhengyongxing 99acaed972 公会信息登记功能补充 4 years ago
zhengyongxing eb6e027ef7 汇总结算单导出功能补充 4 years ago
zhengyongxing 6243ca60cf Merge branch 'release' of 8.136.139.249:wmtx/platform into feature/add_item_two 
 Conflicts:
	Application/Admin/Controller/SocietyInfoController.class.php
	Public/static/area.js
 4 years ago
zhengyongxing a199a12d4b 工会信息bug修改 4 years ago
zhengyongxing 64a565d908 1.28功能提交 4 years ago
zhengyongxing 0fe7e58c61 市场业绩离职功能提交导出修正 4 years ago
zhengyongxing c9ef39ada9 市场业绩离职功能提交导出修正 4 years ago
zhengyongxing d3e9f113ba 市场业绩离职功能提交导出修正 4 years ago
廖金灵 c7a22ce7dd Merge pull request '特殊补点导出修正' (#89) from feature/add_item_two into master 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/89
 4 years ago
郑永星 6c6f458d8b Merge pull request '特殊补点导出修正' (#88) from feature/add_item_two into release 
特殊补点导出修正
 4 years ago
zhengyongxing 7054f82fde 特殊补点导出修正 4 years ago
zhengyongxing 6e767a739c 市场业绩功能提交 4 years ago
郑永星 5ce0be3fe2 Merge pull request '公会信息登记信息补充' (#87) from feature/add_item into release 
公会信息登记信息补充
 4 years ago
zhengyongxing 3beeb81063 公会信息登记信息补充 4 years ago
郑永星 fa3943cda4 Merge pull request '公会信息登记信息补充' (#86) from feature/add_item into release 
公会信息登记信息补充
 4 years ago
zhengyongxing e0430cfb46 公会信息登记信息补充 4 years ago
郑永星 f4ff2c9666 Merge pull request '公会信息登记信息补充' (#85) from feature/add_item into release 
公会信息登记信息补充
 4 years ago
zhengyongxing f923f4d667 公会信息登记信息补充 4 years ago
陈志 55e29b571c Merge pull request 'feature/more_finance_20201211' (#83) from feature/more_finance_20201211 into release 
优化公式
 4 years ago
chenzhi 174219d9d5 优化公式 4 years ago
chenzhi 197e129f04 优化结算比例公式 4 years ago
郑永星 9ed794a56c Merge pull request 'feature/add_item' (#82) from feature/add_item into release 
公会信息录入功能添加
 4 years ago
zhengyongxing e775701c78 公会信息登记导出补充 4 years ago
zhengyongxing 9fceedd10e 模板下载功能添加 4 years ago
zhengyongxing 07ee17ca1d 公会信息录入功能添加 4 years ago
ELF 3dfc92ecc3 修改下载超时 4 years ago
chenzhi 170895055e 优化重算 4 years ago
zhengyongxing 667c43dc5c 市场业绩上月业绩绩效百分比比对 4 years ago
zhengyongxing b073f3e8cd 特殊补点编辑修改 4 years ago
zhengyongxing fecb58efdd 特殊补点编辑修改 4 years ago
chenzhi 6dd2558350 Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/more_finance_20201211 4 years ago
chenzhi 3a629d63ea 优化结算人 4 years ago
tping 32d3160320 Merge branch 'feature/add_item' into hotfix/company_bug 4 years ago
zhengyongxing a641ff2526 上游公司分页修改 4 years ago
tping 8897a87342 甲乙方公司 4 years ago
廖金灵 5c119e2d76 Merge pull request '优化登陆' (#68) from feature/more_finance_20201211 into master 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/68
 4 years ago
chenzhi e6e408845b 优化cw只能登陆子系统 4 years ago
chenzhi 8323fafd30 优化只读账号 4 years ago
chenzhi 343ecc8587 优化登陆 4 years ago
廖金灵 54266852cc Merge pull request 'feature/more_finance_20201211' (#67) from feature/more_finance_20201211 into master 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/67
 4 years ago
chenzhi 12f4cda850 优化商户筛选 4 years ago
chenzhi 36e9125363 新增测试订单 4 years ago
chenzhi 96c937b7d3 优化日志 4 years ago
chenzhi c85e9a831f 优化消息异步 4 years ago
张谷成 79872bbaf7 Merge pull request '优化' (#64) from feature/1228zgc into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/64
 4 years ago
tping 5775e7f02e 优化 4 years ago
chenzhi 14bb68b82e 优化业绩提成 4 years ago
张谷成 83148cd777 Merge pull request '优化' (#63) from feature/1228zgc into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/63
 4 years ago
tping 9f329b7c34 优化 4 years ago
chenzhi df2da60986 优化市场部毛利 4 years ago
张谷成 5410a1cb2e Merge pull request '时间格式' (#61) from feature/1228zgc into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/61
 4 years ago
tping 98ebb36aa3 时间格式 4 years ago
chenzhi 1b0124606a 优化市场结算脚本 4 years ago
张谷成 049f08af72 Merge pull request '优化' (#59) from feature/1228zgc into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/59
 4 years ago
tping e3f020965d 优化 4 years ago
张谷成 5de3b95d54 Merge pull request '优化' (#58) from feature/1228zgc into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/58
 4 years ago
tping b4c3b64fb0 优化 4 years ago
张谷成 2123ad9ef4 Merge pull request '优化' (#57) from feature/1228zgc into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/57
 4 years ago
tping e57a5f8e50 优化 4 years ago
chenzhi 382f2527a0 优化新增条件 4 years ago
张谷成 a97e94fc21 Merge pull request '1' (#56) from feature/1228zgc into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/56
 4 years ago
tping ee34cc86f5 1 4 years ago
郑永星 a6812d26e4 Merge pull request '短信验证万能验证码注释' (#55) from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/55
 4 years ago
chenzhi c5bc599289 优化游戏统计 4 years ago
zhengyongxing f5e2adb860 短信验证万能验证码注释 4 years ago
chenzhi 813aebfd64 优化统计 4 years ago
郑永星 c62ad6e69d Merge pull request '12.28功能提交' (#54) from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/54
 4 years ago
zhengyongxing 9c0006ef45 12.28功能提交 4 years ago
郑永星 a9aca61c73 Merge pull request '12.28功能提交' (#53) from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/53
 4 years ago
zhengyongxing f855835501 12.28功能提交 4 years ago
chenzhi 7ccf5e5857 Merge branch 'release' of 8.136.139.249:wmtx/platform into feature/more_finance_20201211 4 years ago
郑永星 444cff5f64 Merge pull request '12.28功能提交' (#52) from feature/add_item into release 
12.28功能提交
 4 years ago
zhengyongxing d1b0ec55a8 12.28功能提交 4 years ago
郑永星 1496fa349a Merge pull request '12.28功能提交' (#51) from feature/add_item into release 
12.28功能提交
 4 years ago
zhengyongxing 0293fd7ff1 12.28功能提交 4 years ago
chenzhi f0829e84cc 优化统计 4 years ago
zhengyongxing bb73235874 12.28功能提交 4 years ago
郑永星 12434fb840 Merge pull request 'feature/add_item' (#50) from feature/add_item into release 
12.28功能提交
 4 years ago
chenzhi be8a30a2e8 合并 4 years ago
chenzhi b1a34cc9a0 优化不打款汇总 4 years ago
zhengyongxing e84ce56293 12.28功能提交 4 years ago
chenzhi 19f7406298 优化结算 4 years ago
万盟天下 459026d842 Merge pull request '修改bug' (#49) from feature/leniu_testing_resource into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/49
 4 years ago
ELF a70bffaee3 修改bug 4 years ago
万盟天下 4917d4806f Merge pull request '调试bug' (#48) from feature/leniu_testing_resource into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/48
 4 years ago
ELF 4f4929ad72 修改 4 years ago
万盟天下 9ded6cb0bd Merge pull request '剑仙诀添加资源发放接口' (#47) from feature/leniu_testing_resource into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/47
 4 years ago
chenzhi 6aeb73b759 优化财务汇总 4 years ago
ELF 932a082134 剑仙诀添加资源发放接口 4 years ago
chenzhi 90de336434 优化数据 4 years ago
zhengyongxing 08d235c03a 12.28功能提交 4 years ago
zhengyongxing 3c166a913e Merge branch 'feature/update_payment' into feature/add_item 
# Conflicts:
#	Application/Admin/Controller/CompanyStatementOfflineController.class.php
#	Application/Admin/Controller/StatementMangementController.class.php
#	Application/Payment/Controller/PaymentController.class.php
#	Application/Payment/View/Payment/lists.html
#	Data/update.sql
 4 years ago
chenzhi b6c87bfefe 优化首页 4 years ago
张谷成 1c1ef2e6a9 Merge pull request 'feature/1228zgc' (#46) from feature/1228zgc into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/46
 4 years ago
郑永星 cd2d9b3bc2 Merge pull request '12.28功能提交' (#44) from feature/update_payment into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/44
 4 years ago
zhengyongxing e0f17ea195 12.28功能提交 4 years ago
chenzhi 0e54b1c376 优化渠道和测试服订单 4 years ago
郑永星 11c7c542f8 Merge pull request '12.28功能提交' (#43) from feature/update_payment into release 
12.28功能提交
 4 years ago
zhengyongxing d0ee96f7b5 12.28功能提交 4 years ago
郑永星 db487f1033 Merge pull request 'feature/update_payment' (#42) from feature/update_payment into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/42
 4 years ago
zhengyongxing ac70fd3f79 12.28功能提交 4 years ago
zhengyongxing f4027b75b3 12.28功能提交 4 years ago
zhengyongxing eb8478fbb7 12.28功能提交 4 years ago
郑永星 21f957f46f Merge pull request '12.28功能提交' (#41) from feature/update_payment into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/41
 4 years ago
zhengyongxing 08153a8359 12.28功能提交 4 years ago
郑永星 ad7dc1f46d Merge pull request 'feature/update_payment' (#40) from feature/update_payment into release 
12.28功能提交
 4 years ago
zhengyongxing ffa78964ec 12.28功能提交 4 years ago
zhengyongxing 29e8421266 12.28功能提交 4 years ago