Commit Graph

533 Commits (82c5bd30da447b49d5040e88419987d8cbce4d6c)

Author SHA1 Message Date
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
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 流程样式
zhengchanglong 5390597093 超级签首页 搜索框样式自适应
zhengchanglong 228f7de164 样式修改
zyx bd572379b0 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zyx 5c5d879710 资源日志bug修复
ELF 84174b18e9 修改bug
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 推广员平台币支付 支付宝支付账户信息重配置文件读取
ELF b2f357608f Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
ELF c715996821 修改bug
sunke 2e18b8cc05 资料详情落地页增加layui样式
zyx c988ee0517 Merge branch 'dev_zcl' of 47.111.118.107:/srv/git/platform
zhengchanglong 9ffb5fd753 New branch commit
zhengchanglong c2945ce522 Merge remote-tracking branch 'origin/dev' into dev
zhengchanglong 6db2ead554 误提交恢复
chenxiaojun a9cb458ada 订单查询支付方式修改
chenxiaojun 4e7904c3de 订单查询支付方式修改
zhengchanglong 24f70b8380 new branch commit
zyx 607e32e43a 首页功能提示样式修改
chenxiaojun 0e87fc7267 订单查询支付方式修改
chenxiaojun 446085a154 订单查询支付方式修改
chenxiaojun 7456c891a8 区服ID更新
zyx e4be69d796 Merge branch 'dev' of 47.111.118.107:/srv/git/platform
zyx 3ed9092e07 首页功能隐藏
chenxiaojun 439c8f1ba9 更新
chenxiaojun 0355472a1c 区服ID
chenxiaojun b426a6e153 订单查询 注册明细