Commit Graph

252 Commits (c6b8f99b6e95682bf02828f861f5cc3e805ffd4d)

Author SHA1 Message Date
“用lww c1b5569213 手机官网-手机注册与账号注册修改,昵称自动生成
zhengchanglong aa8e612ead 超级签测试金额修改
“用lww 8120d41204 Merge remote-tracking branch 'origin/dev' into dev_lww
# Conflicts:
#	Application/Common/Conf/seo_media_config.php
#	Application/Mobile/View/Index/introduce.html
#	Application/Mobile/View/User/login.html
#	Application/Mobile/View/User/recharge.html
#	Application/Mobile/View/User/step1.html
#	Application/Mobile/View/User/userset.html
#	Public/Mobile/css/common-cz.css
#	Public/Mobile/js/home.js
“用lww 176aa70c8d 去除vbs代码
chenzhi 39e682e69e Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz
zhengchanglong 5a56b41330 Merge branch 'feature/promote' into dev
zyx cbe9117e3d 充值界面bug修复
zhengchanglong 2e5973cf3b 删除冗余文件
zyx 2b012aad08 我的礼包界面功能完善
zyx 0d090ded9b 礼包界面
chenzhi 5d454e5429 我的游戏
chenzhi ad6eb5b0d7 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
chenzhi bf728438d7 优化
zyx 8f0ae7dd8b 充值界面模板嵌套
chenzhi 9764d361f1 123
chenzhi fbf8a76ec9 123
chenzhi 40001277bc login
chenzhi 0cd21feb28 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
chenzhi 44e2623efe 123
chenzhi 451ea9588e base
chenzhi 4b7d9202b7 123
zyx a0e27f9e7a 覆盖vbs脚本
chenzhi c3196b7be0 123
chenzhi b52eee941b 优化
chenzhi 3098558fe0 lww代码合并
chenzhi 4c2e1f294e 去vs
chenzhi 68eead8d31 123
chenzhi 63c5421d49 Merge branch 'dev_lww' of 47.111.118.107:/srv/git/platform into dev_lww
chenzhi a28acf200d 个人中心
zhengchanglong 5af7ab4e5e Merge remote-tracking branch 'origin/dev_lww' into dev_lww
zhengchanglong d9e75cd4c0 充值
chenzhi 71c1ad1437 Merge branch 'dev_lww' of 47.111.118.107:/srv/git/platform into dev_lww
chenzhi 737e7786e8 移动官网手机及账号注册
zhengchanglong 0b188b12bb 充值
chenzhi 2e610bc245 优化手机注册1
chenzhi 8ad35726fb 账号注册ok
chenzhi ddad6f6bf4 优化注册
dev_lww c94dc6b3a5 手机官网
dev_lww 584a228fb4 手机官网
“用lww fa69e8ba83 手机端官网修改
“用lww 0d83da8446 手机官网->首页->解决首页底部菜单由于引入bootstrap导致和其他页面不一致
“用lww 6d5bb2a9a1 手机官网-底部菜单高亮bug修复
chenzhi 02151093af 修改
chenxiaojun 63b27d8c1d 手机官网->(产品服务->去除搜索框和推荐|单张不轮播)(我的->新增超级签路口)
chenxiaojun c4f7a928f9 用户手机号注册规则修改
chenxiaojun 32ba151ac5 手机官网->平台币充值简介修改
chenxiaojun 85839b7e94 手机官网->平台币充值简介修改
chenzhi 5d7385e77a 登陆bug优化
chenzhi a54a6b8b26 优化bug
zhengchanglong 8af781b9b4 修改超级签充值金额
chenzhi 4dba7bcfeb 修复严重码bug
zhengchanglong d2d7dec38a 超级签页面title修改
zhengchanglong b46921447a 微信支付回跳修改
zhengchanglong 941303065d Merge branch 'dev_zcl' into dev
zhengchanglong eea9cc772c 微信支付回跳修改
zhengchanglong 58f489199c 删除冗余代码
zhengchanglong 4c04cdc8f6 Merge branch 'dev_zcl' into dev
zhengchanglong 745c034d3e 去除alert 弹框
zhengchanglong fe70974a54 修改超级前充值测试金额
zhengchanglong f9b9106ce5 Merge branch 'dev_zcl' into dev
zhengchanglong 8de8da4f38 超级签充值业务迁移mobile目录下
chenxiaojun 7d8f7b53e6 ios13.1绑定提示修改 下级推广员查询bug修复
chenxiaojun a29d153581 ios13.1绑定提示修改
chenxiaojun cdc7e284da ios13.1绑定bug修复
chenxiaojun ea3e0015bf ios13.1绑定
zhengchanglong 5889b69b71 Merge branch 'dev-cz' into dev
chenzhi 0b70159a66 123
chenzhi ba4219dc64 更新忘记密码
chenzhi 5f4dca0a77 1018修改
elf@home e94675c93c 修改
elf@home 848e07238d 修改
chenzhi 5805880e0c 更新推广
chenzhi 61f4bec085 login
chenzhi 2e8f7ba410 更新
chenzhi 4539c163a4 首页alert恢复
chenzhi d24fa30651 优化
chenzhi 5a25e5dec1 验证码简化
chenzhi 992ef831b5 验证码简化
chenzhi ca79a3f627 css ok
chenzhi b112a5548f 123
chenzhi cc78f094ad 去除blank
chenzhi b5484a07c6 blank
chenzhi 5236c7a6f1 优化css1
chenzhi f4a26b2cc2 账号验证
chenzhi 3757281985 弹窗
chenzhi 0d50d94a42 123456
chenzhi e826b22d56 1234
chenzhi f87853a9f7 123
chenzhi 8f5f4ba9bc 礼包领取
chenzhi 5635519c17 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz
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 983b707d69 修改手机端显示
zhengchanglong 9cebace169 Merge branch 'dev-cz' into dev
chenzhi b8945e8655 修复bug
zhengchanglong 604fe050d0 Merge branch 'dev-cz' into dev
chenzhi 165fa76414 更新浏览器识别
chenzhi 88a971b56e 优化css
zhengchanglong a6398b488f Merge branch 'dev_zcl' into dev
# Conflicts:
#	Data/update.sql
chenzhi b8153b1cd2 比例加大
chenzhi 866fb4c290 适配加大
ELF a093dd3d5b 修改手机端目录
chenzhi 92942cb7f5 优化ssg
chenzhi 4e887c7f71 Merge branch 'dev-cz' of 47.111.118.107:/srv/git/platform into dev-cz
chenzhi 953cb6b988 流程样式
zhengchanglong 5390597093 超级签首页 搜索框样式自适应
zhengchanglong 228f7de164 样式修改
chenzhi 712498aff9 下载
chenzhi 6ed821429f 检索
chenzhi 4ac6442777 更新
chenzhi da8aee73c6 增加弹框
chenzhi d1428e1044 名字测试
“‘ 56f567e47f 支付
tpingzhang c2fbf2c141 超级签 官方渠道优化
tpingzhang 8670b8974f 超级签 登入状态验证
chenxiaojun 3a9afae16e 游戏管理->混服管理 游戏管理->分成比例
chenxiaojun 1cfba9a3b5 更新
ELF 94acfd4c74 修改菜单
chenxiaojun 49c3c8a45e ios13.1
chenxiaojun 63f2fa47b5 登录提示变更
zhengchanglong 29282badd6 超级签删除冗余页面及JS路径有误修正
liaojinling 0fbfd868bc 修改bug
liaojinling b8f05ec380 手机端注册登录添加日志、cookie
chenxiaojun 4a819428df 落地页更新
chenxiaojun 0fb4c7f225 落地页更新
chenxiaojun faf79e2b96 落地页更新
chenxiaojun c596052b59 落地页更新
chenxiaojun 10ee809e6e 落地页更新
tpingzhang 461afa0e9c 文字提示
chenxiaojun 9f7bf58fbd 落地页更新
chenxiaojun efe8307605 落地页更新
chenxiaojun 1c6297f5a8 落地页更新
tpingzhang e2af2869bf 订单查询 不做登入验证
tpingzhang 7ba207b7dd 订单查询 不做登入验证
tpingzhang a002276baf 超级签关联推广ID
zhengchanglong 8bbf1f8df4 推广员管理后台首页修改
zhengchanglong 5229da60f1 推广员管理后台首页业务
zhengchanglong c5221795ec 超级签H5修改
zhengchanglong 7388a4bbc0 超级签H5订单优化
zhengchanglong 13a4a48c1d 超级签H5无订单优化
zhengchanglong 622ef0571e Merge remote-tracking branch 'origin/dev' into dev
zhengchanglong 6b366d7c41 修改超级签H5登录BUG
ELF d61f98df7b 修改内容
ELF ba7511897a 修改
ELF 07d1a23e0c 测试