mabo
|
a62530d7b8
|
删除文件 buyer/src/components/indexDecorate/modelForm.vue
|
2021-08-10 08:06:57 +00:00 |
pikachu
|
86fed0db41
|
Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui
|
2021-08-06 19:19:01 +08:00 |
|
pikachu
|
7cbca93d3d
|
积分字段修改
|
2021-08-06 19:18:55 +08:00 |
|
mabo
|
146854b098
|
导出订单默认导出一万条，优化代码
|
2021-08-06 16:12:41 +08:00 |
|
mabo
|
c75bd5208b
|
买家端商品分类，导航加载报错问题，商家端跳转买家端商品地址代码优化，文件上传地址调用位置修改
|
2021-08-06 11:32:29 +08:00 |
|
mabo
|
1fe7c050a4
|
分销商品添加移除功能，删除无用接口
|
2021-08-06 09:40:12 +08:00 |
|
mabo
|
c6874acb1b
|
pc端修改我的优惠券bug，样式，管理端删除添加秒杀活动功能
|
2021-08-05 18:07:11 +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 |
|
mabo
|
726ae1f856
|
1. 第一次进入商品列表，商品分类未展示
2. 链接选择器，店铺开启状态展示错误
3. 从新装修楼层，楼层bug修改
4. 搜索热词为空是返回null，导致报错
5. 首页全部商品分类缓存问题
6. 修改菜单项缓存、添加设置
7. 店铺分类二级分类修改时无父级分类
|
2021-08-04 17:07:39 +08:00 |
|
mabo
|
db42d19f44
|
买家端订单详情添加操作，商品选择器，categoryId传参错误
|
2021-08-03 18:08:18 +08:00 |
|
mabo
|
d822c3c809
|
swiper问题
|
2021-08-03 10:40:38 +08:00 |
|
mabo
|
94719d58cd
|
lock文件添加
|
2021-08-03 10:20:54 +08:00 |
|
mabo
|
307153801d
|
取消pakcge-lock.json的忽略
|
2021-08-03 10:08:07 +08:00 |
|
mabo
|
a771189939
|
swiper 报错
|
2021-08-03 09:53:50 +08:00 |
|
mabo
|
98c65eab46
|
Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui
|
2021-08-03 09:23:39 +08:00 |
|
mabo
|
21a37db1da
|
删除无用代码
|
2021-08-03 09:23:36 +08:00 |
Chopper
|
4008816c66
|
Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop-ui
|
2021-08-02 18:45:01 +08:00 |
|
Chopper
|
925e84528c
|
修改结算页面展示字段
|
2021-08-02 18:44:28 +08:00 |
|
mabo
|
8d6ee03d88
|
首页展示秒杀商品，楼层装修页面调整
|
2021-08-02 18:13:08 +08:00 |
|
mabo
|
ad17d8b743
|
文件名大小写修改
|
2021-07-31 11:05:34 +08:00 |
|
mabo
|
2792d24e98
|
添加注释
|
2021-07-31 09:49:17 +08:00 |
|
mabo
|
ff92fd8d76
|
添加pc端代码注释
|
2021-07-30 18:17:01 +08:00 |
|
mabo
|
93ba1c134f
|
热搜词缓存
|
2021-07-30 17:11:36 +08:00 |
|
mabo
|
dc08d545a2
|
删除like模块引用
|
2021-07-30 16:13:31 +08:00 |
|
mabo
|
ca3cf71c6d
|
搜索热词，pc端注释，管理端结算单订单号字段错误
|
2021-07-30 15:59:14 +08:00 |
|
mabo
|
cd0cd14f77
|
代码注释添加
|
2021-07-28 17:07:37 +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
|
877ccc059e
|
楼层装修接口多次调用，发票管理状态错误，售后详情打开多个会为空
|
2021-07-27 18:13:45 +08:00 |
|
pikachu
|
6a716fa531
|
提现申请审核
|
2021-07-24 17:38:19 +08:00 |
|
pikachu
|
05b4f67bd3
|
修复提现记录不展示
|
2021-07-24 11:46:41 +08:00 |
|
mabo
|
9130485631
|
添加注释，修改分销设置提交方式，左侧菜单无法选中问题
|
2021-07-23 18:05:05 +08:00 |
|
mabo
|
80d070bb67
|
管理端售后，添加跳转链接
|
2021-07-22 18:05:55 +08:00 |
|
mabo
|
abc58298a3
|
logo替换为本地文件，商品搜索项折叠，售后展示平台退款订单
|
2021-07-22 14:25:55 +08:00 |
|
mabo
|
6351bdb633
|
买家优惠券页面调整，订单导出添加参数，订单详情样式调整
|
2021-07-22 09:01:59 +08:00 |
|
mabo
|
75bff1edc4
|
会员中心添加首页按钮，pclogo改为阿里云地址，编辑折扣券没有传折扣值，
|
2021-07-21 15:27:39 +08:00 |
|
mabo
|
eee0258061
|
物流公司切换禁用无效问题，pc退货添加物流信息回填，保存发票回显错误
|
2021-07-20 18:00:35 +08:00 |
|
mabo
|
07f41f5cb6
|
pc商品列表样式修改，商家注释添加，订单统计，退订单按钮样式
|
2021-07-16 17:57:24 +08:00 |
|
mabo
|
0e277a8e6d
|
前端首页下拉样式，头部样式，seller端批量上传
|
2021-07-13 18:15:32 +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
|
48c0dcb69b
|
bug修改
|
2021-07-08 14:36:05 +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
|
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
|
cc1afed902
|
分销提现，滑块验证bug修改
|
2021-07-02 16:45:52 +08:00 |
|
mabo
|
e318fe5be0
|
pc首页margin问题
|
2021-07-02 09:50:25 +08:00 |
|
mabo
|
be2280907e
|
导出待发货订单
|
2021-07-02 09:10:53 +08:00 |
|
mabo
|
6100f1e39a
|
商品参数修改
|
2021-07-01 17:00:52 +08:00 |
|
mabo
|
6887b6c624
|
issues上bug修改
|
2021-07-01 16:02:12 +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 |
|
mabo
|
950b8a097c
|
bug修改
|
2021-06-30 09:45:36 +08:00 |
|
mabo
|
5143f2b83f
|
添加滑块验证注释
|
2021-06-29 15:24:16 +08:00 |
|
mabo
|
18bfa0edef
|
滑块验证优化
|
2021-06-29 14:58:07 +08:00 |
|
pikachu
|
338994fb45
|
对接会员消息
|
2021-06-29 08:30:39 +08:00 |
|
pikachu
|
995b0d65fb
|
对接会员消息
|
2021-06-29 08:25:02 +08:00 |
|
mabo
|
edcaa2421b
|
no message
|
2021-06-28 17:12:18 +08:00 |
|
mabo
|
20e4662961
|
管理端店铺经纬度改为店铺定位
|
2021-06-28 17:07:48 +08:00 |
|
mabo
|
2f6380da22
|
bug修改
|
2021-06-28 15:47:42 +08:00 |
|
mabo
|
b748f467aa
|
修改api地址
|
2021-06-28 11:26:30 +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 |
|
pikachu
|
f0914960a4
|
update buyer/src/components/header/Header.vue.
|
2021-06-26 03:23:26 +00:00 |
|
pikachu
|
3c83cc9f50
|
合并分支
|
2021-06-26 11:15:23 +08:00 |
lemon橪
|
e1000d324e
|
合并分支
|
2021-06-25 19:15:45 +08:00 |
|
lemon橪
|
3cb3fd81e7
|
修改一些看到的bug以及功能上的问题
|
2021-06-25 19:15:27 +08:00 |
|
mabo
|
c71da0b437
|
Merge branch 'ma'
|
2021-06-25 18:47:48 +08:00 |
|
mabo
|
1b2f6e221e
|
充值功能
|
2021-06-25 18:47:16 +08:00 |
|
mabo
|
974cc504d9
|
Merge branch 'ma' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui into ma
|
2021-06-25 18:31:58 +08:00 |
|
mabo
|
31c585bcaf
|
添加余额支付
|
2021-06-25 18:31:55 +08:00 |
|
Chopper
|
0adbde45b9
|
充值功能支付跳转
|
2021-06-25 18:30:30 +08:00 |
|
mabo
|
4160ebe004
|
虚拟商品售后，商品详情参数
|
2021-06-25 17:36:00 +08:00 |
|
Chopper
|
b48acb9691
|
Merge branch 'ma' of gitee.com:beijing_hongye_huicheng/lilishop-ui into ma
|
2021-06-25 17:31:27 +08:00 |
|
Chopper
|
75d4fda92d
|
增加pc余额支付功能。增加倒计时
|
2021-06-25 17:31:12 +08:00 |
|
mabo
|
b3863568d6
|
虚拟商品下单
|
2021-06-25 16:24:38 +08:00 |
|
mabo
|
73246e1dc6
|
PC端bug修改
|
2021-06-25 15:28:31 +08:00 |
|
mabo
|
9ef1761c63
|
虚拟商品不展示重量
|
2021-06-24 17:45:00 +08:00 |
|
mabo
|
39fd76ebdc
|
规格项修改
|
2021-06-24 15:56:20 +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
|
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 |
|
mabo
|
f2f2984c3e
|
bug修改
|
2021-06-23 16:49:35 +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 |
|
Chopper
|
8e239a5bbf
|
token 解析问题处理
|
2021-06-22 17:36:07 +08:00 |
|
lemon橪
|
2b85a5aba1
|
合并冲突
|
2021-06-21 14:32:07 +08:00 |
|
lemon橪
|
35094a7ac2
|
合并冲突
|
2021-06-21 14:30:06 +08:00 |
|
Chopper
|
d57b33cb4e
|
Merge branch 'dev-ryan'
# Conflicts:
# buyer/src/components/header/Header.vue
# buyer/src/components/invoiceModal/index.vue
# manager/src/config/index.js
|
2021-06-21 14:26:47 +08:00 |