paulGao
|
8ff6c0414a
|
优化买家端订单详情页，优化卖家端、平台端优惠券显示。优化结算页无效商品提示。
|
2022-08-12 19:24:41 +08:00 |
学习很差啦
|
f7c310b126
|
修改楼层装修判断的语法
|
2022-08-12 09:11:07 +08:00 |
|
paulGao
|
ab0db38eb2
|
修复管理端楼层装修符号错误问题
|
2022-08-11 22:06:21 +08:00 |
|
paulGao
|
283f4d6afa
|
修复订单列表查询订单类型查询无效问题
|
2022-08-11 20:57:30 +08:00 |
chc
|
db51df89f7
|
热词统计增加下方表格
|
2022-08-11 10:32:26 +08:00 |
|
学习很差啦
|
b77b4c0ef8
|
解决楼层装修 移动端发现的小问题
|
2022-08-10 19:06:19 +08:00 |
|
学习很差啦
|
dd67687d3a
|
发现 并解决了一个 移动端楼层装修拖动促销活动时候出现的bug
|
2022-08-10 17:54:17 +08:00 |
|
学习很差啦
|
bf393181b8
|
补充提交
|
2022-08-03 18:32:16 +08:00 |
|
学习很差啦
|
79ff1cecb4
|
修改楼层装修判断失误导致误出现Bug
|
2022-08-03 18:31:00 +08:00 |
|
学习很差啦
|
c281b0a867
|
优化退款消息提示
|
2022-08-03 11:20:07 +08:00 |
OceansDeep
|
bd322709f3
|
修复多次选择积分商品信息有误
|
2022-07-28 07:42:06 +00:00 |
|
lemon橪
|
4ecb41e9a2
|
merge paulGao commit
|
2022-07-14 10:38:52 +08:00 |
|
lemon橪
|
dba167738b
|
优化商家对账时点击切换可能出现的问题
|
2022-07-14 10:38:07 +08:00 |
|
OceansDeep
|
c1853fd4e0
|
!25 修复pc端楼层装修外部链接无法填写
Merge pull request !25 from OceansDeep/dev-gl
|
2022-07-13 13:05:58 +00:00 |
|
paulGao
|
75ef173c64
|
修复pc端楼层装修外部链接无法填写
|
2022-07-13 20:00:41 +08:00 |
Chopper
|
752c1086a0
|
Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop-ui
|
2022-07-13 19:06:42 +08:00 |
|
Chopper
|
6c5994202b
|
增加minio配置前端访问地址
|
2022-07-13 19:06:28 +08:00 |
|
lemon橪
|
00e229e7f4
|
新增退款失败错误提示
|
2022-07-13 18:12:30 +08:00 |
|
lemon橪
|
eeadfc1db9
|
新增移动端公告横纵向设置，我的足迹以及秒杀活动展示优化
|
2022-07-13 09:37:59 +08:00 |
|
lemon橪
|
f3ef286aa7
|
修改分销订单显示问题
|
2022-07-08 14:48:23 +08:00 |
mhhhh
|
a3fe3a3743
|
修改隐私协议的判断
|
2022-07-07 18:25:27 +08:00 |
|
lemon橪
|
86fa39d7af
|
合并master
|
2022-07-06 17:33:08 +08:00 |
|
lemon橪
|
a785718715
|
修改回收站不能修改用户信息问题
|
2022-07-06 17:31:12 +08:00 |
|
OceansDeep
|
d4eb17e573
|
!24 优化逻辑
Merge pull request !24 from OceansDeep/dev-gl
|
2022-07-06 08:43:21 +00:00 |
|
paulGao
|
994b700892
|
优化逻辑
|
2022-07-06 16:18:09 +08:00 |
|
lemon橪
|
c1830df1a2
|
修改优化
|
2022-07-05 18:24:14 +08:00 |
|
lemon橪
|
c7b739e546
|
更换editor,可支持拖拽式上传
|
2022-07-05 18:04:04 +08:00 |
|
mhhhh
|
8d6fa2f19f
|
去掉隐私协议中的排序，分类
|
2022-06-30 10:25:38 +08:00 |
|
paulGao
|
0a5563e5e2
|
优化管理端促销相关文本，操作条件
|
2022-06-22 10:55:17 +08:00 |
|
paulGao
|
f4b7068cd6
|
Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop-ui into dev-gl
|
2022-06-22 10:20:06 +08:00 |
|
lemon橪
|
2cb6f04465
|
更改统计图关键字
|
2022-06-21 16:57:32 +08:00 |
|
lemon橪
|
cd81a6afb1
|
合并master
|
2022-06-17 18:50:54 +08:00 |
|
lemon橪
|
f930d73a6a
|
商品选择器显示零售商品批发商品
|
2022-06-17 18:50:30 +08:00 |
|
paulGao
|
23bae9efd5
|
优化k8s部署提交
|
2022-06-16 14:08:46 +08:00 |
|
OceansDeep
|
2880c21a26
|
!21 优化代码
Merge pull request !21 from OceansDeep/dev-gl
|
2022-06-16 01:24:18 +00:00 |
|
paulGao
|
274ac3f155
|
Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop-ui into dev-gl
|
2022-06-16 09:21:29 +08:00 |
|
paulGao
|
c85d488de4
|
优化代码
|
2022-06-16 09:21:14 +08:00 |
|
lemon橪
|
9a3d202524
|
优化统计图显示
|
2022-06-15 18:48:43 +08:00 |
|
Chopper
|
2dcfacd431
|
适配minio
|
2022-06-07 09:37:53 +08:00 |
|
Chopper
|
d2c2da25b4
|
消费积分设置问题
|
2022-06-02 09:29:19 +08:00 |
|
mhhhh
|
e5f9f81ef7
|
解决冲突
|
2022-06-01 10:26:41 +08:00 |
|
mhhhh
|
0c0c903529
|
修改商家logo没有更换的问题
|
2022-06-01 10:13:53 +08:00 |
|
OceansDeep
|
115fa87ff2
|
!19 管理端商品详情增加批发商品信息展示
Merge pull request !19 from OceansDeep/dev-gl
|
2022-06-01 01:15:27 +00:00 |
|
paulGao
|
bb40364aed
|
管理端商品详情增加批发商品信息展示
|
2022-06-01 09:04:36 +08:00 |
|
lemon橪
|
0e921de6c3
|
合并master
|
2022-05-31 11:17:29 +08:00 |
|
lemon橪
|
58eeed4bbd
|
解决商品分类控件-添加一个品种后重复添加问题
|
2022-05-31 11:17:05 +08:00 |
|
mhhhh
|
21289f5a92
|
修改logo缓存
|
2022-05-31 11:04:40 +08:00 |
|
mhhhh
|
0aec486291
|
修改logo接口缓存
|
2022-05-31 09:51:43 +08:00 |
|
paulGao
|
ebacb58049
|
商品搜索优化
|
2022-05-27 16:07:54 +08:00 |
|
lemon橪
|
1b4c05f70b
|
修改高德地图key更新此commit 之前请务必确认一下创建的高德key日期。修改部分方法名称
|
2022-05-20 16:40:09 +08:00 |
|
lemon橪
|
a3f5212bbc
|
删除被墙的cdn 启用pickmall cdn加载资源
|
2022-05-19 15:51:32 +08:00 |
|
lemon橪
|
9d7a06e867
|
优化管理端代办事项
|
2022-05-19 09:13:16 +08:00 |
|
mhhhh
|
48f3c38fbd
|
修改获取logo接口地址
|
2022-05-18 21:53:32 +08:00 |
|
mhhhh
|
b6fa3175c6
|
Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop-ui
|
2022-05-17 09:19:58 +08:00 |
|
mhhhh
|
3cd57a6915
|
隐私协议菜单，店铺详情店铺详情非空判断，自定义logo
|
2022-05-17 09:19:36 +08:00 |
|
lemon橪
|
d433ff02cb
|
首页历史统计新增 历史记录对比
|
2022-05-13 14:17:33 +08:00 |
|
mhhhh
|
727d240715
|
git stashMerge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop-ui
|
2022-05-12 10:44:17 +08:00 |
|
mhhhh
|
1f4448ba08
|
增加打印发货单功能，隐藏配送信息，删除腾讯云智能客服
|
2022-05-12 10:33:02 +08:00 |
fengtianyangyang
|
479470832d
|
结算单修改
|
2022-05-11 19:18:04 +08:00 |
|
lemon橪
|
c83eddd62e
|
优化订单统计
|
2022-05-09 18:37:53 +08:00 |
|
学习很差啦
|
84e0803558
|
!9 修复查看满额活动详细后点击返回键找不到路由返回白屏问题
Merge pull request !9 from Assure/master 感谢Assure发现的返回白屏问题 此处接受并提交
|
2022-04-28 08:19:02 +00:00 |
|
ran
|
1691f8244f
|
修改账户昵称过长问题以及viper 在pr上提的Bug
|
2022-04-28 16:13:36 +08:00 |
|
Chopper
|
24f4a36082
|
流水信息退款单中展示更多细节
|
2022-04-26 11:14:57 +08:00 |
胡程
|
7cf7123dd2
|
fix:修复查看满额活动详细后点击返回键找不到路由返回白屏问题
|
2022-04-26 10:05:11 +08:00 |
|
Chopper
|
37064141c2
|
Merge branch 'dev-lmr'
# Conflicts:
# manager/src/views/page/article-manage/hotWords.vue
|
2022-04-25 19:00:25 +08:00 |
|
Chopper
|
5bd66b9ec6
|
还原接口api
|
2022-04-25 18:16:06 +08:00 |
|
Chopper
|
9e34b44165
|
热词功能补充提交
|
2022-04-25 18:09:49 +08:00 |
|
Chopper
|
8d9a64d84b
|
热词功能完善
|
2022-04-25 18:08:29 +08:00 |
|
lemon橪
|
9b14cd633e
|
热词部分代码
|
2022-04-25 09:18:31 +08:00 |
|
OceansDeep
|
118aaaf6fb
|
!8 修复结算页中有无效商品店铺显示问题。优化购物车页。管理端增加搜索热词全删除
Merge pull request !8 from OceansDeep/dev-gl
|
2022-04-22 08:50:00 +00:00 |
|
paulGao
|
0635dd38a2
|
修复结算页中有无效商品店铺显示问题。优化购物车页。管理端增加搜索热词全删除
|
2022-04-22 16:48:43 +08:00 |
fengtianyangyang
|
1d648bbad7
|
结算单页面修改
|
2022-04-22 09:04:20 +08:00 |
|
OceansDeep
|
5dfcc2482c
|
!7 优化楼层装修,修复结算页显示失效商品问题
Merge pull request !7 from OceansDeep/dev-gl
|
2022-04-21 08:27:40 +00:00 |
|
paulGao
|
c4168c9a2b
|
优惠移动端楼层装修
|
2022-04-21 14:57:33 +08:00 |
fengtianyangyang
|
c09e25974f
|
结算单修改
|
2022-04-18 19:10:10 +08:00 |
|
paulGao
|
744567e8de
|
优化楼层装修
|
2022-04-18 09:49:09 +08:00 |
|
paulGao
|
4156d51d78
|
优化楼层装修
|
2022-04-18 09:38:52 +08:00 |
|
lemon橪
|
0d09920314
|
修复楼层装修选择链接时可能出现的bug
|
2022-04-18 09:01:09 +08:00 |
|
lemon橪
|
36fd58a446
|
解决短信模版页面分页条件不显示问题
|
2022-04-13 10:40:45 +08:00 |
|
lemon橪
|
df408e640a
|
合并master
|
2022-04-08 17:31:14 +08:00 |
|
lemon橪
|
f365231ee7
|
提交高德api中更新安全密钥的提示
|
2022-04-08 17:29:28 +08:00 |
pikachu
|
9a33db76e9
|
楼层装修 问题
|
2022-03-22 10:14:31 +08:00 |
|
Chopper
|
65aa9d0a9f
|
Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop-ui
|
2022-03-18 17:41:33 +08:00 |
|
Chopper
|
baaeef0978
|
管理端无法修改会员信息问题处理
|
2022-03-18 17:41:29 +08:00 |
|
lemon橪
|
e27070e089
|
优化一个上传组件控制台报错bug 以及 buyer端楼层装修显示
|
2022-03-17 16:35:10 +08:00 |
|
pikachu
|
5188bba5b1
|
会员流量报表 名称修改
|
2022-03-15 11:46:49 +08:00 |
|
lemon橪
|
33bb16a0d3
|
修改菜单栏重复点击console会显示bug ， 以及行政地区不回显问题
|
2022-03-04 15:12:37 +08:00 |
夜良king
|
87f6b81e37
|
合并
|
2022-03-04 02:31:56 +08:00 |
|
lemon橪
|
378ac39315
|
商家楼层装修
|
2022-03-03 11:26:50 +08:00 |
|
lemon橪
|
c879cb2af0
|
优化订单详情中显示的价格问题
|
2022-03-02 15:02:18 +08:00 |
|
夜良king
|
6e737a3fa7
|
解决冲突
|
2022-02-26 15:27:10 +08:00 |
|
fengtianyangyang
|
535a36c378
|
‘合并
|
2022-02-23 21:24:18 +08:00 |
|
fengtianyangyang
|
7b30bc42d7
|
添加
|
2022-02-23 20:56:00 +08:00 |
|
lemon橪
|
800b91d406
|
修改会员信息少一个前缀问题
|
2022-02-23 16:15:37 +08:00 |
|
Chopper
|
31f438edfa
|
IM更新
|
2022-02-21 22:45:39 +08:00 |
|
zhenghao
|
a7ed6454af
|
clerk
|
2022-02-17 16:37:11 +08:00 |
|
夜良king
|
f9d09365ea
|
部分bug
|
2022-02-17 10:43:46 +08:00 |
|
夜良king
|
b5ca94ab98
|
楼层装修 分页
|
2022-02-16 11:37:00 +08:00 |
|
夜良king
|
c4037a346d
|
修改样式 和 优化一些 功能
|
2022-02-16 09:25:01 +08:00 |
|
paulGao
|
aee67ec317
|
修改版本号
|
2022-02-15 14:08:04 +08:00 |
|
夜良king
|
51610546c4
|
重新修改config
|
2022-02-15 10:17:19 +08:00 |
|
夜良king
|
e8e7d27c0d
|
Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui
|
2022-02-15 10:12:53 +08:00 |
|
夜良king
|
166e889b6f
|
commit
|
2022-02-15 10:12:49 +08:00 |
|
paulGao
|
db95647cd8
|
修复管理端刷新tokenapi错误问题
|
2022-02-15 10:03:14 +08:00 |
|
lemon橪
|
db13814156
|
Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui
|
2022-02-14 17:10:45 +08:00 |
|
lemon橪
|
5cf3956bc8
|
取消cdn加载
|
2022-02-14 17:10:40 +08:00 |
|
paulGao
|
8023852b3c
|
升级版本号
|
2022-02-14 15:35:01 +08:00 |
|
paulGao
|
228935034d
|
适配api
|
2022-02-14 14:21:37 +08:00 |
|
paulGao
|
acff55dc65
|
适配修改后的api
|
2022-02-12 15:20:36 +08:00 |
|
paulGao
|
61a9110c51
|
Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop-ui into fengtianyangyang
|
2022-02-11 16:44:27 +08:00 |
|
paulGao
|
3a3e14e0a7
|
适配微服务
|
2022-02-10 18:57:36 +08:00 |
|
lemon橪
|
925365018b
|
优化商家发布商品丢失规格问题，修改开启cdn
|
2022-02-10 14:26:53 +08:00 |
|
lemon橪
|
5960df31bd
|
合并并提交修改
|
2022-02-09 20:50:09 +08:00 |
|
lemon橪
|
21f9fd92e2
|
取消cdn加载
|
2022-02-09 20:49:49 +08:00 |
|
paulGao
|
9765310136
|
Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop-ui into fengtianyangyang
|
2022-02-09 10:32:50 +08:00 |
|
paulGao
|
51cde2dd0d
|
fix bugs
|
2022-01-27 14:58:37 +08:00 |
|
fengtianyangyang
|
e5918b041a
|
路径修改
|
2022-01-25 12:01:40 +08:00 |
|
fengtianyangyang
|
631519d7c7
|
路径修改
|
2022-01-25 09:22:22 +08:00 |
|
Chopper
|
c8a0619141
|
积分设置优化
|
2022-01-21 16:20:15 +08:00 |
|
fengtianyangyang
|
e1d7b1801d
|
接口修改
|
2022-01-21 09:14:21 +08:00 |
|
paulGao
|
15456ae377
|
修复删除会员评论，弹出框不关闭问题
|
2022-01-20 17:40:05 +08:00 |
|
fengtianyangyang
|
1c3d711298
|
路径修改
|
2022-01-20 17:21:30 +08:00 |
|
paulGao
|
1bee69cefb
|
优化管理端和卖家端登录
|
2022-01-17 18:00:49 +08:00 |
|
paulGao
|
cf740d9605
|
修复富文本编辑器xss过滤样式问题
|
2022-01-17 16:49:55 +08:00 |
|
夜良king
|
d5f81fe5d8
|
Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui
|
2021-12-31 18:23:05 +08:00 |
|
夜良king
|
fada0a735f
|
修改样式 和查看虚拟实物
|
2021-12-31 18:22:30 +08:00 |
zhanglei829
|
d2a0940858
|
修复登出账号、修改密码等操作会清除uuidbug
|
2021-12-30 10:13:34 +08:00 |
|
paulGao
|
f45b115355
|
修复满额活动赠送积分不显示填写积分。商品规格默认项无法退格删除。权限菜单选择某一子项获取选择全部问题
|
2021-12-28 19:54:40 +08:00 |
|
lemon橪
|
0a0066fe5c
|
Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui
|
2021-12-27 16:16:27 +08:00 |
|
lemon橪
|
4f7e38db3b
|
修改移动端楼层装修文章地址
|
2021-12-27 16:16:26 +08:00 |
|
paulGao
|
54dcd2d8be
|
修复优化促销问题
|
2021-12-25 18:36:15 +08:00 |
|
paulGao
|
c6c890da63
|
修复拼团排序问题
|
2021-12-24 16:55:30 +08:00 |
|
paulGao
|
75e7bc2d9c
|
优化搜索热词管理
|
2021-12-24 16:09:57 +08:00 |
|
paulGao
|
193628913a
|
优化店铺详情页
|
2021-12-23 21:20:37 +08:00 |
|
paulGao
|
1e408eb8ae
|
修复管理端积分商品问题
|
2021-12-23 17:11:30 +08:00 |
|
Chopper
|
d762d18c7b
|
将支付应用id分别配置
|
2021-12-23 11:58:09 +08:00 |
|
paulGao
|
1b9b2d9c95
|
适配字段变化
|
2021-12-22 10:50:43 +08:00 |
|
paulGao
|
0d5c60ed8c
|
Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop-ui
|
2021-12-21 18:59:57 +08:00 |
|
paulGao
|
ab2bcb515f
|
优化促销相关代码
|
2021-12-21 18:59:45 +08:00 |
|
lemon橪
|
b3e6eb72eb
|
新增npmrc以及yarnrc文件，修改config配置变成可配置的cdn加载以及端口设置
|
2021-12-21 16:30:54 +08:00 |
|
eeer
|
8d3b5cf91d
|
update manager/vue.config.js. 统一取消cdn加载 目前cdn链接的https请求挂了
|
2021-12-20 06:31:08 +00:00 |
|
lemon橪
|
246ba9057f
|
删除最低购买金额
|
2021-12-16 13:41:57 +08:00 |
|
lemon橪
|
9eecc603db
|
Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui
|
2021-12-13 19:27:23 +08:00 |
|
lemon橪
|
1fe4078115
|
化楼层装修中商品分类判断
|
2021-12-13 19:27:20 +08:00 |
|
paulGao
|
ef73a6fe94
|
Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop-ui
|
2021-12-11 13:51:33 +08:00 |
|
paulGao
|
edef393535
|
适配重构促销
|
2021-12-11 13:50:58 +08:00 |
|
lemon橪
|
3cb0e52ca0
|
优化楼层装修中商品分类代码可能会出现的bug . 如果更新此版本建议同步更新uni版本更新
|
2021-12-09 18:32:11 +08:00 |
|
lemon橪
|
fd1d32d431
|
管理端优惠券判断优化
|
2021-12-03 10:00:23 +08:00 |
|
lemon橪
|
8c169489eb
|
修改统计中发现的bug
|
2021-11-30 17:15:37 +08:00 |
|
lemon橪
|
6ecb6b8055
|
修改部分冗余代码，新增商家端npmrc配置 后续还会新增yarnrc
|
2021-11-22 11:16:32 +08:00 |