diff --git a/common/js/globalData.js b/common/js/globalData.js
index b134ea7..96de592 100644
--- a/common/js/globalData.js
+++ b/common/js/globalData.js
@@ -1,5 +1,5 @@
 export default {
-	deptId: 1,
+	deptId: 101,
 	initPageNum: 1,
 	initPageSize: 5
 }
\ No newline at end of file
diff --git a/common/js/request.js b/common/js/request.js
index 78c996b..ad87764 100644
--- a/common/js/request.js
+++ b/common/js/request.js
@@ -6,6 +6,8 @@ export default {
 		uni.addInterceptor('request', {
 			invoke(args) {
 				// request 触发前拼接 url 
+				// args.url = 'https://www.opsoul.com' + args.url;
+				// args.url = 'http://192.168.2.3:80' + args.url;
 				args.url = 'http://127.0.0.1:80' + args.url;
 				// console.log("停止触发");
 				// return false;
@@ -60,52 +62,56 @@ export default {
 		})
 	},
 	async login() {
-		// 从缓存中获取登录信息
-		let userInfo = uni.getStorageSync('userProfile');
-		if (userInfo) {
-			return true;
-		}
-
-		// 获取微信登录凭证
-		const wxLoginRes = await wx.login();
-		console.log(wxLoginRes)
-		const wxAuthRes = await uni.request({
-			url: '/wx/auth',
-			header: {
-				code: wxLoginRes.code
-			}
-		})
-		console.log(wxAuthRes)
-		// TODO:调用小程序服务端确认是否是授权登录过的用户
-		let loginRes = {
-			logined: false,
-			userInfo: {}
-		};
-		// 未登录过的获取微信用户信息
-		if (!loginRes || !loginRes.logined) {
-			userInfo = await wx.getUserProfile({
-				desc: '用于小程序登录'
-			});
-			// 再次请求小程序服务端存储用户，服务端添加附加用户信息后返回
-			loginRes = {
-				logined: true,
-				userInfo: {
-					userId: 1,
-					wxLoginCode: wxLoginRes.code,
-					openId: wxAuthRes[1].data.data.openid
-				}
-			};
-		}
-		userInfo = loginRes.userInfo;
-		if (!userInfo) {
-			uni.showToast({
-				icon: 'error',
-				title: '用户信息获取失败，请退出小程序重试'
-			})
-			return false;
-		}
-		// 页面存储用户登录有效信息，以便其他页面调用
-		uni.setStorageSync('userProfile', userInfo);
+		// 从缓存中获取登录信息
+		let userInfo = uni.getStorageSync('userProfile');
+		if (userInfo) {
+			return true;
+		}
+		
+		// TODO:调用小程序服务端确认是否是授权登录过的用户
+		let loginRes = {
+			logined: false,
+			userInfo: {}
+		};
+		// 未登录过的获取微信用户信息
+		if (!loginRes.logined) {
+			userInfo = await wx.getUserProfile({
+				desc: '用于小程序登录'
+			});
+			// 获取微信登录凭证
+			const wxLoginRes = await wx.login();
+			console.log(wxLoginRes)
+			// 再次请求小程序服务端存储用户，服务端添加附加用户信息后返回
+			loginRes = {
+				logined: true,
+				userInfo: {
+					...userInfo,
+					userId: 1,
+					wxLoginCode: wxLoginRes.code
+				}
+			};
+			
+			const wxAuthRes = await uni.request({
+				url: '/wx/auth',
+				header: {
+					code: wxLoginRes.code
+				}
+			})
+			console.log(wxAuthRes)
+			loginRes.userInfo.openId = wxAuthRes[1].data.data.openid;
+			loginRes.userInfo.customerId = 2;
+		}
+		userInfo = loginRes.userInfo;
+		
+		if (!userInfo) {
+			uni.showToast({
+				icon: 'error',
+				title: '微信用户信息获取失败，请退出小程序重试'
+			})
+			return false;
+		}
+		// 页面存储用户登录有效信息，以便其他页面调用
+		uni.setStorageSync('userProfile', userInfo);
 		return true;
 	},
 	wxLogin() {
@@ -113,7 +119,6 @@ export default {
 	},
 	getCurUserInfo() {
 		let userProfile = uni.getStorageSync('userProfile');
-		console.log("curUser:" + userProfile)
 		return userProfile;
 	},
 	getProductCategories(params = {}) {
@@ -152,5 +157,50 @@ export default {
 			}
 		})
 		return res[1].data;
-	},
+	},
+	async getAddressList(params = {}) {
+		let res = await uni.request({
+			url: '/customer/address/list',
+			method: 'POST',
+			data: params
+		})
+		return res[1].data;
+	},
+	async addAddressList(params = {}) {
+		let res = await uni.request({
+			url: '/customer/address/insert',
+			method: 'POST',
+			data: params
+		})
+		return res[1].data;
+	},
+	async editAddressList(params = {}) {
+		let res = await uni.request({
+			url: '/customer/address/update',
+			method: 'POST',
+			data: params
+		})
+		return res[1].data;
+	},
+	async delAddressList(customerAddressId) {
+		let res = await uni.request({
+			url: '/customer/address/delete',
+			method: 'POST',
+			data: {
+				customerAddressId: customerAddressId
+			},
+			header: {
+				'content-type': 'application/x-www-form-urlencoded'
+			}
+		})
+		return res[1].data;
+	},
+	async areaListByStep(params = { parentCode: null }) {
+		let res = await uni.request({
+			url: '/system/area/list',
+			method: 'POST',
+			data: params
+		})
+		return res[1].data;
+	}
 }
