Commit Graph

  • c3d6cad1d6 feat: 秒杀相关判断修正 xiaoguang 2022-05-17 10:15:22 +0800
  • 4c47b8d78b Merge branch 'feature/task1.0.0' into 'msb_test' 肖广 2022-05-16 14:37:39 +0000
  • 6cc6c4354f Merge branch 'feature/task1.0.0' into 'msb_test' 肖广 2022-05-16 14:37:37 +0000
  • 824a307232 Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0' 肖广 2022-05-16 14:37:24 +0000
  • bbf85f7b3e Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0' 肖广 2022-05-16 14:37:21 +0000
  • 71af82d03c feat: 修改UI问题 xiaoguang 2022-05-16 22:36:57 +0800
  • a8c54f76d2 Merge branch 'feature/task1.0.0' into msb_test 张征 2022-05-16 22:04:21 +0800
  • c867fb7246 Merge branch 'feature/task1.0.0-0507-zz' into feature/task1.0.0 张征 2022-05-16 22:04:03 +0800
  • 864e6e3740 fix:修改bug 张征 2022-05-16 22:02:36 +0800
  • e636883bd6 Merge branch 'feature/task1.0.0' into msb_test 张征 2022-05-16 21:32:06 +0800
  • 54a0fc8b2d Merge branch 'feature/task1.0.0-0507-zz' into feature/task1.0.0 张征 2022-05-16 21:31:43 +0800
  • b19649a9a3 fix:修复bug 张征 2022-05-16 21:31:07 +0800
  • 9bd6c2ab59 购物车计算Bar悬浮效果 ch 2022-05-16 20:55:47 +0800
  • 62d587d575 Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0' 肖广 2022-05-16 10:05:22 +0000
  • ed7c11349f Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0' 肖广 2022-05-16 10:05:19 +0000
  • 862d0e2152 feat: 首页点击新开浏览器窗口跳转 xiaoguang 2022-05-16 18:04:54 +0800
  • 262d51d993 Merge branch 'feature/task1.0.0' into msb_test ch 2022-05-16 17:53:12 +0800
  • 96835cbc3a Merge branch 'feature/task1.0.0-0505-ch' into feature/task1.0.0 ch 2022-05-16 17:52:51 +0800
  • c01f524201 订单列表点击 ch 2022-05-16 17:52:26 +0800
  • c45d530980 Merge branch 'feature/task1.0.0' into 'msb_test' 肖广 2022-05-16 09:24:06 +0000
  • cf3a097e06 Merge branch 'feature/task1.0.0' into 'msb_test' 肖广 2022-05-16 09:24:04 +0000
  • e3519ba9ba Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0' 肖广 2022-05-16 09:23:24 +0000
  • 67a0b540c2 Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0' 肖广 2022-05-16 09:23:22 +0000
  • 946f85a8b3 feat: 修复个人中午物流未显示bug xiaoguang 2022-05-16 17:23:01 +0800
  • 12203846d6 Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0' 肖广 2022-05-16 09:00:55 +0000
  • 484c8a0945 Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0' 肖广 2022-05-16 09:00:53 +0000
  • 0d4dc2b0e6 feat: 修改头部购物车面板UI,获取用户信息时机修改 xiaoguang 2022-05-16 17:00:30 +0800
  • 468179c860 Merge branch 'feature/task1.0.0' into msb_test ch 2022-05-16 16:52:18 +0800
  • 5b5710caa9 Merge branch 'feature/task1.0.0-0505-ch' into feature/task1.0.0 ch 2022-05-16 16:50:21 +0800
  • 8b8e5372de 修改3级Bug ch 2022-05-16 16:47:54 +0800
  • 01d6e31ae0 Merge branch 'feature/task1.0.0' into msb_test 张征 2022-05-16 16:13:42 +0800
  • 44ee987139 Merge branch 'feature/task1.0.0-0507-zz' into feature/task1.0.0 张征 2022-05-16 16:12:54 +0800
  • 775c5f663c fix:修改禅道bug 张征 2022-05-16 16:12:12 +0800
  • ccabddea26 fix:修改禅道bug 张征 2022-05-16 16:10:38 +0800
  • 750d1ea0f4 Merge branch 'feature/task1.0.0' into 'msb_test' 肖广 2022-05-16 07:45:20 +0000
  • 3dad3ea712 Merge branch 'feature/task1.0.0' into 'msb_test' 肖广 2022-05-16 07:45:19 +0000
  • 07e8794bfb Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0' 肖广 2022-05-16 07:45:05 +0000
  • fc39b30a99 Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0' 肖广 2022-05-16 07:45:03 +0000
  • 022c5579f1 feat: 删除测试代码 xiaoguang 2022-05-16 15:44:45 +0800
  • d230fab63a Merge branch 'feature/task1.0.0' into 'msb_test' 肖广 2022-05-16 07:43:22 +0000
  • cc15b42774 Merge branch 'feature/task1.0.0' into 'msb_test' 肖广 2022-05-16 07:43:08 +0000
  • 4349b3bf1c Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0' 肖广 2022-05-16 07:42:54 +0000
  • 6b5cac13c0 Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0' 肖广 2022-05-16 07:42:51 +0000
  • 7190f03a69 feat: 未登录打开个人中心跳转首页 xiaoguang 2022-05-16 15:42:25 +0800
  • 55ead5e145 Merge branch 'feature/task1.0.0-0505-ch' into msb_test ch 2022-05-16 14:48:28 +0800
  • c4c4ce7554 物流信息 ch 2022-05-16 14:47:05 +0800
  • 7d0f236488 Merge branch 'feature/task1.0.0-0505-ch' into msb_test ch 2022-05-16 14:25:58 +0800
  • c3af52a00a 修改2级以上BUg ch 2022-05-16 14:18:24 +0800
  • f4d5383420 Merge branch 'feature/task1.0.0' into 'msb_test' 肖广 2022-05-16 03:52:48 +0000
  • 76ae753d4b Merge branch 'feature/task1.0.0' into 'msb_test' 肖广 2022-05-16 03:52:45 +0000
  • 4f90c93ebd Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0' 肖广 2022-05-16 03:52:32 +0000
  • caef2ad8d1 Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0' 肖广 2022-05-16 03:52:30 +0000
  • f5745ec642 feat: 修改热门分类请求时机 xiaoguang 2022-05-16 11:52:06 +0800
  • f3ce1e00dc Merge branch 'msb_test' of http://internel-git.mashibing.cn/yanxuan-frontend/shop-pc into msb_test ch 2022-05-16 11:25:52 +0800
  • 1567936184 Merge branch 'feature/task1.0.0' into msb_test ch 2022-05-16 11:25:46 +0800
  • 10f2033592 Merge branch 'feature/task1.0.0' into 'msb_test' 肖广 2022-05-16 03:25:09 +0000
  • 51be7f8d66 Merge branch 'feature/task1.0.0' into 'msb_test' 肖广 2022-05-16 03:25:07 +0000
  • c09cbb9900 Merge branch 'feature/task1.0.0' of http://internel-git.mashibing.cn/yanxuan-frontend/shop-pc into feature/task1.0.0 ch 2022-05-16 11:24:57 +0800
  • a9fe82e2ea Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0' 肖广 2022-05-16 03:24:50 +0000
  • ee6eca44ff Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0' 肖广 2022-05-16 03:24:47 +0000
  • 6461354a0d 确认收货 ch 2022-05-16 11:24:30 +0800
  • c543931458 feat: 登录弹窗隐藏时重置表单 xiaoguang 2022-05-16 11:24:18 +0800
  • f71938ace0 Merge branch 'feature/task1.0.0' into 'msb_test' 肖广 2022-05-13 13:18:59 +0000
  • 52ad76b42d Merge branch 'feature/task1.0.0' into 'msb_test' 肖广 2022-05-13 13:18:57 +0000
  • 8a238e0b3b Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0' 肖广 2022-05-13 13:18:45 +0000
  • aac3d48028 Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0' 肖广 2022-05-13 13:18:43 +0000
  • c91e940631 feat: 修复变量未引入使用报错 xiaoguang 2022-05-13 21:18:28 +0800
  • 62e1b9ac6a Merge branch 'feature/task1.0.0' into 'msb_test' 肖广 2022-05-13 13:11:11 +0000
  • dd13945345 Merge branch 'feature/task1.0.0' into 'msb_test' 肖广 2022-05-13 13:11:08 +0000
  • 6420f107ba Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0' 肖广 2022-05-13 13:10:57 +0000
  • 040d471d38 Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0' 肖广 2022-05-13 13:10:55 +0000
  • 2a15109002 feat: 修复bug xiaoguang 2022-05-13 21:10:36 +0800
  • d16c9e002d Merge branch 'feature/task1.0.0' into 'msb_test' 肖广 2022-05-13 12:44:51 +0000
  • 279121d150 Merge branch 'feature/task1.0.0' into 'msb_test' 肖广 2022-05-13 12:44:49 +0000
  • 2f7bb07ff6 Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0' 肖广 2022-05-13 12:44:34 +0000
  • f29046ea7b Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0' 肖广 2022-05-13 12:44:30 +0000
  • f0f78b8118 feat: 添加首页固定按钮 xiaoguang 2022-05-13 20:43:44 +0800
  • 30d31c925d Merge branch 'feature/task1.0.0' into 'msb_test' 肖广 2022-05-13 11:44:30 +0000
  • 89c46f15d0 Merge branch 'feature/task1.0.0' into 'msb_test' 肖广 2022-05-13 11:44:26 +0000
  • 8265d096d9 Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0' 肖广 2022-05-13 11:44:08 +0000
  • 77cb358072 Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0' 肖广 2022-05-13 11:44:03 +0000
  • 63d5c862bb feat: 添加购物车/删除购物车商品时,更新购物车面板 xiaoguang 2022-05-13 19:43:36 +0800
  • 16a70bd821 Merge branch 'feature/task1.0.0' into 'msb_test' 肖广 2022-05-13 10:07:21 +0000
  • b3c1796424 Merge branch 'feature/task1.0.0' into 'msb_test' 肖广 2022-05-13 10:07:19 +0000
  • 1e2240b692 Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0' 肖广 2022-05-13 10:07:09 +0000
  • be865907cf Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0' 肖广 2022-05-13 10:07:07 +0000
  • 477412e6f9 feat: 无购物车商品信息时隐藏面板 xiaoguang 2022-05-13 18:06:44 +0800
  • d261e30fb8 Merge branch 'feature/task1.0.0' into 'msb_test' 肖广 2022-05-13 10:01:57 +0000
  • 107b330eba Merge branch 'feature/task1.0.0' into 'msb_test' 肖广 2022-05-13 10:01:54 +0000
  • c16126e94e Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0' 肖广 2022-05-13 10:01:42 +0000
  • ed8b183ab6 Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0' 肖广 2022-05-13 10:01:40 +0000
  • 279b82b8fc feat: 获取购物车商品前端判断是否登录 xiaoguang 2022-05-13 18:01:25 +0800
  • 09d03faf61 Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0' 肖广 2022-05-13 09:59:54 +0000
  • 5ede9a92cc Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0' 肖广 2022-05-13 09:59:51 +0000
  • 465f2508f9 feat: 修改登录systemId值 xiaoguang 2022-05-13 17:59:32 +0800
  • 0bac60fa84 Merge branch 'feature/task1.0.0' into 'msb_test' 肖广 2022-05-13 09:52:08 +0000
  • 5d49d0aa51 Merge branch 'feature/task1.0.0' into 'msb_test' 肖广 2022-05-13 09:52:03 +0000
  • 5128c50ddd Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0' 肖广 2022-05-13 09:51:01 +0000
  • a75f5d519b Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0' 肖广 2022-05-13 09:50:58 +0000
  • a7b5be58ba Merge branch 'feature/task1.0.0-0505-ch' into feature/task1.0.0 ch 2022-05-13 17:44:29 +0800