Commit Graph

593 Commits (8e64ecebd1c504a3b52e4b42872ec62c44a259ac)

Author SHA1 Message Date
YunaiV 6326cf80c5 商品详情:接入优惠劵 API 2023-12-10 19:08:43 +08:00
YunaiV 0e189711a8 商品详情:评论列表 2023-12-10 17:25:15 +08:00
YunaiV e3264329e7 商品详情:SKU 的选择完善 2023-12-10 11:57:24 +08:00
芋道源码 2ee3c77249
!25 商城装修
Merge pull request !25 from 疯狂的世界/master-vue3
2023-12-10 01:34:25 +00:00
owen 4e3b8eccff Merge remote-tracking branch 'origin/master-vue3' into master-vue3
# Conflicts:
#	sheep/components/s-wallet-card/s-wallet-card.vue
2023-12-09 23:00:11 +08:00
owen 72998abf10 营销:适配商城装修组件【悬浮按钮】 2023-12-09 21:33:46 +08:00
YunaiV 3157df8464 商品详情:SKU 选择的属性展示 2023-12-09 20:04:51 +08:00
owen a28a36e038 修复合并异常 2023-12-09 16:55:31 +08:00
owen d9b25ed14b 营销:适配商城装修组件【弹窗广告】 2023-12-09 15:37:24 +08:00
YunaiV 4854cee7ca Merge branch 'vue3_tmp' of https://gitee.com/huizhizao/yudao-mall-uniapp into master-vue3
# Conflicts:
#	pages/index/index.vue
2023-12-09 11:45:12 +08:00
芋道源码 2192ec3508
!24 商城装修
Merge pull request !24 from 疯狂的世界/master-vue3
2023-12-09 03:40:58 +00:00
owen a1eaa04a19 Merge remote-tracking branch 'origin/master-vue3' into master-vue3 2023-12-07 21:25:44 +08:00
owen 7f79fbf76a 商城装修:装修模板预览 2023-12-07 21:25:24 +08:00
落日晚风 39692952f0 我的 优惠券和积分数据 积分列表 售后订单列表 售后订单详情 隐藏手机号绑定弹窗 2023-12-07 17:53:34 +08:00
落日晚风 ef254d2d3c 我的 优惠券和积分数据 积分列表 售后订单列表 售后订单详情 隐藏手机号绑定弹窗 2023-12-07 17:52:48 +08:00
Bluemark 6251ffa994 修复冲突
Signed-off-by: Bluemark <kongdy@bluemark.cn>
2023-12-07 02:01:57 +00:00
落日晚风 16a4fd21b1 我的全部订单,待发货-待评价-评价晒单 优惠券列表 2023-12-06 17:56:46 +08:00
落日晚风 648b1a6351 我的-全部订单-订单详情 2023-12-05 17:59:31 +08:00
落日晚风 4030e40ebc 优化从购物车下单 2023-12-05 14:27:36 +08:00
芋道源码 2164c91488
!20 商城装修
Merge pull request !20 from 疯狂的世界/master-vue3
2023-12-02 01:02:34 +00:00
owen 51a0d8792e 营销:适配商城装修组件【分割线】 2023-12-02 00:51:58 +08:00
owen ff6788b685 营销:适配商城装修组件【用户资产】 2023-12-01 23:40:06 +08:00
owen fc9359a8ae 营销:适配商城装修组件【用户订单】 2023-12-01 23:34:18 +08:00
owen cfd6551732 营销:适配商城装修组件【用户卡片】 2023-12-01 23:12:43 +08:00
owen 8755d64683 营销:适配商城装修组件【拼团】(待重写) 2023-12-01 21:00:39 +08:00
owen cfc04d9c82 营销:适配商城装修组件【秒杀】(待重写) 2023-12-01 20:24:54 +08:00
owen 343b1fd5f6 营销:适配商城装修组件【营销文章】 2023-11-25 15:53:06 +08:00
芋道源码 6513b48429
!18 商城装修
Merge pull request !18 from 疯狂的世界/master-vue3
2023-11-24 14:36:08 +00:00
owen 92e164747a 营销:适配商城装修组件【优惠券】 2023-11-22 16:57:59 +08:00
owen 04b0b87126 Merge remote-tracking branch 'origin/master-vue3' into master-vue3 2023-11-21 10:41:41 +08:00
YunaiV e7b1834536 解决 vue3 启动后首页报错的问题 2023-11-20 20:20:41 +08:00
owen f0bf79c43e 营销:适配商城装修组件【商品栏】 2023-11-19 18:27:24 +08:00
芋道源码 25966adfc0
!16 商城装修
Merge pull request !16 from 疯狂的世界/master-vue3
2023-11-18 17:14:10 +00:00
owen 10fe28093e Merge remote-tracking branch 'origin/master-vue3' into master-vue3 2023-11-17 21:52:37 +08:00
owen 99529e3b9e 营销:适配商城装修组件【商品卡片】 2023-11-17 09:56:50 +08:00
芋道源码 fd3e4e76fa
!15 商城装修
Merge pull request !15 from 疯狂的世界/master-vue3
2023-11-14 00:32:55 +00:00
owen 7adf5dd257 营销:适配商城装修组件【广告魔方】 2023-11-12 19:29:24 +08:00
芋道源码 63c831464d
!13 用户钱包及明细.搜索页修复.个人信息移除多余页面.商品列表字段优化,分类子商品展示
Merge pull request !13 from Bluemark/vue3_tmp
2023-11-10 11:27:21 +00:00
落日晚风 bfa440e98c Merge branch 'vue3_tmp' of https://gitee.com/huizhizao/yudao-mall-uniapp into vue3_tmp 2023-11-09 17:46:26 +08:00
落日晚风 60f1ff6a15 全部订单的,上拉加载逻辑 2023-11-09 17:45:25 +08:00
Bluemark 83a88d0d12 修复冲突
Signed-off-by: Bluemark <kongdy@bluemark.cn>
2023-11-09 01:29:59 +00:00
芋道源码 626338416b
!14 商城装修
Merge pull request !14 from 疯狂的世界/master-vue3
2023-11-09 01:29:50 +00:00
owen e4af437545 营销:适配商城装修组件【菜单导航】 2023-11-09 09:21:45 +08:00
owen a40aa1218d 营销:适配商城装修组件【宫格导航】 2023-11-09 09:21:45 +08:00
owen b050edae8d 营销:适配商城装修组件【列表导航】 2023-11-09 09:21:45 +08:00
owen 4af42e2949 营销:整理商城装修组件 2023-11-09 09:21:45 +08:00
落日晚风 bf8b960793 全部订单数据对接 2023-11-08 17:22:29 +08:00
落日晚风 a9afb6452d 用户钱包及明细.搜索页修复.个人信息移除多余页面.商品列表字段优化,分类子商品展示 2023-11-07 17:49:02 +08:00
落日晚风 627b3d015f 订单数量,个人信息修改,收藏,收货地址,全部订单接口简单替换 2023-11-06 17:50:55 +08:00
芋道源码 c7df3c9fbd
!12 商城装修
Merge pull request !12 from 疯狂的世界/master-vue3
2023-11-06 06:59:16 +00:00