Commit Graph

362 Commits (581a6385e5422ed37c4b5c77f3a87e9c16cbff1e)
 

Author SHA1 Message Date
张征 581a6385e5 fix:修改冲突
3 years ago
张征 3c2ff793ab merge:合并修复bug以及首页修改
3 years ago
张征 e4f8336673 fix:修改首页,修改bug
3 years ago
张征 3200e2492e Merge branch 'fix/ui-0521-zz' into msb_test
3 years ago
张征 f4a4435c8e feat:修改首页
3 years ago
ch 8e339ea56a Merge branch 'fix/code-0520-ch' into msb_test
3 years ago
ch f3deb67326 修改APP二维码为公众号二维码
3 years ago
ch dd58b90d97 Merge branch 'feature/task1.0.0' into msb_test
3 years ago
张征 b6d530da8f fix:修改banner
3 years ago
张征 44234d4659 Merge branch 'feature/task1.0.0' into feature/task1.0.0-0507-zz
3 years ago
张征 c73b8cc2b2 fix:修改ui
3 years ago
肖广 8336805b1f Merge branch 'feature/task1.0.0' into 'msb_prod'
3 years ago
肖广 5fd5690c50 Merge branch 'feature/task1.0.0' into 'msb_test'
3 years ago
肖广 ff037a1bca Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0'
3 years ago
xiaoguang 641ea8a7fe feat: 首页支持上拉刷新,首页固定图标位置适配屏宽,UI调整
3 years ago
ch bc378dc73d Merge branch 'feature/task1.0.0-0505-ch' into msb_prod
3 years ago
ch 8aa28e0346 APP二维码
3 years ago
ch 112f3ac1fc Merge branch 'feature/task1.0.0-0505-ch' into msb_prod
3 years ago
ch ac257746d4 Merge branch 'feature/task1.0.0-0505-ch' into msb_test
3 years ago
ch 5b4e495bc5 sku处理回退
3 years ago
肖广 e0458dd21e Merge branch 'feature/task1.0.0' into 'msb_prod'
3 years ago
张征 950a2d3699 Merge branch 'feature/task1.0.0-0507-zz' into feature/task1.0.0
3 years ago
张征 2aad2172e3 Merge branch 'feature/task1.0.0-0507-zz' into msb_test
3 years ago
张征 c14ce44b14 fix:修改收货地址
3 years ago
肖广 b6ea4af6ed Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0'
3 years ago
xiaoguang ed326844ce feat: 首页分类UI调整
3 years ago
张征 84cb8d281b Merge branch 'feature/task1.0.0-0507-zz' into feature/task1.0.0
3 years ago
张征 ea82937dad fix:修改申请售后
3 years ago
张征 480fe88330 Merge branch 'msb_test' of http://internel-git.mashibing.cn/yanxuan-frontend/shop-pc into msb_test
3 years ago
张征 8517931645 fix:修改申请售后
3 years ago
肖广 827cb7c36b Merge branch 'feature/task1.0.0' into 'msb_test'
3 years ago
肖广 7f06e29597 Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0'
3 years ago
xiaoguang 4bdf753c6e feat: 点击吸顶栏搜索滚动到顶部并且输入框聚焦
3 years ago
张征 c71a4ea7bb Merge branch 'feature/task1.0.0-0507-zz' into msb_test
3 years ago
张征 15b7867528 Merge branch 'feature/task1.0.0-0507-zz' into feature/task1.0.0
3 years ago
张征 bc24c7511a fix:修改最大库存
3 years ago
肖广 2d213cf6c6 Merge branch 'feature/task1.0.0' into 'msb_test'
3 years ago
肖广 e5bc34804b Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0'
3 years ago
xiaoguang 944a2416da feat: 替换banner图片
3 years ago
张征 a4c147c2ad Merge branch 'feature/task1.0.0' into msb_test
3 years ago
张征 971784c627 Merge branch 'feature/task1.0.0' of http://internel-git.mashibing.cn/yanxuan-frontend/shop-pc into feature/task1.0.0
3 years ago
张征 f40ae45a0d Merge branch 'feature/task1.0.0-0507-zz' into feature/task1.0.0
3 years ago
张征 bd881886cf fix:修改待支付
3 years ago
肖广 1b84783101 Merge branch 'feature/task1.0.0' into 'msb_test'
3 years ago
肖广 76d3173ad4 Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0'
3 years ago
xiaoguang 3e5325fab9 feat: 添加404页面
3 years ago
张征 ae326e6f6b Merge branch 'feature/task1.0.0-0507-zz' into msb_test
3 years ago
张征 dcf0404a30 Merge branch 'feature/task1.0.0-0507-zz' into feature/task1.0.0
3 years ago
张征 c097a9251c fix:修改im
3 years ago
肖广 ca20e3a37a Merge branch 'feature/task1.0.0' into 'msb_test'
3 years ago