elf
/
cf-platform
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Commit Graph

  • f7ca69eba6 支付回调域名 tpingzhang 2019-10-17 18:06:32 +0800
  • c3cb46cab0 超级签充值BUG修复 zhengchanglong 2019-10-17 18:05:53 +0800
  • f05e7a3149 支付回调域名 tpingzhang 2019-10-17 18:02:55 +0800
  • ba644484e7 Merge branch 'serveridnull' into dev tpingzhang 2019-10-17 18:01:28 +0800
  • 81f85e672d 支付回调域名 tpingzhang 2019-10-17 18:00:40 +0800
  • 975b514e90 Merge remote-tracking branch 'origin/dev' into dev chenxiaojun 2019-10-17 17:46:48 +0800
  • 165fa76414 更新浏览器识别 chenzhi 2019-10-17 17:46:31 +0800
  • b4653fa0b8 检索修改 chenxiaojun 2019-10-17 17:45:19 +0800
  • 5f6bd14967 Merge branch 'serveridnull' into dev tpingzhang 2019-10-17 17:44:57 +0800
  • 9fb953ea60 检索修改 chenxiaojun 2019-10-17 17:44:57 +0800
  • b72fc9ff7c apple alipay tpingzhang 2019-10-17 17:40:43 +0800
  • bd10995fad Merge branch 'serveridnull' into dev tpingzhang 2019-10-17 17:37:45 +0800
  • 8a5f833335 apple alipay tpingzhang 2019-10-17 17:35:43 +0800
  • 6fbc15359b Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev tpingzhang 2019-10-17 17:22:17 +0800
  • 63f8e24208 解决冲突 tpingzhang 2019-10-17 17:21:49 +0800
  • cdb5e1e699 去掉pay_header tpingzhang 2019-10-17 17:14:12 +0800
  • 88a971b56e 优化css chenzhi 2019-10-17 17:13:22 +0800
  • ae9d502150 订单查询修改 chenxiaojun 2019-10-17 17:06:12 +0800
  • 82e2c3faab 订单查询修改 chenxiaojun 2019-10-17 17:05:41 +0800
  • a6c99cda3a 1，修改server_id传0 增加game_player_id 2，微信限额》=3000 3，小程序 tpingzhang 2019-10-17 17:04:44 +0800
  • ae6a18303a 超级签名充值测试金额改为0.01 zhengchanglong 2019-10-17 17:00:23 +0800
  • 47ba229b80 Merge remote-tracking branch 'origin/dev' into dev zhengchanglong 2019-10-17 16:45:23 +0800
  • 059900320b 超级签回跳地址是否需要https判断 zhengchanglong 2019-10-17 16:45:11 +0800
  • a7f2695665 无检索条件默认包括本账号 chenxiaojun 2019-10-17 16:43:38 +0800
  • e3d0e885f2 无检索条件默认包括本账号 chenxiaojun 2019-10-17 16:42:36 +0800
  • a6398b488f Merge branch 'dev_zcl' into dev zhengchanglong 2019-10-17 16:17:08 +0800
  • db956a2d77 修改bug ELF 2019-10-17 16:11:49 +0800
  • 34801e02e3 优化适配 chenzhi 2019-10-17 16:02:10 +0800
  • d9ccefaced Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev ELF 2019-10-17 15:53:12 +0800
  • cc9aa1a640 解决冲突 ELF 2019-10-17 15:53:03 +0800
  • 115ce7a35d 增加user_token tpingzhang 2019-10-17 15:52:22 +0800
  • b8153b1cd2 比例加大 chenzhi 2019-10-17 15:52:00 +0800
  • 866fb4c290 适配加大 chenzhi 2019-10-17 15:49:42 +0800
  • ce9f5ff05a Merge branch 'hotfix/menu' ELF 2019-10-17 15:48:43 +0800
  • a093dd3d5b 修改手机端目录 ELF 2019-10-17 15:48:33 +0800
  • 92942cb7f5 优化ssg chenzhi 2019-10-17 15:34:01 +0800
  • b01ff154ea 新增礼包 chenzhi 2019-10-17 15:27:14 +0800
  • db34f256fd Merge branch 'dev-cz' of 47.111.118.107:/srv/git/platform into dev-cz zyx 2019-10-17 15:10:05 +0800
  • 96b81a57ca 礼包添加bug修正 zyx 2019-10-17 15:09:34 +0800
  • 4e887c7f71 Merge branch 'dev-cz' of 47.111.118.107:/srv/git/platform into dev-cz chenzhi 2019-10-17 15:08:17 +0800
  • 953cb6b988 流程样式 chenzhi 2019-10-17 15:07:01 +0800
  • f4bc470156 资源日志bug修复 zyx 2019-10-17 15:03:14 +0800
  • 5390597093 超级签首页 搜索框样式自适应 zhengchanglong 2019-10-17 14:59:20 +0800
  • 228f7de164 样式修改 zhengchanglong 2019-10-17 14:48:50 +0800
  • bd572379b0 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev zyx 2019-10-17 14:18:21 +0800
  • 5c5d879710 资源日志bug修复 zyx 2019-10-17 14:17:42 +0800
  • aabaa9ae01 测试资源日志管理bug修复 zyx 2019-10-17 14:14:45 +0800
  • 84174b18e9 修改bug ELF 2019-10-17 14:02:05 +0800
  • 44121ed303 新增礼包界面js bug修复 zyx 2019-10-17 13:59:26 +0800
  • 55cc0c91e4 新增礼包界面优化 zyx 2019-10-17 13:52:30 +0800
  • d8095f3397 Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev-cz chenzhi 2019-10-17 12:49:01 +0800
  • 712498aff9 下载 chenzhi 2019-10-17 12:48:46 +0800
  • 63eebf5611 礼包管理新增全部，超级签选项 zyx 2019-10-17 11:58:50 +0800
  • 6ed821429f 检索 chenzhi 2019-10-17 09:44:37 +0800
  • f64225cff0 测试功能移交到总管理后台，扶持号管理bug修正 zyx 2019-10-17 09:11:38 +0800
  • 18cddff9a4 Merge branch 'dev' of 47.111.118.107:/srv/git/platform zyx 2019-10-17 09:02:50 +0800
  • 91866f4433 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev ELF 2019-10-16 18:34:29 +0800
  • d9e7a55af4 修改bug ELF 2019-10-16 18:34:17 +0800
  • 80e2a7e0fa 订单查询、注册明细->组长与推广员组合检索bug修复 chenxiaojun 2019-10-16 18:11:18 +0800
  • 57c9c7419a 订单查询、注册明细->组长与推广员组合检索bug修复 chenxiaojun 2019-10-16 18:10:46 +0800
  • 0669d15e3e Merge branch 'dev-cz' of 47.111.118.107:/srv/git/platform into dev-cz chenzhi 2019-10-16 17:18:39 +0800
  • 4ac6442777 更新 chenzhi 2019-10-16 17:17:13 +0800
  • 9fd85bb4b5 完善超级签支付业务 zhengchanglong 2019-10-16 17:13:29 +0800
  • 94e7594f40 删除id sunke 2019-10-16 17:03:04 +0800
  • fb7a8f809c Merge branch 'dev-cz' of 47.111.118.107:/srv/git/platform into dev_zcl zhengchanglong 2019-10-16 16:01:39 +0800
  • 3bfb23b360 超级签支付 zhengchanglong 2019-10-16 15:52:59 +0800
  • d93a68144f 订单查询->组长、推广员检索框位置更改 chenxiaojun 2019-10-16 15:42:14 +0800
  • 6947802527 订单查询->组长、推广员检索框位置更改 chenxiaojun 2019-10-16 15:41:33 +0800
  • 837d168f2d 每日概况、数据汇总、订单查询、注册明细 组长检索bug修复 chenxiaojun 2019-10-16 15:31:48 +0800
  • 307146cd3c 每日概况、数据汇总、订单查询、注册明细 组长检索bug修复 chenxiaojun 2019-10-16 15:29:27 +0800
  • da8aee73c6 增加弹框 chenzhi 2019-10-16 15:08:50 +0800
  • 203e2df7c8 数据管理->订单查询->支付方式检索bug修复 chenxiaojun 2019-10-16 11:52:40 +0800
  • a01c8f04b8 数据管理->订单查询->支付方式检索bug修复 chenxiaojun 2019-10-16 11:51:58 +0800
  • 308903d396 Merge branch 'dev-cz' into dev_zcl zhengchanglong 2019-10-16 11:45:42 +0800
  • d1428e1044 名字测试 chenzhi 2019-10-16 11:42:55 +0800
  • 580d52bf3c 新增->游戏管理->分成比例|设置 chenxiaojun 2019-10-16 11:39:14 +0800
  • 67291fb95e 超级签BUG修复 zhengchanglong 2019-10-16 11:39:01 +0800
  • c8f7014fb2 新增->游戏管理->分成比例|设置 chenxiaojun 2019-10-16 11:38:37 +0800
  • 9316dedc6c 修复 “‘ 2019-10-16 11:35:57 +0800
  • 96ca80221b 修复 “‘ 2019-10-16 11:34:34 +0800
  • 56f567e47f 支付 “‘ 2019-10-16 11:25:32 +0800
  • 414f3121fb 每页条数bug修复 chenxiaojun 2019-10-16 11:15:51 +0800
  • f91c0f0965 每页条数bug修复 chenxiaojun 2019-10-16 11:14:55 +0800
  • 2dc6304ec3 超级签微信支付 zhengchanglong 2019-10-16 10:25:09 +0800
  • bb0a399ef7 推广员平台币支付 支付宝支付账户信息重配置文件读取 zhengchanglong 2019-10-15 17:50:42 +0800
  • b2f357608f Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev ELF 2019-10-15 17:50:13 +0800
  • c715996821 修改bug ELF 2019-10-15 17:50:02 +0800
  • 2e18b8cc05 资料详情落地页增加layui样式 sunke 2019-10-15 16:38:51 +0800
  • c988ee0517 Merge branch 'dev_zcl' of 47.111.118.107:/srv/git/platform zyx 2019-10-15 15:01:22 +0800
  • 9ffb5fd753 New branch commit zhengchanglong 2019-10-15 15:00:59 +0800
  • c2945ce522 Merge remote-tracking branch 'origin/dev' into dev zhengchanglong 2019-10-15 14:53:52 +0800
  • 6db2ead554 误提交恢复 zhengchanglong 2019-10-15 14:53:27 +0800
  • a9cb458ada 订单查询支付方式修改 chenxiaojun 2019-10-15 14:53:03 +0800
  • 4e7904c3de 订单查询支付方式修改 chenxiaojun 2019-10-15 14:51:44 +0800
  • 24f70b8380 new branch commit zhengchanglong 2019-10-15 14:51:26 +0800
  • 607e32e43a 首页功能提示样式修改 zyx 2019-10-15 14:37:24 +0800
  • 0e87fc7267 订单查询支付方式修改 chenxiaojun 2019-10-15 14:29:44 +0800
  • 446085a154 订单查询支付方式修改 chenxiaojun 2019-10-15 14:26:35 +0800
  • 7456c891a8 区服ID更新 chenxiaojun 2019-10-15 14:14:33 +0800
  • e4be69d796 Merge branch 'dev' of 47.111.118.107:/srv/git/platform zyx 2019-10-15 13:55:20 +0800