owen
|
f289b1ae83
|
营销：适配商城装修组件【标题栏】
|
2023-12-15 13:26:27 +08:00 |
|
owen
|
062ede78a2
|
Merge remote-tracking branch 'origin/master-vue3' into master-vue3
|
2023-12-15 12:08:10 +08:00 |
|
YunaiV
|
9049182843
|
✨ 商品收藏：商品详情的底部接入
|
2023-12-15 09:48:10 +08:00 |
|
YunaiV
|
3b5c84f970
|
✨ 我的收藏：接入完成
|
2023-12-15 00:01:54 +08:00 |
|
YunaiV
|
4e85f86529
|
Merge branch 'vue3_tmp' of https://gitee.com/huizhizao/yudao-mall-uniapp into master-vue3
# Conflicts:
# pages.json
# pages/goods/list.vue
# pages/order/list.vue
# sheep/api/order.js
# sheep/api/trade/order.js
# sheep/hooks/useGoods.js
|
2023-12-14 23:26:47 +08:00 |
|
YunaiV
|
06b4e6b01e
|
✨ 订单物流：接入完成
|
2023-12-14 23:22:35 +08:00 |
|
YunaiV
|
3497261f26
|
✨ 订单评价：接入完成
|
2023-12-14 22:00:36 +08:00 |
|
owen
|
3d415b6ecb
|
营销：适配商城装修组件【热区】
|
2023-12-14 20:22:51 +08:00 |
|
YunaiV
|
3efb8ecf27
|
✨ 售后日志：完成
|
2023-12-14 20:07:20 +08:00 |
|
YunaiV
|
2d6cfdf53b
|
✨ 售后列表、详情：完成
|
2023-12-14 19:44:01 +08:00 |
|
落日晚风
|
aad925ed51
|
新增eturn-delivery退货物流提交页
|
2023-12-14 17:42:43 +08:00 |
|
落日晚风
|
2952ad695c
|
依据文档-签到页面迁移-优惠券
|
2023-12-14 14:46:38 +08:00 |
|
YunaiV
|
030dcfd461
|
✨ 售后申请：完成
|
2023-12-13 23:45:55 +08:00 |
|
YunaiV
|
db19393427
|
✨ 订单详情：订单项的售后状态接入
|
2023-12-13 21:17:31 +08:00 |
|
YunaiV
|
953c8f96cb
|
✨ 订单详情：删除单个商品的物流信息，用不到
|
2023-12-13 21:05:35 +08:00 |
|
YunaiV
|
163996ca90
|
✨ 订单列表：接入 95%
|
2023-12-13 20:54:57 +08:00 |
|
YunaiV
|
3180f97cbd
|
✨ 订单详情：接入 80%
|
2023-12-13 20:06:40 +08:00 |
|
落日晚风
|
e71091cbb0
|
依据文档修改
|
2023-12-13 17:42:12 +08:00 |
|
落日晚风
|
98baaab9bc
|
初始化
|
2023-12-13 11:35:02 +08:00 |
|
落日晚风
|
56a0df6369
|
清空2
|
2023-12-13 11:28:42 +08:00 |
|
落日晚风
|
cff33ad7d1
|
清空
|
2023-12-13 11:25:22 +08:00 |
|
芋道源码
|
82407aa87c
|
!26 接口层兼容
Merge pull request !26 from Bluemark/vue3_tmp
|
2023-12-13 03:17:05 +00:00 |
|
Bluemark
|
7c2ab0b7ad
|
修复冲突
Signed-off-by: Bluemark <kongdy@bluemark.cn>
|
2023-12-13 01:56:36 +00:00 |
|
YunaiV
|
25a82c1812
|
✨ 订单列表：接入 80%，部分操作待测试
|
2023-12-12 23:26:02 +08:00 |
|
YunaiV
|
4245164cae
|
✨ 收银台：接入收银结果界面
|
2023-12-12 22:23:33 +08:00 |
|
落日晚风
|
cf2c782c0e
|
接口层兼容
|
2023-12-12 16:13:27 +08:00 |
|
YunaiV
|
072f6a15a9
|
✨ 收银台：接入核心逻辑
|
2023-12-12 00:03:07 +08:00 |
|
YunaiV
|
4ddf17e2df
|
✨ 下单界面
|
2023-12-11 22:21:21 +08:00 |
|
落日晚风
|
ef26268c8e
|
s-coupon-get.vue，detail-tabbar.vue，详情加入购物车，其他模块优化
|
2023-12-11 17:42:50 +08:00 |
|
YunaiV
|
7a15c9496c
|
✨ 购物车：列表
|
2023-12-11 12:50:46 +08:00 |
|
落日晚风
|
c5b1f3ac93
|
合并初始化
|
2023-12-11 09:24:16 +08:00 |
|
落日晚风
|
376376b875
|
清空
|
2023-12-11 09:23:44 +08:00 |
|
YunaiV
|
8fd8ff9f70
|
✨ 商品分类：列表
|
2023-12-10 22:12:33 +08:00 |
|
YunaiV
|
e971e09593
|
✨ 商品分类：second-one 样式接入完成
|
2023-12-10 20:46:11 +08:00 |
|
YunaiV
|
3d4f7e9a09
|
✨ 商品详情：接入营销活动 API
|
2023-12-10 19:52:54 +08:00 |
|
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 |