张征
|
c73b8cc2b2
|
fix:修改ui
|
2 years ago |
肖广
|
8336805b1f
|
Merge branch 'feature/task1.0.0' into 'msb_prod'
Feature/task1.0.0
See merge request yanxuan-frontend/shop-pc!98
|
2 years ago |
|
肖广
|
5fd5690c50
|
Merge branch 'feature/task1.0.0' into 'msb_test'
Feature/task1.0.0
See merge request yanxuan-frontend/shop-pc!97
|
2 years ago |
|
xiaoguang
|
641ea8a7fe
|
feat: 首页支持上拉刷新，首页固定图标位置适配屏宽，UI调整
|
2 years ago |
ch
|
112f3ac1fc
|
Merge branch 'feature/task1.0.0-0505-ch' into msb_prod
* feature/task1.0.0-0505-ch:
sku处理回退
|
2 years ago |
|
ch
|
ac257746d4
|
Merge branch 'feature/task1.0.0-0505-ch' into msb_test
|
2 years ago |
|
ch
|
5b4e495bc5
|
sku处理回退
|
2 years ago |
|
张征
|
84cb8d281b
|
Merge branch 'feature/task1.0.0-0507-zz' into feature/task1.0.0
|
2 years ago |
|
张征
|
ea82937dad
|
fix:修改申请售后
|
2 years ago |
|
张征
|
8517931645
|
fix:修改申请售后
|
2 years ago |
|
张征
|
c71a4ea7bb
|
Merge branch 'feature/task1.0.0-0507-zz' into msb_test
|
2 years ago |
|
张征
|
15b7867528
|
Merge branch 'feature/task1.0.0-0507-zz' into feature/task1.0.0
|
2 years ago |
|
张征
|
bc24c7511a
|
fix:修改最大库存
|
2 years ago |
|
xiaoguang
|
944a2416da
|
feat: 替换banner图片
|
2 years ago |
|
张征
|
f40ae45a0d
|
Merge branch 'feature/task1.0.0-0507-zz' into feature/task1.0.0
|
2 years ago |
|
张征
|
bd881886cf
|
fix:修改待支付
|
2 years ago |
|
xiaoguang
|
0f9e6aa0e7
|
feat: 删除个人中心消息模块
|
2 years ago |
|
xiaoguang
|
e332e95afa
|
feat: 调整UI
|
2 years ago |
|
张征
|
b944477d8d
|
fix:修改sku价格
|
2 years ago |
|
ch
|
fbbc5a8a27
|
Merge branch 'feature/task1.0.0' into feature/task1.0.0-0505-ch
|
2 years ago |
|
ch
|
3358e2c5a7
|
sku选择问题,提交订单金额
|
2 years ago |
|
张征
|
137945dbe6
|
fix:修改看了又看
|
2 years ago |
|
张征
|
aed8c463db
|
Merge branch 'feature/task1.0.0-0507-zz' into feature/task1.0.0
|
2 years ago |
|
张征
|
0c81f5afd5
|
fix:修改刷新报错
|
2 years ago |
|
张征
|
9635c9c3a6
|
feat:完成售后订单开发
|
2 years ago |
|
xiaoguang
|
72b97f1813
|
feat: 添加秒杀商品售罄状态
|
2 years ago |
|
张征
|
30e2d194fa
|
Merge branch 'feature/task1.0.0-0507-zz' into feature/task1.0.0
|
2 years ago |
|
张征
|
3137da82c3
|
fix:修复订单bug
|
2 years ago |
|
xiaoguang
|
904bdc32ac
|
fixbug: 修复个人资料页面切换数据丢失
|
2 years ago |
|
张征
|
1240635f5c
|
fix:修改为你推荐
|
2 years ago |
|
xiaoguang
|
ab41262326
|
fixbug: 修复bug1239
|
2 years ago |
|
张征
|
32d3dd5938
|
Merge branch 'feature/task1.0.0-0507-zz' into feature/task1.0.0
|
2 years ago |
|
张征
|
c11e89124c
|
fix:修改接口地址
|
2 years ago |
|
xiaoguang
|
ff4a767917
|
feat: 未登录跳首页放入中间件判断
|
2 years ago |
|
ch
|
9da1383799
|
Merge branch 'feature/task1.0.0-0505-ch' into feature/task1.0.0
|
2 years ago |
|
xiaoguang
|
c3d6cad1d6
|
feat: 秒杀相关判断修正
|
2 years ago |
|
xiaoguang
|
71af82d03c
|
feat: 修改UI问题
|
2 years ago |
|
张征
|
c867fb7246
|
Merge branch 'feature/task1.0.0-0507-zz' into feature/task1.0.0
|
2 years ago |
|
张征
|
864e6e3740
|
fix:修改bug
|
2 years ago |
|
张征
|
54a0fc8b2d
|
Merge branch 'feature/task1.0.0-0507-zz' into feature/task1.0.0
|
2 years ago |
|
张征
|
b19649a9a3
|
fix:修复bug
|
2 years ago |
|
ch
|
9bd6c2ab59
|
购物车计算Bar悬浮效果
|
2 years ago |
|
xiaoguang
|
862d0e2152
|
feat: 首页点击新开浏览器窗口跳转
|
2 years ago |
|
ch
|
96835cbc3a
|
Merge branch 'feature/task1.0.0-0505-ch' into feature/task1.0.0
|
2 years ago |
|
ch
|
c01f524201
|
订单列表点击
|
2 years ago |
|
xiaoguang
|
946f85a8b3
|
feat: 修复个人中午物流未显示bug
|
2 years ago |
|
xiaoguang
|
0d4dc2b0e6
|
feat: 修改头部购物车面板UI,获取用户信息时机修改
|
2 years ago |
|
ch
|
5b5710caa9
|
Merge branch 'feature/task1.0.0-0505-ch' into feature/task1.0.0
|
2 years ago |
|
ch
|
8b8e5372de
|
修改3级Bug
|
2 years ago |
|
张征
|
44ee987139
|
Merge branch 'feature/task1.0.0-0507-zz' into feature/task1.0.0
|
2 years ago |
|
张征
|
775c5f663c
|
fix:修改禅道bug
|
2 years ago |
|
xiaoguang
|
7190f03a69
|
feat: 未登录打开个人中心跳转首页
|
2 years ago |
|
ch
|
c4c4ce7554
|
物流信息
|
2 years ago |
|
ch
|
c3af52a00a
|
修改2级以上BUg
|
2 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
|
2 years ago |
|
ch
|
6461354a0d
|
确认收货
|
2 years ago |
|
xiaoguang
|
2a15109002
|
feat: 修复bug
|
2 years ago |
|
xiaoguang
|
f0f78b8118
|
feat: 添加首页固定按钮
|
2 years ago |
|
xiaoguang
|
63d5c862bb
|
feat: 添加购物车/删除购物车商品时，更新购物车面板
|
2 years ago |
|
肖广
|
0bac60fa84
|
Merge branch 'feature/task1.0.0' into 'msb_test'
Feature/task1.0.0
See merge request yanxuan-frontend/shop-pc!42
|
2 years ago |
|
ch
|
a7b5be58ba
|
Merge branch 'feature/task1.0.0-0505-ch' into feature/task1.0.0
|
2 years ago |
|
ch
|
879a7bd04d
|
commit
|
2 years ago |
|
xiaoguang
|
a184f61263
|
feat: 公共页头添加购物车面板
|
2 years ago |
|
张征
|
fe4465369a
|
feat:添加购物车
|
2 years ago |
|
张征
|
83dd6c4a3f
|
Merge branch 'msb_test' into feature/task1.0.0-0507-zz
|
2 years ago |
|
张征
|
d3f1bc392e
|
fix:添加购物车
|
2 years ago |
|
张征
|
327bb81131
|
Merge branch 'feature/task1.0.0-0507-zz' into msb_test
|
2 years ago |
|
xiaoguang
|
07d647a39d
|
feat: 添加app二维码
|
2 years ago |
|
张征
|
907bc68327
|
Merge branch 'feature/task1.0.0-0507-zz' into feature/task1.0.0
|
2 years ago |
|
张征
|
7cabe4e455
|
fix:修改库存判断
|
2 years ago |
|
xiaoguang
|
69dc3a2984
|
feat: 首页秒杀tab显示根据是否有miao秒杀活动
|
2 years ago |
|
肖广
|
fd74d83201
|
Merge branch 'feature/task1.0.0' into 'msb_test'
Feature/task1.0.0
See merge request yanxuan-frontend/shop-pc!38
|
2 years ago |
|
张征
|
c2d4c8103d
|
Merge branch 'feature/task1.0.0-0507-zz' into feature/task1.0.0
|
2 years ago |
|
张征
|
f187e9dea7
|
fix:修复秒杀倒计时
|
2 years ago |
|
肖广
|
3bc4d1f436
|
Merge branch 'feature/task1.0.0' into 'msb_test'
Feature/task1.0.0
See merge request yanxuan-frontend/shop-pc!36
|
2 years ago |
|
xiaoguang
|
ef68371ae1
|
feat: 首页为你精选添加分页，分页组件封装
|
2 years ago |
|
肖广
|
a92571d7c3
|
Merge branch 'feature/task1.0.0' into 'msb_test'
Feature/task1.0.0
See merge request yanxuan-frontend/shop-pc!34
|
2 years ago |
|
xiaoguang
|
07b895568e
|
feat: 添加首页为你精选模块
|
2 years ago |
|
肖广
|
69bafb4a5b
|
Merge branch 'feature/task1.0.0' into 'msb_test'
Feature/task1.0.0
See merge request yanxuan-frontend/shop-pc!32
|
2 years ago |
|
xiaoguang
|
5c4e39121f
|
feat: 添加首页新品上架模块
|
2 years ago |
|
ch
|
637a85627e
|
Merge branch 'feature/task1.0.0-0505-ch' into msb_test
|
2 years ago |
|
ch
|
3937bae2cd
|
商品详情加入购物车
|
2 years ago |
|
ch
|
739ebc150e
|
Merge branch 'feature/task1.0.0-0507-zz' into feature/task1.0.0-0505-ch
|
2 years ago |
|
ch
|
ce37efec56
|
购物车 添加为你精选
|
2 years ago |
|
张征
|
45fad297dc
|
Merge branch 'feature/task1.0.0-0507-zz' into feature/task1.0.0
|
2 years ago |
|
张征
|
a6116c717c
|
feat:完成秒杀详情
|
2 years ago |
|
ch
|
303e9e1d28
|
Merge branch 'feature/task1.0.0-0507-zz' into feature/task1.0.0-0505-ch
|
2 years ago |
|
ch
|
94d6a9314e
|
描边
|
2 years ago |
|
xiaoguang
|
a646a2bad4
|
feat: 首页秒杀商品数据另外查询
|
2 years ago |
|
张征
|
bbd5d7b308
|
feat:完成为你竞选
|
2 years ago |
|
ch
|
3aa811277d
|
Merge branch 'feature/task1.0.0-0505-ch' into feature/task1.0.0
|
2 years ago |
|
ch
|
5fb7387ab3
|
购物车
|
2 years ago |
|
ch
|
386545a5eb
|
购物车
|
2 years ago |
|
xiaoguang
|
bb4cd7749f
|
feat: 补充秒杀页面活动已结束/已开始判断以及页面交互
|
2 years ago |
|
xiaoguang
|
1dadcc18e4
|
feat: 秒杀活动倒计时
|
2 years ago |
|
ch
|
f3d14a0e4d
|
Merge branch 'feature/task1.0.0-0505-ch' into feature/task1.0.0
|
2 years ago |
|
ch
|
3ab78fe8cd
|
订单列表
|
2 years ago |
|
xiaoguang
|
ebaf192430
|
feat: 物流列表添加分页
|
2 years ago |
|
xiaoguang
|
1592804a33
|
feat: 完成物流列表
|
2 years ago |
|
张征
|
82772ab10e
|
fix:完成为你推荐
|
2 years ago |
|
xiaoguang
|
2eae09f08b
|
feat: 恢复首页秒杀模块请求数据
|
2 years ago |
|
xiaoguang
|
186b108e88
|
feat: 首页秒杀模块添加倒计时
|
2 years ago |
|
xiaoguang
|
8c9866507e
|
feat: 页头吸顶添加点击事件
|
2 years ago |
|
张征
|
ac8ea65e89
|
Merge branch 'feature/task1.0.0-0507-zz' into feature/task1.0.0
|
2 years ago |
|
张征
|
60a17cd9d9
|
fix:完成为你竞选
|
2 years ago |
|
ch
|
812f7cf645
|
Merge branch 'feature/task1.0.0' into feature/task1.0.0-0505-ch
|
2 years ago |
|
xiaoguang
|
cfa2c4d6d8
|
feat: 个人主页订单栏添加点击事件
|
2 years ago |
|
xiaoguang
|
d26ee0eada
|
feat: 首页秒杀模块，秒杀页面
|
2 years ago |
|
张征
|
33be84ff2b
|
fix:修改监听路由
|
2 years ago |
|
张征
|
c7158ba6ba
|
完成跳转
|
2 years ago |
|
ch
|
ccbfd52580
|
修改支付金额
|
2 years ago |
|
张征
|
7de8f176ae
|
Merge branch 'feature/task1.0.0' into feature/task1.0.0-0507-zz
|
2 years ago |
|
张征
|
fc829b4d49
|
feat:完成删除和编辑地址
|
2 years ago |
|
xiaoguang
|
528b973e52
|
feat: 添加首页秒杀模块
|
2 years ago |
|
xiaoguang
|
69e6474f63
|
feat: 调整热门分类逻辑以及交互
|
2 years ago |
|
张征
|
19b13516ce
|
Merge branch 'feature/task1.0.0' into feature/task1.0.0-0507-zz
|
2 years ago |
|
张征
|
867e6dd653
|
feat:个人中心收货地址
|
2 years ago |
|
xiaoguang
|
bc58bb9f45
|
feat: 修改用户资料组件方法命名
|
2 years ago |
|
xiaoguang
|
d5917b2c86
|
feat: 添加个人资料页面，支持个人资料编辑
|
2 years ago |
|
xiaoguang
|
936db76a1f
|
feat: 添加个人中心首页，element-ui更改主题色
|
2 years ago |
|
ch
|
21532de9b9
|
添加收货地址
|
2 years ago |
|
ch
|
9d912d9154
|
Merge branch 'feature/task1.0.0-0507-zz' into feature/task1.0.0-0505-ch
|
2 years ago |
|
张征
|
dfdd61c054
|
fix:添加插件
|
2 years ago |
|
ch
|
8704cf0839
|
Merge branch 'feature/task1.0.0-0507-zz' into feature/task1.0.0-0505-ch
|
2 years ago |
|
张征
|
834146eeba
|
feat:完成收货地址开发
|
2 years ago |
|
张征
|
a670935eff
|
feat:完成收货地址开发
|
2 years ago |
|
xiaoguang
|
691770268f
|
feat: 添加个人主页左侧导航栏
|
2 years ago |
|
ch
|
b8eae56db6
|
支付成功页样式修改
|
2 years ago |
|
张征
|
032b6b01b9
|
fix:修改图片地址
|
2 years ago |
|
xiaoguang
|
e9a3cf9d60
|
feat: static目录下图片文件移动到assets目录
|
2 years ago |
|
张征
|
08c5478bf1
|
feat:订单地址
|
2 years ago |
|
ch
|
3aafeee978
|
详情细节,测试部署修改
|
2 years ago |
|
ch
|
4beb13e940
|
合并
|
2 years ago |
|
ch
|
cd91ec945a
|
支付倒计时修改,订单详情步骤条
|
2 years ago |
|
xiaoguang
|
c152d778ff
|
feat: 安装@nuxtjs/style-resources插件，配置scss全局变量
|
2 years ago |
|
张征
|
c0e1a257fb
|
fix:修改搜索
|
2 years ago |
|
张征
|
a62da2faa5
|
fix:修改样式问题
|
2 years ago |
|
张征
|
7049ca6890
|
feat:完成商品详情
|
2 years ago |
|
ch
|
bc1c7b76aa
|
Merge branch 'feature/task1.0.0' into feature/task1.0.0-0505-ch
|
2 years ago |
|
ch
|
8e3b894d10
|
pay
|
2 years ago |
|
ch
|
0f0b283387
|
订单详情
|
2 years ago |
|
张征
|
966d13922f
|
feat:开发商品详情
|
2 years ago |
|
张征
|
0dc039da16
|
merge:合并主干分时
|
2 years ago |
|
张征
|
3461adb9fa
|
feat:开发商品详情
|
2 years ago |
|
ch
|
3cf9e54b01
|
按钮封装
|
2 years ago |
|
张征
|
be7f50ddcd
|
merge:合并主分支
|
2 years ago |
|
肖广
|
34d160a754
|
Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0'
feat: 添加公共页尾,页头置顶样式
See merge request yanxuan-frontend/shop-pc!3
|
2 years ago |
|
张征
|
7d42def8d0
|
feat:开发商品列表
|
2 years ago |
|
ch
|
6b6ce39d0c
|
添加订单列表,提交订单
|
2 years ago |
|
xiaoguang
|
4bcea0029d
|
feat: 添加公共页尾,页头置顶样式
|
2 years ago |
