elf
/
qy-platform
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,485 Commits
1 Branch
0 Tags
173 MiB
Commit Graph

1276 Commits (275c0a80229477e3a9243c54c5f4f675e4071aa6)

Author SHA1 Message Date
chenxiaojun 265aa20a60 推广后台->验证安全密码--更新
chenxiaojun b731b827e1 推广后台->验证安全密码--更新
chenxiaojun 43eaaf67c6 推广后台->验证安全密码--更新
chenxiaojun f5d6bd27ab 推广后台->验证安全密码--更新
chenxiaojun 03cbc66d92 推广后台->验证安全密码--更新
chenxiaojun 1561e71977 推广后台->验证安全密码--更新
zyx 602e53e82f 合并分支dev_zyx财务部分的代码
chenxiaojun 8ae754f74a 推广后台->财务管理->结算明细--更新
ELF 71feea26fb 修改bug
ELF 89b243930d 落地页下载页优化
zhengchanglong 561b183bec Merge branch 'dev_zyx' into dev
chenzhi a9bc64a4b2 优化统计逻辑
zhengchanglong 78e23d19b2 Merge branch 'dev_zyx' into dev
zyx 8fd435a324 月结统计，游戏查看名称修改
chenxiaojun a32565e2e1 推广后台->数据管理->数据汇总|每日概况--更新
chenxiaojun 7220247ecd 推广后台->数据管理->数据汇总|每日概况--更新
zhengchanglong e5c834e054 Merge branch 'dev_zyx' into dev
zyx 4dfec50ba5 月结统计修改
chenxiaojun 43603cf493 推广后台->数据管理->数据汇总--更新
chenzhi 0ae24bf2cd 优化财务聚合接口2
chenzhi 58c405e914 优化财务聚合接口
ELF c3502c6120 打包添加ios13兼容
chenzhi 0df9045e67 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
chenzhi f54305911c 优化api暂存
chenxiaojun 3e2d027910 推广后台->财务管理->结算明细--更新
chenxiaojun fba89ccb48 推广后台->财务管理->结算明细--更新
chenxiaojun 1d6ce31515 推广后台->财务管理->结算明细--更新
chenxiaojun 30aff2bd38 推广后台->财务管理->新增->结算明细
ELF dbf113d9d4 修改bug
ELF 6c6b3b54aa Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
ELF 7547e867bb 三级变四级修改
ELF fc89281a48 3级变4级修改
chenzhi eacdea6f9b 暂存修改
chenzhi a9b7b22a4b Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
chenzhi 81192f36c8 xiufu
sunke 372ec046d0 安全中心
zyx 3d8ed52daf 推广后台首页条件修改
chenzhi 6c45b4dd3f 修改获取下级函数
ELF ae44fc79bd 修改
zhengchanglong 879accf9f5 Merge branch 'dev_zyx' into dev
zyx f44a11a915 月结统计提示语修改
chenzhi 2a7d4a435c Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
chenzhi 18be299b4c 同步dev
zhengchanglong 78846c699f Merge branch 'dev_zyx' into dev
zyx 9539b38e86 月结统计提示语修改
jbrazz 48b1cdf66f upt
zhengchanglong 3c3a13c068 Merge branch 'dev_zyx' into dev
zyx f0559c3576 Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx 
 Conflicts:
	Application/Admin/View/Finance/index.html
