YunaiV
							
						 | 
						
							
							
							
							
								
							
								19d90f5df5
								
							
								
							
						 | 
						
							
							
								
								✨ 无需迁移的组件,批量 review
							
							
							
							
							
						 | 
						
							2023-12-16 22:03:37 +08:00 | 
						
					
				
					
						
							
							
								 
								YunaiV
							
						 | 
						
							
							
							
							
								
							
								82b751e49c
								
							
								
							
						 | 
						
							
							
								
								🔥 积分商城:移除相关功能,暂时不考虑
							
							
							
							
							
						 | 
						
							2023-12-16 21:47:43 +08:00 | 
						
					
				
					
						
							
							
								 
								YunaiV
							
						 | 
						
							
							
							
							
								
							
								d95786154c
								
							
								
							
						 | 
						
							
							
								
								✨ 系统设置:接入完成
							
							
							
							
							
						 | 
						
							2023-12-16 21:40:34 +08:00 | 
						
					
				
					
						
							
							
								 
								YunaiV
							
						 | 
						
							
							
							
							
								
							
								d63bbf9dc3
								
							
								
							
						 | 
						
							
							
								
								🔥 意见反馈:移除相关功能,暂时不考虑
							
							
							
							
							
						 | 
						
							2023-12-16 21:29:47 +08:00 | 
						
					
				
					
						
							
							
								 
								YunaiV
							
						 | 
						
							
							
							
							
								
							
								1add3af785
								
							
								
							
						 | 
						
							
							
								
								🔥 发票:移除相关功能,暂时不考虑
							
							
							
							
							
						 | 
						
							2023-12-16 21:00:23 +08:00 | 
						
					
				
					
						
							
							
								 
								YunaiV
							
						 | 
						
							
							
							
							
								
							
								cfb514e276
								
							
								
							
						 | 
						
							
							
								
								✨ 收货地址:编辑/新增
							
							
							
							
							
						 | 
						
							2023-12-16 20:37:37 +08:00 | 
						
					
				
					
						
							
							
								 
								YunaiV
							
						 | 
						
							
							
							
							
								
							
								5bcf44b7a9
								
							
								
							
						 | 
						
							
							
								
								✨ 收货地址:code review
							
							
							
							
							
						 | 
						
							2023-12-16 20:02:31 +08:00 | 
						
					
				
					
						
							
							
								 
								YunaiV
							
						 | 
						
							
							
							
							
								
							
								275e8a278f
								
							
								
							
						 | 
						
							
							
								
								✨ 商品详情:优惠劵信息的接入
							
							
							
							
							
						 | 
						
							2023-12-16 19:16:21 +08:00 | 
						
					
				
					
						
							
							
								 
								YunaiV
							
						 | 
						
							
							
							
							
								
							
								b422c7414f
								
							
								
							
						 | 
						
							
							
								
								✨ 优惠劵详情:100%
							
							
							
							
							
						 | 
						
							2023-12-16 18:32:07 +08:00 | 
						
					
				
					
						
							
							
								 
								YunaiV
							
						 | 
						
							
							
							
							
								
							
								815457844d
								
							
								
							
						 | 
						
							
							
								
								✨ 优惠劵详情:50%
							
							
							
							
							
						 | 
						
							2023-12-16 12:46:11 +08:00 | 
						
					
				
					
						
							
							
								 
								YunaiV
							
						 | 
						
							
							
							
							
								
							
								894f57a551
								
							
								
							
						 | 
						
							
							
								
								✨ 优惠劵列表:接入完成
							
							
							
							
							
						 | 
						
							2023-12-16 10:40:04 +08:00 | 
						
					
				
					
						
							
							
								 
								YunaiV
							
						 | 
						
							
							
							
							
								
							
								77e2719837
								
							
								
							
						 | 
						
							
							
								
								🐛 修复代码冲突,被错误覆盖掉的 cart.vue、pay.vue、result.vue、confirm.vue
							
							
							
							
							
						 | 
						
							2023-12-16 00:09:01 +08:00 | 
						
					
				
					
						
							
							
								 
								YunaiV
							
						 | 
						
							
							
							
							
								
							
								b235cb0d8d
								
							
								
							
						 | 
						
							
							
								
								✨ 商品列表:已完成
							
							
							
							
							
						 | 
						
							2023-12-15 23:46:24 +08:00 | 
						
					
				
					
						
							
							
								 
								芋道源码
							
						 | 
						
							
							
							
								
								
							
							
								
							
								4c5ca70b15
								
									
								
							
								
							
						 | 
						
							
							
								
								!28 商城装修
							
							
							
							
							
							
							
							Merge pull request !28 from 疯狂的世界/master-vue3 
							
						 | 
						
							2023-12-15 15:37:44 +00:00 | 
						
					
				
					
						
							
							
								 
								YunaiV
							
						 | 
						
							
							
							
							
								
							
								bab41f4553
								
							
								
							
						 | 
						
							
							
								
								✨ 商品列表:简化部分代码
							
							
							
							
							
						 | 
						
							2023-12-15 22:15:22 +08:00 | 
						
					
				
					
						
							
							
								 
								owen
							
						 | 
						
							
							
							
							
								
							
								02678c6839
								
							
								
							
						 | 
						
							
							
								
								营销:优化商城装修组件
							
							
							
							
							
						 | 
						
							2023-12-15 17:12:01 +08:00 | 
						
					
				
					
						
							
							
								 
								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 |