diff --git a/pages/my/edit-address.vue b/pages/my/edit-address.vue
index 9c70a0a..e0a9160 100644
--- a/pages/my/edit-address.vue
+++ b/pages/my/edit-address.vue
@@ -10,30 +10,31 @@
 			<form @submit="submit">
 				<view class="cu-form-group">
 					<view class="title">联系人</view>
-					<input name="person2Contact" :value="formData.person2Contact"></input>
+					<input name="name" v-model="formData.name"></input>
 				</view>
 				<view class="cu-form-group">
 					<view class="title">手机号码</view>
-					<input name="phone" :value="formData.phone"></input>
+					<input name="phone" v-model="formData.phone"></input>
 				</view>
 				<!-- #ifndef H5 || APP-PLUS || MP-ALIPAY -->
 				<view class="cu-form-group">
 					<view class="title">地址选择</view>
-					<picker :mode="'multiSelector'" @change="regionChange" :value="multiIndex" :range-key="'name'" :range="areaList">
+					<picker :mode="'multiSelector'" @change="regionChange" @columnchange="regionColChange" :value="multiIndex" :range-key="'areaName'" :range="areaList">
 						<view class="picker">
-							{{areaList[0][multiIndex[0]].name}}，{{areaList[1][multiIndex[1]].name}}，{{areaList[2][multiIndex[2]].name}}
+							{{formData.area && formData.area.length ? formData.area[0].areaName + '-' + formData.area[1].areaName + '-' + formData.area[2].areaName : '请选择'}}
 						</view>
 					</picker>
 				</view>
 				<!-- #endif -->
 				<view class="cu-form-group">
 					<view class="title">详细地址</view>
-					<input name="address" :value="formData.address"></input>
+					<input name="address" v-model="formData.address"></input>
 				</view>
 				<view class="cu-form-group margin-top margin-bottom-with-bar">
-					<view class="title">默认地址</view>
+					<view class="title">默认地址</view>
+					<!-- 0.普通地址, 1.默认地址 -->
 					<switch class="main-color radius" @change="isDefaultChange" :class="formData.isDefault?'checked':''"
-						:checked="formData.isDefault?true:false" name="isDefault" :value="formData.isDefault"></switch>
+						:checked="formData.isDefault?true:false" name="isDefault" :value="formData.isDefault" v-model="formData.isDefault"></switch>
 				</view>
 				<!-- 底部操作栏 -->
 				<view class="cu-bar tabbar border shop fixed-bottom-bar">
@@ -52,7 +53,7 @@
 				multiIndex: [0, 0, 0],
 				formData: {
 				},
