Commit Graph

580 Commits (f45b115355cf88ded112d6067769b3feb8128892)

Author SHA1 Message Date
lemon橪 fb50143ec2 新增app版本描述 2021-08-13 09:18:46 +08:00
mabo 736c5ecd2c 结算单添加砍价,积分商品金额 2021-08-12 18:39:34 +08:00
mabo e88c75d0b7 Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui 2021-08-12 17:42:16 +08:00
mabo a849d8906a 投诉详情取消投诉规则改变,商品分类2级分类没有图片 2021-08-12 17:42:05 +08:00
Chopper 2d2448ebba Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop-ui
# Conflicts:
#	seller/src/views/promotion/seckill/seckill.vue
2021-08-12 17:12:13 +08:00
mabo 9b0a089e29 选择品牌,品牌绑定时候可以搜索 2021-08-12 16:41:43 +08:00
Chopper 682bd13b6e add elasticsearch progress 2021-08-12 02:17:28 +08:00
mabo 71ab63e047 Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui 2021-08-12 01:03:43 +08:00
mabo 2e27a2fb85 好评率展示问题,申请售后图片变形,清除足迹不刷新列表,结算单筛选条件展示错误,店铺审核按钮调整到详情 2021-08-12 01:03:39 +08:00
Chopper 02bf570f08 商家端售后排序问题处理 2021-08-12 00:09:01 +08:00
Chopper e52ac06fb3 pc支持分销 2021-08-11 22:53:47 +08:00
Chopper c1a741466c 商家端查看秒杀活动列表问题处理 2021-08-11 22:29:27 +08:00
mabo 81ab58e009 店铺入驻bug修改 2021-08-11 22:13:25 +08:00
mabo a42a7515dc Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui 2021-08-11 21:41:19 +08:00
mabo 2dabff65ed 店铺入驻没有回显问题 2021-08-11 21:41:15 +08:00
pikachu 71d8fbd5fe Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui 2021-08-11 21:32:54 +08:00
pikachu 7763abd591 拼团活动相关校验 2021-08-11 21:32:42 +08:00
mabo 6bbba6bd35 Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui 2021-08-11 21:18:26 +08:00
mabo c7ce4e72c6 店铺入驻bug修改,订单详情添加修改金额展示 2021-08-11 21:18:22 +08:00
pikachu 9e365c27b5 新增充值取消状态 2021-08-11 19:28:47 +08:00
mabo 4557b1d5c1 Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui 2021-08-11 18:48:03 +08:00
mabo e9163e4247 管理、商家,添加删除秒杀商品接口,管理端切换账号菜单权限不生效问题,代码优化 2021-08-11 18:47:59 +08:00
lemon橪 328bceec2c 合并master 2021-08-11 18:12:53 +08:00
lemon橪 82bb5577b2 修改统计错误信息 2021-08-11 18:12:36 +08:00
mabo 3e505a8a4e Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui 2021-08-11 14:56:06 +08:00
mabo cc80242896 pc端添加2个轮播代码,楼层装修跟pc端样式不一致,楼层装修无法添加的bug修改 2021-08-11 14:56:02 +08:00
lemon橪 e521e723d5 修改移动端楼层装修bug 2021-08-11 11:57:02 +08:00
lemon橪 9213aed8e0 修改部分移动端楼层装修bug 2021-08-11 10:19:45 +08:00
mabo d104baf426 管理端,装修页面添加两种新轮播 2021-08-10 18:01:07 +08:00
mabo b89fb8b2ba Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui 2021-08-10 17:39:20 +08:00
mabo bb8ea94850 pc收藏店铺字段变更,添加修改秒杀页面 2021-08-10 17:39:15 +08:00
lemon橪 783c6df0a4 修改统计上店铺不加载bug 修改统计图antV加载数据不齐全bug 2021-08-10 16:50:55 +08:00
lemon橪 06a6b77d2e pull最新代码 修改店铺简介的富文本框 2021-08-10 16:30:55 +08:00
mabo 924de43227 删除文件 buyer/src/pages/payment/thirdPay.vue 2021-08-10 08:11:21 +00:00
mabo 0597531c72 删除文件 buyer/src/pages/forgetPassword.vue 2021-08-10 08:11:11 +00:00
mabo 07e75f71cc 删除文件 buyer/src/pages/couponCenter.vue 2021-08-10 08:11:04 +00:00
mabo c9d42755ef 删除文件 buyer/src/components/nav/cateNav.vue 2021-08-10 08:10:15 +00:00
mabo 9e45c45688 删除文件 buyer/src/components/indexDecorate/modelList/seckill.vue 2021-08-10 08:09:05 +00:00
mabo 75fd42e152 删除文件 buyer/src/components/indexDecorate/modelList/recommend.vue 2021-08-10 08:08:59 +00:00
mabo 97bc68ad26 删除文件 buyer/src/components/indexDecorate/modelList/notEnough.vue 2021-08-10 08:08:54 +00:00
mabo 05a25bd80f 删除文件 buyer/src/components/indexDecorate/modelList/newGoodsSort.vue 2021-08-10 08:08:45 +00:00
mabo ffde03bc21 删除文件 buyer/src/components/indexDecorate/modelList/firstPageAdvert.vue 2021-08-10 08:08:39 +00:00
mabo 0d42bce536 删除文件 buyer/src/components/indexDecorate/modelList/carousel.vue 2021-08-10 08:08:31 +00:00
mabo bf2eb82728 删除文件 buyer/src/components/indexDecorate/modelFormItem.vue 2021-08-10 08:07:02 +00:00
mabo a62530d7b8 删除文件 buyer/src/components/indexDecorate/modelForm.vue 2021-08-10 08:06:57 +00:00
mabo 3e1fa0b937 修改秒杀页面展示名 2021-08-10 11:53:28 +08:00
mabo 604a918fd1 商家端代码优化 2021-08-10 10:17:48 +08:00
mabo 1f02b45600 管理端代码优化 2021-08-10 09:59:53 +08:00
lemon橪 ebb048f1a7 修改付款日志订单创建时间 2021-08-09 11:57:57 +08:00
lemon橪 c58d70524d 更改seller上面之前配置出错的问题 2021-08-09 11:11:57 +08:00