Commit Graph

7440 Commits (25c5c683e4fa0708241592b077688bd0a275b135)
 

Author SHA1 Message Date
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 5f6bd14967 Merge branch 'serveridnull' into dev
tpingzhang b72fc9ff7c apple alipay
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
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