191 Commits (9181011a4d5175242dd329a730f5fe8a4cb71d06)

Author SHA1 Message Date
ELF 6112d6d00c 修改样式 5 years ago
ELF d6a30964b1 修改落地页 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