mabo
|
ba7e711a88
|
删除无用字段
|
2021-08-06 14:12:30 +08:00 |
lemon橪
|
10dcf4473c
|
合并master
|
2021-08-06 11:59:20 +08:00 |
|
lemon橪
|
4c217b85e9
|
优化菜单设置权限功能，懒人版一件选中权限
|
2021-08-06 11:58:53 +08:00 |
|
mabo
|
c75bd5208b
|
买家端商品分类，导航加载报错问题，商家端跳转买家端商品地址代码优化，文件上传地址调用位置修改
|
2021-08-06 11:32:29 +08:00 |
|
mabo
|
c6874acb1b
|
pc端修改我的优惠券bug，样式，管理端删除添加秒杀活动功能
|
2021-08-05 18:07:11 +08:00 |
|
mabo
|
ffeef640da
|
店铺列表，搜索项，店铺状态字段错误
|
2021-08-05 17:35:52 +08:00 |
|
mabo
|
1f054b796d
|
积分商品流程完成，billpirce改为flowprice，必填项提示错误
|
2021-08-05 17:10:10 +08:00 |
|
mabo
|
35881e30e0
|
积分商品，搜索热词为null问题
|
2021-08-05 11:19:12 +08:00 |
pikachu
|
a8e55d230a
|
Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui
|
2021-08-04 19:08:33 +08:00 |
|
pikachu
|
083576ab3f
|
更改微信提现状态
|
2021-08-04 19:08:04 +08:00 |
|
mabo
|
0387ac510a
|
管理端和商家端userInfo字段名变更，管理端会员详情，他的积分字段调整
|
2021-08-04 17:51:43 +08:00 |
|
mabo
|
726ae1f856
|
1. 第一次进入商品列表，商品分类未展示
2. 链接选择器，店铺开启状态展示错误
3. 从新装修楼层，楼层bug修改
4. 搜索热词为空是返回null，导致报错
5. 首页全部商品分类缓存问题
6. 修改菜单项缓存、添加设置
7. 店铺分类二级分类修改时无父级分类
|
2021-08-04 17:07:39 +08:00 |
|
mabo
|
483d8c3aef
|
链接选择器，店铺开启状态展示错误
|
2021-08-03 18:12:27 +08:00 |
|
mabo
|
db42d19f44
|
买家端订单详情添加操作，商品选择器，categoryId传参错误
|
2021-08-03 18:08:18 +08:00 |
|
mabo
|
8d6ee03d88
|
首页展示秒杀商品，楼层装修页面调整
|
2021-08-02 18:13:08 +08:00 |
|
mabo
|
ca3cf71c6d
|
搜索热词，pc端注释，管理端结算单订单号字段错误
|
2021-07-30 15:59:14 +08:00 |
|
mabo
|
94a9404b39
|
结算单添加积分，砍价价格字段
|
2021-07-28 10:56:37 +08:00 |
|
mabo
|
2385bbd912
|
积分展示问题
|
2021-07-28 09:24:37 +08:00 |
|
mabo
|
327d911f80
|
买家图片地址问题
|
2021-07-28 09:02:48 +08:00 |
|
mabo
|
83f0f01233
|
Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui
|
2021-07-27 18:13:48 +08:00 |
|
mabo
|
877ccc059e
|
楼层装修接口多次调用，发票管理状态错误，售后详情打开多个会为空
|
2021-07-27 18:13:45 +08:00 |
|
lemon橪
|
9313d5a886
|
新增商品楼层装修模块
|
2021-07-27 18:13:24 +08:00 |
|
mabo
|
5fb6986a18
|
菜单管理保存时删除无用字段
|
2021-07-27 16:13:38 +08:00 |
|
mabo
|
eb4a5e4fdc
|
管理端注释添加完成
|
2021-07-27 15:59:34 +08:00 |
|
mabo
|
59e1aedbf3
|
Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui
|
2021-07-26 18:12:17 +08:00 |
|
mabo
|
87980277bf
|
添加注释，删除无用代码，bug修改
|
2021-07-26 18:12:13 +08:00 |
Chopper
|
30fbe6ca83
|
no message
|
2021-07-26 16:03:39 +08:00 |
|
Chopper
|
31d28627f1
|
热词功能完善
|
2021-07-26 16:02:31 +08:00 |
|
mabo
|
df9ea021b3
|
Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui
|
2021-07-26 14:47:22 +08:00 |
|
mabo
|
a198fc0161
|
添加注释，测试功能，选择部门组件报错，会员详情积分字段展示错误，售后原因添加标识判断是新增还是编辑
|
2021-07-26 14:47:18 +08:00 |
|
pikachu
|
6a716fa531
|
提现申请审核
|
2021-07-24 17:38:19 +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橪
|
502c77fb6e
|
优化角色权限样式
|
2021-07-22 18:02:47 +08:00 |
|
lemon橪
|
4809c3839b
|
修改售后单部分样式以及逻辑
|
2021-07-22 14:23:31 +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
|
07f41f5cb6
|
pc商品列表样式修改，商家注释添加，订单统计，退订单按钮样式
|
2021-07-16 17:57:24 +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 |
|
pikachu
|
d7da00582a
|
Merge branch 'master' into qiuqiu
|
2021-07-12 23:44:29 +08:00 |
|
pikachu
|
953320526e
|
砍价第一版本
|
2021-07-12 23:43:59 +08:00 |
|
pikachu
|
726b11eb82
|
砍价第一版本
|
2021-07-12 23:42:59 +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
|
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
|
cc1afed902
|
分销提现，滑块验证bug修改
|
2021-07-02 16:45:52 +08:00 |
|
mabo
|
3a76ba2c1f
|
发布文章图片不回显，发布商品不选类型可以点下一步
|
2021-07-02 14:26:01 +08:00 |
|
mabo
|
f7167912e7
|
商品sku只展示一个问题
|
2021-06-30 17:41:24 +08:00 |
|
mabo
|
14feac43fe
|
Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui
|
2021-06-30 15:51:18 +08:00 |
|
mabo
|
c9e58f3586
|
修改bug
|
2021-06-30 15:51:14 +08:00 |
|
Chopper
|
e8809bbeb8
|
镜像脚本更新
|
2021-06-30 14:54:24 +08:00 |
|
lemon橪
|
d8b9d81f70
|
合并master
|
2021-06-30 14:29:03 +08:00 |
|
lemon橪
|
4340b1a5b7
|
优化商品分类，隐藏没用的楼层装修弹窗的样式
|
2021-06-30 14:28:50 +08:00 |
|
mabo
|
950b8a097c
|
bug修改
|
2021-06-30 09:45:36 +08:00 |
|
mabo
|
72ed363ac3
|
商品评价，点击查看报错问题
|
2021-06-29 18:13:58 +08:00 |
|
mabo
|
5143f2b83f
|
添加滑块验证注释
|
2021-06-29 15:24:16 +08:00 |
|
mabo
|
b728e340a0
|
Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui
|
2021-06-29 14:58:10 +08:00 |
|
mabo
|
18bfa0edef
|
滑块验证优化
|
2021-06-29 14:58:07 +08:00 |
|
lemon橪
|
f87306f6de
|
合并master
|
2021-06-29 12:00:05 +08:00 |
|
lemon橪
|
7a080124c6
|
新增会员提现功能
|
2021-06-29 11:59:45 +08:00 |
|
mabo
|
0575503687
|
Merge branch 'ma'
|
2021-06-29 10:44:40 +08:00 |
|
mabo
|
346c753670
|
代码格式调整
|
2021-06-29 10:44:25 +08:00 |
lifenlong
|
46a93c5524
|
Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui
|
2021-06-29 10:10:11 +08:00 |
|
lifenlong
|
b3d9040c02
|
修改虚拟订单列表按照订单状态筛选
|
2021-06-29 10:09:58 +08:00 |
|
lifenlong
|
9b83d20b85
|
修改虚拟订单字段
|
2021-06-29 10:06:54 +08:00 |
|
Chopper
|
8245b0a38d
|
虚拟订单查询参数初始化问题处理
|
2021-06-29 10:03:17 +08:00 |
|
Chopper
|
59a580ccac
|
Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop-ui
|
2021-06-29 09:42:39 +08:00 |
|
Chopper
|
6b0ba4e5ee
|
页面展示属性问题
|
2021-06-29 09:42:21 +08:00 |
|
mabo
|
a8aa73760f
|
Merge branch 'ma'
|
2021-06-29 09:28:36 +08:00 |
|
mabo
|
ebaa75ed15
|
管理端上架问题，批量设置物流模板
|
2021-06-29 09:28:21 +08:00 |
|
mabo
|
5ea61a160e
|
Merge branch 'ma'
|
2021-06-28 18:54:09 +08:00 |
|
lemon橪
|
78dc8a5e0b
|
合并Master
|
2021-06-28 18:17:19 +08:00 |
|
lemon橪
|
3e54f24ddd
|
merge master
|
2021-06-28 18:16:41 +08:00 |
|
mabo
|
cb14b13c19
|
管理端，添加店铺，选择会员失败问题
|
2021-06-28 18:14:53 +08:00 |
|
mabo
|
1e6e7c123c
|
修改添加商品拖拽改变位置
|
2021-06-28 18:14:00 +08:00 |
|
mabo
|
edcaa2421b
|
no message
|
2021-06-28 17:12:18 +08:00 |
|
mabo
|
20e4662961
|
管理端店铺经纬度改为店铺定位
|
2021-06-28 17:07:48 +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 |
|
mabo
|
c3bd727694
|
店铺入驻bug修改
|
2021-06-28 11:23:22 +08:00 |
|
Chopper
|
510cf963a2
|
对没有支付方式的充值进行一下过滤
|
2021-06-28 10:15:57 +08:00 |
|
Chopper
|
081d251594
|
充值方式字段描述
|
2021-06-28 10:07:46 +08:00 |
|
pikachu
|
f436d17735
|
修改资金管理接口
|
2021-06-26 16:49:44 +08:00 |