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

3259 Commits (5f3c726a05c419aa817ceecacb5e835a38729a11)

Author SHA1 Message Date
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
郑永星 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
郑永星 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
郑永星 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
zhengyongxing 99acaed972 公会信息登记功能补充 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 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
郑永星 f4ff2c9666 Merge pull request '公会信息登记信息补充' (#85) from feature/add_item into release 
公会信息登记信息补充
 4 years ago
zhengyongxing f923f4d667 公会信息登记信息补充 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
chenzhi 170895055e 优化重算 4 years ago
zhengyongxing 667c43dc5c 市场业绩上月业绩绩效百分比比对 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 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 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
张谷成 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
chenzhi c5bc599289 优化游戏统计 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
chenzhi 6aeb73b759 优化财务汇总 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
chenzhi 0e54b1c376 优化渠道和测试服订单 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
zhengyongxing 4f2f18ad91 12.28功能提交 4 years ago
zhengyongxing 82592dd457 12.28功能提交 4 years ago
zhengyongxing c716535975 12.28功能提交 4 years ago
zhengyongxing 552a6f8181 12.28功能提交 4 years ago
zhengyongxing 6a86a5e76f 12.18功打款能提交 4 years ago
chenzhi 9ab8454970 优化结算汇总 4 years ago
zhengyongxing 8a6191810b 12.18功打款能提交 4 years ago
chenzhi 40005b7177 优化游戏统计 4 years ago
tping ccf0589e4f 导入 4 years ago
chenzhi c0926299dc 优化平台币充值 4 years ago
tping 824b7b3f06 公会信息导入导出 4 years ago
chenzhi fa9dc518d5 导出 4 years ago
chenzhi 4fdb94c617 优化订单查询 4 years ago
chenzhi 45d883e89c 优化渠道统计 4 years ago
zhengyongxing 8430fa1813 12.18功能提交 4 years ago
chenzhi 19c62de87c 優化公會統計 4 years ago
tping 24fcfc4b90 公会信息 4 years ago
张谷成 0c7e4b2d30 Merge pull request 'hotfix/1211bug' (#35) from hotfix/1211bug into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/35
 4 years ago
tping 304c59be10 甲乙方公司 4 years ago
tping d6f34127df 1 4 years ago
chenzhi 5b5029d570 Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/more_finance_20201211 4 years ago
chenzhi 5f0d0a7101 优化游戏统计导出 4 years ago
chenzhi c5bc21cb36 优化游戏导出 4 years ago
chenzhi f00ef7fcc9 优化导出 4 years ago
chenzhi 236bd8f538 优化财务游戏汇总 4 years ago
chenzhi 76874cf34a 优化游戏统计 4 years ago
张谷成 91701cc612 Merge pull request '公会信息' (#34) from feature/1228zgc into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/34
 4 years ago
廖金灵 feb46d1954 Merge pull request 'feature/add_item_two' (#33) from feature/add_item_two into master 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/33
 4 years ago
zhengyongxing 699449a702 未结算数据的补充 4 years ago
zhengyongxing 0c49d1d655 Merge branch 'release' of 8.136.139.249:wmtx/platform into feature/add_item_two 4 years ago
zhengyongxing c30e396b2c 未结算数据的补充 4 years ago
zhengyongxing 32abdbb390 汇总统计修改 4 years ago
chenzhi fc75b7d81d 优化统计 4 years ago
chenzhi 79588d52e8 优化财务汇总 4 years ago
chenzhi 8ef35174dc 优化个人补点 4 years ago
chenzhi 419793d91b 优化上游结算 4 years ago
tping 0aef9e3019 公会信息 4 years ago
chenzhi e6af0fbcd5 Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/more_finance_20201211 4 years ago
chenzhi b7cc3ccd77 优化权限 4 years ago
chenzhi 3fdc14120f 优化首页折线 4 years ago
郑永星 6699ce1045 Merge pull request '未结算数据的补充' (#23) from feature/add_item into release 
未结算数据的补充
 4 years ago
zhengyongxing f13ee0583c 未结算数据的补充 4 years ago
chenzhi d08691c13a 优化充值列表导出 4 years ago
chenzhi 29636f2922 Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/more_finance_20201211 4 years ago
chenzhi fb798e82bf 优化下游推广公司搜索 4 years ago
chenzhi fe75b57618 合并master 4 years ago
chenzhi 0d533525fe 优化权限修改 4 years ago
廖金灵 342b592976 Merge pull request 'feature/testing_resource_verify_admin' (#11) from feature/testing_resource_verify_admin into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/11
 4 years ago
郑永星 ca8a2ada0e Merge pull request '12月功能提交,手机万能验证码屏蔽提交' (#7) from feature/add_item into release 
12月功能提交,手机万能验证码屏蔽提交
 4 years ago
zhengyongxing 309b195986 12月功能提交 4 years ago
陈志 79ad02ba2e Merge pull request '优化' (#9) from feature/st_mange_20201202 into release 
优化
 4 years ago
chenzhi 1945cae9a5 优化 4 years ago
张谷成 6e63a3857e Merge pull request 'feature/1211' (#8) from feature/1211 into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/8
 4 years ago
tping cf88d4c1db Merge branch 'release' into feature/1211 
# Conflicts:
#	Application/Home/Controller/BaseController.class.php
 4 years ago
tping 6c266178df 数据互通 4 years ago
陈志 9d30d48fac Merge pull request 'feature/st_mange_20201202' (#6) from feature/st_mange_20201202 into release 
优化公式
 4 years ago