mabo
|
dbd3bb6124
|
Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui
|
2021-06-24 15:56:33 +08:00 |
|
mabo
|
39fd76ebdc
|
规格项修改
|
2021-06-24 15:56:20 +08:00 |
Chopper
|
e65d84f95f
|
管理端订单来源字段处理
|
2021-06-24 11:54:21 +08:00 |
|
Chopper
|
a337972f7a
|
Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop-ui
|
2021-06-24 10:41:00 +08:00 |
lemon橪
|
75ca4de9e1
|
合并master
|
2021-06-24 10:35:51 +08:00 |
|
lemon橪
|
4133badc46
|
修改后台小程序直播查看问题，新增只有自营店可以赠送积分
|
2021-06-24 10:32:51 +08:00 |
|
mabo
|
f8f205d0e8
|
Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui
|
2021-06-23 18:19:47 +08:00 |
|
mabo
|
4d7b4eb2b4
|
发布商品修改
|
2021-06-23 18:19:43 +08:00 |
|
mabo
|
31295d7cb2
|
我的订单，去掉用户名展示
|
2021-06-23 18:18:38 +08:00 |
|
lemon橪
|
b7dd7f1c3b
|
合并master上面的冲突
|
2021-06-23 18:13:11 +08:00 |
|
lemon橪
|
2391f71d9a
|
修改部分页面ui以及bug
|
2021-06-23 18:08:22 +08:00 |
lifenlong
|
6bc0591418
|
Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui
|
2021-06-23 17:40:44 +08:00 |
|
lifenlong
|
6d94b6fbdc
|
秒杀活动，状态展示
|
2021-06-23 17:40:34 +08:00 |
|
mabo
|
ff3f4dd8c0
|
腾讯云智服标识设置
|
2021-06-23 17:32:08 +08:00 |
|
Chopper
|
ee5759c86a
|
Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop-ui
|
2021-06-23 16:58:22 +08:00 |
|
mabo
|
752d967a50
|
修改规格接口
|
2021-06-23 16:58:15 +08:00 |
|
mabo
|
5d78241b8e
|
Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui
|
2021-06-23 16:49:39 +08:00 |
|
mabo
|
f2f2984c3e
|
bug修改
|
2021-06-23 16:49:35 +08:00 |
|
Chopper
|
8032f3bda1
|
分类规格相关页面跳转
|
2021-06-23 16:48:43 +08:00 |
|
lifenlong
|
c326431407
|
商品列表，状态展示优化
|
2021-06-23 11:46:38 +08:00 |
|
lifenlong
|
d5c96f66ce
|
优化店铺后台状态展示
|
2021-06-23 11:34:56 +08:00 |
|
mabo
|
eb5816ff80
|
Merge branch 'dev-ryan'
# Conflicts:
# buyer/src/plugins/request.js
|
2021-06-23 10:48:54 +08:00 |
|
mabo
|
a1fd5be5c4
|
修改立即购买按钮一直加载bug
|
2021-06-23 10:45:05 +08:00 |
|
lifenlong
|
ea396405df
|
Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui
|
2021-06-23 00:21:59 +08:00 |
|
lifenlong
|
5b3c89886e
|
优化运营后台状态展示
|
2021-06-23 00:21:17 +08:00 |
|
lemon橪
|
b566a2fd4f
|
合并分支
|
2021-06-22 18:11:41 +08:00 |
|
lemon橪
|
bce709a57a
|
解决运营后台出现的bug
|
2021-06-22 18:11:23 +08:00 |
|
Chopper
|
8e239a5bbf
|
token 解析问题处理
|
2021-06-22 17:36:07 +08:00 |
|
Chopper
|
d3576b691c
|
商品属性搜索初始化问题处理
|
2021-06-22 15:16:02 +08:00 |
|
Chopper
|
3b922839a1
|
商品列表问题展示搜索字段，展示商品类型
|
2021-06-22 14:59:20 +08:00 |
|
lemon橪
|
9586eedb56
|
合并master
|
2021-06-21 18:12:17 +08:00 |
|
lemon橪
|
d89b984344
|
修改直播间时间没有判断bug,店铺后台，批量发货没有跳转bug,直播后台添加小程序直播，前台显示小程序直播
|
2021-06-21 18:11:46 +08:00 |
|
Chopper
|
4a6fd431bc
|
特殊情况下会报错问题处理
|
2021-06-21 16:03:23 +08:00 |
|
Chopper
|
597af1a210
|
保存json excel问题
|
2021-06-21 14:35:33 +08:00 |
|
lemon橪
|
2b85a5aba1
|
合并冲突
|
2021-06-21 14:32:07 +08:00 |
|
lemon橪
|
35094a7ac2
|
合并冲突
|
2021-06-21 14:30:06 +08:00 |
|
Chopper
|
d57b33cb4e
|
Merge branch 'dev-ryan'
# Conflicts:
# buyer/src/components/header/Header.vue
# buyer/src/components/invoiceModal/index.vue
# manager/src/config/index.js
|
2021-06-21 14:26:47 +08:00 |
|
lemon橪
|
c3be931218
|
提交批量发货没有跳转的Bug
|
2021-06-21 14:15:52 +08:00 |
pikachu
|
85bfb48c0c
|
第三部完成不能手动点击
|
2021-06-20 10:32:35 +08:00 |
|
pikachu
|
861c7f905a
|
订单区分商品订单和虚拟订单
|
2021-06-19 16:25:17 +08:00 |
|
pikachu
|
be42bfcf40
|
虚拟订单和商品订单区分开
|
2021-06-19 16:10:55 +08:00 |
|
lemon橪
|
d9368b7514
|
商品分类修改绑定规格八阿哥
|
2021-06-18 17:11:18 +08:00 |
|
Chopper
|
c4cc078680
|
分类信息缓存更新时间设定
|
2021-06-18 17:06:25 +08:00 |
|
Chopper
|
b3fda14322
|
券活动完善
|
2021-06-18 16:38:10 +08:00 |
|
lemon橪
|
336643419e
|
解决商品分类不同步数据问题，解决pc端添加发票问题
|
2021-06-18 14:52:40 +08:00 |
|
lemon橪
|
99ae898139
|
解决pc端个人中心跳转问题
|
2021-06-17 15:24:34 +08:00 |
|
lemon橪
|
76d09c0559
|
劵活动新增活动范围判断
|
2021-06-17 14:45:14 +08:00 |
|
lemon橪
|
d16c446070
|
合并master
|
2021-06-17 14:15:21 +08:00 |
|
lemon橪
|
57ff6c8d70
|
取消pc楼层装修提示框，改为无痕更改
|
2021-06-17 14:11:13 +08:00 |
|
lemon橪
|
0106bc7b75
|
合并master
|
2021-06-17 11:59:27 +08:00 |