lemon橪
|
78dc8a5e0b
|
合并Master
|
2021-06-28 18:17:19 +08:00 |
|
lemon橪
|
3e54f24ddd
|
merge master
|
2021-06-28 18:16:41 +08:00 |
|
mabo
|
1e6e7c123c
|
修改添加商品拖拽改变位置
|
2021-06-28 18:14:00 +08:00 |
|
mabo
|
20e4662961
|
管理端店铺经纬度改为店铺定位
|
2021-06-28 17:07:48 +08:00 |
|
mabo
|
2f6380da22
|
bug修改
|
2021-06-28 15:47:42 +08:00 |
|
lemon橪
|
37b873ecce
|
修改当首页空数据显示问题
|
2021-06-28 15:12:50 +08:00 |
|
mabo
|
10fc7d4dd0
|
Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui
# Conflicts:
# manager/src/config/index.js
# seller/src/config/index.js
|
2021-06-28 11:25:30 +08:00 |
|
mabo
|
e14ecef05a
|
no message
|
2021-06-28 11:24:06 +08:00 |
|
lemon橪
|
e1000d324e
|
合并分支
|
2021-06-25 19:15:45 +08:00 |
|
lemon橪
|
3cb3fd81e7
|
修改一些看到的bug以及功能上的问题
|
2021-06-25 19:15:27 +08:00 |
|
mabo
|
c673ab2b5e
|
no message
|
2021-06-25 19:05:47 +08:00 |
|
mabo
|
b61f5e47df
|
添加分类id
|
2021-06-25 19:03:47 +08:00 |
|
mabo
|
1b2f6e221e
|
充值功能
|
2021-06-25 18:47:16 +08:00 |
|
mabo
|
830cc3e83c
|
Merge branch 'master' into ma
|
2021-06-25 16:03:21 +08:00 |
|
mabo
|
be611871bc
|
修改发布商品格式
|
2021-06-25 16:03:10 +08:00 |
|
mabo
|
73246e1dc6
|
PC端bug修改
|
2021-06-25 15:28:31 +08:00 |
|
mabo
|
0a11a25ccd
|
发布商品小修改
|
2021-06-25 11:37:54 +08:00 |
|
mabo
|
bb51771898
|
发布商品页面bug修改
|
2021-06-25 11:29:48 +08:00 |
|
mabo
|
532cbc943d
|
发布商品回显问题
|
2021-06-24 18:36:08 +08:00 |
|
Chopper
|
d645f4ea6b
|
商品参数问题处理，参数回显
|
2021-06-24 17:46:45 +08:00 |
|
Chopper
|
3cb1edee83
|
参数相关问题处理
|
2021-06-24 17:44:43 +08:00 |
|
mabo
|
e0a7bb86a6
|
模板
|
2021-06-24 17:13:26 +08:00 |
|
mabo
|
84f3eaea10
|
商品模板修改
|
2021-06-24 16:41:04 +08:00 |
|
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 |
|
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 |
|
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
|
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 |
|
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 |
|
lemon橪
|
b566a2fd4f
|
合并分支
|
2021-06-22 18:11:41 +08:00 |
|
lemon橪
|
bce709a57a
|
解决运营后台出现的bug
|
2021-06-22 18:11:23 +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橪
|
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 |
|