Commit Graph

752 Commits (d5998e722e9d8462c403c9b47c4eb05322f5c92d)

Author SHA1 Message Date
chenxiaojun 85839b7e94 手机官网->平台币充值简介修改
chenxiaojun ecf43d6e7a PC官网->平台币充值简介修改
chenxiaojun 66e011e101 PC官网->平台币充值简介修改
tpingzhang 29883f60ac 修改重复插入问题 增加唯一索引 记录重复插入异常
jbrazz c1ab4e789c Merge branch 'featrue/fix_bug' into dev
jbrazz 9bc5127223 upt
zhengchanglong 4b2e492340 Merge branch 'dev_zcl' into dev
zhengchanglong dee6c2e60d 扶持号SDK登录安全防护业务
chenxiaojun 641dcd5b65 推广员后台->每日概况->游戏检索bug
chenxiaojun db424fde84 推广员后台->每日概况->游戏检索bug
jbrazz 953564d291 upt
zyx 24d5bf34c7 添加站点功能修改快捷菜单的图标
ELF b7964e19d0 修改bug
ELF 4d0359aaba 修改bug
ELF cd90807d58 Merge branch 'hotfix/promote' into dev
ELF b29d62a4ac Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
chenxiaojun 5bb7e9850f 推广员后台->区服排序
chenxiaojun c3d4c112d6 推广员后台->区服排序
ELF b8f93f74c6 隐藏推广员系统目录
ELF 157676f268 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
ELF 260e45f4d9 Merge branch 'hotfix/query' into dev
ELF 2816054361 修改bug
zhengchanglong ec07cedc5e Merge branch 'dev_zcl' into dev
chenzhi 5d7385e77a 登陆bug优化
zyx e23943cfdb Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zyx bb3109f5d3 测试账号冻结状态需要的字段修改
zhengchanglong 32595840c3 Merge branch 'dev_zcl' into dev
chenzhi a54a6b8b26 优化bug
zyx 5ffc0bf9b0 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zyx 560e13af03 更改文章详情的后退按钮的样式
ELF cdfbe61fa2 Merge branch 'hotfix/pc' into dev
chenxiaojun bb23bb2a03 推广员后台->检索bug修复
chenxiaojun a5873caf8d 推广员后台->检索bug修复
jbrazz 2d94c4a539 fix
chenxiaojun 1ba358fabb 管理后台->新增混服管理查询 推广员后台->推广员检索调整 sys_model->game的list_grid字段添加server_type
chenxiaojun c322f6ec7e 管理后台->新增混服管理查询 推广员后台->推广员检索调整 sys_model->game的list_grid字段添加server_type
zyx 3c1b1673f2 测试资源申请页面检索数据修正,检索都统一改为模糊查询,文章详情页隐藏首页,添加返回按钮
ELF 608d24b732 开放测试帐号
ELF 554793d95e Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
ELF c888915daa Merge branch 'hotfix/query' into dev
ELF ece317d6fa 修改bug
chenxiaojun a91c372a3b 修复关联游戏混服选项bug
chenxiaojun 76bd557efd 修复关联游戏混服选项bug
Your Name 51154dd533 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
Your Name 22e7866644 SDK菜单添加
zhengchanglong 8af781b9b4 修改超级签充值金额
chenzhi 4dba7bcfeb 修复严重码bug
Your Name 45ff545256 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
Your Name f1b5a2257d SDK用户菜单-修改
zhengchanglong d2d7dec38a 超级签页面title修改
zhengchanglong b46921447a 微信支付回跳修改
zhengchanglong 68c9c492c5 微信支付回跳修改
zhengchanglong 941303065d Merge branch 'dev_zcl' into dev
zhengchanglong eea9cc772c 微信支付回跳修改
zyx 97ccd1d57a 解决游戏公告无法发出的问题
zyx 91b773d974 开服信息,平台显示修正
zyx 7e27d35a97 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zyx 9eb36bd81f 组长账号显示测试资源
chenxiaojun dbf0f67d19 官网->商务合作公司地址修改
chenxiaojun 7d018b47af 官网->商务合作公司地址修改
chenxiaojun 165d9dad62 官网->商务合作公司地址修改
zyx ccf7bfc65a 首页开服信息图标大小修改
zhengchanglong 58f489199c 删除冗余代码
Your Name 032b2b5197 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
Your Name b253d23ae3 SDK用户菜单字段名修改
zyx 595112e6b5 快捷菜单关闭回调事件添加
Your Name 277eea047d Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
Your Name 971906dd29 SDK用户菜单
zhengchanglong 4c04cdc8f6 Merge branch 'dev_zcl' into dev
zhengchanglong 745c034d3e 去除alert 弹框
Your Name 2eff781166 SDK用户菜单
Your Name 118340fa33 SDK用户菜单
zhengchanglong fe70974a54 修改超级前充值测试金额
zhengchanglong f9b9106ce5 Merge branch 'dev_zcl' into dev
zhengchanglong 8de8da4f38 超级签充值业务迁移mobile目录下
chenxiaojun f8206e3f7d ios13.1绑定提示修改
chenxiaojun 7d8f7b53e6 ios13.1绑定提示修改 下级推广员查询bug修复
chenxiaojun a29d153581 ios13.1绑定提示修改
chenxiaojun cff2dc911a 获取下级推广员bug修改
zyx 6f7c814051 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zyx 2c2446d38b 将首页开服信息icon改成80*80
zyx aeab84e426 将首页开服信息icon改成80*80
chenxiaojun fb19592de2 ios13.1绑定
chenxiaojun cdc7e284da ios13.1绑定bug修复
chenxiaojun ea3e0015bf ios13.1绑定
zyx a985da5c44 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev_zyx
zyx 66ced8930e 首页bug解决
zhengchanglong 5889b69b71 Merge branch 'dev-cz' into dev
chenzhi 0b70159a66 123
chenzhi ba4219dc64 更新忘记密码
zhengchanglong 8a7bcb13d3 Merge branch 'dev_zcl' into dev
zhengchanglong ee6e3a8624 修改测试金额
zhengchanglong 2b8cbf0021 Merge branch 'dev_zcl' into dev
chenzhi 5f4dca0a77 1018修改
elf@home e94675c93c 修改
elf@home 848e07238d 修改
ELF 9b42942900 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhengchanglong ae911f62a0 Merge branch 'dev-cz' into dev
chenzhi 5805880e0c 更新推广
ELF 24b1441632 修改超级签链接
zhengchanglong c367a965f2 Merge branch 'dev-cz' into dev
chenzhi 61f4bec085 login
zyx f00ff01f95 php版本问题bug
zhengchanglong 433219c3f6 Merge branch 'dev-cz' into dev
chenzhi 2e8f7ba410 更新
zhengchanglong 46e5b1198c 修改金额
zyx 5ef6cda158 首页开服信息区分平台bug修正
zhengchanglong 6a3b3cd114 超级签网页端充值地址修改
zhengchanglong be9586bc5b 支付流程修改
zhengchanglong f0dc10cd60 支付流程修改
zyx 84327c1315 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zyx ae1986b4a8 已读日志为零时不显示
chenzhi 4539c163a4 首页alert恢复
tpingzhang 464e9f244b 正常充值不需要验证spend表 是否重复充值
zhengchanglong e30580791e 超级前购买测试金额改为0.01
zyx dd3e56d27c Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zyx 72036e51e3 首页时间问题修正,快捷菜单10个限制添加
zhengchanglong 4367052f77 Merge branch 'dev-cz' into dev
zhengchanglong 86040c88c6 超级签购买错误信息页面
chenzhi d24fa30651 优化
tpingzhang 9ac3bf3397 测试
tpingzhang b5b43b0875 支付状态
zhengchanglong 7863eb1be3 Merge branch 'dev-cz' into dev_zcl
# Conflicts:
#	Public/Sdk/css/ssg/common.css
#	Public/Sdk/images/ssg/blank/blankimg.png
zhengchanglong 5f5be5d57e 超级签充值流程修改
chenzhi 5a25e5dec1 验证码简化
chenzhi 992ef831b5 验证码简化
tpingzhang 5be8421011 旧版
tpingzhang e9f8449468 eregi php5.3 废弃
preg_match
apple 支付页面
zhengchanglong 2ba3b915b9 超级前充值金额修改
zhengchanglong e2fc2e5128 修改超级签充值流程
chenzhi ca79a3f627 css ok
chenzhi 95fc99816f 价格
chenzhi b112a5548f 123
ELF 2638929031 通过帐号隐藏目录
chenzhi cc78f094ad 去除blank
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 983b707d69 修改手机端显示
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 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
ELF cc9aa1a640 解决冲突
chenzhi b8153b1cd2 比例加大
chenzhi 866fb4c290 适配加大
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
zyx 44121ed303 新增礼包界面js bug修复
zyx 55cc0c91e4 新增礼包界面优化
chenzhi d8095f3397 Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev-cz
chenzhi 712498aff9 下载
zyx 63eebf5611 礼包管理新增全部,超级签选项
chenzhi 6ed821429f 检索
zyx f64225cff0 测试功能移交到总管理后台,扶持号管理bug修正
zyx 18cddff9a4 Merge branch 'dev' of 47.111.118.107:/srv/git/platform
ELF 91866f4433 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
ELF d9e7a55af4 修改bug
chenxiaojun 80e2a7e0fa 订单查询、注册明细->组长与推广员组合检索bug修复
chenxiaojun 57c9c7419a 订单查询、注册明细->组长与推广员组合检索bug修复
chenzhi 0669d15e3e Merge branch 'dev-cz' of 47.111.118.107:/srv/git/platform into dev-cz
chenzhi 4ac6442777 更新
zhengchanglong 9fd85bb4b5 完善超级签支付业务
sunke 94e7594f40 删除id
zhengchanglong fb7a8f809c Merge branch 'dev-cz' of 47.111.118.107:/srv/git/platform into dev_zcl
zhengchanglong 3bfb23b360 超级签支付
chenxiaojun d93a68144f 订单查询->组长、推广员检索框位置更改
chenxiaojun 6947802527 订单查询->组长、推广员检索框位置更改
chenxiaojun 837d168f2d 每日概况、数据汇总、订单查询、注册明细 组长检索bug修复
chenxiaojun 307146cd3c 每日概况、数据汇总、订单查询、注册明细 组长检索bug修复
chenzhi da8aee73c6 增加弹框
chenxiaojun 203e2df7c8 数据管理->订单查询->支付方式检索bug修复
chenxiaojun a01c8f04b8 数据管理->订单查询->支付方式检索bug修复
zhengchanglong 308903d396 Merge branch 'dev-cz' into dev_zcl
# Conflicts:
#	Application/Sdk/Controller/Ipa365Controller.class.php
chenzhi d1428e1044 名字测试
chenxiaojun 580d52bf3c 新增->游戏管理->分成比例|设置
zhengchanglong 67291fb95e 超级签BUG修复
chenxiaojun c8f7014fb2 新增->游戏管理->分成比例|设置
“‘ 9316dedc6c 修复
“‘ 96ca80221b 修复
“‘ 56f567e47f 支付
chenxiaojun 414f3121fb 每页条数bug修复
chenxiaojun f91c0f0965 每页条数bug修复
zhengchanglong 2dc6304ec3 超级签微信支付
zhengchanglong bb0a399ef7 推广员平台币支付 支付宝支付账户信息重配置文件读取