lemon橪
|
92d58ea7e5
|
合并paulGao代码
|
2022-06-15 18:49:34 +08:00 |
|
lemon橪
|
9a3d202524
|
优化统计图显示
|
2022-06-15 18:48:43 +08:00 |
paulGao
|
273fdf2e84
|
适配优化的sql，将平台id改为0
|
2022-06-08 15:40:23 +08:00 |
mhhhh
|
71690cfd8f
|
修改title闪现undefined
|
2022-06-06 16:08:58 +08:00 |
|
mhhhh
|
0c0c903529
|
修改商家logo没有更换的问题
|
2022-06-01 10:13:53 +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
|
2111020f62
|
Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop-ui into dev-gl
|
2022-05-27 18:27:20 +08:00 |
|
lemon橪
|
160658cfb6
|
批发商品部分
|
2022-05-27 18:20:42 +08:00 |
|
lemon橪
|
8a7f9b2487
|
批量商品价格展示
|
2022-05-27 18:16:12 +08:00 |
|
paulGao
|
85061ed2f8
|
增加批发商品的标识
|
2022-05-27 18:12:19 +08:00 |
|
paulGao
|
994ef217ac
|
add wholesale of sale model
|
2022-05-27 15:23:10 +08:00 |
|
paulGao
|
1bda042bc9
|
add wholesale of sale model
|
2022-05-27 15:22:36 +08:00 |
|
lemon橪
|
e97dbe1c90
|
批量价格显示的样式
|
2022-05-27 10:28:37 +08:00 |
|
lemon橪
|
1b4c05f70b
|
修改高德地图key更新此commit 之前请务必确认一下创建的高德key日期。修改部分方法名称
|
2022-05-20 16:40:09 +08:00 |
|
lemon橪
|
32dffe96ed
|
修改axios为19.2链接
|
2022-05-20 15:42:23 +08:00 |
|
lemon橪
|
e2df32d906
|
补充提交
|
2022-05-20 15:11:26 +08:00 |
|
lemon橪
|
1e40e2d557
|
修改axios版本
|
2022-05-20 14:42:11 +08:00 |
|
lemon橪
|
a3f5212bbc
|
删除被墙的cdn 启用pickmall cdn加载资源
|
2022-05-19 15:51:32 +08:00 |
|
lemon橪
|
706bab7eff
|
修改buyer端发现的问题
|
2022-05-17 17:27:19 +08:00 |
|
mhhhh
|
3cd57a6915
|
隐私协议菜单，店铺详情店铺详情非空判断，自定义logo
|
2022-05-17 09:19:36 +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 |
|
paulGao
|
71fa00c267
|
修复秒杀已售数量不正确问题
|
2022-05-11 16:11:59 +08:00 |
|
paulGao
|
cbb2365ae8
|
修复秒杀活动页已售数量问题
|
2022-05-09 14:32:00 +08:00 |
|
paulGao
|
670ba74044
|
修复bug
|
2022-05-05 09:30:42 +08:00 |
yeliang-king
|
92aafe3031
|
Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui
|
2022-04-25 14:50:11 +08:00 |
|
yeliang-king
|
81f4f4a742
|
接口更改
|
2022-04-25 14:49:57 +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 |
|
OceansDeep
|
5dfcc2482c
|
!7 优化楼层装修,修复结算页显示失效商品问题
Merge pull request !7 from OceansDeep/dev-gl
|
2022-04-21 08:27:40 +00:00 |
|
paulGao
|
7ff51b5e53
|
修复结算页显示失效商品问题
|
2022-04-21 16:11:11 +08:00 |
|
paulGao
|
c4168c9a2b
|
优惠移动端楼层装修
|
2022-04-21 14:57:33 +08:00 |
|
yeliang-king
|
79a719e7ff
|
取消横向滚动条
|
2022-04-18 09:15:08 +08:00 |
pikachu
|
9e0a681e01
|
buyer端的导航条下拉
|
2022-04-12 18:03:31 +08:00 |
|
lemon橪
|
df408e640a
|
合并master
|
2022-04-08 17:31:14 +08:00 |
|
lemon橪
|
f365231ee7
|
提交高德api中更新安全密钥的提示
|
2022-04-08 17:29:28 +08:00 |
|
paulGao
|
2e8d124560
|
修复pc端订单详情不展示发票信息
|
2022-04-08 15:32:18 +08:00 |
|
paulGao
|
1e8279c849
|
improve code
|
2022-03-31 09:26:24 +08:00 |
|
paulGao
|
48668fd2d4
|
Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop-ui
|
2022-03-29 17:58:47 +08:00 |
|
paulGao
|
ee5539fb0f
|
修复pc搜索商品分类参数无效问题
|
2022-03-29 17:57:42 +08:00 |
|
pikachu
|
97d88abf80
|
溢出 滚动显示
|
2022-03-28 18:21:44 +08:00 |
|
lemon橪
|
e27070e089
|
优化一个上传组件控制台报错bug 以及 buyer端楼层装修显示
|
2022-03-17 16:35:10 +08:00 |
|
pikachu
|
2ea2723aed
|
样式 问题
|
2022-03-16 11:31:05 +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橪
|
2dac958227
|
更改买家提交售后显示的价格
|
2022-03-02 15:21:28 +08:00 |
fengtianyangyang
|
25b403cde9
|
冲突文件
|
2022-02-26 15:05:51 +08:00 |
|
fengtianyangyang
|
535a36c378
|
‘合并
|
2022-02-23 21:24:18 +08:00 |
|
fengtianyangyang
|
7b30bc42d7
|
添加
|
2022-02-23 20:56:00 +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
|
12ea0c2b84
|
Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui
|
2022-02-17 10:44:14 +08:00 |
|
paulGao
|
44086e8bf4
|
修改api
|
2022-02-17 15:32:56 +08:00 |
|
paulGao
|
b740a6f906
|
Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop-ui
|
2022-02-17 14:54:30 +08:00 |
|
paulGao
|
7376d4d890
|
修复api错误
|
2022-02-17 14:54:18 +08:00 |
|
夜良king
|
f9d09365ea
|
部分bug
|
2022-02-17 10:43:46 +08:00 |
|
lemon橪
|
0994b6659a
|
合并部分代码 回滚规格
|
2022-02-16 11:22:35 +08:00 |
|
lemon橪
|
45a6e76d4a
|
需改pc样式上的bug
|
2022-02-15 16:54:36 +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 |
|
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橪
|
6ba767419e
|
新增文库详情页面，转门为审核使用
|
2022-02-10 17:13:26 +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 |
|
fengtianyangyang
|
e5918b041a
|
路径修改
|
2022-01-25 12:01:40 +08:00 |
|
paulGao
|
f46330ecf0
|
Merge branch 'fengtianyangyang' of gitee.com:beijing_hongye_huicheng/lilishop-ui into fengtianyangyang
|
2022-01-25 09:46:15 +08:00 |
|
paulGao
|
846e80f1fa
|
适配微服务版本
|
2022-01-25 09:46:12 +08:00 |
|
fengtianyangyang
|
631519d7c7
|
路径修改
|
2022-01-25 09:22:22 +08:00 |
|
paulGao
|
bbeb31e8a3
|
修复店铺和平台优惠券同时选择时，显示问题
|
2022-01-21 19:02:09 +08:00 |
|
paulGao
|
4d725221a5
|
优化店铺搜索栏
|
2022-01-21 16:53:16 +08:00 |
|
fengtianyangyang
|
1c3d711298
|
路径修改
|
2022-01-20 17:21:30 +08:00 |
|
paulGao
|
d2aca24d06
|
优化申请售后退货
|
2022-01-04 19:57:40 +08:00 |
|
paulGao
|
6e042c4b78
|
Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop-ui
|
2022-01-04 09:21:03 +08:00 |
|
paulGao
|
1afd1704ab
|
修复pc显示促销价格问题
|
2022-01-04 09:21:00 +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 |
|
夜良king
|
35de0c031d
|
样式加 虚拟实物查看
|
2021-12-31 18:22:06 +08:00 |
|
lemon橪
|
2e5eefc079
|
提交 buyer和seller退出uuid清空bug
|
2021-12-30 11:16:08 +08:00 |
|
夜良king
|
7490211340
|
修改了小样式 按钮
|
2021-12-28 18:33:47 +08:00 |
|
夜良king
|
76d028277a
|
buyer一些样式和一个弹框
|
2021-12-28 17:51:23 +08:00 |
|
paulGao
|
54dcd2d8be
|
修复优化促销问题
|
2021-12-25 18:36:15 +08:00 |
|
lemon橪
|
3653b4e7cb
|
优化buyer底部信息，优化购物车显示规格数量可能导致的bug 新增订单物流显示
|
2021-12-25 10:59:00 +08:00 |
|
lemon橪
|
cb304d7d53
|
Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui
|
2021-12-23 19:02:30 +08:00 |
|
lemon橪
|
4bb7bd4603
|
buyer端 部分颜色优化以及部分间距优化
|
2021-12-23 19:02:29 +08:00 |
|
paulGao
|
1e408eb8ae
|
修复管理端积分商品问题
|
2021-12-23 17:11:30 +08:00 |
|
Chopper
|
3622c7bb53
|
pc订单详情无法跳转商品详情页面问题处理
|
2021-12-22 18:29:29 +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 |
|
lemon橪
|
9742aaf0bc
|
udesk 技术储备方案
|
2021-12-20 17:37:22 +08:00 |
|
lemon橪
|
bc1942c492
|
Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui
|
2021-12-20 16:48:10 +08:00 |
|
lemon橪
|
44facf549a
|
提交udesk方案
|
2021-12-20 16:48:08 +08:00 |
|
eeer
|
5a90567e98
|
update buyer/vue.config.js. 统一取消cdn加载 目前cdn链接的https请求挂了
|
2021-12-20 06:30:40 +00:00 |
|
paulGao
|
edef393535
|
适配重构促销
|
2021-12-11 13:50:58 +08:00 |
|
lemon橪
|
6ecb6b8055
|
修改部分冗余代码，新增商家端npmrc配置 后续还会新增yarnrc
|
2021-11-22 11:16:32 +08:00 |
|
lemon橪
|
515cd3ebbd
|
新增部分售后判断
|
2021-11-18 18:07:58 +08:00 |
|
lemon橪
|
6c6b89f512
|
优化buyer端配置信息完善性
|
2021-11-18 17:10:44 +08:00 |
|
lemon橪
|
41bfd17cd0
|
pc端物流日志
|
2021-11-16 11:02:59 +08:00 |
|
paulGao
|
5614414185
|
add logout
|
2021-11-11 18:45:53 +08:00 |
|
Chopper
|
f7f836f5fd
|
PC显示发票信息问题处理，结算页面商品宽度调整，后台发票开具条件增加已发货可以开具发票的按钮
|
2021-10-26 10:38:41 +08:00 |
|
lemon橪
|
dbe5a21f4d
|
修改buyer api路径 将buyer manager seller 统一为 public/config下修改api地址，新增buyer底部 公司，备案号等信息展示，修改商家端seller秒杀bug以及部分issue中的优化方案
|
2021-10-19 16:40:43 +08:00 |
|
lemon橪
|
4f2f6e8d20
|
优化楼层装修样式问题，以及退单金额显示，删除砍价批量删除商品功能
|
2021-09-29 16:04:24 +08:00 |
|
lemon橪
|
2037b57a5d
|
优化管理端商家端冗余以及配置内容。抽出公共主题颜色、站点标题等内容。分离config中api配置，修改商家发布中拖拽以及控制台出错的bug。
|
2021-09-22 15:08:34 +08:00 |
|
lemon橪
|
53cc6f46d1
|
修改buyer端购物车显示bug
|
2021-09-17 18:26:24 +08:00 |
|
Chopper
|
b84f1b595e
|
镜像相关提交
|
2021-09-16 16:22:13 +08:00 |
|
lemon橪
|
8c864c207a
|
修改部分样式问题，新增解析转义，修改buyer端没有第三方登录问题
|
2021-09-09 10:43:41 +08:00 |
|
lemon橪
|
aaadc90b09
|
cdn axios版本升级
|
2021-09-07 11:46:54 +08:00 |
|
lemon橪
|
b0021a759f
|
vue版本升级为2.6 优化cdn加载，优化部分样式，删除某部分图片，修改店铺bug
|
2021-09-06 17:01:38 +08:00 |
|
Chopper
|
9feff82451
|
merge master
|
2021-09-03 09:42:19 +08:00 |
|
Chopper
|
647ed90eac
|
价格展示相关优化，拼团活动返回不刷新问题处理
|
2021-09-03 09:40:57 +08:00 |
|
paulGao
|
c8edf9c1bd
|
add goods parameter sort
|
2021-09-02 16:37:46 +08:00 |
|
lemon橪
|
6d5428317f
|
修改统计出现的bug
|
2021-09-02 15:01:54 +08:00 |
|
Chopper
|
a7ee9a6444
|
双减号问题处理
|
2021-08-30 14:46:01 +08:00 |
|
Chopper
|
abaefc59a6
|
领取数量调整描述为已领取数量，明确含义。
购物车无法渲染哪个商品参与了满减活动问题处理
|
2021-08-26 11:15:07 +08:00 |
|
Chopper
|
589b7fc7c5
|
售后信息展示，单价展示问题处理
|
2021-08-25 14:18:35 +08:00 |
mabo
|
14a8695cc9
|
删除debugger，证照信息需要上传正反面，修改店铺信息，地址回显，bug修改，代码优化，店铺详情展示优化
|
2021-08-13 18:03:07 +08:00 |
|
mabo
|
e6588af790
|
积分扣减展示问题，pc商品详情图片不展示问题，pc楼层装修提示修改，代码优化
|
2021-08-13 10:38:04 +08:00 |
|
mabo
|
a849d8906a
|
投诉详情取消投诉规则改变，商品分类2级分类没有图片
|
2021-08-12 17:42:05 +08:00 |
|
mabo
|
9b0a089e29
|
选择品牌，品牌绑定时候可以搜索
|
2021-08-12 16:41:43 +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
|
e52ac06fb3
|
pc支持分销
|
2021-08-11 22:53:47 +08:00 |
|
mabo
|
81ab58e009
|
店铺入驻bug修改
|
2021-08-11 22:13:25 +08:00 |
|
mabo
|
2dabff65ed
|
店铺入驻没有回显问题
|
2021-08-11 21:41:15 +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
|
e9163e4247
|
管理、商家，添加删除秒杀商品接口，管理端切换账号菜单权限不生效问题，代码优化
|
2021-08-11 18:47:59 +08:00 |
|
mabo
|
cc80242896
|
pc端添加2个轮播代码，楼层装修跟pc端样式不一致，楼层装修无法添加的bug修改
|
2021-08-11 14:56:02 +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橪
|
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 |