zyx cfa33d3e42 月结统计提示语修改
jbrazz a8125bf377 upt
zhengchanglong 9dd5a34bf7 Merge branch 'dev_zyx' into dev
zyx a850cfa048 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
chenzhi 50c775a78b Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
zyx 71b2287647 测试资源日志管理修改
chenzhi f9397efebf 修改总流水统计方式
chenxiaojun b6a62e2df1 推广后台->数据管理->每日概况 -- 更新
zhengchanglong 6dcd1549d0 Merge branch 'dev_zyx' into dev 
# Conflicts:
#	Data/update.sql
zyx 5a7432ef40 月结统计新增平台比收入字段，将平台币流水改为平台币支出
chenzhi c8da11a12e 新增平台币流水充值
chenxiaojun 81ed43afdd 推广后台->数据管理->每日概况|数据汇总 -- 更新
zyx b6080180ab 测试资源bug修正
chenzhi b4c9f60ac9 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
elf@home fc1cef9ec1 修改落地页/下载页
ELF b4168a23f1 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
ELF edc40b8a1b ss
chenzhi 8212b4ecaf 4级推广申请资源修正
chenzhi 498de9ab75 同步dev
chenzhi ab2252375d Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
chenzhi c8fb1bb207 修改
chenxiaojun 681c401686 推广后台->数据管理->每日概况|数据汇总 -- 更新
chenxiaojun 42d330bbc4 推广后台->数据管理->每日概况|数据汇总 -- 更新
chenxiaojun b1b10645fc 推广后台->数据管理->每日概况|数据汇总 -- 更新
ELF 689cc08b69 修改
zhengchanglong 5b93736468 Merge branch 'dev_zyx' into dev
zyx 1201180f79 游戏到处删除玩家昵称栏位
sunke 8633efd7d6 增加部门长分级
jbrazz 48de85a3c3 upt
zhengchanglong 2c80186025 Merge branch 'dev_zyx' into dev
zyx fcbf41fa65 Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
zyx 27e8a0c0b5 提示栏文字调整,组长渠道与推广员渠道添加文字提示栏
chenzhi dcc5939692 Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
chenzhi b4b4e7bc00 新增强制重新更新
zyx a97ce09429 Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
zyx 414f471ac1 提示栏文字调整
zhengchanglong bf24f74d00 Merge branch 'dev_zyx' into dev
chenzhi c547d43330 Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
chenzhi d91a44184f 优化数据更新提示
zyx 7167366949 提示栏文字调整
zyx 064a3d0098 搜索框样式调整
zyx 6f77f576d1 标签位置调整
zyx bbc75a419d bug修正，样式更新
zhengchanglong fd97ecf494 Merge branch 'dev_zyx' into dev
chenzhi fa29554923 肯定没错
zhengchanglong d554815d12 Merge branch 'dev_zyx' into dev
chenzhi a1f22ad756 Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
chenzhi 2e4067e1de 测试
zhengchanglong 3da91ecb0f Merge branch 'dev_zyx' into dev
zyx e8fc252599 组长统计搜索bug修正
zhengchanglong cd70dd7dd8 Merge branch 'dev_zyx' into dev
zyx 62311eb40d 月结统计bug修正
zyx 515ffa25b9 月结统计bug修正
chenzhi 3983a086ac 优化生成数据
chenzhi 8796458ead 聚合新增月份
chenxiaojun 381a2e0a67 推广后台->数据管理->每日概况|数据汇总 -- 更新
chenxiaojun bf7c353692 推广后台->数据管理->每日概况|数据汇总 -- 更新
ELF 00966dc9e4 修改
Your Name dce059abe5 SDK菜单修改
Your Name 7466b90d13 SDK菜单修改
Your Name ed3ce2b4b5 SDK菜单修改
Your Name c3762b420c SDK菜单修改
Your Name 2569850407 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
Your Name c90c397dd9 SDK菜单修改
chenzhi af05f08689 Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
chenzhi 4f7077a3ec 10311331
ELF 22dcca566b 修改
zyx f16bf0b606 月结统计筛选列表逻辑修正
zyx 2adc07ec4a 组长月结统计页面文字修正
zyx 4803bd4a1b 组长月结统计页面修正
chenxiaojun a14b18f54f 推广后台->数据管理->每日概况|数据汇总 -- 更新
zhengchanglong e69bc5f459 Merge branch 'dev_zyx' into dev
zyx 63dff98660 月结统计导出bug修正
zyx 1d59721ee2 月结统计导出bug修正
zyx b42f621dbc 财务管理功能提交
zyx da1686fe14 Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
zyx ee5dccfaeb 财务管理功能代码完善
jbrazz b78c6228b0 Merge branch 'hotfix/fix_bug' into dev
jbrazz d4c7727426 upt
sunke 9844d5a740 订单查询
sunke f15c6e68eb 注册明细，订单查询 修改等级结构
chenzhi 185f0ca30e 优化强制更新
chenzhi 2983f5b93f 新增强制更新某月份
chenzhi e0857168f8 优化接口终结
chenzhi cce64d646b 1
zyx 82323a7138 Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
zyx 54a01da982 财务管理功能完善
chenzhi 483ccdffa2 Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
chenzhi 4cf967fbcd 优化数据获取
zyx fe8a60093f 新增渠道模板提交
zyx d3de669837 '代码合并'
jbrazz 8859c847f6 upt
chenxiaojun 750a6dc596 推广后台->数据管理->每日概况|数据汇总 -- 更新
chenxiaojun fffbdb739b 推广后台->数据管理->每日概况|数据汇总 -- 更新
ELF 6d68ddfe07 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
ELF 3abbe94774 修改bug
jbrazz 459b722c1c upt
zhengchanglong 5c8573df37 修改月份列表
chenxiaojun 9c1eeb2448 推广后台->游戏管理->专服管理|混服管理 -- 更新
chenzhi 06395bcb9d 123
chenzhi 3b70468942 Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
chenzhi 9803b418b9 优化统计
ELF 5b62b99765 三级变四级
chenxiaojun 49daffbbe4 推广后台->数据管理->每日概况|数据汇总->合计更新
chenxiaojun 9169a2084b 推广后台->数据管理->每日概况|数据汇总->合计更新
chenxiaojun 3be42d0186 管理后台->统计->新增->其他注册统计|官方渠道统计
chenxiaojun e247c7dedf 管理后台->统计->新增->其他注册统计|官方渠道统计
zyx 24cdd7086b '合并代码'
chenzhi b41fbb05b7 123
sunke 021673f657 图片上传补充
chenzhi 50efce9315 更新spen root
chenzhi f6f47748bc 优化时间戳
chenxiaojun 28969fd024 管理后台->游戏管理->合作方管理->批量删除更新
chenxiaojun 19f10c574d 管理后台->游戏管理->合作方管理->批量删除更新
chenzhi b3f2069e94 Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
chenzhi d273c5af27 spendAPI优化
sunke 692a1bcc11 webuploader插件
zyx c65aa8d69a 财务管理bug修正，导出功能，合作方列表添加
zyx 224c745ba8 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev_zyx
zyx b39efb2d18 同步代码
chenzhi 1783cb0b71 恢复
chenzhi 28e15792e4 123
chenzhi d708a6302f 123
zyx abeb6acde9 git测试
zyx 2c4e20911e Merge remote-tracking branch 'origin/dev_zyx' into dev_zyx 
# Conflicts:
#	Application/Admin/Controller/FinanceController.class.php
zyx 882041495e git测试
chenzhi bee4544f70 Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
chenzhi c2c92b4c95 xiuag
zyx bedd841eda 财务管理功能添加
zyx 81c137a1bc 财务管理功能添加
chenzhi 3d38e78160 123
zyx 112316c395 财务管理功能添加
chenxiaojun 20c8165888 管理后台->游戏管理->合作方管理->批量删除bug修改
chenxiaojun 0963c69f4d 管理后台->游戏管理->合作方管理->新增批量删除
chenxiaojun 41d45995b0 管理后台->游戏管理->合作方管理更新
chenxiaojun dd10535a07 管理后台->游戏管理->新增合作方管理
chenzhi a3d0c81d4b 修改
chenzhi f5ac904a49 优化扶持
zyx d7c9744872 扶持号时间格式修改
zyx ae9a01f325 管理后台代码回滚
zyx 8b4bb3baab Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zyx 1ce876c39f 管理后台测试资源bug修正
chenxiaojun fbe8a764f1 管理后台->删除溪谷入口
chenxiaojun a04f291471 管理后台->删除溪谷入口
zyx 96effb3525 管理后台测试资源bug修正
zyx 5c435bad74 公用文件添加排序
zyx ecc93af47c 测试资源排序添加
ELF 6e1a768721 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
ELF e4f1ed99f8 修改后台登录页
Your Name 6cb3a9ad75 SDK菜单
Your Name c1a9c3918e SDK菜单
chenxiaojun 032e5de877 推广平台->注册明细->bug修复
chenxiaojun 8b2e384fb6 推广平台->注册明细->bug修复
zyx 7e37560efe 公告计数负数问题改正
zyx 56deca114f Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zyx 2f2158dbe0 详情页公告提示修正
chenxiaojun 1ec9c156cf 推广平台->数据汇总|每日概况->bug修复
chenxiaojun 27665e5b14 推广平台->数据汇总|每日概况->bug修复
ELF 6df44afb16 功能隐藏
zyx b0411e3704 详情页公告提示修正
zyx 0ffbc8aff9 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zyx 048e37fdd7 详情页公告提示修正
ELF 437909d53a 测试
chenxiaojun 37188cb085 推广平台->数据汇总|每日概况|订单查询|注册明细->检索调整
chenxiaojun 36b9b51817 推广平台->数据汇总|每日概况|订单查询|注册明细->检索调整
zyx 95731bba09 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zyx 387f729773 首页公告提示修正
ELF 674dcc9e55 Merge branch 'hotfix/pc' into dev
ELF 390974a557 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
ELF 4917458099 Merge branch 'hotfix/query' into dev
ELF c6a52282d5 修改bug
zyx 5637b496e9 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zyx 36de2e17c5 扶持号js逻辑修正
zhengchanglong 954928b7f2 推广员首页优化
zyx 31039bdeab Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zyx 0d35370ade 扶持号管理推广员搜索改成下拉选项框，扶持号管理搜索异常修正，去除将text_resource的排序规则改回一般排序
zhengchanglong af68a2ef10 推官员首页优化
chenxiaojun 9ba9710670 推广平台->数据汇总|每日概况|订单查询|注册明细->检索调整
chenxiaojun af06ea8364 推广平台->数据汇总|每日概况|订单查询|注册明细->检索调整
chenxiaojun 155df3336d 推广平台->数据汇总|每日概况|订单查询|注册明细->检索调整
chenxiaojun c3c2f91c30 推广平台->数据汇总|每日概况|订单查询|注册明细->检索调整
chenxiaojun 3226b01dfb 推广平台->数据汇总|每日概况->列表名词解释调整
chenxiaojun cf5e6c849b 推广平台->数据汇总|每日概况->列表名词解释调整
chenxiaojun 456c4c925e 手机官网->(产品服务->去除搜索框和推荐|单张不轮播)(我的->新增超级签路口)
chenxiaojun 63b27d8c1d 手机官网->(产品服务->去除搜索框和推荐|单张不轮播)(我的->新增超级签路口)
zyx 4a23e1dd8a 日志管理bug修复
zyx a16c77181c 优化首页计算代码
zyx 7ead67f8cb 快捷图标代码修正
zyx c461190682 首页用户注册充值信息修正,昨日注册用户
zyx 219596843b 首页用户注册充值信息修正,昨日注册用户
zyx c6da6fb705 首页用户注册充值信息修正
jbrazz 5527b0bc31 Merge branch 'hotfix/promote_query' into dev
jbrazz 736c0fd432 fix
chenxiaojun f46a76649c 推广平台->84推广员开权限
chenxiaojun 74f88da239 推广平台->84推广员开权限
ELF eb09c67dd4 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
ELF 5ff559cf11 修改bug
chenxiaojun 9500fbbc80 用户手机号注册规则修改
chenxiaojun c4f7a928f9 用户手机号注册规则修改
zhengchanglong 5dbfb59f3f Merge branch 'dev_zcl' into dev
zhengchanglong a5899444a7 Merge branch 'dev_zyx' into dev 
# Conflicts:
#	Application/Admin/Controller/TestResourceController.class.php
chenzhi 2f124bffbb coin_num
chenxiaojun df3c2d823c 推广员后台->2推广员开权限
chenxiaojun cd29b17e03 推广员后台->2推广员开权限
chenxiaojun e92790a89f 推广员后台->订单查询|注册明细->玩家账号检索修改为完整查询|玩家账号列表添加玩家ID显示
chenxiaojun d56bebdaa6 推广员后台->订单查询|注册明细->玩家账号检索修改为完整查询|玩家账号列表添加玩家ID显示
chenzhi 751ab77dc9 Merge branch 'dev_zcl' of 47.111.118.107:/srv/git/platform into dev_zcl
chenzhi e3d9d382d9 新增线下充值审核
ELF 37ef999710 修改
zyx 0112a0151c 首页用户注册充值信息修正
zhengchanglong c9fead3389 修改 tab_coin_pay_order 表字段
zyx 44bb1c3e19 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zyx 0a9dbe6a78 管理后台菜单bug修复
chenxiaojun 16bb3cfc13 PC官网->平台币充值简介样式修改
chenxiaojun 8db91a21ee PC官网->平台币充值简介样式修改
chenxiaojun c7979cada0 PC官网->平台币充值简介样式修改
chenxiaojun 82c5bd30da PC/手机官网->平台币充值简介修改
zyx 2a52aa42ae Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zyx ba6fc9634b Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zyx c8f101f40c 管理后台添加测试资源
zhengchanglong 732777305e Merge remote-tracking branch 'origin/dev' into dev
zhengchanglong 6154654a35 SDK登录BUG修复
chenxiaojun 32ba151ac5 手机官网->平台币充值简介修改
chenxiaojun 85839b7e94 手机官网->平台币充值简介修改
chenxiaojun ecf43d6e7a PC官网->平台币充值简介修改
chenxiaojun 66e011e101 PC官网->平台币充值简介修改
tpingzhang 29883f60ac 修改重复插入问题 增加唯一索引 记录重复插入异常
jbrazz c1ab4e789c Merge branch 'featrue/fix_bug' into dev
jbrazz 9bc5127223 upt
zhengchanglong 4b2e492340 Merge branch 'dev_zcl' into dev
zhengchanglong dee6c2e60d 扶持号SDK登录安全防护业务
chenxiaojun 641dcd5b65 推广员后台->每日概况->游戏检索bug
chenxiaojun db424fde84 推广员后台->每日概况->游戏检索bug
jbrazz 953564d291 upt
zyx 24d5bf34c7 添加站点功能修改快捷菜单的图标
ELF b7964e19d0 修改bug
ELF 4d0359aaba 修改bug
ELF cd90807d58 Merge branch 'hotfix/promote' into dev
ELF b29d62a4ac Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
chenxiaojun 5bb7e9850f 推广员后台->区服排序
chenxiaojun c3d4c112d6 推广员后台->区服排序
ELF b8f93f74c6 隐藏推广员系统目录
ELF 157676f268 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
ELF 260e45f4d9 Merge branch 'hotfix/query' into dev
ELF 2816054361 修改bug
zhengchanglong ec07cedc5e Merge branch 'dev_zcl' into dev
chenzhi 5d7385e77a 登陆bug优化
zyx e23943cfdb Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zyx bb3109f5d3 测试账号冻结状态需要的字段修改
zhengchanglong 32595840c3 Merge branch 'dev_zcl' into dev
chenzhi a54a6b8b26 优化bug
ELF 53e0395674 修改
zyx 5ffc0bf9b0 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zyx 560e13af03 更改文章详情的后退按钮的样式
ELF cdfbe61fa2 Merge branch 'hotfix/pc' into dev
chenxiaojun bb23bb2a03 推广员后台->检索bug修复
chenxiaojun a5873caf8d 推广员后台->检索bug修复
jbrazz 2d94c4a539 fix
chenxiaojun 1ba358fabb 管理后台->新增混服管理查询 推广员后台->推广员检索调整 sys_model->game的list_grid字段添加server_type
chenxiaojun c322f6ec7e 管理后台->新增混服管理查询 推广员后台->推广员检索调整 sys_model->game的list_grid字段添加server_type
zyx 3c1b1673f2 测试资源申请页面检索数据修正，检索都统一改为模糊查询，文章详情页隐藏首页，添加返回按钮
ELF 608d24b732 开放测试帐号
ELF 554793d95e Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
ELF c888915daa Merge branch 'hotfix/query' into dev
ELF ece317d6fa 修改bug
chenxiaojun a91c372a3b 修复关联游戏混服选项bug
chenxiaojun 76bd557efd 修复关联游戏混服选项bug
ELF bcc34cbd0c 打包逻辑重构
Your Name 51154dd533 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
Your Name 22e7866644 SDK菜单添加
zhengchanglong 8af781b9b4 修改超级签充值金额
chenzhi 4dba7bcfeb 修复严重码bug
Your Name 45ff545256 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
Your Name f1b5a2257d SDK用户菜单-修改
zhengchanglong d2d7dec38a 超级签页面title修改
zhengchanglong b46921447a 微信支付回跳修改
zhengchanglong 68c9c492c5 微信支付回跳修改
zhengchanglong 941303065d Merge branch 'dev_zcl' into dev
zhengchanglong eea9cc772c 微信支付回跳修改
zyx 97ccd1d57a 解决游戏公告无法发出的问题
zyx 91b773d974 开服信息，平台显示修正
zyx 7e27d35a97 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zyx 9eb36bd81f 组长账号显示测试资源
ELF 69a6f9612f 打包优化
chenxiaojun dbf0f67d19 官网->商务合作公司地址修改
chenxiaojun 7d018b47af 官网->商务合作公司地址修改
chenxiaojun 165d9dad62 官网->商务合作公司地址修改
zyx ccf7bfc65a 首页开服信息图标大小修改
zhengchanglong 58f489199c 删除冗余代码
Your Name 032b2b5197 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
Your Name b253d23ae3 SDK用户菜单字段名修改
zyx 595112e6b5 快捷菜单关闭回调事件添加
Your Name 277eea047d Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
Your Name 971906dd29 SDK用户菜单
zhengchanglong 4c04cdc8f6 Merge branch 'dev_zcl' into dev
zhengchanglong 745c034d3e 去除alert 弹框
Your Name 2eff781166 SDK用户菜单
Your Name 118340fa33 SDK用户菜单
zhengchanglong fe70974a54 修改超级前充值测试金额
zhengchanglong f9b9106ce5 Merge branch 'dev_zcl' into dev
zhengchanglong 8de8da4f38 超级签充值业务迁移mobile目录下
chenxiaojun f8206e3f7d ios13.1绑定提示修改
chenxiaojun 7d8f7b53e6 ios13.1绑定提示修改 下级推广员查询bug修复
chenxiaojun a29d153581 ios13.1绑定提示修改
chenxiaojun cff2dc911a 获取下级推广员bug修改
zyx 6f7c814051 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zyx 2c2446d38b 将首页开服信息icon改成80*80
zyx aeab84e426 将首页开服信息icon改成80*80
chenxiaojun fb19592de2 ios13.1绑定
chenxiaojun cdc7e284da ios13.1绑定bug修复
chenxiaojun ea3e0015bf ios13.1绑定
zyx a985da5c44 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev_zyx
zyx 66ced8930e 首页bug解决
zhengchanglong 5889b69b71 Merge branch 'dev-cz' into dev
chenzhi 0b70159a66 123
chenzhi ba4219dc64 更新忘记密码
zhengchanglong 8a7bcb13d3 Merge branch 'dev_zcl' into dev
zhengchanglong ee6e3a8624 修改测试金额
zhengchanglong 2b8cbf0021 Merge branch 'dev_zcl' into dev
chenzhi 5f4dca0a77 1018修改
elf@home e94675c93c 修改
elf@home 848e07238d 修改
ELF 9b42942900 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhengchanglong ae911f62a0 Merge branch 'dev-cz' into dev
chenzhi 5805880e0c 更新推广
ELF 24b1441632 修改超级签链接
zhengchanglong c367a965f2 Merge branch 'dev-cz' into dev
chenzhi 61f4bec085 login
zyx f00ff01f95 php版本问题bug
zhengchanglong 433219c3f6 Merge branch 'dev-cz' into dev
chenzhi 2e8f7ba410 更新
zhengchanglong 46e5b1198c 修改金额
zyx 5ef6cda158 首页开服信息区分平台bug修正
zhengchanglong 6a3b3cd114 超级签网页端充值地址修改
zhengchanglong be9586bc5b 支付流程修改
zhengchanglong f0dc10cd60 支付流程修改
zyx 84327c1315 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zyx ae1986b4a8 已读日志为零时不显示
chenzhi 4539c163a4 首页alert恢复
tpingzhang 464e9f244b 正常充值不需要验证spend表 是否重复充值
zhengchanglong e30580791e 超级前购买测试金额改为0.01
zyx dd3e56d27c Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zyx 72036e51e3 首页时间问题修正，快捷菜单10个限制添加
zhengchanglong 4367052f77 Merge branch 'dev-cz' into dev
zhengchanglong 86040c88c6 超级签购买错误信息页面
chenzhi d24fa30651 优化
tpingzhang 9ac3bf3397 测试
tpingzhang b5b43b0875 支付状态
zhengchanglong 7863eb1be3 Merge branch 'dev-cz' into dev_zcl 
# Conflicts:
#	Public/Sdk/css/ssg/common.css
#	Public/Sdk/images/ssg/blank/blankimg.png
zhengchanglong 5f5be5d57e 超级签充值流程修改
chenzhi 5a25e5dec1 验证码简化
chenzhi 992ef831b5 验证码简化
tpingzhang 5be8421011 旧版
tpingzhang e9f8449468 eregi php5.3 废弃 
preg_match
apple 支付页面
zhengchanglong 2ba3b915b9 超级前充值金额修改
zhengchanglong e2fc2e5128 修改超级签充值流程
chenzhi ca79a3f627 css ok
chenzhi 95fc99816f 价格
chenzhi b112a5548f 123
ELF 2638929031 通过帐号隐藏目录
chenzhi cc78f094ad 去除blank
chenzhi e4b72a1847 新增blank页
chenzhi 629c803e87 Merge branch 'dev-cz' of 47.111.118.107:/srv/git/platform into dev_zcl
chenzhi b5484a07c6 blank
chenzhi 5236c7a6f1 优化css1
zyx 5d5879021f Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev_zyx 
 Conflicts:
	Application/Admin/View/Giftbag/add.html
