 ELF
|
145144ba51
|
解决冲突
|
5 years ago |
|
ELF
|
4a403076b9
|
解决冲突
|
5 years ago |
|
ELF
|
9bc356cf43
|
Merge branch 'master' of 47.111.118.107:/srv/git/platform
|
5 years ago |
|
ELF
|
106e5818e7
|
Merge branch 'hotfix/mobile'
|
5 years ago |
|
ELF
|
983b707d69
|
修改手机端显示
|
5 years ago |
zyx
|
02043044b5
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
zyx
|
a12002a567
|
扶持账号的登录bug修正
|
5 years ago |
zhengchanglong
|
a550435883
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
zhengchanglong
|
9cebace169
|
Merge branch 'dev-cz' into dev
|
5 years ago |
tpingzhang
|
99f4d30af0
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
tpingzhang
|
41075f8abc
|
Merge branch 'serveridnull' into dev
|
5 years ago |
chenzhi
|
b8945e8655
|
修复bug
|
5 years ago |
|
zhengchanglong
|
604fe050d0
|
Merge branch 'dev-cz' into dev
|
5 years ago |
|
tpingzhang
|
f7ca69eba6
|
支付回调域名
|
5 years ago |
|
zhengchanglong
|
c3cb46cab0
|
超级签充值BUG修复
|
5 years ago |
|
tpingzhang
|
f05e7a3149
|
支付回调域名
|
5 years ago |
|
tpingzhang
|
ba644484e7
|
Merge branch 'serveridnull' into dev
|
5 years ago |
|
tpingzhang
|
81f85e672d
|
支付回调域名
|
5 years ago |
chenxiaojun
|
975b514e90
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
chenzhi
|
165fa76414
|
更新浏览器识别
|
5 years ago |
|
chenxiaojun
|
b4653fa0b8
|
检索修改
|
5 years ago |
|
chenxiaojun
|
9fb953ea60
|
检索修改
|
5 years ago |
|
tpingzhang
|
5f6bd14967
|
Merge branch 'serveridnull' into dev
|
5 years ago |
|
tpingzhang
|
b72fc9ff7c
|
apple alipay
|
5 years ago |
|
tpingzhang
|
bd10995fad
|
Merge branch 'serveridnull' into dev
|
5 years ago |
|
tpingzhang
|
8a5f833335
|
apple alipay
|
5 years ago |
|
tpingzhang
|
6fbc15359b
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
tpingzhang
|
63f8e24208
|
解决冲突
|
5 years ago |
|
tpingzhang
|
cdb5e1e699
|
去掉pay_header
|
5 years ago |
|
chenzhi
|
88a971b56e
|
优化css
|
5 years ago |
|
chenxiaojun
|
ae9d502150
|
订单查询修改
|
5 years ago |
|
chenxiaojun
|
82e2c3faab
|
订单查询修改
|
5 years ago |
|
tpingzhang
|
a6c99cda3a
|
1，修改server_id传0 增加game_player_id
2，微信限额》=3000
3，小程序
|
5 years ago |
|
zhengchanglong
|
ae6a18303a
|
超级签名充值测试金额改为0.01
|
5 years ago |
|
zhengchanglong
|
47ba229b80
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
zhengchanglong
|
059900320b
|
超级签回跳地址是否需要https判断
|
5 years ago |
|
chenxiaojun
|
a7f2695665
|
无检索条件默认包括本账号
|
5 years ago |
|
chenxiaojun
|
e3d0e885f2
|
无检索条件默认包括本账号
|
5 years ago |
|
zhengchanglong
|
a6398b488f
|
Merge branch 'dev_zcl' into dev
# Conflicts:
# Data/update.sql
|
5 years ago |
|
ELF
|
db956a2d77
|
修改bug
|
5 years ago |
|
chenzhi
|
34801e02e3
|
优化适配
|
5 years ago |
|
ELF
|
d9ccefaced
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
ELF
|
cc9aa1a640
|
解决冲突
|
5 years ago |
|
tpingzhang
|
115ce7a35d
|
增加user_token
|
5 years ago |
|
chenzhi
|
b8153b1cd2
|
比例加大
|
5 years ago |
|
chenzhi
|
866fb4c290
|
适配加大
|
5 years ago |
|
ELF
|
ce9f5ff05a
|
Merge branch 'hotfix/menu'
|
5 years ago |
|
ELF
|
a093dd3d5b
|
修改手机端目录
|
5 years ago |
|
chenzhi
|
92942cb7f5
|
优化ssg
|
5 years ago |
|
chenzhi
|
b01ff154ea
|
新增礼包
|
5 years ago |