-				mode: 1 // 1为新增，0
+				mode: 1 // 1为新增，0为修改
 			}
 		},
 		onLoad(options) {
@@ -67,10 +68,24 @@
 		},
 		methods: {
 			async loadData() {
-				this.areaList = await this.$api.data('areaList');
+				// this.areaList = await this.$api.data('areaList');
+				this.loadAreaList();
 			},
 			fillForm(addressInfo) {
 				this.formData = addressInfo && Object.keys(addressInfo).length > 0 ? addressInfo : this.formData;
+			},
+			async loadAreaList(idArr) {
+				let areaList = await this.$request.areaListByStep();
+				areaList = areaList.data;
+				let col1Code = idArr ? idArr[0] : areaList[0].areaCode;
+				let subAreaList = await this.$request.areaListByStep({ parentCode: col1Code });
+				subAreaList = subAreaList.data;
+				let col2Code = idArr ? idArr[1] : subAreaList[0].areaCode;
+				let subSubAreaList = await this.$request.areaListByStep({ parentCode: col2Code });
+				subSubAreaList = subSubAreaList.data;
+				this.areaList.push(areaList);
+				this.areaList.push(subAreaList);
+				this.areaList.push(subSubAreaList);
 			},
 			regionChange(e) {
 				this.multiIndex = e.detail.value;
@@ -78,15 +93,44 @@
 				for(let i = 0; i < this.areaList.length; i++) {
 					chosenArea.push(this.areaList[i][this.multiIndex[i]]);
 				}
-				this.formData.area = chosenArea;
+				this.formData.area = chosenArea;
+				this.formData.provinceId = chosenArea[1].areaId;
+				this.formData.cityId = chosenArea[2].areaId;
+				this.formData.countryId = chosenArea[0].areaId;
+			},
+			async regionColChange(e) {
+				let colObj = e.detail;
+				if (colObj.column == 0) {
+					let subSubAreaList = [];
+					// 通过一级查询二级，通过二级查三级
+					let subAreaList = await this.$request.areaListByStep({parentCode: this.areaList[0][colObj.value].areaCode});
+					subAreaList = subAreaList.data;
+					if (subAreaList && subAreaList.length) {
+						subSubAreaList = await this.$request.areaListByStep({parentCode: subAreaList[0].areaCode});
+						subSubAreaList = subSubAreaList.data;
+					}
+					this.areaList.pop();
+					this.areaList.pop();
+					this.areaList.push(subAreaList);
+					this.areaList.push(subSubAreaList);
+					this.multiIndex = [colObj.value, 0, 0];
+				} else if (colObj.column == 1) {
+					// 通过二级查三级
+					let subSubAreaList = await this.$request.areaListByStep({parentCode: subAreaList[0].areaCode});
+					subSubAreaList = subSubAreaList.data;
+					this.areaList.pop();
+					this.areaList.push(subSubAreaList);
+					this.multiIndex = [this.multiIndex[0], colObj.value, 0];
+				}
 			},
 			isDefaultChange(e) {
 				this.formData.isDefault = e.detail.value;
 			},
 			validateForm(addressInfo) {
-				let valid = Boolean(addressInfo.person2Contact) &&
+				let valid = Boolean(addressInfo.name) &&
 					Boolean(addressInfo.phone) &&
-					Boolean(addressInfo.address);
+					Boolean(addressInfo.address) &&
+					Boolean(addressInfo.area) && addressInfo.area.length > 0
 				
 				if (!valid) {
 					uni.showToast({
@@ -104,15 +148,43 @@
 				}
 				return valid;
 			},
-			submit(e) {
+			async submit(e) {
 				const confirmFormData = Object.assign({}, this.formData, e.detail.value)
 				let formValid = this.validateForm(confirmFormData);
-				if (formValid) {
-					uni.showToast({
-						title: '保存成功',
-						icon: 'success',
-						mask: true
-					})
+				if (formValid) {
+					let isSuccess = false;
+					if (this.mode === 1) {
+						let res = await this.$request.addAddressList({
+							...this.formData,
+							customerId: this.$request.getCurUserInfo().customerId,
+							isDefault: this.formData.isDefault ? 1 : 0
+						});
+						if (res.code === 0) {
+							isSuccess = true;
+						}
+					} else if (this.mode === 0) {
+						let res = await this.$request.editAddressList({
+							...this.formData,
+							customerId: this.$request.getCurUserInfo().customerId,
+							isDefault: this.formData.isDefault ? 1 : 0
+						});
+						if (res.code === 0) {
+							isSuccess = true;
+						}
+					}
+					if (isSuccess) {
+						uni.showToast({
+							title: '保存成功',
+							icon: 'success',
+							mask: true
+						})
+					} else {
+						uni.showToast({
+							title: '保存失败',
+							icon: 'error',
+							mask: true
+						})
+					}
 				}
 			}
 		}
diff --git a/pages/my/my-address.vue b/pages/my/my-address.vue
index f5789a6..4b54316 100644
--- a/pages/my/my-address.vue
+++ b/pages/my/my-address.vue
@@ -11,39 +11,28 @@
 				<view @click="chooseAddress(item)">
 					<view class="flex justify-start align-center">
 						<view class='cu-tag bg-yellow margin-right-sm' v-if="item.isDefault">默认</view>
-						<view class="text-gray margin-right-xs" v-for="(areaObj, index) in item.area">
-							{{areaObj.name}}</view>
+						<view class="text-gray margin-right-xs">{{item.countryName}}</view>
+						<view class="text-gray margin-right-xs">{{item.provinceName}}</view>
+						<view class="text-gray margin-right-xs">{{item.cityName}}</view>
 					</view>
 					<view class="text-lg margin-tb-sm">{{item.address}}</view>
 					<view class="text-gray">
-						<text class="margin-right">{{item.person2Contact}}</text>
+						<text class="margin-right">{{item.name}}</text>
 						<text>{{item.phone}}</text>
 					</view>
 				</view>
 				<view class="oper-column text-xl flex justify-end">
 					<view class="cuIcon-edit padding-lr-xs padding-tb" @click="addEditAddress(item)"></view>
-					<view class="cuIcon-close padding-lr-xs padding-tb" @click="confirm2DelAddress(item, index)"></view>
+					<view class="cuIcon-close padding-lr-xs padding-tb" @click="confirm2DelAddress(item)"></view>
 				</view>
 			</view>
 		</view>
 		<!-- 底部新增地址按钮 -->
 		<view class="cu-bar tabbar border shop fixed-bottom-bar bg-back">
-			<button class="cu-btn bg-main-color long-btn margin-lr-sm shadow-blur" @click="addEditAddress">新增地址</button>
+			<button class="cu-btn bg-main-color long-btn margin-lr-sm shadow-blur" @click="addEditAddress(null)">新增地址</button>
 		</view>
 		<!-- 模态框 -->
-		<view class="cu-modal" :class="modalName=='delAddress'?'show':''">
-			<view class="cu-dialog">
-				<view class="padding-xl">
-					是否删除该地址？
-				</view>
-				<view class="cu-bar bg-white">
-					<view class="action margin-0 flex-sub text-black" @tap="hideModal">取消</view>
-					<view class="action margin-0 flex-sub text-main-color solid-left" @tap="hideModal"
-						@click="delAddress">确定</view>
-				</view>
-			</view>
-		</view>
-		<confirm-modal ref="confirmModal" :content="'是否确定删除？'" :confirm="delAddress.bind(this, 1)"></confirm-modal>
+		<confirm-modal ref="confirmModal" :content="'是否确定删除？'"></confirm-modal>
 	</view>
 </template>
 
@@ -54,7 +43,6 @@
 				myAddressList: [],
 				modalName: '',
 				delAddressInfo: {},
-				delAddressIndex: 0,
 				chooseMode: false
 			}
 		},
@@ -62,15 +50,21 @@
 			if (Boolean(options)) {
 				this.chooseMode = options.chooseMode === 'true' ? true : false;
 			}
-			this.loadData();
 			this.bindEvent();
 		},
+		onShow() {
+			this.loadData();
+		},
 		onUnload() {
 			this.offBindEvent();
 		},
 		methods: {
 			async loadData() {
-				this.myAddressList = await this.$api.data('myAddressList');
+				// this.myAddressList = await this.$api.data('myAddressList');
+				let res = await this.$request.getAddressList({
+					customerId: this.$request.getCurUserInfo().customerId
+				});
+				this.myAddressList = res.data;
 			},
 			bindEvent() {
 				uni.$on(this.$globalFun.CONFIRM, this.delAddress);
@@ -83,6 +77,16 @@
 				let params = null;
 				if (addressInfo) {
 					// 修改
+					addressInfo.area = [{
+						areaId: addressInfo.countryId,
+						areaName: addressInfo.countryName
+					}, {
+						areaId: addressInfo.provinceId,
+						areaName: addressInfo.provinceName
+					}, {
+						areaId: addressInfo.cityId,
+						areaName: addressInfo.cityName
+					}]
 					params = {
 						addressInfo: addressInfo,
 						mode: 0
@@ -97,13 +101,26 @@
 					url: '/pages/my/edit-address?params=' + encodeURIComponent(JSON.stringify(params))
 				})
 			},
-			confirm2DelAddress(addressInfo, index) {
+			confirm2DelAddress(addressInfo) {
 				this.delAddressInfo = addressInfo;
-				this.delAddressIndex = index;
 				this.$refs.confirmModal.showModal();
 			},
-			delAddress() {
-				this.myAddressList = this.myAddressList.slice(0, this.delAddressIndex).concat(this.myAddressList.slice(++this.delAddressIndex));
+			async delAddress() {
+				let res = await this.$request.delAddressList(this.delAddressInfo.customerAddressId);
+				if (res.code === 0) {
+					uni.showToast({
+						title: '删除成功',
+						icon: 'success',
+						mask: true
+					})
+					this.loadData();
+				} else {
+					uni.showToast({
+						title: '删除失败',
+						icon: 'error',
+						mask: true
+					})
+				}
 			},
 			showModal(e) {
 				this.modalName = typeof e === 'string' ? e : e.currentTarget.dataset.target
diff --git a/pages/order/order-detail.vue b/pages/order/order-detail.vue
index 1bc794d..ca5c653 100644
--- a/pages/order/order-detail.vue
+++ b/pages/order/order-detail.vue
@@ -9,14 +9,14 @@
 		<view v-if="formInfo.defaultAddress" class="bg-white">
 			<view class="padding flex justify-between align-center" @click="showAddress2Choose">
 				<view>
-					<view class="flex justify-start align-center">
-						<view class="text-gray margin-right-xs" v-for="(areaObj, index) in formInfo.defaultAddress.area">
-							{{areaObj.name}}
-						</view>
+					<view class="flex justify-start align-center">
+						<view class="text-gray margin-right-xs">{{formInfo.defaultAddress.countryName}}</view>
+						<view class="text-gray margin-right-xs">{{formInfo.defaultAddress.provinceName}}</view>
+						<view class="text-gray margin-right-xs">{{formInfo.defaultAddress.cityName}}</view>
 					</view>
 					<view class="text-lg margin-tb-sm">{{formInfo.defaultAddress.address}}</view>
 					<view class="text-gray">
-						<text class="margin-right">{{formInfo.defaultAddress.person2Contact}}</text>
+						<text class="margin-right">{{formInfo.defaultAddress.name}}</text>
 						<text>{{formInfo.defaultAddress.phone}}</text>
 					</view>
 				</view>
@@ -95,7 +95,10 @@
 			<view class="flex justify-between align-center">
 				<!-- <text class="text-black">发票信息</text>
 				<text class="text-sm text-bold cuIcon-right"></text> -->
-				<text class="text-black">是否需要发票</text>
+				<view class="basis-df">
+					<view class="text-black">是否需要发票</view>
+					<view class="text-red text-sm">需开具发票请在下面备注发票信息</view>
+				</view>
 				<radio-group @change="changeIsNeedBill">
 					<label class="radio">
 						<radio class="main-color" value="0" :checked="formInfo.isNeedBill=='0'" />
@@ -240,7 +243,7 @@
 					// customerId: curUserInfo.userId,
 					customerId: 2,
 					serverTime: this.formInfo.doorTime,
-					addressId: this.formInfo.defaultAddress.id,
+					addressId: this.formInfo.defaultAddress.customerAddressId,
 					payType: this.formInfo.payWay,
 					remark: this.formInfo.comments,
 					isNeedBill: this.formInfo.isNeedBill,
@@ -255,6 +258,16 @@
 				}
 				// 调用下单接口
 				let res = await this.$request.placeOrder(params);
+				if (res.code != 0) {
+					return;
+				} else if (this.formInfo.payWay == '1') {
+					// 上门支付则不拉起微信支付窗口，直接跳转至提示导航页面
+					uni.navigateTo({
+						url: '/pages/order/pay-result?customTip=下单成功，待上门支付'
+					})
+					return;
+				}
+				
 				try {
 					// 获取微信支付所需参数
 					let exPayParams = {
diff --git a/pages/order/pay-result.vue b/pages/order/pay-result.vue
index b422c40..03133df 100644
--- a/pages/order/pay-result.vue
+++ b/pages/order/pay-result.vue
@@ -6,7 +6,8 @@
 			<block slot="content">支付结果</block>
 		</cu-custom>
 		<view class="padding-lg margin-xl text-center">
-			<view class="text-xxl">{{payResult ? '支付成功' : '支付失败'}}</view>
+			<view class="text-xxl" v-if="customTip">{{customTip}}</view>
+			<view class="text-xxl" v-else>{{payResult ? '支付成功' : '支付失败'}}</view>
 			<view class="margin-top">
 				<view class="cu-btn bg-main-color radius text-xl shadow-blur" @click="showMyOrder">查看我的订单</view>
 			</view>
@@ -19,6 +20,7 @@
 		data() {
 			return {
 				payResult: false,
+				customTip: null,
 				servOrderTabList: [{
 					type: 'ordersWait2Pay',
 					name: '待付款'
@@ -39,14 +41,16 @@
 			}
 		},
 		onLoad(options) {
-			if (options.payResult === '0') {
-				this.payResult = true;
+			if (options.payResult) {
+				this.payResult = options.payResult === '0' ? true : false;
+			} else if (options.customTip) {
+				this.customTip = options.customTip;
 			}
 		},
 		methods: {
 			showMyOrder() {
 				let params = null;
-				if (this.payResult) {
+				if (this.payResult || this.customTip) {
 					params = {
 						orderType: this.servOrderType,
 						tabHeaderList: this.servOrderTabList,