Commit Graph

  • 15b7867528 Merge branch 'feature/task1.0.0-0507-zz' into feature/task1.0.0 张征 2022-05-17 19:58:05 +0800
  • bc24c7511a fix:修改最大库存 张征 2022-05-17 19:57:13 +0800
  • 2d213cf6c6 Merge branch 'feature/task1.0.0' into 'msb_test' 肖广 2022-05-17 10:21:49 +0000
  • 29f8db89fd Merge branch 'feature/task1.0.0' into 'msb_test' 肖广 2022-05-17 10:21:47 +0000
  • e5bc34804b Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0' 肖广 2022-05-17 10:21:34 +0000
  • 1a827ced9b Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0' 肖广 2022-05-17 10:21:32 +0000
  • 944a2416da feat: 替换banner图片 xiaoguang 2022-05-17 18:21:08 +0800
  • a4c147c2ad Merge branch 'feature/task1.0.0' into msb_test 张征 2022-05-17 18:07:05 +0800
  • 971784c627 Merge branch 'feature/task1.0.0' of http://internel-git.mashibing.cn/yanxuan-frontend/shop-pc into feature/task1.0.0 张征 2022-05-17 18:06:42 +0800
  • f40ae45a0d Merge branch 'feature/task1.0.0-0507-zz' into feature/task1.0.0 张征 2022-05-17 18:06:15 +0800
  • bd881886cf fix:修改待支付 张征 2022-05-17 18:05:57 +0800
  • 1b84783101 Merge branch 'feature/task1.0.0' into 'msb_test' 肖广 2022-05-17 10:02:16 +0000
  • b7d114b045 Merge branch 'feature/task1.0.0' into 'msb_test' 肖广 2022-05-17 10:02:13 +0000
  • 76d3173ad4 Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0' 肖广 2022-05-17 10:02:01 +0000
  • da7918c1ea Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0' 肖广 2022-05-17 10:01:59 +0000
  • 3e5325fab9 feat: 添加404页面 xiaoguang 2022-05-17 18:01:27 +0800
  • ae326e6f6b Merge branch 'feature/task1.0.0-0507-zz' into msb_test 张征 2022-05-17 17:48:21 +0800
  • dcf0404a30 Merge branch 'feature/task1.0.0-0507-zz' into feature/task1.0.0 张征 2022-05-17 17:48:01 +0800
  • c097a9251c fix:修改im 张征 2022-05-17 17:47:32 +0800
  • ca20e3a37a Merge branch 'feature/task1.0.0' into 'msb_test' 肖广 2022-05-17 09:38:41 +0000
  • 2d66b0c4f8 Merge branch 'feature/task1.0.0' into 'msb_test' 肖广 2022-05-17 09:38:36 +0000
  • 9cb021e001 Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0' 肖广 2022-05-17 09:38:21 +0000
  • 986b0612ba Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0' 肖广 2022-05-17 09:38:19 +0000
  • 0f9e6aa0e7 feat: 删除个人中心消息模块 xiaoguang 2022-05-17 17:37:47 +0800
  • e332e95afa feat: 调整UI xiaoguang 2022-05-17 17:37:19 +0800
  • 67176fa1fb Merge branch 'feature/task1.0.0' into feature/task1.0.0-0507-zz 张征 2022-05-17 17:26:34 +0800
  • b944477d8d fix:修改sku价格 张征 2022-05-17 17:26:10 +0800
  • 688fd6ea8c Merge branch 'msb_test' of http://internel-git.mashibing.cn/yanxuan-frontend/shop-pc into msb_test 张征 2022-05-17 17:25:36 +0800
  • f8d393661f fix:修改sku价格 张征 2022-05-17 17:25:25 +0800
  • cf8ea99afb Merge branch 'feature/task1.0.0' into msb_test ch 2022-05-17 16:58:58 +0800
  • d43b2d77da Merge branch 'feature/task1.0.0-0505-ch' into feature/task1.0.0 ch 2022-05-17 16:58:37 +0800
  • fbbc5a8a27 Merge branch 'feature/task1.0.0' into feature/task1.0.0-0505-ch ch 2022-05-17 16:57:28 +0800
  • fd33b79f7e Merge branch 'feature/task1.0.0' into msb_test 张征 2022-05-17 16:55:39 +0800
  • 37ef0f9d04 fix:修复二次添加 张征 2022-05-17 16:55:17 +0800
  • 09199ee816 Merge branch 'feature/task1.0.0' of http://internel-git.mashibing.cn/yanxuan-frontend/shop-pc into feature/task1.0.0 张征 2022-05-17 16:54:50 +0800
  • 1a0aa89c65 fix:修复二次添加地址 张征 2022-05-17 16:54:35 +0800
  • 3358e2c5a7 sku选择问题,提交订单金额 ch 2022-05-17 16:54:08 +0800
  • a9b35a9672 Merge branch 'feature/task1.0.0' into 'msb_test' 肖广 2022-05-17 08:47:04 +0000
  • a36c3f5f01 Merge branch 'feature/task1.0.0' into 'msb_test' 肖广 2022-05-17 08:46:52 +0000
  • 87ea7307e7 Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0' 肖广 2022-05-17 08:46:40 +0000
  • 726319038f Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0' 肖广 2022-05-17 08:46:38 +0000
  • b88f6ba9ce feat: dockerfile添加static目录 xiaoguang 2022-05-17 16:45:48 +0800
  • 137945dbe6 fix:修改看了又看 张征 2022-05-17 16:44:36 +0800
  • 1bc1a46999 fix:修改看了又看 张征 2022-05-17 16:43:52 +0800
  • 8f7e940158 Merge branch 'feature/task1.0.0-0507-zz' into msb_test 张征 2022-05-17 16:36:51 +0800
  • d4c546c525 fix:修改收货地址 张征 2022-05-17 16:35:52 +0800
  • 501ef99b89 fix:修改手机号 张征 2022-05-17 16:34:03 +0800
  • d52997cc07 Merge branch 'feature/task1.0.0' into msb_test 张征 2022-05-17 16:11:46 +0800
  • 57d1e74077 fix:修改配置 张征 2022-05-17 16:11:18 +0800
  • aed8c463db Merge branch 'feature/task1.0.0-0507-zz' into feature/task1.0.0 张征 2022-05-17 16:10:51 +0800
  • 0c81f5afd5 fix:修改刷新报错 张征 2022-05-17 16:10:23 +0800
  • f0c23a102f fix:修改点击商品详情为新开窗口 张征 2022-05-17 15:49:21 +0800
  • 9635c9c3a6 feat:完成售后订单开发 张征 2022-05-17 15:47:55 +0800
  • 2f1c3d9ba1 Merge branch 'feature/task1.0.0' into 'msb_test' 肖广 2022-05-17 07:44:00 +0000
  • 1bad9a6389 Merge branch 'feature/task1.0.0' into 'msb_test' 肖广 2022-05-17 07:43:56 +0000
  • 1bd4650def Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0' 肖广 2022-05-17 07:43:44 +0000
  • b5fc650596 Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0' 肖广 2022-05-17 07:43:42 +0000
  • 72b97f1813 feat: 添加秒杀商品售罄状态 xiaoguang 2022-05-17 15:43:19 +0800
  • 442614a67a Merge branch 'feature/task1.0.0' into msb_test 张征 2022-05-17 15:28:25 +0800
  • 30e2d194fa Merge branch 'feature/task1.0.0-0507-zz' into feature/task1.0.0 张征 2022-05-17 15:28:00 +0800
  • 3137da82c3 fix:修复订单bug 张征 2022-05-17 15:27:31 +0800
  • 80a73d11d8 Merge branch 'feature/task1.0.0' into 'msb_test' 肖广 2022-05-17 07:09:48 +0000
  • 1933d2e82b Merge branch 'feature/task1.0.0' into 'msb_test' 肖广 2022-05-17 07:09:46 +0000
  • bc10181ee4 Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0' 肖广 2022-05-17 07:09:33 +0000
  • eb167a90b9 Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0' 肖广 2022-05-17 07:09:31 +0000
  • 904bdc32ac fixbug: 修复个人资料页面切换数据丢失 xiaoguang 2022-05-17 15:08:25 +0800
  • 8e1fac846f Merge branch 'msb_test' of http://internel-git.mashibing.cn/yanxuan-frontend/shop-pc into msb_test 张征 2022-05-17 14:30:42 +0800
  • 24201b110e Merge branch 'feature/task1.0.0' into 'msb_test' 肖广 2022-05-17 06:30:30 +0000
  • 1a2636eb76 Merge branch 'feature/task1.0.0' into 'msb_test' 肖广 2022-05-17 06:30:28 +0000
  • e1cfc41ebb Merge branch 'feature/task1.0.0' into msb_test 张征 2022-05-17 14:30:27 +0800
  • 4372719082 Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0' 肖广 2022-05-17 06:30:02 +0000
  • 4f0f97e219 feat: 响应状态码为退出登录时,返回reject xiaoguang 2022-05-17 14:29:37 +0800
  • 1240635f5c fix:修改为你推荐 张征 2022-05-17 14:29:27 +0800
  • 0d918cadfc Merge branch 'feature/task1.0.0' into feature/task1.0.0-0507-zz 张征 2022-05-17 14:01:32 +0800
  • e69a45ac87 merge 张征 2022-05-17 12:37:32 +0800
  • 21c967e12a Merge branch 'feature/task1.0.0' into 'msb_test' 肖广 2022-05-17 03:49:16 +0000
  • 77607d2463 Merge branch 'feature/task1.0.0' into 'msb_test' 肖广 2022-05-17 03:49:14 +0000
  • 5dfb2871b9 Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0' 肖广 2022-05-17 03:49:02 +0000
  • 4782682d08 Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0' 肖广 2022-05-17 03:48:59 +0000
  • ab41262326 fixbug: 修复bug1239 xiaoguang 2022-05-17 11:48:39 +0800
  • 597a3c8aae Merge branch 'feature/task1.0.0' into msb_test 张征 2022-05-17 11:41:52 +0800
  • 32d3dd5938 Merge branch 'feature/task1.0.0-0507-zz' into feature/task1.0.0 张征 2022-05-17 11:41:21 +0800
  • c11e89124c fix:修改接口地址 张征 2022-05-17 11:40:50 +0800
  • 0ed9fc9885 Merge branch 'feature/task1.0.0' into 'msb_test' 肖广 2022-05-17 03:35:34 +0000
  • b68581aedf Merge branch 'feature/task1.0.0' into 'msb_test' 肖广 2022-05-17 03:35:32 +0000
  • 2c317806a1 Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0' 肖广 2022-05-17 03:35:18 +0000
  • f270ab31cd Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0' 肖广 2022-05-17 03:35:16 +0000
  • ff4a767917 feat: 未登录跳首页放入中间件判断 xiaoguang 2022-05-17 11:34:51 +0800
  • de75b1bbaa Merge branch 'feature/task1.0.0' into 'msb_test' 肖广 2022-05-17 03:04:11 +0000
  • 13bc51d87a Merge branch 'feature/task1.0.0' into 'msb_test' 肖广 2022-05-17 03:04:09 +0000
  • 9956949fac Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0' 肖广 2022-05-17 02:58:52 +0000
  • 5acda6cd15 Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0' 肖广 2022-05-17 02:58:50 +0000
  • e97096ffbc feat: 去掉路由前置钩子内未登录跳转页面逻辑 xiaoguang 2022-05-17 10:58:28 +0800
  • 73ce946530 Merge branch 'feature/task1.0.0' into msb_test ch 2022-05-17 10:19:37 +0800
  • 9da1383799 Merge branch 'feature/task1.0.0-0505-ch' into feature/task1.0.0 ch 2022-05-17 10:18:34 +0800
  • c4ecf74934 注释个人中心拦截器 ch 2022-05-17 10:17:24 +0800
  • 17b1346ff1 Merge branch 'feature/task1.0.0' into 'msb_test' 肖广 2022-05-17 02:16:14 +0000
  • bcfe2a83e1 Merge branch 'feature/task1.0.0' into 'msb_test' 肖广 2022-05-17 02:16:12 +0000
  • 93e9dcac03 Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0' 肖广 2022-05-17 02:15:56 +0000
  • df02ad24a1 Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0' 肖广 2022-05-17 02:15:53 +0000