ch
|
a0099fddc1
|
Merge branch 'fix/goods-0525' into msb_test
|
3 years ago |
|
ch
|
0f8d21bd2d
|
修改改虚拟商品提交订单
|
3 years ago |
|
ch
|
6aa4eec34f
|
Merge branch 'fix/goods-0525' into msb_test
|
3 years ago |
|
ch
|
469270c769
|
修改提交订单的地址问题
|
3 years ago |
|
ch
|
487254db76
|
修改
|
3 years ago |
|
ch
|
66f9530883
|
Merge branch 'fix/goods-0525' into msb_test
|
3 years ago |
|
ch
|
8370bdd5f0
|
报错
|
3 years ago |
|
ch
|
235d8e0cff
|
页面html
|
3 years ago |
|
ch
|
494c288e20
|
Merge branch 'fix/goods-0525' into msb_test
|
3 years ago |
|
ch
|
9bf02bfc56
|
pref:虚拟商品订单详情
|
3 years ago |
|
ch
|
d11be41163
|
pref:下载页面
|
3 years ago |
|
ch
|
e0ce483a2b
|
Merge branch 'fix/im-0526' into msb_test
|
3 years ago |
|
ch
|
7d26167a30
|
修改im store问
|
3 years ago |
|
ch
|
3672052d81
|
Merge branch 'fix/im-0526' into msb_test
|
3 years ago |
|
ch
|
49e78efda8
|
IM收货消息
|
3 years ago |
|
ch
|
efaa39c832
|
pref:虚拟商品提交订单
|
3 years ago |
张征
|
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'
Feature/task1.0.0
See merge request yanxuan-frontend/shop-pc!98
|
3 years ago |
|
肖广
|
5fd5690c50
|
Merge branch 'feature/task1.0.0' into 'msb_test'
Feature/task1.0.0
See merge request yanxuan-frontend/shop-pc!97
|
3 years ago |
|
xiaoguang
|
641ea8a7fe
|
feat: 首页支持上拉刷新，首页固定图标位置适配屏宽，UI调整
|
3 years ago |
|
ch
|
112f3ac1fc
|
Merge branch 'feature/task1.0.0-0505-ch' into msb_prod
* feature/task1.0.0-0505-ch:
sku处理回退
|
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 |
|
张征
|
84cb8d281b
|
Merge branch 'feature/task1.0.0-0507-zz' into feature/task1.0.0
|
3 years ago |
|
张征
|
ea82937dad
|
fix:修改申请售后
|
3 years ago |
|
张征
|
8517931645
|
fix:修改申请售后
|
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 |
|
xiaoguang
|
944a2416da
|
feat: 替换banner图片
|
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 |
|
xiaoguang
|
0f9e6aa0e7
|
feat: 删除个人中心消息模块
|
3 years ago |
|
xiaoguang
|
e332e95afa
|
feat: 调整UI
|
3 years ago |
|
张征
|
b944477d8d
|
fix:修改sku价格
|
3 years ago |
|
ch
|
fbbc5a8a27
|
Merge branch 'feature/task1.0.0' into feature/task1.0.0-0505-ch
|
3 years ago |
|
ch
|
3358e2c5a7
|
sku选择问题,提交订单金额
|
3 years ago |
|
张征
|
137945dbe6
|
fix:修改看了又看
|
3 years ago |
|
张征
|
aed8c463db
|
Merge branch 'feature/task1.0.0-0507-zz' into feature/task1.0.0
|
3 years ago |
|
张征
|
0c81f5afd5
|
fix:修改刷新报错
|
3 years ago |
|
张征
|
9635c9c3a6
|
feat:完成售后订单开发
|
3 years ago |
|
xiaoguang
|
72b97f1813
|
feat: 添加秒杀商品售罄状态
|
3 years ago |
|
张征
|
30e2d194fa
|
Merge branch 'feature/task1.0.0-0507-zz' into feature/task1.0.0
|
3 years ago |
|
张征
|
3137da82c3
|
fix:修复订单bug
|
3 years ago |
|
xiaoguang
|
904bdc32ac
|
fixbug: 修复个人资料页面切换数据丢失
|
3 years ago |
|
张征
|
1240635f5c
|
fix:修改为你推荐
|
3 years ago |
|
xiaoguang
|
ab41262326
|
fixbug: 修复bug1239
|
3 years ago |
|
张征
|
32d3dd5938
|
Merge branch 'feature/task1.0.0-0507-zz' into feature/task1.0.0
|
3 years ago |
|
张征
|
c11e89124c
|
fix:修改接口地址
|
3 years ago |
|
xiaoguang
|
ff4a767917
|
feat: 未登录跳首页放入中间件判断
|
3 years ago |
|
ch
|
9da1383799
|
Merge branch 'feature/task1.0.0-0505-ch' into feature/task1.0.0
|
3 years ago |
|
xiaoguang
|
c3d6cad1d6
|
feat: 秒杀相关判断修正
|
3 years ago |
|
xiaoguang
|
71af82d03c
|
feat: 修改UI问题
|
3 years ago |
|
张征
|
c867fb7246
|
Merge branch 'feature/task1.0.0-0507-zz' into feature/task1.0.0
|
3 years ago |
|
张征
|
864e6e3740
|
fix:修改bug
|
3 years ago |
|
张征
|
54a0fc8b2d
|
Merge branch 'feature/task1.0.0-0507-zz' into feature/task1.0.0
|
3 years ago |
|
张征
|
b19649a9a3
|
fix:修复bug
|
3 years ago |
|
ch
|
9bd6c2ab59
|
购物车计算Bar悬浮效果
|
3 years ago |
|
xiaoguang
|
862d0e2152
|
feat: 首页点击新开浏览器窗口跳转
|
3 years ago |
|
ch
|
96835cbc3a
|
Merge branch 'feature/task1.0.0-0505-ch' into feature/task1.0.0
|
3 years ago |
|
ch
|
c01f524201
|
订单列表点击
|
3 years ago |
|
xiaoguang
|
946f85a8b3
|
feat: 修复个人中午物流未显示bug
|
3 years ago |
|
xiaoguang
|
0d4dc2b0e6
|
feat: 修改头部购物车面板UI,获取用户信息时机修改
|
3 years ago |
|
ch
|
5b5710caa9
|
Merge branch 'feature/task1.0.0-0505-ch' into feature/task1.0.0
|
3 years ago |
|
ch
|
8b8e5372de
|
修改3级Bug
|
3 years ago |
|
张征
|
44ee987139
|
Merge branch 'feature/task1.0.0-0507-zz' into feature/task1.0.0
|
3 years ago |
|
张征
|
775c5f663c
|
fix:修改禅道bug
|
3 years ago |
|
xiaoguang
|
7190f03a69
|
feat: 未登录打开个人中心跳转首页
|
3 years ago |
|
ch
|
c4c4ce7554
|
物流信息
|
3 years ago |
|
ch
|
c3af52a00a
|
修改2级以上BUg
|
3 years ago |
|
ch
|
c09cbb9900
|
Merge branch 'feature/task1.0.0' of http://internel-git.mashibing.cn/yanxuan-frontend/shop-pc into feature/task1.0.0
|
3 years ago |
|
ch
|
6461354a0d
|
确认收货
|
3 years ago |
|
xiaoguang
|
2a15109002
|
feat: 修复bug
|
3 years ago |
|
xiaoguang
|
f0f78b8118
|
feat: 添加首页固定按钮
|
3 years ago |
|
xiaoguang
|
63d5c862bb
|
feat: 添加购物车/删除购物车商品时，更新购物车面板
|
3 years ago |
|
肖广
|
0bac60fa84
|
Merge branch 'feature/task1.0.0' into 'msb_test'
Feature/task1.0.0
See merge request yanxuan-frontend/shop-pc!42
|
3 years ago |
|
ch
|
a7b5be58ba
|
Merge branch 'feature/task1.0.0-0505-ch' into feature/task1.0.0
|
3 years ago |
|
ch
|
879a7bd04d
|
commit
|
3 years ago |
|
xiaoguang
|
a184f61263
|
feat: 公共页头添加购物车面板
|
3 years ago |
|
张征
|
fe4465369a
|
feat:添加购物车
|
3 years ago |
|
张征
|
83dd6c4a3f
|
Merge branch 'msb_test' into feature/task1.0.0-0507-zz
|
3 years ago |
|
张征
|
d3f1bc392e
|
fix:添加购物车
|
3 years ago |
|
张征
|
327bb81131
|
Merge branch 'feature/task1.0.0-0507-zz' into msb_test
|
3 years ago |
|
xiaoguang
|
07d647a39d
|
feat: 添加app二维码
|
3 years ago |
|
张征
|
907bc68327
|
Merge branch 'feature/task1.0.0-0507-zz' into feature/task1.0.0
|
3 years ago |
|
张征
|
7cabe4e455
|
fix:修改库存判断
|
3 years ago |
|
xiaoguang
|
69dc3a2984
|
feat: 首页秒杀tab显示根据是否有miao秒杀活动
|
3 years ago |
|
肖广
|
fd74d83201
|
Merge branch 'feature/task1.0.0' into 'msb_test'
Feature/task1.0.0
See merge request yanxuan-frontend/shop-pc!38
|
3 years ago |
|
张征
|
c2d4c8103d
|
Merge branch 'feature/task1.0.0-0507-zz' into feature/task1.0.0
|
3 years ago |
|
张征
|
f187e9dea7
|
fix:修复秒杀倒计时
|
3 years ago |
