xsl/meida_applet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
559 Commits 1 Branch 0 Tags
f03fcf13735e910886039f61c2cee4f3c662f81e
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
YunaiV f03fcf1373 Merge branch 'master' of https://gitee.com/yudaocode/yudao-mall-uniapp into develop 
# Conflicts:
#	pages/goods/index.vue
#	pages/order/addressSelection.vue
#	pages/order/confirm.vue
#	sheep/components/s-goods-column/s-goods-column.vue
 2024-09-16 08:24:54 +08:00
YunaiV 5a66e71809 【代码优化】差满减活动时间外，from 岳琳红 https://gitee.com/yudaocode/yudao-mall-uniapp/commit/26a18e7e9a78af4ec49f0d07785a0aead22b00cc 2024-09-16 08:18:32 +08:00
YunaiV e93322959e 【代码优化】差满减活动时间外，from 岳琳红 https://gitee.com/yudaocode/yudao-mall-uniapp/commit/26a18e7e9a78af4ec49f0d07785a0aead22b00cc 2024-09-16 08:15:54 +08:00
芋道源码andGitee 4a8a92f323 !98 【功能修复】修复拼团的单买价格 
Merge pull request !98 from 卢越/master
 2024-09-15 13:15:07 +00:00
芋道源码andGitee ba56d9843f !101 批量优化或修改BUG 
Merge pull request !101 from 痴货/develop-mall
 2024-09-15 13:13:26 +00:00
YunaiV eb3d0ff6b0 【代码优化】商城：优化 /promotion/activity/list-by-spu-id 的逻辑 2024-09-15 17:59:42 +08:00
YunaiV 49e8b9f5c3 【功能完善】下单界面，接入门店自提的开关 2024-09-13 19:21:22 +08:00
芋道源码andGitee 55131bf0c3 !97 【功能优化】支付方式默认选中首个可用方式 
Merge pull request !97 from Lcp/pr
 2024-09-09 14:58:32 +00:00
YunaiV 29584a108b 【功能修复】秒杀装修重构 2024-09-09 09:22:06 +08:00
芋道源码andGitee 1432ec5996 !96 【功能修复】优惠券相关问题修正 
Merge pull request !96 from 卢越/master
 2024-09-09 01:21:15 +00:00
YunaiV 3e2749672e CDN 使用 yudao 提供，解决不定期的 https 问题！ 2024-09-07 16:15:43 +08:00
芋道源码andGitee 07098527ff !90 修复在线客服页面的一些问题 
Merge pull request !90 from 英狐/master
 2024-09-07 06:29:26 +00:00
YunaiV cb29c2c0aa 【BUG修复】授权登录成功后，每次都要填昵称和重新上传头像。 
如果用户已经有头像和昵称，则不要弹出上传头像和填写昵称的信息弹框。
 2024-09-07 14:28:02 +08:00
芋道源码andGitee 4be2b441f5 !93 【BUG修复】授权登录成功后，每次都要填昵称和重新上传头像。 
Merge pull request !93 from heyho/N/A
 2024-09-07 06:26:11 +00:00
芋道源码andGitee 2cd4095035 !95 【优化】分销中心 => 我的团队 页面样式，布局优化、美化 
Merge pull request !95 from heyho/master
 2024-09-07 06:23:40 +00:00
YunaiV 80b2bb6f5e 【功能修复】商城：选择拼团 SKU 时，存在遮罩的问题 https://gitee.com/yudaocode/yudao-mall-uniapp/issues/IAMK4A 2024-09-07 14:22:44 +08:00
YunaiV 9b6d1a9a97 【功能优化】商城：价格计算时，返回可用 + 不可用的优惠劵 2024-09-07 12:06:10 +08:00
YunaiV 735dc8c373 【代码优化】商城：拼团装修重构 2024-09-06 21:02:59 +08:00
芋道源码andGitee fdca229a77 !91 【综合修复】拼团装修重构、处理无法发布到微信小程序的问题 
Merge pull request !91 from 卢越/master
 2024-09-06 12:56:49 +00:00
YunaiV 81cd02bbee 【修复】小程序端银行卡提现，银行名称改为下拉选择 2024-09-05 20:08:48 +08:00
芋道源码andGitee 1cfd974fed !92 【修复】小程序端银行卡提现，银行名称改为下拉选择。【新增接口】新增系统字典查询接口 
Merge pull request !92 from heyho/master
 2024-09-05 11:23:14 +00:00
