chenzhi
|
f92f59601d
|
优化上游结算模板导出
|
4 years ago |
 廖金灵
|
79af51d27b
|
Merge branch 'hotfix/test_resource_new' of wmtx/platform into master
测试资源发放
|
4 years ago |
|
chenzhi
|
98f2711f86
|
合并mas
|
4 years ago |
|
ELF
|
49751b8760
|
测试资源修改
|
4 years ago |
|
chenzhi
|
9ee69f9bd4
|
优化下游结算单导出
|
4 years ago |
|
chenzhi
|
82787ca561
|
优化上游结算单导出模板样式
|
4 years ago |
|
chenzhi
|
efa8cff4c4
|
优化上游导出(乙方)
|
4 years ago |
yulingwei
|
8d1415258f
|
upt
|
4 years ago |
|
chenzhi
|
dcd69c02fb
|
优化模板
|
4 years ago |
|
chenzhi
|
0b0450f29d
|
优化上游模板
|
4 years ago |
|
ELF
|
557f0203ac
|
解决冲突
|
4 years ago |
|
chenzhi
|
61e6d8131c
|
新增支付宝真实名称只能是中文验证
|
4 years ago |
zhengyongxing
|
1fff2e6c09
|
财务代码搬到新的分支上
|
4 years ago |
|
chenzhi
|
69adcbabf8
|
优化推广公司
|
4 years ago |
|
chenzhi
|
819137054e
|
新增查询
|
4 years ago |
|
chenzhi
|
3b6f8c70cc
|
优化可以为空填写
|
5 years ago |
|
chenzhi
|
e770a00cbb
|
优化推广公司必填项目
|
5 years ago |
|
chenzhi
|
9f7e15caac
|
优化推广公司检验规则
|
5 years ago |
|
廖金灵
|
ff5b2e3483
|
Merge branch 'feature/aggregate_finance' of wmtx/platform into release
聚合财务结算单
|
5 years ago |
|
chenzhi
|
2fc38b25b6
|
聚合结算单导出优化2
|
5 years ago |
|
ELF
|
d9cc82f73a
|
修改网站注册
|
5 years ago |
|
ELF
|
908722c5be
|
修改
|
5 years ago |
sunke
|
848eb6c294
|
平台
|
5 years ago |
|
ELF
|
7c25ecbcf8
|
修改
|
5 years ago |
|
ELF
|
173cd3a4b7
|
修改bug
|
5 years ago |
|
ELF
|
3be6a94286
|
修改bug
|
5 years ago |
|
ELF
|
34e1db7684
|
4.4哀悼日
|
5 years ago |
|
ELF
|
2ea55acfd1
|
隐藏礼包数量
|
5 years ago |
|
ELF
|
2a09b5569e
|
修改bug
|
5 years ago |
|
ELF
|
ce89c87e31
|
修改bug
|
5 years ago |
|
ELF
|
1dd60b4051
|
调试
|
5 years ago |
|
ELF
|
dba4fb4e6e
|
调试
|
5 years ago |
|
ELF
|
71e736b27d
|
调试
|
5 years ago |
|
ELF
|
303e471d0b
|
修改bug
|
5 years ago |
|
ELF
|
2a2e5f0d31
|
添加tf礼包问题
|
5 years ago |
|
chenzhi
|
ea69ecb086
|
财务比较2
|
5 years ago |
|
ELF
|
4a1ffd2955
|
解决冲突
|
5 years ago |
|
ELF
|
6112d6d00c
|
修改样式
|
5 years ago |
|
ELF
|
d6a30964b1
|
修改落地页
|
5 years ago |
|
ELF
|
b434d2eacc
|
优化游戏管理
|
5 years ago |
|
ELF
|
0010ca54f7
|
修改落地页样式
|
5 years ago |
|
ELF
|
04bbf3534b
|
修改落地页ios注册
|
5 years ago |
|
ELF
|
3fef1f7910
|
Merge branch 'hotfix/download_name' into release
|
5 years ago |
|
ELF
|
afb5c3b246
|
修改落地页样式
|
5 years ago |
|
yulingwei
|
e26f517df1
|
冲突解决
|
5 years ago |
zhengchanglong
|
858c028faf
|
Merge branch 'feature/add_promote_company' into release
# Conflicts:
# Data/update.sql
|
5 years ago |
|
zhengyongxing
|
e6d136410d
|
Merge branch 'feature/admin_optimize' into release
|
5 years ago |
liuweiwen
|
e15460b08f
|
合作方
|
5 years ago |
chenzhi
|
f507dde70b
|
新增推广公司导出功能
|
5 years ago |
|
yulingwei
|
dfe52865bd
|
upt
|
5 years ago |
|
chenzhi
|
1f1e75e736
|
新增推广公司添加
|
5 years ago |
|
ELF
|
227c6e6ef9
|
添加推广员搜索功能添加组名/部门名
|
5 years ago |
|
ELF
|
526bbc1556
|
添加ios下载控制功能
|
5 years ago |
|
ELF
|
d3a3b8cdb7
|
修改
|
5 years ago |
|
ELF
|
0f44d9e95c
|
解决冲突
|
5 years ago |
|
zhengchanglong
|
bb08c723a3
|
Merge branch 'feature/group_type' into release-1.0.1
|
5 years ago |
|
chenzhi
|
dbc0e00132
|
合并
|
5 years ago |
liuweiwen
|
57a1d8ed8c
|
对账系统
|
5 years ago |
|
zhengchanglong
|
1c00290da9
|
Merge branch 'feature/group_type' into dev
# Conflicts:
# Data/update.sql
|
5 years ago |
|
liuweiwen
|
394a3e4bb5
|
cp/工会对账系统
|
5 years ago |
chenxiaojun
|
114cb2f7a5
|
更新
|
5 years ago |
|
chenxiaojun
|
f2e0cec5aa
|
更新
|
5 years ago |
|
chenxiaojun
|
0927417ce9
|
推广结算--更新
|
5 years ago |
|
ELF
|
f472f5e9d3
|
文件保存改成cdn
|
5 years ago |
|
ELF
|
297ca262b6
|
修改落地页样式
|
5 years ago |
|
ELF
|
4cfad7166d
|
修改落地页样式
|
5 years ago |
|
ELF
|
67caddeef0
|
修改落地页样式
|
5 years ago |
|
ELF
|
5e0c1c0f87
|
修改
|
5 years ago |
|
liuweiwen
|
7a0280f50c
|
excel下载模板
|
5 years ago |
|
liuweiwen
|
263937f83e
|
落地页增加登录注册等静态页面
|
5 years ago |
|
chenzhi
|
8bd7ae4fdb
|
优化框架层级问题
|
5 years ago |
|
chenzhi
|
95f055b532
|
修改下拉框层级太大问题
|
5 years ago |
|
liuweiwen
|
dabdbb6c98
|
落地页测试
|
5 years ago |
|
liuweiwen
|
8f99c7354a
|
落地页测试
|
5 years ago |
|
liuweiwen
|
d7bd8326bd
|
落地页测试
|
5 years ago |
|
liuweiwen
|
b608f8587b
|
落地页测试
|
5 years ago |
|
liuweiwen
|
5bebb747f7
|
落地页样式调整测试
|
5 years ago |
|
liuweiwen
|
656c1a9bbb
|
落地页样式调整测试
|
5 years ago |
|
liuweiwen
|
50bea19cd2
|
落地页样式调整测试
|
5 years ago |
|
liuweiwen
|
c6588a4c35
|
落地页样式调整测试
|
5 years ago |
|
liuweiwen
|
d0eb964808
|
落地页样式调整测试
|
5 years ago |
|
zhengchanglong
|
7c7ec4fc1d
|
Merge branch 'dev_permission' into release-1.0.0
# Conflicts:
# Application/Admin/Common/function.php
# Application/Admin/Controller/BehaviorLogController.class.php
# Application/Admin/Controller/ExportController.class.php
|
5 years ago |
|
liuweiwen
|
c07ba38dbf
|
官网充值
|
5 years ago |
|
liuweiwen
|
e5067479d7
|
官网充值
|
5 years ago |
|
liuweiwen
|
42ccd44de3
|
Merge branch 'dev_lww' into dev_permission
# Conflicts:
# Application/Admin/Common/extend.php
# Application/Admin/Controller/MendController.class.php
# Application/Admin/Controller/PromoteController.class.php
# Application/Admin/Model/MemberModel.class.php
|
5 years ago |
|
zhengyongxing
|
4a5a6a90d0
|
Merge branches 'dev_permission' and 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_permission
Conflicts:
Data/update.sql
|
5 years ago |
|
chenzhi
|
ff6c70e380
|
合并cz
|
5 years ago |
|
zhengyongxing
|
d545c22c3b
|
数据管理功能提交
|
5 years ago |
|
liuweiwen
|
e30f2f9601
|
Merge branch 'dev' into dev_lww
# Conflicts:
# Application/Admin/Controller/FileController.class.php
# Application/Admin/Controller/GameController.class.php
# Application/Admin/View/Game/edit.html
# Application/Home/Controller/HomeController.class.php
# Application/Home/View/default/Home/landingPage.html
# Public/Home/css/index2.css
|
5 years ago |
|
chenxiaojun
|
d6186a9579
|
推广平台>落地页--更新
|
5 years ago |
|
liuweiwen
|
0b67ef8eb3
|
pc官网-》家长监护页-》导航样式调整
|
5 years ago |
|
chenzhi
|
6188102e04
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz
|
5 years ago |
|
liuweiwen
|
188abdcbdd
|
落地页视频置顶判断
|
5 years ago |
|
chenzhi
|
1649cd1e80
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz
|
5 years ago |
|
liuweiwen
|
c31ae44f79
|
落地页去掉App购买
|
5 years ago |
|
chenzhi
|
5359e67860
|
优化补链记录为ajax
|
5 years ago |
|
liuweiwen
|
99f175eece
|
落地页样式调整
|
5 years ago |
|
liuweiwen
|
52b134fe90
|
落地页样式调整
|
5 years ago |
|
liuweiwen
|
ce85de6f5c
|
落地页新增需求-增加app购买浮层
|
5 years ago |
|
liuweiwen
|
4aa33ad48b
|
落地页视屏
|
5 years ago |