Browse Source
			
			
			Merge branch 'master' of http://8.134.10.79:3000/Leadfyy.co/ec.uniapp-master
			
				
		Merge branch 'master' of http://8.134.10.79:3000/Leadfyy.co/ec.uniapp-master
	
		
	
			
				# Conflicts: # pages/business/order/list.vue # pages/order/cashier/cashier.vue # pages/order/confirm/confirm.vue # pages/order/pointconfirm/confirm.vuemaster
				 18 changed files with 205 additions and 67 deletions
			
			
		- 
					2components/lf-adModal/lf-adModal.vue
 - 
					3components/lf-payPassword/lf-payPassword.vue
 - 
					4components/lf-shopGoodsCard/lf-shopGoodsCard.vue
 - 
					2pages/aboutpay/confirmcash.vue
 - 
					6pages/business/center/center.vue
 - 
					11pages/business/login/login.vue
 - 
					4pages/business/order/list.vue
 - 
					7pages/business/payment/wait.vue
 - 
					2pages/index/activity/hot.vue
 - 
					7pages/index/category/category.vue
 - 
					11pages/index/openScreenAd/openScreenAd.vue
 - 
					11pages/order/cashier/cashier.vue
 - 
					4pages/order/confirm/confirm.vue
 - 
					32pages/order/index/onlineorder.vue
 - 
					26pages/order/newdetail/newdetail.vue
 - 
					3pages/order/pointconfirm/confirm.vue
 - 
					65pages/shop/goodsdetail.vue
 - 
					72pages/store/cart/cart.vue
 
						Write
						Preview
					
					
					Loading…
					
					Cancel
						Save
					
		Reference in new issue