YunaiV 7268659193 【功能修复】拼团的单买价格展示不正确 2024-09-03 10:18:30 +08:00
YunaiV 89e86b84fe 增加优惠劵描述 2024-08-31 09:06:47 +08:00
芋道源码andGitee 77574e099a !89 【功能修复】修复商城部分BUG 
Merge pull request !89 from 卢越/master
 2024-08-26 10:40:33 +00:00
芋道源码andGitee abf1235916 !88 【功能修复】修复客服聊天列表页点击商品卡片无法显示商品详情的问题 
Merge pull request !88 from 卢越/master
 2024-08-25 13:55:10 +00:00
YunaiV 75c5203c90 【代码评审】商城的 todo 进一步说明 2024-08-25 14:33:27 +08:00
芋道源码andGitee a514de68b3 !87 【功能修复】修复顶部导航栏装修无效的问题 
Merge pull request !87 from 卢越/master
 2024-08-25 06:29:58 +00:00
芋道源码andGitee 263eb74695 !86 【功能修复】修复订单结算页没有优惠券但是提示优惠券不存在的问题#IAK656:issue 
Merge pull request !86 from 卢越/master
 2024-08-23 12:04:02 +00:00
芋道源码andGitee adc521022f !85 【代码优化】格式化配置文件 
Merge pull request !85 from 卢越/master
 2024-08-21 13:58:33 +00:00
芋道源码andGitee 07d167c624 !84 【功能优化】商品结算页现在可展示优惠券是否可用的原因 
Merge pull request !84 from 卢越/master
 2024-08-20 12:57:31 +00:00
芋道源码andGitee af0643ce93 !83 【逻辑优化】现在活动库存可以真实显示 
Merge pull request !83 from 卢越/master
 2024-08-19 13:55:24 +00:00
芋道源码andGitee 28faf73c62 !82 【功能修复】修复拼团详情页的价格 
Merge pull request !82 from 卢越/master
 2024-08-18 05:32:29 +00:00
芋道源码andGitee edf158ec2c !81 【功能修复】修复商品拼团和秒杀价格显示 
Merge pull request !81 from 卢越/master
 2024-08-16 12:22:26 +00:00
芋道源码andGitee 283449fc3d !80 【功能修复】修复装修优惠券背景图片问题 
Merge pull request !80 from 卢越/master
 2024-08-15 13:43:47 +00:00
YunaiV 0575bd56b0 Merge remote-tracking branch 'origin/master' 2024-08-15 09:24:49 +08:00
YunaiV 8154108fe9 【功能修复】拼团：未开启拼团的 SKU 需要禁用选择 2024-08-15 09:24:39 +08:00
芋道源码andGitee 7f1504214c !77 删除无用代码 
Merge pull request !77 from 卢越/master
 2024-08-14 16:29:51 +00:00
芋道源码andGitee c6b55dc90b !78 购物车商品数量减为0时，删除错误 
Merge pull request !78 from 邓飞鹏/master
 2024-08-14 16:27:04 +00:00
芋道源码andGitee ed7258b577 !79 完善拼团的剩余 TODO 
Merge pull request !79 from puhui999/master
 2024-08-14 16:12:22 +00:00
芋道源码andGitee 4db992d3fa !76 【功能修复】修复部分装修背景图片问题 
Merge pull request !76 from 卢越/master
 2024-08-12 16:34:44 +00:00
芋道源码andGitee 83daf7f7c2 !75 【功能修复】商城模板装修 
Merge pull request !75 from 卢越/master
 2024-08-12 01:28:07 +00:00
YunaiV 5feab41b3d 【功能修复】拼团：未开启拼团的 SKU 需要禁用选择 2024-08-10 11:36:02 +08:00
YunaiV 51ba185e81 【代码优化】进入分类页的时候，自动勾选左侧一级分类（比如从首页进入） 2024-08-10 10:25:51 +08:00
芋道源码andGitee 92b9820f20 !74 进入分类页的时候自动勾选左侧一级分类（比如从首页进入） 
Merge pull request !74 from 卢越/master
 2024-08-10 02:23:32 +00:00
芋道源码andGitee 374ccf43fd !71 修复一些 issues 提到的问题 
Merge pull request !71 from puhui999/master
 2024-08-09 13:38:49 +00:00
芋道源码andGitee 7a3f98e5fc !69 修复优惠券（类别型）功能 
Merge pull request !69 from 卢越/master
 2024-08-08 05:06:40 +00:00
