Commit Graph

852 Commits (eb9c999a1606cef530530fe859b1b6c14673cee6)

Author SHA1 Message Date
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橪 92d58ea7e5 合并paulGao代码 2022-06-15 18:49:34 +08:00
lemon橪 9a3d202524 优化统计图显示 2022-06-15 18:48:43 +08:00
OceansDeep ba71eaeaaf
!20 适配优化的sql,将平台id改为0
Merge pull request !20 from OceansDeep/dev-gl
2022-06-08 08:16:55 +00:00
paulGao 273fdf2e84 适配优化的sql,将平台id改为0 2022-06-08 15:40:23 +08:00
lemon橪 59cfa0efb0 合并master 更改并提交内容 2022-06-07 10:22:42 +08:00
lemon橪 14d720beed 商家端刷新token 路径修改 2022-06-07 10:22:11 +08:00
Chopper 2dcfacd431 适配minio 2022-06-07 09:37:53 +08:00
mhhhh 71690cfd8f 修改title闪现undefined 2022-06-06 16:08:58 +08:00
Chopper d2c2da25b4 消费积分设置问题 2022-06-02 09:29:19 +08:00
mhhhh c3c29af8c7 吧配送模版费用为0的限制去掉 2022-06-01 13:56:29 +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
OceansDeep 5c34245ba4
!18 修复编辑sku时,单独编辑的sku图片没有保存问题
Merge pull request !18 from OceansDeep/dev-gl
2022-05-30 06:45:42 +00:00
paulGao 3d0a202cbe 修复编辑sku时,单独编辑的sku图片没有保存问题 2022-05-30 14:44:36 +08:00
OceansDeep 66143deb0d
!17 增加批发商品的标识
Merge pull request !17 from OceansDeep/dev-gl
2022-05-27 10:28:17 +00: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 3405cf68bb 优化生成价格区间 2022-05-27 16:28:26 +08:00
paulGao ebacb58049 商品搜索优化 2022-05-27 16:07:54 +08:00
paulGao 8873f575db 商品搜索和列表显示增加销售模式 2022-05-27 15:49:27 +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橪 f19071542a 添加vuex cdn 2022-05-24 14:21:10 +08:00
lemon橪 50836e0aa3 删除已发现的冗余内容 2022-05-23 14:17:36 +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橪 9eab3b261e 合并seller 2022-05-20 14:42:43 +08:00
lemon橪 1e40e2d557 修改axios版本 2022-05-20 14:42:11 +08:00
OceansDeep 256ada983b
!16 优化商品sku编辑,不在清空数据。commit v1
Merge pull request !16 from OceansDeep/dev-gl
2022-05-19 09:32:57 +00:00
paulGao cd0c90ace8 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop-ui into dev-gl 2022-05-19 17:30:32 +08:00
paulGao 913b96af5a 优化商品sku编辑,不在清空数据。commit v1 2022-05-19 17:22:22 +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
lemon橪 706bab7eff 修改buyer端发现的问题 2022-05-17 17:27:19 +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