Commit graph

  • *
  • | *
  • | |\
  • | |/
  • |/|
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • |\ \
  • * | |
  • | * |
  • | * |
  • | |\ \
  • | |/ /
  • |/| |
  • | * |
  • * | |
  • |\| |
  • * | |
  • | * |
  • |/ /
  • * |
  • * |
  • |\ \
  • * | |
  • | * |
  • | |\ \
  • | |/ /
  • |/| |
  • | * |
  • * | |
  • |\| |
  • * | |
  • | * |
  • | |\ \
  • | |/ /
  • |/| |
  • | * |
  • | * |
  • | |\ \
  • * | | |
  • * | | |
  • | |/ /
  • |/| |
  • | * |
  • * | |
  • * | |
  • |/ /
  • * |
  • * |
  • * |
  • * |
  • |\ \
  • * | |
  • | * |
  • |/ /
  • * |
  • |\ \
  • * | |
  • | * |
  • |/ /
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • |\ \
  • * | |
  • | * |
  • |/ /
  • * |
  • |\ \
  • * | |
  • | * |
  • |/ /
  • * |
  • * |
  • |\ \
  • * | |
  • | * |
  • |/ /
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • |\ \
  • * | |
  • | * |
  • | |\ \
  • | |/ /
  • |/| |
  • | * |
  • * | |
  • | | *
  • * | |
  • | |/
  • |/|
  • * |
  • * |
  • |\ \
  • | |/
  • |/|
  • | | *
  • * | |
  • | | *
  • * | |
  • | | *
  • * | |
  • * | |
  • * | |
  • * | |
  • * | |
  • * | |
  • * | |
  • * | |
  • |\ \ \
  • | * | |
  • | | | *
  • 9c24256 (dev) bug修改 by wangfei 2018-12-28 10:31:23 +0800
  • 11d4129 (HEAD -> master, tag: v2.5.0) Merge branch 'dev' by zjxpcyc 2018-12-28 08:51:39 +0800
  • 62a8110 bug修改 by wangfei 2018-12-26 21:44:53 +0800
  • b050630 bug修改 by wangfei 2018-12-26 21:36:19 +0800
  • 5a4a220 bug修改 by wangfei 2018-12-26 21:10:01 +0800
  • e727f1b 去除vconsole by wangfei 2018-12-26 20:24:19 +0800
  • e838de6 ytj by yuantianjiao 2018-12-26 17:09:36 +0800
  • 6c79770 ytj by yuantianjiao 2018-12-26 11:46:00 +0800
  • bc1d0c3 bug fix by wangfei 2018-12-25 20:21:55 +0800
  • 03853c5 bug修改 by wangfei 2018-12-25 17:34:41 +0800
  • 50fe315 bug修改 by wangfei 2018-12-25 15:40:22 +0800
  • b415a35 bug修改 by wangfei 2018-12-25 15:01:46 +0800
  • d358dc1 bug修改 by wangfei 2018-12-25 14:24:41 +0800
  • 91a0485 1221 by wangfei 2018-12-21 20:21:22 +0800
  • 0085036 1221 by wangfei 2018-12-21 19:08:08 +0800
  • 17b21d6 ytj by yuantianjiao 2018-12-21 09:58:09 +0800
  • 0f92672 ytj by yuantianjiao 2018-12-20 15:58:11 +0800
  • 6064df4 Merge branch 'dev' of http://git.ycjcjy.com/SpaceOfCheng/wechat into dev by yuantianjiao 2018-12-20 15:29:48 +0800
  • 4188747 ytj by yuantianjiao 2018-12-20 15:29:42 +0800
  • cb862aa update by wangfei 2018-12-20 15:29:29 +0800
  • f9f0834 Merge branch 'dev' of http://git.ycjcjy.com/SpaceOfCheng/wechat into dev by wangfei 2018-12-20 15:28:19 +0800
  • 2e44174 1220 by wangfei 2018-12-20 15:28:12 +0800
  • 95db97b Merge branch 'dev' of http://git.ycjcjy.com/SpaceOfCheng/wechat into dev by yuantianjiao 2018-12-20 11:24:18 +0800
  • 716bdea ytj by yuantianjiao 2018-12-20 11:24:13 +0800
  • 3575d95 1220 by wangfei 2018-12-20 10:19:43 +0800
  • a3b99cb 1220 by wangfei 2018-12-20 09:27:19 +0800
  • 3bfd83a 1219 by wangfei 2018-12-19 18:07:39 +0800
  • cdfe9c7 1219 by wangfei 2018-12-19 18:07:00 +0800
  • 2ec9437 Merge branch 'dev' of http://git.ycjcjy.com/SpaceOfCheng/wechat into dev by yuantianjiao 2018-12-19 18:04:46 +0800
  • ecc89c7 ytj by yuantianjiao 2018-12-19 18:04:43 +0800
  • e2442d6 Merge branch 'dev' of http://git.ycjcjy.com/SpaceOfCheng/wechat into dev by wangfei 2018-12-19 17:40:09 +0800
  • 58804d5 1219 by wangfei 2018-12-19 17:40:00 +0800
  • bec5d6e Merge branch 'dev' of http://git.ycjcjy.com/SpaceOfCheng/wechat into dev by yuantianjiao 2018-12-19 16:59:29 +0800
  • 5e714b3 ytj by yuantianjiao 2018-12-19 16:59:24 +0800
  • 21cf81e ytj by yuantianjiao 2018-12-19 16:59:18 +0800
  • 8e1f5d4 1219 by wangfei 2018-12-19 16:58:37 +0800
  • 554fba9 1219 by wangfei 2018-12-19 16:52:17 +0800
  • 784a95c ytj by yuantianjiao 2018-12-19 15:18:14 +0800
  • bd4fb1d 1219 by wangfei 2018-12-19 15:17:48 +0800
  • 732ed4b 1219 by wangfei 2018-12-19 11:28:00 +0800
  • 1988945 ytj by yuantianjiao 2018-12-19 11:15:39 +0800
  • 91b35be ytj by yuantianjiao 2018-12-19 10:25:44 +0800
  • 9b6859b xcx by xuchengxiang 2018-12-19 09:36:57 +0800
  • 03ae75c Merge branch 'dev' of http://git.ycjcjy.com/SpaceOfCheng/wechat into dev by wangfei 2018-12-19 09:28:02 +0800
  • 037aa8d 1219 by wangfei 2018-12-19 09:27:54 +0800
  • 5a15b14 xcx by xuchengxiang 2018-12-18 16:13:20 +0800
  • 76e5dbf Merge branch 'dev' of http://git.ycjcjy.com/SpaceOfCheng/wechat into dev by xuchengxiang 2018-12-18 15:37:22 +0800
  • a66255d xcx by xuchengxiang 2018-12-18 15:37:02 +0800
  • d837fa4 1218 by wangfei 2018-12-18 15:36:41 +0800
  • 4c32d7e xcx by xuchengxiang 2018-12-18 14:47:29 +0800
  • 413590e xcx by xuchengxiang 2018-12-18 14:27:53 +0800
  • 39c5e8e xcx by xuchengxiang 2018-12-18 14:00:16 +0800
  • e982e63 1218 by wangfei 2018-12-18 13:51:55 +0800
  • d8fe055 xcx by xuchengxiang 2018-12-18 10:31:24 +0800
  • d2d789b xcx by xuchengxiang 2018-12-18 10:30:30 +0800
  • a070bbb xcx by xuchengxiang 2018-12-18 09:52:53 +0800
  • e07f6de Merge branch 'dev' of http://git.ycjcjy.com/SpaceOfCheng/wechat into dev by xuchengxiang 2018-12-18 09:21:08 +0800
  • cbeb6f2 xcx by xuchengxiang 2018-12-18 09:20:48 +0800
  • 8600373 ytj by yuantianjiao 2018-12-17 18:02:39 +0800
  • ddcc933 Merge branch 'dev' of http://git.ycjcjy.com/SpaceOfCheng/wechat into dev by xuchengxiang 2018-12-17 09:48:24 +0800
  • a1cc377 1 by xuchengxiang 2018-12-17 09:48:05 +0800
  • 173ee79 ytj by yuantianjiao 2018-12-17 09:06:54 +0800
  • 8513760 ytj by yuantianjiao 2018-12-11 17:22:50 +0800
  • 05e0622 Merge branch 'dev' of http://git.ycjcjy.com/SpaceOfCheng/wechat into dev by wangfei 2018-12-10 19:10:15 +0800
  • 05da6c5 1210PM by wangfei 2018-12-10 19:10:05 +0800
  • 7a71471 ytj by yuantianjiao 2018-12-10 19:09:54 +0800
  • f256a8f 1210PM by wangfei 2018-12-10 16:48:01 +0800
  • 1b3c3c3 ytj by yuantianjiao 2018-12-10 15:25:15 +0800
  • 5cd39ef ytj by yuantianjiao 2018-12-08 19:34:15 +0800
  • 4d4554b ytj by yuantianjiao 2018-12-08 13:59:58 +0800
  • b7a4e00 ytj by yuantianjiao 2018-12-05 18:14:03 +0800
  • 8eb7d34 ytj by yuantianjiao 2018-12-05 15:01:13 +0800
  • 22b7b30 1204PM by wangfei 2018-12-04 17:09:13 +0800
  • 499d8b1 ytj by yuantianjiao 2018-12-04 09:03:52 +0800
  • c91d8a2 ytj by yuantianjiao 2018-12-03 14:55:52 +0800
  • 12e4f38 ytj by yuantianjiao 2018-11-30 15:53:53 +0800
  • 3a39343 ytj by yuantianjiao 2018-11-30 15:52:10 +0800
  • f09d3be ytj by yuantianjiao 2018-11-30 15:51:02 +0800
  • 53914a1 xcx by xuchengxiang 2018-11-27 18:01:43 +0800
  • d209fcd xcx by xuchengxiang 2018-11-27 17:59:11 +0800
  • 0663052 update user app.vue by wangfei 2018-11-27 11:02:16 +0800
  • 8999c2d ytj by yuantianjiao 2018-11-27 10:35:42 +0800
  • d4d2f4f add by wangfei 2018-11-27 10:30:22 +0800
  • d12d678 ytj by yuantianjiao 2018-11-13 16:28:21 +0800
  • a808d46 Merge branch '2.0.1' by yuantianjiao 2018-11-07 11:46:05 +0800
  • 508aefe (luckdraw) ytj by yuantianjiao 2018-11-05 14:08:58 +0800
  • e06df47 (2.1.0) ytj by yuantianjiao 2018-11-05 14:08:48 +0800
  • 6f7734b ytj by yuantianjiao 2018-10-30 16:28:28 +0800
  • 0bcd298 ytj by yuantianjiao 2018-10-30 16:28:17 +0800
  • 3ecd528 ytj by yuantianjiao 2018-10-29 11:56:55 +0800
  • fb7da0b ytj by yuantianjiao 2018-10-29 11:56:46 +0800
  • e3c61be bug修改 by wangfei 2018-10-29 10:36:29 +0800
  • 5b633e1 bug修改 by wangfei 2018-10-29 10:36:11 +0800
  • 050eefb bug修改 by wangfei 2018-10-29 10:32:18 +0800
  • 8927edf bug修改 by wangfei 2018-10-29 10:26:16 +0800
  • 1c49baf bug修改 by wangfei 2018-10-29 10:20:51 +0800
  • ac42a94 bug修改 by wangfei 2018-10-29 10:20:07 +0800
  • 28c7969 Merge branch '2.1.0' of http://git.ycjcjy.com/SpaceOfCheng/wechat into 2.1.0 by wangfei 2018-10-29 10:16:04 +0800
  • 369ed12 ytj by yuantianjiao 2018-10-29 10:04:54 +0800
  • f583021 ytj by yuantianjiao 2018-10-29 09:04:58 +0800