Commit Graph

450 Commits (4490a4119eea0e523af3ee0cdbac0b4d1535dabe)

Author SHA1 Message Date
yeliang-king 3b036a7cb7 合并冲突 2023-05-29 15:20:08 +08:00
yeliang-king 9a0cb35637 修改页面内容 2023-05-29 15:19:31 +08:00
Yer 1c938e0007 refactor: 🎨 优化我的收藏和足迹代码 2023-05-24 16:54:15 +08:00
Yer f31ff79a39 refactor: 🎨 优化订单备注在onShow时候丢失问题 以及 优化部分代码 2023-05-17 14:50:05 +08:00
Yer d5ea5a4fa9 Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-uniapp 2023-05-16 18:04:23 +08:00
Yer c7237e561c fix: 🐛 修改订单取消不展示bug 2023-05-16 18:04:20 +08:00
chc 6717721725 移动端店铺收藏问题 2023-05-15 14:34:54 +08:00
chc 5e5d5b904b fix: 移动端店铺收藏 2023-05-15 14:21:38 +08:00
Yer a353022d36 fix: 🐛 地址取消加载 loading Bug 2023-05-11 18:24:07 +08:00
Yer ca4e458db1 feat: 新增商品下架提示框,在原有的下架提示中优化商品展示页面,弹出下架提示,展示其他商品功能。 2023-05-10 10:46:23 +08:00
Yer b4f46ded2b feat: 我的足迹新增失效商品判断 2023-05-08 18:15:01 +08:00
Yer 274a03fe73 refactor: 🎨 购物车页面步进器数量插件更改,删除冗余代码 2023-05-04 11:03:44 +08:00
Yer 0a07ebfe8b 删除部分冗余代码 2023-04-28 11:21:50 +08:00
mahe 39c82361b6 修改店铺跳转地址 2023-04-28 10:58:13 +08:00
Yer 89f4e051ca fix: 🐛 后端修改es商品返回数据字段,前端同步 2023-04-28 10:21:36 +08:00
Yer c04ae5eb39 fix: 🐛 补充提交购物车多次点击提交bug 2023-04-20 16:45:15 +08:00
Yer 02a1f7ee83 fix: 🐛 修改购物车微信小程序多次点击新增商品数量导致 页面卡顿问题 2023-04-20 10:17:57 +08:00
学习很差啦 97aa989e0b 修改优惠券文字描述 2023-04-14 10:59:54 +08:00
学习很差啦 ac67c16378 遗漏补充提交 2023-04-11 19:04:04 +08:00
学习很差啦 2bdb8682e1 feat: 优化在微信小程序中接口返回的错误信息 会被uni.hideLoading取消展示错误信息问题 2023-04-11 18:41:34 +08:00
学习很差啦 c070ed01f7 refactor: 🐛 重构im代码 2023-04-11 15:17:15 +08:00
学习很差啦 af4cfe7fba feat: 🐛 新增备用登录方案、并优化店铺名称过长导致显示错乱的样式问题、优化自动发券功能 2023-04-10 11:18:09 +08:00
学习很差啦 6a8e666fb8 fix: 🐛 优化优惠券详情不展示折扣信息 2023-04-04 18:30:26 +08:00
学习很差啦 c097a423f9 style: 后端ES接口返回格式调整,前端字段调整 2023-04-04 16:07:22 +08:00
学习很差啦 f0dcf473e8 Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-uniapp 2023-04-04 09:54:31 +08:00
学习很差啦 bdff6a3c93 fix: 🐛 Im 修复在微信小程序中键盘弹出导致navbar上移的bug 2023-04-04 09:54:24 +08:00
chc 77db8df123 Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-uniapp 2023-03-29 16:44:59 +08:00
chc a403a7d432 feat: 订单详情展示联系客服 2023-03-29 16:44:15 +08:00
学习很差啦 951d2d7f30 补全提交 2023-03-29 16:17:46 +08:00
学习很差啦 e8ddc53188 Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-uniapp 2023-03-29 15:25:41 +08:00
学习很差啦 0708226890 refactor: 修改部分页面变量命名,迁移首页中新人发券代码 2023-03-29 15:25:39 +08:00
lemon橪 b0447eec3a fix: 🐛 退出登录后清空优惠券足迹展示 2023-03-28 11:32:13 +08:00
学习很差啦 e37a8ec41d fix: 🐛 新增h5中微信支付完回调查询订单详情 2023-03-21 18:47:23 +08:00
学习很差啦 467b7a0cba fix: 🐛 修改微信浏览器中支付唤起支付显示框不关闭bug 2023-03-21 15:49:42 +08:00
学习很差啦 9a583e75f3 feat: 优化联系客服,搜索功能显搜索关键字 2023-03-17 20:13:47 +08:00
学习很差啦 e768a4c1db Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-uniapp 2023-03-10 09:09:34 +08:00
学习很差啦 a77390bf5c feat: App联合登录新增unionId 2023-03-10 09:09:32 +08:00
chc 1e41801612 fix: 🐛 自提不回显问题,自提取消后券码取消显示 2023-03-09 11:17:53 +08:00
misworga831 d870ee409a add withdrawal 2023-03-08 22:01:02 +08:00
学习很差啦 b2a448447c fix: 🐛 修复投诉功未填写信息导致后端报错问题,优化投诉模块显示 2023-03-02 11:39:00 +08:00
学习很差啦 38a00e6177 Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-uniapp 2023-03-01 18:29:32 +08:00
学习很差啦 767ad94565 优化Im 多订单展示 2023-03-01 18:29:25 +08:00
Jimi 9192f32bbb fix: 修复暂无收货地址判断错误问题 2023-02-28 17:09:17 +08:00
学习很差啦 d256fd3559 style: 💄 修改im样式 2023-02-17 18:12:22 +08:00
学习很差啦 989a567ecb 代理入驻 2023-02-16 10:53:14 +08:00
d5d47ffae5 上拉刷新空页面wenti 2023-02-13 11:57:52 +08:00
8001622be2 im断线重连 2023-02-13 10:56:11 +08:00
fc5a6a6f7f 更改IM 2023-02-10 17:55:52 +08:00
dc15439861 im重复请求 2023-02-10 16:26:30 +08:00
c9c0d2d171 im重复请求 2023-02-10 16:25:42 +08:00
Chopper711 44cf46fed3 略微完善注释与逻辑 2023-02-10 14:29:18 +08:00
63ebf1a7c5 im重复请求问题 2023-02-10 14:13:22 +08:00
90f656beab im 2023-02-09 16:52:07 +08:00
db4dfd3edc 修改im接口报错问题 2023-02-08 12:03:48 +08:00
e7879aac65 im聊天室接口报错问题 2023-02-08 11:59:15 +08:00
学习很差啦 723570b392 Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-uniapp 2023-01-29 18:14:59 +08:00
学习很差啦 5dc562396c style: 新增复制粘贴以及拨打电话封装模块,优化部分文件中的变量名、将冗余功能抽出、优化订单详情展示 2023-01-29 18:14:53 +08:00
chc b266aad634 Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-uniapp 2023-01-19 17:24:17 +08:00
chc a25c75bf7a 自提回显 2023-01-19 17:23:52 +08:00
学习很差啦 43fc159e27 fix: 🐛 修复商品列表有促销活动不显示Bug 2023-01-19 15:59:10 +08:00
学习很差啦 2e37cb8158 style: 💄 修改部分页面UI 2023-01-17 16:14:12 +08:00
学习很差啦 529175c0ab style: 🎨 优化退出登录功能、优化部分变量名 2023-01-16 16:56:45 +08:00
学习很差啦 071599074c Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-uniapp 2023-01-16 09:17:48 +08:00
学习很差啦 d420c128eb fix: 🐛 展示在订单详情中的立即支付按钮 2023-01-16 09:17:45 +08:00
lemon橪 b33fd7e2b3 Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-uniapp 2023-01-13 11:04:28 +08:00
lemon橪 815118d496 fix: 🐛 删除我的顶部背景栏配置项 2023-01-13 11:04:25 +08:00
83031507b9 Merge branch 'master' of https://toscode.gitee.com/beijing_hongye_huicheng/lilishop-uniapp 2023-01-13 10:52:39 +08:00
7565086291 转换表情 2023-01-13 10:52:12 +08:00
lemon橪 7c71375b6c Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-uniapp 2023-01-12 18:12:40 +08:00
lemon橪 c919b1463c feat: config新增默认用户头像以及默认背景配置,修复查看订单报错无权限bug 2023-01-12 18:12:35 +08:00
b72d831df9 im商品跳转问题 2023-01-12 16:48:31 +08:00
2c494ac0d1 Merge branch 'master' of https://toscode.gitee.com/beijing_hongye_huicheng/lilishop-uniapp 2023-01-12 14:35:28 +08:00
83b2295818 更换socket 2023-01-12 14:35:24 +08:00
Yer11214 11a831299a
!9 update pages/tabbar/home/template/tpl_goods.vue.
Merge pull request !9 from 微安/N/A
2023-01-12 06:30:03 +00:00
paulGao bbe315fb45 feat: 优化优惠券使用跳转 2023-01-11 11:28:51 +08:00
yeliang-king 9c03205c9f 合并 2023-01-13 07:36:43 +08:00
yeliang-king 0843e457b0 移动端自动发券前端展示 2023-01-13 07:35:51 +08:00
学习很差啦 b1bde2f105 fix: 🐛 修改因为Im导致微信小程序编译不通过问题 更改看到的变量名问题 im后续会进行优化 2023-01-10 15:21:18 +08:00
chc d2ff0b1ea1 IM配置 2023-01-09 19:03:29 +08:00
chc 7ff13babaa 合并im 2023-01-09 18:53:29 +08:00
chc 0da7dc6796 Merge branch 'lili_self' of https://gitee.com/beijing_hongye_huicheng/lilishop-uniapp 2023-01-09 18:49:54 +08:00
yeliang-king f84f9ab696 优惠券种类字段修改 2022-12-30 17:33:05 +08:00
yeliang-king 8b5f7def93 楼层装修单个图片 问题 2022-12-30 14:38:42 +08:00
8c33b899bf 订单列表显示,修改bug 2022-12-29 18:19:17 +08:00
yeliang-king 8767ad6d3f 修改优惠券 类型 字段 2022-12-29 14:54:35 +08:00
yeliang-king f797538935 修改优惠券 2022-12-29 12:02:05 +08:00
cfb4310d6f Merge branch 'lili_self' of https://gitee.com/beijing_hongye_huicheng/lilishop-uniapp into lili_self 2022-12-28 18:33:57 +08:00
d59cd74bf0 发送消息不显示bug 2022-12-28 18:33:50 +08:00
chc c378ce7d71 im 2022-12-28 18:23:49 +08:00
9cc6f519a9 聊天功能 2022-12-27 18:01:41 +08:00
18251dde89 聊天 2022-12-27 14:49:23 +08:00
chc 04bf707836 获取消息 2022-12-27 14:48:41 +08:00
chc 5e38247ce8 IM功能 2022-12-27 14:17:00 +08:00
lemon橪 979a1e6b14 fix: 🐛 修改商品数量为0时候下单报错问题,修改店铺楼层开关不生效问题 2022-12-26 16:28:14 +08:00
lemon橪 9127d61a59 Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-uniapp 2022-12-26 15:07:27 +08:00
lemon橪 fed76499a0 fix: 🐛 修改楼层中热区判断失效问题,优化客服跳转判断 2022-12-26 15:07:24 +08:00
chc 6843feebfa 四个协议不展示问题 2022-12-22 18:19:09 +08:00
weian e650ee66ff
update pages/tabbar/home/template/tpl_goods.vue.
微信小程序首页的商品分类模块,以lili官方演示站点小程序为例,点击(精选、实惠、进口、热卖)这一排分类的时候,会有黑色的底色出现,h5没有这个底色,我调试后发现是这个uni-data-select组件源码中cursor: pointer样式引起的,注释掉,微信小程序点击这一排就正常了不会有底色,对h5也没影响


Signed-off-by: weian <20943448@qq.com>
2022-12-14 06:17:24 +00:00
yeliang-king fa6f571f61 ios 退出问题 2022-12-08 11:18:54 +08:00
学习很差啦 b30caf051c
!8 update pages/order/afterSales/afterSales.vue.
合并岁岁平安提出来的pr
2022-12-02 03:44:39 +00:00