Enzo
							
						 | 
						
							
							
							
								
							
								42428614c2
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of http://8.134.10.79:3000/Leadfyy.co/ec.uniapp-master
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								
								 Enzo
							
						 | 
						
							
							
							
								
							
								8cf67f5be6
								
							
								
							
						 | 
						
							
							
								
								倒计时
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								邓平艺
							
						 | 
						
							
							
							
								
							
								dc492c0f13
								
							
								
							
						 | 
						
							
							
								
								修修改改
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								邓平艺
							
						 | 
						
							
							
							
								
							
								f7bed80832
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of ssh://8.134.10.79:222/Leadfyy.co/ec.uniapp-master
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	pages/order/confirm/confirm.vue 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								邓平艺
							
						 | 
						
							
							
							
								
							
								fca8c68aa4
								
							
								
							
						 | 
						
							
							
								
								解决精度丢失问题,删除无用页面和组件
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								
								 Enzo
							
						 | 
						
							
							
							
								
							
								c3624ad8c8
								
							
								
							
						 | 
						
							
							
								
								商品详情积分显示
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								
								 Enzo
							
						 | 
						
							
							
							
								
							
								8440f4aba9
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of http://8.134.10.79:3000/Leadfyy.co/ec.uniapp-master
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								
								 Enzo
							
						 | 
						
							
							
							
								
							
								3faa300855
								
							
								
							
						 | 
						
							
							
								
								兑换优化 积分显示
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								邓平艺
							
						 | 
						
							
							
							
								
							
								004b9db891
								
							
								
							
						 | 
						
							
							
								
								秒杀订单传参
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								邓平艺
							
						 | 
						
							
							
							
								
							
								0ea878c5ae
								
							
								
							
						 | 
						
							
							
								
								no message
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								邓平艺
							
						 | 
						
							
							
							
								
							
								a8885a1a28
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of ssh://8.134.10.79:222/Leadfyy.co/ec.uniapp-master
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								邓平艺
							
						 | 
						
							
							
							
								
							
								178b4321ed
								
							
								
							
						 | 
						
							
							
								
								线上余额支付
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								
								 Enzo
							
						 | 
						
							
							
							
								
							
								2fa74a3b6b
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of http://8.134.10.79:3000/Leadfyy.co/ec.uniapp-master
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								
								 Enzo
							
						 | 
						
							
							
							
								
							
								2927f9590f
								
							
								
							
						 | 
						
							
							
								
								一系列优化
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								邓平艺
							
						 | 
						
							
							
							
								
							
								f394363306
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of ssh://8.134.10.79:222/Leadfyy.co/ec.uniapp-master
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								邓平艺
							
						 | 
						
							
							
							
								
							
								3adabfcf42
								
							
								
							
						 | 
						
							
							
								
								路由分发
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								
								 Enzo
							
						 | 
						
							
							
							
								
							
								e46cbe7091
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of http://8.134.10.79:3000/Leadfyy.co/ec.uniapp-master
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								
								 Enzo
							
						 | 
						
							
							
							
								
							
								73dfbb9fbc
								
							
								
							
						 | 
						
							
							
								
								一系列优化
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								Shuixiang
							
						 | 
						
							
							
							
								
							
								85e7369c6a
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of ssh://8.134.10.79:222/Leadfyy.co/ec.uniapp-master
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								邓平艺
							
						 | 
						
							
							
							
								
							
								d3f31a81e3
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of ssh://8.134.10.79:222/Leadfyy.co/ec.uniapp-master
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								邓平艺
							
						 | 
						
							
							
							
								
							
								68d16cf9c9
								
							
								
							
						 | 
						
							
							
								
								增加购物车删除请求提示
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								
								 Enzo
							
						 | 
						
							
							
							
								
							
								6a4005f829
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of http://8.134.10.79:3000/Leadfyy.co/ec.uniapp-master
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								
								 Enzo
							
						 | 
						
							
							
							
								
							
								3a7f13e3bd
								
							
								
							
						 | 
						
							
							
								
								miaosha 一系列优化
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								邓平艺
							
						 | 
						
							
							
							
								
							
								2d72f9fc74
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of ssh://8.134.10.79:222/Leadfyy.co/ec.uniapp-master
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								邓平艺
							
						 | 
						
							
							
							
								
							
								d9c2551c3d
								
							
								
							
						 | 
						
							
							
								
								对接商品详情页无规格
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								Shuixiang
							
						 | 
						
							
							
							
								
							
								b161695125
								
							
								
							
						 | 
						
							
							
								
								错别字修改
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								
								 Enzo
							
						 | 
						
							
							
							
								
							
								6e2f295929
								
							
								
							
						 | 
						
							
							
								
								秒杀倒计时
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								
								 Enzo
							
						 | 
						
							
							
							
								
							
								145b987006
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of http://8.134.10.79:3000/Leadfyy.co/ec.uniapp-master
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								
								 Enzo
							
						 | 
						
							
							
							
								
							
								2fa7d1cbe7
								
							
								
							
						 | 
						
							
							
								
								图片选择
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								邓平艺
							
						 | 
						
							
							
							
								
							
								6366423a10
								
							
								
							
						 | 
						
							
							
								
								优化支付页面跳转
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								
								 Enzo
							
						 | 
						
							
							
							
								
							
								d266c15e9b
								
							
								
							
						 | 
						
							
							
								
								发现
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								
								 Enzo
							
						 | 
						
							
							
							
								
							
								86d65292a9
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of http://8.134.10.79:3000/Leadfyy.co/ec.uniapp-master
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								
								 Enzo
							
						 | 
						
							
							
							
								
							
								7a37c679ee
								
							
								
							
						 | 
						
							
							
								
								一系列优化
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								邓平艺
							
						 | 
						
							
							
							
								
							
								d21adbb698
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of ssh://8.134.10.79:222/Leadfyy.co/ec.uniapp-master
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								邓平艺
							
						 | 
						
							
							
							
								
							
								ecda2ae5f0
								
							
								
							
						 | 
						
							
							
								
								商家中心新增退出登录,线下扫码付输入支付密码
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								
								 Enzo
							
						 | 
						
							
							
							
								
							
								a8be7b761d
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of http://8.134.10.79:3000/Leadfyy.co/ec.uniapp-master
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								
								 Enzo
							
						 | 
						
							
							
							
								
							
								23208dbfa5
								
							
								
							
						 | 
						
							
							
								
								添加自提核销码 等一系列优化
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								邓平艺
							
						 | 
						
							
							
							
								
							
								408b0aa6ef
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of ssh://8.134.10.79:222/Leadfyy.co/ec.uniapp-master
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								邓平艺
							
						 | 
						
							
							
							
								
							
								037d45e256
								
							
								
							
						 | 
						
							
							
								
								对接商家中心扫码核销活动和自提订单
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								
								 Enzo
							
						 | 
						
							
							
							
								
							
								b6dda03b5a
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of http://8.134.10.79:3000/Leadfyy.co/ec.uniapp-master
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								
								 Enzo
							
						 | 
						
							
							
							
								
							
								567277dc4c
								
							
								
							
						 | 
						
							
							
								
								一系列优化
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								邓平艺
							
						 | 
						
							
							
							
								
							
								26f72e559c
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of ssh://8.134.10.79:222/Leadfyy.co/ec.uniapp-master
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	common/js/config.js 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								邓平艺
							
						 | 
						
							
							
							
								
							
								3e54b76123
								
							
								
							
						 | 
						
							
							
								
								新增商家中心活动
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								
								 Enzo
							
						 | 
						
							
							
							
								
							
								8c4a0a1765
								
							
								
							
						 | 
						
							
							
								
								首页跳转优化
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								
								 Enzo
							
						 | 
						
							
							
							
								
							
								00d0ba6b85
								
							
								
							
						 | 
						
							
							
								
								店铺详情商品显示优化
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								
								 Enzo
							
						 | 
						
							
							
							
								
							
								cdc1df9431
								
							
								
							
						 | 
						
							
							
								
								下单页面地址选择优化 首页购物车数量动态显示 发现详情和发现列表无用户信息时的优化
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								
								 Enzo
							
						 | 
						
							
							
							
								
							
								9cc05f9f0c
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of http://8.134.10.79:3000/Leadfyy.co/ec.uniapp-master
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								
								 Enzo
							
						 | 
						
							
							
							
								
							
								93bb6d37f1
								
							
								
							
						 | 
						
							
							
								
								动态上传图片我的订单
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								邓平艺
							
						 | 
						
							
							
							
								
							
								1b8193f82b
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of ssh://8.134.10.79:222/Leadfyy.co/ec.uniapp-master
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								邓平艺
							
						 | 
						
							
							
							
								
							
								ba754bb885
								
							
								
							
						 | 
						
							
							
								
								增加判断线下扫码付,优化商品详情页规格,商家中心登录态判断
							
							
							
							
								
							
							
						 | 
						4 years ago |