Commit Graph

437 Commits (eca8370c7091f1fc3308f08499995728309a6ed5)

Author SHA1 Message Date
chc af115c45cc 配置文件 2022-10-25 17:32:09 +08:00
chc fa8aa633bf v4.2.5 2022-10-21 11:22:56 +08:00
paulGao 17a4131bf1 fix: 修复新增首个规格项的规格值时。规格列表显示错乱问题 2022-10-14 15:43:39 +08:00
学习很差啦 6007dc57d5 Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui 2022-10-09 18:33:32 +08:00
学习很差啦 7dfdb4f685 fix: 🐛 修改发现的代码bug 2022-10-09 18:33:30 +08:00
paulGao 0cc27f4e60 style: 优化秒杀页面显示效果 2022-10-09 16:04:25 +08:00
学习很差啦 68ba97e590 fix: 🐛 修改扫码登录等待时间 2022-09-23 15:24:31 +08:00
学习很差啦 0f28a7f16c 提交微信登录不能登录问题 2022-09-22 09:14:03 +08:00
学习很差啦 2f9754b2a5 优化pc二维码刷新 2022-09-21 11:07:21 +08:00
lemon橪 23e456d265 feat: 基于 @xiaochangbai 老哥的代码进行了一点样式优化
看到老哥有引入其他的qr插件,在项目里面本身自带了一个,稍微改了一下部分样式

https://gitee.com/beijing_hongye_huicheng/lilishop-uniapp/pulls/3
2022-09-16 16:37:38 +08:00
paulGao 0933f1942e fix: 🐛 修复管理端下架商品传递undefined问题,优化秒杀展示 2022-09-09 14:30:15 +08:00
Chopper a345586b25 功能测试与修改 2022-09-05 14:35:01 +08:00
学习很差啦 3d0ba486df Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui 2022-09-05 14:22:00 +08:00
学习很差啦 4651d74b7b 优化部分操作流程,修改售后显示问题,优化计量单位 商品规格添加重复问题 2022-09-05 14:21:58 +08:00
paulGao 8b22b73f3d 优化pc端商品详情页的优惠券展示 2022-09-02 11:00:01 +08:00
学习很差啦 db6e47fa04 Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui 2022-08-18 12:44:54 +08:00
学习很差啦 116c168ed7 修改演示站点发现的问题 2022-08-18 12:44:53 +08:00
paulGao 8ff6c0414a 优化买家端订单详情页,优化卖家端、平台端优惠券显示。优化结算页无效商品提示。 2022-08-12 19:24:41 +08:00
Chopper aaf1c172de 秒杀销售百分比展示问题 2022-08-12 10:06:45 +08:00
学习很差啦 c281b0a867 优化退款消息提示 2022-08-03 11:20:07 +08:00
学习很差啦 8d5f4db494 修改pc足迹以及nav显示遮罩问题 2022-07-19 16:28:40 +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
lemon橪 eeadfc1db9 新增移动端公告横纵向设置,我的足迹以及秒杀活动展示优化 2022-07-13 09:37:59 +08:00
lemon橪 954cd1cda9 修改分销中展示问题 2022-07-08 18:52:03 +08:00
lemon橪 7874931b1f 修改win上商品详情展示优化 2022-07-08 11:48:12 +08:00
lemon橪 c3b3e7bb61 合并master 2022-07-08 11:13:11 +08:00
lemon橪 12839eee8d 解决秒杀活动可能在首页出现的bug 2022-07-08 11:12:13 +08:00
Chopper 601a2e8d33 PC端分销用户绑定关系接口问题处理 2022-07-08 09:34:45 +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
OceansDeep 42db858d61
!23 优化订单投诉显示
Merge pull request !23 from OceansDeep/dev-gl
2022-07-05 01:58:13 +00:00
paulGao 85349a197f 优化订单投诉显示 2022-07-04 18:36:05 +08:00
lemon橪 8ef3510c4b 修改pc显示商品详情图片问题 2022-07-04 18:33:40 +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橪 037a307ed1 pc端分销问题 2022-06-21 16:51:39 +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橪 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