696 Commits (c3762b420c518b82641df3898f09bfd36675cd48)

Author SHA1 Message Date
zyx 5ef6cda158 首页开服信息区分平台bug修正 5 years ago
zhengchanglong 6a3b3cd114 超级签网页端充值地址修改 5 years ago
zhengchanglong be9586bc5b 支付流程修改 5 years ago
zhengchanglong f0dc10cd60 支付流程修改 5 years ago
zyx 84327c1315 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zyx ae1986b4a8 已读日志为零时不显示 5 years ago
chenzhi 4539c163a4 首页alert恢复 5 years ago
tpingzhang 464e9f244b 正常充值不需要验证spend表 是否重复充值 5 years ago
zhengchanglong e30580791e 超级前购买测试金额改为0.01 5 years ago
zyx dd3e56d27c Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zyx 72036e51e3 首页时间问题修正,快捷菜单10个限制添加 5 years ago
zhengchanglong 4367052f77 Merge branch 'dev-cz' into dev 5 years ago
zhengchanglong 86040c88c6 超级签购买错误信息页面 5 years ago
chenzhi d24fa30651 优化 5 years ago
tpingzhang 9ac3bf3397 测试 5 years ago
tpingzhang b5b43b0875 支付状态 5 years ago
zhengchanglong 7863eb1be3 Merge branch 'dev-cz' into dev_zcl
# Conflicts:
#	Public/Sdk/css/ssg/common.css
#	Public/Sdk/images/ssg/blank/blankimg.png
5 years ago
zhengchanglong 5f5be5d57e 超级签充值流程修改 5 years ago
chenzhi 5a25e5dec1 验证码简化 5 years ago
chenzhi 992ef831b5 验证码简化 5 years ago
tpingzhang 5be8421011 旧版 5 years ago
tpingzhang e9f8449468 eregi php5.3 废弃
preg_match
apple 支付页面
5 years ago
zhengchanglong 2ba3b915b9 超级前充值金额修改 5 years ago
zhengchanglong e2fc2e5128 修改超级签充值流程 5 years ago
chenzhi ca79a3f627 css ok 5 years ago
chenzhi 95fc99816f 价格 5 years ago
chenzhi b112a5548f 123 5 years ago
ELF 2638929031 通过帐号隐藏目录 5 years ago
chenzhi cc78f094ad 去除blank 5 years ago
chenzhi e4b72a1847 新增blank页 5 years ago
chenzhi 629c803e87 Merge branch 'dev-cz' of 47.111.118.107:/srv/git/platform into dev_zcl 5 years ago
chenzhi b5484a07c6 blank 5 years ago
chenzhi 5236c7a6f1 优化css1 5 years ago
zyx 5d5879021f Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev_zyx
 Conflicts:
	Application/Admin/View/Giftbag/add.html
