Commit Graph

341 Commits (ff92fd8d7649b64052a298589aaa48964b05fbcf)

Author SHA1 Message Date
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 712e3cd2f2 Merge branch 'ma' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui into ma 2021-06-24 18:36:12 +08:00
mabo 532cbc943d 发布商品回显问题 2021-06-24 18:36:08 +08:00
Chopper 854a04d7f4 商品参数分组名称展示 2021-06-24 18:23:29 +08:00
Chopper d645f4ea6b 商品参数问题处理,参数回显 2021-06-24 17:46:45 +08:00
mabo 9ef1761c63 虚拟商品不展示重量 2021-06-24 17:45:00 +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 7b2054206a Merge branch 'master' into ma 2021-06-24 15:56:48 +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
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
mabo 6475be77bc Merge branch 'master' into ma 2021-06-23 08:48:30 +08:00
mabo 8d76128b5a Merge branch 'ma' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui into ma 2021-06-23 08:45:22 +08:00
mabo e6d2c51252 no message 2021-06-23 08:45:18 +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