YunaiV a9739208f8 Merge remote-tracking branch 'origin/master' 2024-08-08 13:05:00 +08:00
YunaiV bb1da04177 【代码优化】实现动态 terminal 终端类型的计算 2024-08-08 13:04:34 +08:00
YunaiV 15ce250c1b Merge branch 'develop' of https://gitee.com/yudaocode/yudao-mall-uniapp 2024-08-08 12:58:51 +08:00
芋道源码andGitee f7ec1badf7 !66 feat(request): 实现动态Terminal功能。 
Merge pull request !66 from Ordinary/master
 2024-08-08 04:58:39 +00:00
芋道源码andGitee 2b5a06174f !70 【代码优化】门店自提：h5 位置信息相关逻辑 
Merge pull request !70 from puhui999/master
 2024-08-08 04:56:46 +00:00
YunaiV 3099c8c491 实现抖音小程序的兼容 2024-08-07 23:51:29 +08:00
YunaiV 1aa944e18c Merge branch 'develop' of https://gitee.com/yudaocode/yudao-mall-uniapp 
# Conflicts:
#	pages/goods/index.vue
#	pages/order/confirm.vue
#	pages/order/detail.vue
 2024-08-07 23:37:38 +08:00
芋道源码andGitee e635b91bb5 !67 修复抖音小程序无法启动问题 
Merge pull request !67 from undefined/master
 2024-08-07 15:07:19 +00:00
YunaiV c7ea2f97ac 【代码评审】门店自提：相关代码的优化、以及 todo 评审 2024-08-07 22:09:15 +08:00
芋道源码andGitee 965b97dae7 !68 【新增】自提门店选择、积分选择 
Merge pull request !68 from puhui999/master
 2024-08-07 13:36:47 +00:00
YunaiV d1681ec2d5 V2.2.0 版本发布 2024-08-02 23:07:09 +08:00
YunaiV eae8f3c174 【代码优化】SYSTEM：微信小程序的订阅 2024-08-01 13:08:01 +08:00
YunaiV 7f5970d741 【代码优化】SYSTEM：微信小程序的订阅 2024-07-31 23:46:08 +08:00
YunaiV ececc6f67c 【代码优化】SYSTEM：微信小程序的订阅 2024-07-31 19:48:13 +08:00
芋道源码andGitee 77306a54e7 !65 【新增】订阅消息：拼团结果通知消息订阅 
Merge pull request !65 from puhui999/master
 2024-07-31 11:31:08 +00:00
芋道源码andGitee 1b385d728a !64 【新增】订阅消息：订单发货消息订阅 
Merge pull request !64 from puhui999/master
 2024-07-31 05:51:17 +00:00
芋道源码andGitee 59c6613102 !63 【新增】订阅消息：订单发货、充值退款消息订阅 
Merge pull request !63 from puhui999/master
 2024-07-30 15:14:12 +00:00
YunaiV d97cc41f42 Merge branch 'downey' of https://gitee.com/downeyin/yudao-mall-uniapp into develop 2024-07-28 20:06:40 +08:00
YunaiV dfe19ca710 【代码修复】cloneDeep 深拷贝对列表的处理错误 2024-07-28 19:41:07 +08:00
YunaiV d716bc4619 【代码修复】修复在微信小程序下，切换手机 + 密码登录失败的问题 2024-07-26 13:14:25 +08:00
YunaiV 0b9e8a39aa 【代码修复】下单时，备注未传递给后端的问题 2024-07-26 09:38:29 +08:00
YunaiV f67e6a7f54 【代码修复】login.vue 微信登录绑定过慢，导致登录失败 2024-07-25 08:48:45 +08:00
芋道源码andGitee 3d7f63868f !61 【新增】接入微信订阅消息 
Merge pull request !61 from puhui999/master
 2024-07-24 11:36:54 +00:00
YunaiV 0b9d7a8808 【代码修复】分销的提现的类型不正确的问题 2024-07-22 21:58:05 +08:00
芋道源码andGitee 1879a0b464 !60 新增在线客服，基于 WebSocket 实现实时通信 
Merge pull request !60 from 芋道源码/develop
 2024-07-22 10:00:11 +00:00
YunaiV f4cc8def91 【代码优化】分销相关的注释 2024-07-22 17:56:09 +08:00
芋道源码andGitee 2e423e9748 !58 复制订单信息失败，字段错误 
Merge pull request !58 from WCH/N/A
 2024-07-17 15:40:41 +00:00
芋道源码andGitee 9fc054a301 !59 update pages/order/aftersale/return-delivery.vue. 
Merge pull request !59 from zhaowg/master
 2024-07-17 15:38:18 +00:00