5 years ago
elf@home f7aaa9030e 修改bug 5 years ago
elf@home 4c5473a27f 修改bug 5 years ago
zhengchanglong f338c3d210 超级签充值金额修改 5 years ago
zhengchanglong c261e88932 Merge branch 'dev-cz' into dev 5 years ago
chenzhi f4a26b2cc2 账号验证 5 years ago
zhengchanglong caf5f0aff1 Merge branch 'dev-cz' into dev_zcl 5 years ago
chenzhi 3757281985 弹窗 5 years ago
chenzhi 0d50d94a42 123456 5 years ago
chenzhi e826b22d56 1234 5 years ago
chenzhi f87853a9f7 123 5 years ago
chenzhi 8f5f4ba9bc 礼包领取 5 years ago
zhengchanglong f80ebc8583 修改超级签名BUG 5 years ago
chenzhi 5635519c17 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz 5 years ago
zhengchanglong 0a62987665 修改超级签名BUG 5 years ago
zhengchanglong e3315ca26e Merge remote-tracking branch 'origin/dev' into dev 5 years ago
zyx 0dbbfb763d Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zyx 90665c3dc5 新增礼包bug修正 5 years ago
chenzhi a544978349 新增密码复杂度验证 5 years ago
zhengchanglong 7a1b537d98 Merge branch 'dev-cz' into dev 5 years ago
chenzhi 4441f2844c bug3 5 years ago
chenzhi 2693172cda 修复3 5 years ago
chenzhi b69ca03856 bug修复2 5 years ago
ELF 145144ba51 解决冲突 5 years ago
ELF 4a403076b9 解决冲突 5 years ago
ELF 983b707d69 修改手机端显示 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 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
ELF cc9aa1a640 解决冲突 5 years ago
chenzhi b8153b1cd2 比例加大 5 years ago
chenzhi 866fb4c290 适配加大 5 years ago
ELF a093dd3d5b 修改手机端目录 5 years ago
chenzhi 92942cb7f5 优化ssg 5 years ago
chenzhi b01ff154ea 新增礼包 5 years ago
zyx db34f256fd Merge branch 'dev-cz' of 47.111.118.107:/srv/git/platform into dev-cz 5 years ago
zyx 96b81a57ca 礼包添加bug修正 5 years ago
chenzhi 4e887c7f71 Merge branch 'dev-cz' of 47.111.118.107:/srv/git/platform into dev-cz 5 years ago
chenzhi 953cb6b988 流程样式 5 years ago
zyx f4bc470156 资源日志bug修复 5 years ago
zhengchanglong 5390597093 超级签首页 搜索框样式自适应 5 years ago
zhengchanglong 228f7de164 样式修改 5 years ago
zyx bd572379b0 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zyx 5c5d879710 资源日志bug修复 5 years ago
zyx aabaa9ae01 测试资源日志管理bug修复 5 years ago
ELF 84174b18e9 修改bug 5 years ago
zyx 44121ed303 新增礼包界面js bug修复 5 years ago
zyx 55cc0c91e4 新增礼包界面优化 5 years ago
chenzhi d8095f3397 Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev-cz 5 years ago
chenzhi 712498aff9 下载 5 years ago
zyx 63eebf5611 礼包管理新增全部,超级签选项 5 years ago
chenzhi 6ed821429f 检索 5 years ago
zyx f64225cff0 测试功能移交到总管理后台,扶持号管理bug修正 5 years ago
zyx 18cddff9a4 Merge branch 'dev' of 47.111.118.107:/srv/git/platform 5 years ago
ELF 91866f4433 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
ELF d9e7a55af4 修改bug 5 years ago
chenxiaojun 80e2a7e0fa 订单查询、注册明细->组长与推广员组合检索bug修复 5 years ago
chenxiaojun 57c9c7419a 订单查询、注册明细->组长与推广员组合检索bug修复 5 years ago
chenzhi 0669d15e3e Merge branch 'dev-cz' of 47.111.118.107:/srv/git/platform into dev-cz 5 years ago
chenzhi 4ac6442777 更新 5 years ago
zhengchanglong 9fd85bb4b5 完善超级签支付业务 5 years ago
sunke 94e7594f40 删除id 5 years ago
zhengchanglong fb7a8f809c Merge branch 'dev-cz' of 47.111.118.107:/srv/git/platform into dev_zcl 5 years ago
zhengchanglong 3bfb23b360 超级签支付 5 years ago
chenxiaojun d93a68144f 订单查询->组长、推广员检索框位置更改 5 years ago
chenxiaojun 6947802527 订单查询->组长、推广员检索框位置更改 5 years ago
chenxiaojun 837d168f2d 每日概况、数据汇总、订单查询、注册明细 组长检索bug修复 5 years ago
chenxiaojun 307146cd3c 每日概况、数据汇总、订单查询、注册明细 组长检索bug修复 5 years ago
chenzhi da8aee73c6 增加弹框 5 years ago
chenxiaojun 203e2df7c8 数据管理->订单查询->支付方式检索bug修复 5 years ago
chenxiaojun a01c8f04b8 数据管理->订单查询->支付方式检索bug修复 5 years ago
zhengchanglong 308903d396 Merge branch 'dev-cz' into dev_zcl
# Conflicts:
#	Application/Sdk/Controller/Ipa365Controller.class.php
5 years ago
chenzhi d1428e1044 名字测试 5 years ago
chenxiaojun 580d52bf3c 新增->游戏管理->分成比例|设置 5 years ago
zhengchanglong 67291fb95e 超级签BUG修复 5 years ago
chenxiaojun c8f7014fb2 新增->游戏管理->分成比例|设置 5 years ago
“‘ 9316dedc6c 修复 5 years ago
“‘ 96ca80221b 修复 5 years ago
“‘ 56f567e47f 支付 5 years ago
chenxiaojun 414f3121fb 每页条数bug修复 5 years ago
chenxiaojun f91c0f0965 每页条数bug修复 5 years ago
zhengchanglong 2dc6304ec3 超级签微信支付 5 years ago
zhengchanglong bb0a399ef7 推广员平台币支付 支付宝支付账户信息重配置文件读取 5 years ago
ELF b2f357608f Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
ELF c715996821 修改bug 5 years ago
sunke 2e18b8cc05 资料详情落地页增加layui样式 5 years ago
zyx c988ee0517 Merge branch 'dev_zcl' of 47.111.118.107:/srv/git/platform 5 years ago
zhengchanglong 9ffb5fd753 New branch commit 5 years ago
zhengchanglong c2945ce522 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
zhengchanglong 6db2ead554 误提交恢复 5 years ago
chenxiaojun a9cb458ada 订单查询支付方式修改 5 years ago
chenxiaojun 4e7904c3de 订单查询支付方式修改 5 years ago
zhengchanglong 24f70b8380 new branch commit 5 years ago
zyx 607e32e43a 首页功能提示样式修改 5 years ago
chenxiaojun 0e87fc7267 订单查询支付方式修改 5 years ago
chenxiaojun 446085a154 订单查询支付方式修改 5 years ago
chenxiaojun 7456c891a8 区服ID更新 5 years ago
zyx e4be69d796 Merge branch 'dev' of 47.111.118.107:/srv/git/platform 5 years ago
zyx 3ed9092e07 首页功能隐藏 5 years ago
chenxiaojun 439c8f1ba9 更新 5 years ago
chenxiaojun 0355472a1c 区服ID 5 years ago
chenxiaojun b426a6e153 订单查询 注册明细 5 years ago
chenxiaojun 5e75ed2480 订单查询 注册明细 5 years ago
zyx eab8135549 首页添加日志及未读提醒功能 5 years ago
ELF 5dd9df5cd5 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
ELF 8bea436dee 修改 5 years ago
chenxiaojun 66b86e074e 数据汇总 每日概况 5 years ago
chenxiaojun 52d9da8f1d 数据汇总 每日概况 5 years ago
ELF 580a531bc4 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
ELF 24cbe37faa 修改bugt 5 years ago
chenxiaojun 329c9d1514 数据汇总 每日概况 5 years ago
chenxiaojun 3fc4438754 数据汇总 每日概况 5 years ago
chenxiaojun 9ef95cdabf 数据汇总 每日概况 5 years ago
chenxiaojun a5bd8c25c4 数据汇总 每日概况 5 years ago
ELF 4c4d3255d7 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
ELF 8ce7442062 修改bug 5 years ago
chenxiaojun c678968253 数据汇总 5 years ago
chenxiaojun e53268815c 数据汇总 5 years ago
chenxiaojun 9aa0dee895 官网认证 5 years ago
chenxiaojun 9de8e33ba9 数据汇总 5 years ago
chenxiaojun 615e6f660d 官网认证 5 years ago
chenxiaojun 809778b449 数据汇总更新 5 years ago
ELF e610500db6 修改时间插件默认值显示bug 5 years ago
ELF 06bfdbca93 解决冲突 5 years ago
elf@home cda67249ac 修改 5 years ago
ELF d3412cc3ce 测试 5 years ago
zyx 700ac00fbc 测试资源title标签补全 5 years ago
zhengchanglong c8192c384d 无用菜单隐藏 5 years ago
chenxiaojun 9bb4900b2c 新增:官网->客服帮助->模糊搜索 5 years ago
chenxiaojun dea1cb1283 新增:官网->客服帮助->模糊搜索 5 years ago
chenxiaojun 5745fee3bd 新增:官网->客服帮助->模糊搜索 5 years ago
chenxiaojun 18a2a25d26 新增:官网->客服帮助->模糊搜索 5 years ago
chenxiaojun b668140aed 新增:官网->客服帮助->模糊搜索 5 years ago
sunke ae666881ed 修改专区防错 5 years ago
chenxiaojun 114b218b19 新增:官网->客服帮助->模糊搜索 5 years ago
chenxiaojun af9e148f1d 新增:官网->客服帮助->模糊搜索 5 years ago
sunke c4bd54b6d5 资料专区菜单 5 years ago
chenxiaojun 007f2ec003 批量添加下级游戏bug修复 5 years ago
chenxiaojun 7f7d054dfc 批量添加下级游戏bug修复 5 years ago
chenxiaojun ddd7b9805f 批量添加下级游戏bug修复 5 years ago
chenxiaojun 98392b21b8 批量添加下级游戏bug修复 5 years ago
chenxiaojun bfc4cd92e8 官网样式调整 5 years ago
chenxiaojun 2fcca7fcaa 落地页 5 years ago
chenxiaojun 7c360e40f6 落地页测试 5 years ago
chenxiaojun 93cf48ef8e 落地页测试 5 years ago
chenxiaojun 1e014fe0b0 落地页 5 years ago
chenxiaojun b3aa8078af 官网页面修复 5 years ago
zyx 98a0ea3631 后台菜单修改提交 5 years ago
zyx 1aec352b50 防护日志功能添加,扶持号功能修改 5 years ago
tpingzhang e14c736d6b 域名 5 years ago
tpingzhang d600b8d7aa Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
tpingzhang 60fb35a8b3 小程序支付
优先抵扣平台币
微信支付限额
支付回调客户端
5 years ago
“‘ 70a4ba3244 修复密码bug 5 years ago
“‘ b9bd9655b7 测试资源记录及发放 5 years ago
ELF ab4dc74784 修改 5 years ago
ELF 1a2ffac6be Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
ELF 7c19d63e17 Merge branch 'hotfix/promote-menu' into dev 5 years ago
ELF 4bb79166d8 Merge branch 'master' of 47.111.118.107:/srv/git/platform 5 years ago
ELF 85cabc0031 显示推广系统游戏菜单 5 years ago
“‘ c28cef6ee4 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
ELF 0dc0063092 修改arpu 5 years ago
“‘ efccda637b 测试资源测试 5 years ago
chenxiaojun 3a9adbae03 更新->下级添加游戏bug修复 5 years ago
chenxiaojun b5ed51bed1 更新->下级添加游戏bug修复 5 years ago
chenxiaojun ae8bb7880d 更新->添加下级游戏bug修复 5 years ago
chenxiaojun 91d5166af3 更新->下级添加游戏bug修复 5 years ago
ELF 659c27b930 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
ELF 49d42a0bdf Merge branch 'supersign' 5 years ago
ELF f695dad611 修改 5 years ago
ELF 0c34bb88d3 解决冲突 5 years ago
ELF 88a7df1119 修改 5 years ago
“‘ c1ad138313 菜单 5 years ago
“‘ 227fd3b3f1 新增目录 5 years ago
tpingzhang 057ccc9f4c Merge branch 'supersign' into dev 5 years ago
tpingzhang c2fbf2c141 超级签 官方渠道优化 5 years ago
“‘ fb95cebcf5 新增目录 5 years ago
“‘ 89ae55f554 新增测试资源申请 5 years ago
zyx 926c72f8af Merge branch 'dev' of 47.111.118.107:/srv/git/platform 5 years ago
zyx 5cfd492676 10.11支持号管理功能修改提交 5 years ago
tpingzhang e8aa7eb4db Merge commit '8670b8974faec3a3a252643c79072b787c2c581c' into dev 5 years ago
tpingzhang 386e119f15 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into supersign 5 years ago
tpingzhang 8670b8974f 超级签 登入状态验证 5 years ago
chenxiaojun 5d57c4a78b 更新->数据汇总 每日概况 5 years ago
chenxiaojun fe331aebad 更新->数据汇总 每日概况 5 years ago
ELF b268f1fce6 数据统计 5 years ago
chenxiaojun 24b0649615 新增->游戏分包打包排序 5 years ago
chenxiaojun 59de455dea Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	Data/update.sql
5 years ago
chenxiaojun a1476436d2 新增->游戏分包打包顺序
# Conflicts:
#	Data/update.sql
5 years ago
chenxiaojun 82d40f4e8b 新增->游戏分包打包顺序 5 years ago
zyx e3d2e4b1b3 支持号管理功能提交 5 years ago
ELF fc73d458c9 业绩 5 years ago
chenxiaojun 62d38bf08e 新增->设置'会长下级游戏展示'
# Conflicts:
#	Data/update.sql
5 years ago
chenxiaojun f4fe99c130 管理员后台->推官员编辑->添加'下级游戏展示'设置 5 years ago
chenxiaojun 6970e36395 游戏管理->设置 5 years ago
chenxiaojun b9a29a5032 游戏管理->设置 5 years ago
18850253506@163.com 13eef28c29 css 5 years ago
18850253506@163.com 5ff1cb6d5b 详情落地页样式修改 5 years ago
chenxiaojun 362d5b4f05 落地页样式调整 5 years ago
chenxiaojun 5ba238766d 落地页样式调整 兼容360兼容模式 5 years ago
18850253506@163.com 4a96cf7871 资料专区 5 years ago
chenxiaojun 35df2c87aa 订单查询 注册明细 管理员后台游戏添加混服设置 5 years ago
chenxiaojun 906f3fd870 订单查询更新 5 years ago
chenxiaojun e95b78aa03 订单查询更新 5 years ago
chenxiaojun 622264a820 订单查询更新 5 years ago
chenxiaojun 2ca1009b32 管理员后台 游戏添加混服设置 5 years ago
chenxiaojun 73a604c815 更新 5 years ago
chenxiaojun 41291daa3f 更新 5 years ago
ELF e020b09e4d 测试 5 years ago
chenxiaojun 3a9afae16e 游戏管理->混服管理 游戏管理->分成比例 5 years ago
chenxiaojun 6c78459b38 更新 5 years ago
chenxiaojun 8ffc9038c4 更新 5 years ago
chenxiaojun 1cfba9a3b5 更新 5 years ago
chenxiaojun 93b3affa75 混服模块 分成比例模块 5 years ago
ELF 94acfd4c74 修改菜单 5 years ago
chenxiaojun 4d19e28633 落地页更新 5 years ago
chenxiaojun 49c3c8a45e ios13.1 5 years ago
tpingzhang efae40fa2e 重复点击充值
平台币充值提示问题。
5 years ago
chenxiaojun 63f2fa47b5 登录提示变更 5 years ago
zhengchanglong c6753aaa9e 推广员首页开服信息添加AJAX分页 5 years ago
zhengchanglong 0b046abc68 推广员首页开服信息添加AJAX分页 5 years ago
chenxiaojun 999f3af068 我的游戏页面更新 5 years ago
chenxiaojun 2b11bed26f 复制到剪切板功能更新 5 years ago
zhengchanglong 8fbe2f527e Merge remote-tracking branch 'origin/dev' into dev 5 years ago
zhengchanglong 29282badd6 超级签删除冗余页面及JS路径有误修正 5 years ago
tpingzhang 7557053604 游戏 回调日志 5 years ago
tpingzhang 9978371b58 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
tpingzhang 28937dd832 微信小程序支付显示安卓
save返回
5 years ago
zhengchanglong 0a3bdd9c3e Merge remote-tracking branch 'origin/dev' into dev 5 years ago
elf@home 2bc1f3c567 修改内容 5 years ago
liaojinling 0fbfd868bc 修改bug 5 years ago
liaojinling b8f05ec380 手机端注册登录添加日志、cookie 5 years ago
liaojinling 22783c3168 sdk添加注册日志 5 years ago
liaojinling 5861fb19c5 修改首页 5 years ago
liaojinling fa2bf60610 隐藏首页数据 5 years ago
chenxiaojun 4a819428df 落地页更新 5 years ago
chenxiaojun 0fb4c7f225 落地页更新 5 years ago
chenxiaojun aca0919aea 落地页更新 5 years ago
chenxiaojun 529b8882a8 落地页更新 5 years ago
chenxiaojun faf79e2b96 落地页更新 5 years ago