elf@home f7aaa9030e 修改bug
elf@home 4c5473a27f 修改bug
zhengchanglong f338c3d210 超级签充值金额修改
zhengchanglong c261e88932 Merge branch 'dev-cz' into dev
chenzhi f4a26b2cc2 账号验证
zhengchanglong caf5f0aff1 Merge branch 'dev-cz' into dev_zcl
chenzhi 3757281985 弹窗
chenzhi 0d50d94a42 123456
chenzhi e826b22d56 1234
chenzhi f87853a9f7 123
chenzhi 8f5f4ba9bc 礼包领取
zhengchanglong f80ebc8583 修改超级签名BUG
chenzhi 5635519c17 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz
zhengchanglong 0a62987665 修改超级签名BUG
zhengchanglong e3315ca26e Merge remote-tracking branch 'origin/dev' into dev
zyx 0dbbfb763d Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zyx 90665c3dc5 新增礼包bug修正
chenzhi a544978349 新增密码复杂度验证
zhengchanglong 7a1b537d98 Merge branch 'dev-cz' into dev
chenzhi 4441f2844c bug3
chenzhi 2693172cda 修复3
chenzhi b69ca03856 bug修复2
ELF 145144ba51 解决冲突
ELF 4a403076b9 解决冲突
ELF 983b707d69 修改手机端显示
zhengchanglong a550435883 Merge remote-tracking branch 'origin/dev' into dev
zhengchanglong 9cebace169 Merge branch 'dev-cz' into dev
tpingzhang 99f4d30af0 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
tpingzhang 41075f8abc Merge branch 'serveridnull' into dev
chenzhi b8945e8655 修复bug
zhengchanglong 604fe050d0 Merge branch 'dev-cz' into dev
tpingzhang f7ca69eba6 支付回调域名
zhengchanglong c3cb46cab0 超级签充值BUG修复
tpingzhang f05e7a3149 支付回调域名
tpingzhang ba644484e7 Merge branch 'serveridnull' into dev
tpingzhang 81f85e672d 支付回调域名
chenxiaojun 975b514e90 Merge remote-tracking branch 'origin/dev' into dev
chenzhi 165fa76414 更新浏览器识别
chenxiaojun b4653fa0b8 检索修改
chenxiaojun 9fb953ea60 检索修改
tpingzhang bd10995fad Merge branch 'serveridnull' into dev
tpingzhang 8a5f833335 apple alipay
tpingzhang 6fbc15359b Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
tpingzhang 63f8e24208 解决冲突
tpingzhang cdb5e1e699 去掉pay_header
chenzhi 88a971b56e 优化css
chenxiaojun ae9d502150 订单查询修改
chenxiaojun 82e2c3faab 订单查询修改
tpingzhang a6c99cda3a 1，修改server_id传0 增加game_player_id 
2，微信限额》=3000
3，小程序
zhengchanglong ae6a18303a 超级签名充值测试金额改为0.01
zhengchanglong 47ba229b80 Merge remote-tracking branch 'origin/dev' into dev
zhengchanglong 059900320b 超级签回跳地址是否需要https判断
chenxiaojun a7f2695665 无检索条件默认包括本账号
chenxiaojun e3d0e885f2 无检索条件默认包括本账号
zhengchanglong a6398b488f Merge branch 'dev_zcl' into dev 
# Conflicts:
#	Data/update.sql
ELF db956a2d77 修改bug
ELF cc9aa1a640 解决冲突
chenzhi b8153b1cd2 比例加大
chenzhi 866fb4c290 适配加大
ELF a093dd3d5b 修改手机端目录
chenzhi 92942cb7f5 优化ssg
chenzhi b01ff154ea 新增礼包
zyx db34f256fd Merge branch 'dev-cz' of 47.111.118.107:/srv/git/platform into dev-cz
zyx 96b81a57ca 礼包添加bug修正
chenzhi 4e887c7f71 Merge branch 'dev-cz' of 47.111.118.107:/srv/git/platform into dev-cz
chenzhi 953cb6b988 流程样式
zyx f4bc470156 资源日志bug修复
zhengchanglong 5390597093 超级签首页 搜索框样式自适应
zhengchanglong 228f7de164 样式修改
zyx bd572379b0 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zyx 5c5d879710 资源日志bug修复
zyx aabaa9ae01 测试资源日志管理bug修复
ELF 84174b18e9 修改bug
zyx 44121ed303 新增礼包界面js bug修复
zyx 55cc0c91e4 新增礼包界面优化
chenzhi d8095f3397 Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev-cz
chenzhi 712498aff9 下载
zyx 63eebf5611 礼包管理新增全部，超级签选项
chenzhi 6ed821429f 检索
zyx f64225cff0 测试功能移交到总管理后台，扶持号管理bug修正
zyx 18cddff9a4 Merge branch 'dev' of 47.111.118.107:/srv/git/platform
ELF 91866f4433 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
ELF d9e7a55af4 修改bug
chenxiaojun 80e2a7e0fa 订单查询、注册明细->组长与推广员组合检索bug修复
chenxiaojun 57c9c7419a 订单查询、注册明细->组长与推广员组合检索bug修复
chenzhi 0669d15e3e Merge branch 'dev-cz' of 47.111.118.107:/srv/git/platform into dev-cz