Commit Graph

5228 Commits (d5aeb21b33227e915bac8d654e85b468ec8ab5b4)
 

Author SHA1 Message Date
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 9bc356cf43 Merge branch 'master' of 47.111.118.107:/srv/git/platform
ELF 106e5818e7 Merge branch 'hotfix/mobile'
ELF 983b707d69 修改手机端显示
zyx 02043044b5 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zyx a12002a567 扶持账号的登录bug修正
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 5f6bd14967 Merge branch 'serveridnull' into dev