317 Commits

Author SHA1 Message Date
pikachu
05b4f67bd3 修复提现记录不展示 2021-07-24 11:46:41 +08:00
mabo
9130485631 添加注释,修改分销设置提交方式,左侧菜单无法选中问题 2021-07-23 18:05:05 +08:00
mabo
ae329419a6 页签切换,一级菜单也要选中,报错信息提示多个问题 2021-07-23 11:46:01 +08:00
mabo
66462b9085 Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui 2021-07-22 18:05:59 +08:00
mabo
80d070bb67 管理端售后,添加跳转链接 2021-07-22 18:05:55 +08:00
lemon橪
916dd1a398 合并Master 2021-07-22 18:03:04 +08:00
lemon橪
502c77fb6e 优化角色权限样式 2021-07-22 18:02:47 +08:00
mabo
2f8946f372 Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui 2021-07-22 14:25:59 +08:00
mabo
abc58298a3 logo替换为本地文件,商品搜索项折叠,售后展示平台退款订单 2021-07-22 14:25:55 +08:00
lemon橪
4809c3839b 修改售后单部分样式以及逻辑 2021-07-22 14:23:31 +08:00
lemon橪
7fbcdafa9b 合并master 2021-07-22 09:10:42 +08:00
lemon橪
b2180ecaf7 更改退货列表间距 2021-07-22 09:10:15 +08:00
mabo
6351bdb633 买家优惠券页面调整,订单导出添加参数,订单详情样式调整 2021-07-22 09:01:59 +08:00
mabo
75bff1edc4 会员中心添加首页按钮,pclogo改为阿里云地址,编辑折扣券没有传折扣值, 2021-07-21 15:27:39 +08:00
paulGao
f512caa81d 添加自定义分词管理 2021-07-21 08:00:24 +08:00
lemon橪
c3178eb7d0 合并master 2021-07-20 18:03:28 +08:00
lemon橪
562679b366 新增楼层装修砍价的编辑 2021-07-20 18:02:49 +08:00
mabo
eee0258061 物流公司切换禁用无效问题,pc退货添加物流信息回填,保存发票回显错误 2021-07-20 18:00:35 +08:00
mabo
0a248d89d5 物流公司switch切换无效,代码注释添加 2021-07-20 14:06:53 +08:00
mabo
5062cad2b0 商家端添加注释,删除无用代码,优化样式 2021-07-19 18:03:35 +08:00
mabo
07f41f5cb6 pc商品列表样式修改,商家注释添加,订单统计,退订单按钮样式 2021-07-16 17:57:24 +08:00
mabo
133febe7a7 代码注释添加 2021-07-15 10:19:56 +08:00
mabo
e74c6d9eda Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui 2021-07-14 18:01:03 +08:00
mabo
0499a9c237 批量上传、添加注释 2021-07-14 18:00:59 +08:00
pikachu
fbb24fd07f 修复积分字段展示问题 2021-07-13 18:55:20 +08:00
pikachu
0b62cba3b9 修改积分类型字段 2021-07-13 18:46:55 +08:00
mabo
0fd4645514 Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui
# Conflicts:
#	seller/src/config/index.js
2021-07-13 18:16:10 +08:00
mabo
0e277a8e6d 前端首页下拉样式,头部样式,seller端批量上传 2021-07-13 18:15:32 +08:00
lemon橪
ca8d518fae 修改物流请求 2021-07-12 18:37:42 +08:00
lemon橪
3e3c101a1e 合并方法 2021-07-12 18:19:05 +08:00
lemon橪
c6417cf197 修改商家端物流这块请求方法 2021-07-12 18:18:49 +08:00
mabo
4c0aec2f42 文章分类,订单列表,商品分类,收款记录等页面bug修改 2021-07-09 17:58:31 +08:00
mabo
7331fcbb17 Merge branch 'ma' 2021-07-09 15:21:28 +08:00
mabo
f5faad982c 发布商品代码拆分完成,管理端订单设置修改 2021-07-09 15:04:02 +08:00
mabo
48c0dcb69b bug修改 2021-07-08 14:36:05 +08:00
mabo
0504592f7d 拆分代码 2021-07-08 09:24:42 +08:00
mabo
9ff4197ec4 no message 2021-07-07 17:45:38 +08:00
mabo
c835616ad2 Merge branch 'master' into ma
# Conflicts:
#	buyer/src/components/goodsDetail/ShowGoodsDetail.vue
#	buyer/src/config/index.js
#	seller/src/views/goods/goods-seller/goodsOperation.vue
2021-07-07 16:14:23 +08:00
mabo
e5449213c2 no message 2021-07-07 16:12:55 +08:00
mabo
872a5d1982 左侧菜单选中设置 2021-07-07 16:03:48 +08:00
mabo
1246810c01 bug修改 2021-07-07 15:34:38 +08:00
mabo
fc393ecd64 部分bug修改 2021-07-05 17:53:23 +08:00
mabo
9b9295ea94 拆分发布商品代码 2021-07-05 16:08:12 +08:00
mabo
c403fce786 no message 2021-07-02 18:04:17 +08:00
mabo
31349634f6 Merge branch 'master' into ma
# Conflicts:
#	seller/src/views/goods/goods-seller/goodsOperation.vue
2021-07-02 17:38:14 +08:00
mabo
cc1afed902 分销提现,滑块验证bug修改 2021-07-02 16:45:52 +08:00
mabo
3a76ba2c1f 发布文章图片不回显,发布商品不选类型可以点下一步 2021-07-02 14:26:01 +08:00
mabo
da330b80c8 Merge branch 'master' into ma 2021-07-02 10:33:34 +08:00
mabo
1028b8189e 导出待发货订单 2021-07-02 10:32:15 +08:00
mabo
6988ad8bf0 Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui 2021-07-02 09:50:28 +08:00