YunaiV 2ea027a6e0 【修复】商品详情页，未登录状态下，需要登录的问题 2024-07-17 23:35:39 +08:00
芋道源码andGitee 508bd9cbd7 !56 完善 mall 客服，实现 WebSocket 封装 
Merge pull request !56 from puhui999/master
 2024-07-17 14:37:56 +00:00
芋道源码andGitee 6550441bc9 !55 解析分享参数，绑定推广员 
Merge pull request !55 from puhui999/master
 2024-05-27 13:57:30 +00:00
芋道源码andGitee c3b1ff4b92 !54 海报：完善小程序码（添加前缀 data:image/png;base64,） 
Merge pull request !54 from puhui999/master
 2024-05-26 01:52:49 +00:00
芋道源码andGitee 521553e2f5 !53 完善用户、商品、拼团海报生成 
Merge pull request !53 from puhui999/master
 2024-05-18 13:10:17 +00:00
YunaiV ae3cef3e19 【发版】全局：2.1.0 发版 2024-05-04 11:17:53 +08:00
YunaiV 68d2fc4c24 【修复】拼团装修组件，跳转拼团商品界面的 id 不正确的问题 2024-05-02 10:16:17 +08:00
YunaiV c3f3c44e63 【完善】兼容 HBuilder 最新版本 vite5 2024-05-02 09:39:00 +08:00
芋道源码andGitee 97802232a2 !51 update pages/order/detail.vue. @tap="onGoodsDetail(item.skuId)" =>@tap="onGoodsDetail(item.spuId)" 
Merge pull request !51 from 孙正涛/N/A
 2024-05-02 01:29:15 +00:00
YunaiV a816582206 bugfix：修复拼团详情错误传递 groupon_id 的问题 2024-03-30 15:28:29 +08:00
芋道源码andGitee d2c4b9efc9 !50 适配顶部导航 
Merge pull request !50 from 疯狂的世界/navbar
 2024-03-17 01:26:39 +00:00
芋道源码andGitee b7c38be5b3 !49 update pages/index/login.vue. 
Merge pull request !49 from 天痕/N/A
 2024-03-09 10:35:24 +00:00
芋道源码andGitee d7eb74968a !48 配置文件描述修改 
Merge pull request !48 from 天痕/N/A
 2024-03-09 10:34:03 +00:00
芋道源码andGitee ddc54679fb !47 完善微信导入收货地址 
Merge pull request !47 from DH/N/A
 2024-03-09 10:33:32 +00:00
芋道源码andGitee 7226eb8eb0 !46 fix : data.combinationActivityId 
Merge pull request !46 from cnyballk/fix/api/trade/order
 2024-03-09 10:32:02 +00:00
芋道源码andGitee a0deb30075 !45 fix: gravityFormat to gravityFormatMap 
Merge pull request !45 from cnyballk/master
 2024-03-09 10:31:30 +00:00
芋道源码andGitee e8cc7cb6c0 !44 fix: add export checkUpdate 
Merge pull request !44 from cnyballk/fix/wechat/checkUpdate
 2024-03-09 10:28:49 +00:00
YunaiV b10f8d3181 🎉 2.0.1 版本发布！ 2024-03-01 20:53:46 +08:00
YunaiV 71b9a502f3 Merge remote-tracking branch 'origin/master' 2024-03-01 18:56:07 +08:00
YunaiV d51ebca23b bugfix：购物车界面，金额展示不正确 2024-03-01 18:54:36 +08:00
芋道源码andGitee fb4220b46e !43 fix: formatOrderStatusDescription variable error 
Merge pull request !43 from cnyballk/fix/hooks/formatOrderStatusDescription
 2024-03-01 10:49:25 +00:00
YunaiV d815fd5e3f bugfix：确认订单页面，不展示会员优惠信息 2024-03-01 18:48:32 +08:00
YunaiV a0e9ceb945 Merge remote-tracking branch 'origin/master' 2024-03-01 13:20:49 +08:00
YunaiV 12332f0f30 修复订单列表 tab 切换叠加问题 2024-03-01 13:20:39 +08:00
芋道源码andGitee eea2ad446f !39 修复了商品卡片没有正确格式化数字的问题 
Merge pull request !39 from DH/master
 2024-03-01 05:09:04 +00:00
YunaiV fe76f2fc90 ✨ 砍价：暂时移除，砍价在小程序中容易被封号 2024-03-01 13:06:56 +08:00