Commit Graph

1719 Commits (77574b4d3757c177a7d5d2cd88ad29663c28010f)
 

Author SHA1 Message Date
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
chenzhi 34801e02e3 优化适配
ELF d9ccefaced Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
ELF cc9aa1a640 解决冲突
tpingzhang 115ce7a35d 增加user_token
chenzhi b8153b1cd2 比例加大
chenzhi 866fb4c290 适配加大
ELF ce9f5ff05a Merge branch 'hotfix/menu'
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
chenzhi 4ac6442777 更新
zhengchanglong 9fd85bb4b5 完善超级签支付业务
sunke 94e7594f40 删除id
zhengchanglong fb7a8f809c Merge branch 'dev-cz' of 47.111.118.107:/srv/git/platform into dev_zcl
zhengchanglong 3bfb23b360 超级签支付
chenxiaojun d93a68144f 订单查询->组长、推广员检索框位置更改
chenxiaojun 6947802527 订单查询->组长、推广员检索框位置更改
chenxiaojun 837d168f2d 每日概况、数据汇总、订单查询、注册明细 组长检索bug修复