Merge branch 'developerC' of http://git.caimei365.com/caimei-repository/caimei-applets-caimei into developerC

pages/user/order/create-order.vue

@@ -178,7 +178,7 @@
 			},
 			getAddressData(){//获取地址信息
 				this.$api.getStorage().then((resolve) => {
-					this.UserService.QueryAddressList({pageNum:1,pageSize:1,userID:resolve.userID}).then(response =>{
+					this.UserService.QueryAddressList({pageNum:1,pageSize:1,userID:resolve.userId}).then(response =>{
 						this.isAddress = true
 						this.addressData = {}
 						if(response.data.results != ''){