474 Commits (5f6bd14967b0e351ab27448d4d6933c994fca9ec)
 

Author SHA1 Message Date
tpingzhang 5f6bd14967 Merge branch 'serveridnull' into dev 6 years ago
tpingzhang b72fc9ff7c apple alipay 6 years ago
tpingzhang bd10995fad Merge branch 'serveridnull' into dev 6 years ago
tpingzhang 8a5f833335 apple alipay 6 years ago
tpingzhang 6fbc15359b Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 6 years ago
tpingzhang 63f8e24208 解决冲突 6 years ago
tpingzhang cdb5e1e699 去掉pay_header 6 years ago
chenxiaojun ae9d502150 订单查询修改 6 years ago
chenxiaojun 82e2c3faab 订单查询修改 6 years ago
tpingzhang a6c99cda3a 1,修改server_id传0 增加game_player_id
2,微信限额》=3000
3,小程序
6 years ago
zhengchanglong ae6a18303a 超级签名充值测试金额改为0.01 6 years ago
zhengchanglong 47ba229b80 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
zhengchanglong 059900320b 超级签回跳地址是否需要https判断 6 years ago
chenxiaojun a7f2695665 无检索条件默认包括本账号 6 years ago
chenxiaojun e3d0e885f2 无检索条件默认包括本账号 6 years ago
zhengchanglong a6398b488f Merge branch 'dev_zcl' into dev
# Conflicts:
#	Data/update.sql
6 years ago
ELF db956a2d77 修改bug 6 years ago
chenzhi 34801e02e3 优化适配 6 years ago
ELF d9ccefaced Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 6 years ago
ELF cc9aa1a640 解决冲突 6 years ago
tpingzhang 115ce7a35d 增加user_token 6 years ago
chenzhi b8153b1cd2 比例加大 6 years ago
chenzhi 866fb4c290 适配加大 6 years ago
ELF ce9f5ff05a Merge branch 'hotfix/menu' 6 years ago
ELF a093dd3d5b 修改手机端目录 6 years ago
chenzhi 92942cb7f5 优化ssg 6 years ago
chenzhi b01ff154ea 新增礼包 6 years ago
zyx db34f256fd Merge branch 'dev-cz' of 47.111.118.107:/srv/git/platform into dev-cz 6 years ago
zyx 96b81a57ca 礼包添加bug修正 6 years ago
chenzhi 4e887c7f71 Merge branch 'dev-cz' of 47.111.118.107:/srv/git/platform into dev-cz 6 years ago
chenzhi 953cb6b988 流程样式 6 years ago
zhengchanglong 5390597093 超级签首页 搜索框样式自适应 6 years ago
zhengchanglong 228f7de164 样式修改 6 years ago
zyx bd572379b0 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 6 years ago
zyx 5c5d879710 资源日志bug修复 6 years ago
ELF 84174b18e9 修改bug 6 years ago
chenzhi d8095f3397 Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev-cz 6 years ago
chenzhi 712498aff9 下载 6 years ago
zyx 63eebf5611 礼包管理新增全部,超级签选项 6 years ago
chenzhi 6ed821429f 检索 6 years ago
zyx f64225cff0 测试功能移交到总管理后台,扶持号管理bug修正 6 years ago
zyx 18cddff9a4 Merge branch 'dev' of 47.111.118.107:/srv/git/platform 6 years ago
ELF 91866f4433 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 6 years ago
ELF d9e7a55af4 修改bug 6 years ago
chenxiaojun 80e2a7e0fa 订单查询、注册明细->组长与推广员组合检索bug修复 6 years ago
chenxiaojun 57c9c7419a 订单查询、注册明细->组长与推广员组合检索bug修复 6 years ago
chenzhi 0669d15e3e Merge branch 'dev-cz' of 47.111.118.107:/srv/git/platform into dev-cz 6 years ago
chenzhi 4ac6442777 更新 6 years ago
zhengchanglong 9fd85bb4b5 完善超级签支付业务 6 years ago
sunke 94e7594f40 删除id 6 years ago