合并地址页面

pages/pages_zhentou/myPage/address.vue

@@ -56,7 +56,8 @@
 								收货人：
 							</view>
 							<view class="right_item">
-								<uni-easyinput v-model="buyUser" :inputBorder="false" placeholder="请输入收货人姓名"></uni-easyinput>
+								<uni-easyinput v-model="buyUser" :inputBorder="false"
+									placeholder="请输入收货人姓名"></uni-easyinput>
 							</view>
 						</view>
 						<view class="content_item">
@@ -64,7 +65,8 @@
 								联系电话：
 							</view>
 							<view class="right_item">
-								<uni-easyinput v-model="buyPhone" :inputBorder="false" placeholder="请输入联系方式"></uni-easyinput>
+								<uni-easyinput v-model="buyPhone" :inputBorder="false"
+									placeholder="请输入联系方式"></uni-easyinput>
 							</view>
 						</view>
 						<view class="content_item">
@@ -77,8 +79,8 @@
 								<!-- <view class="right_icon" @click="changeAddress">
 								<image src="../../../static/image/icon-arrow-right.png"></image>
 							</view> -->
-								<picker class="picker_box" :range="locationArr" @change="cityChange" mode="multiSelector"
+								<picker class="picker_box" :range="locationArr" @change="cityChange"
-									@columnchange="columnchange" :value="multiIndex">
+									mode="multiSelector" @columnchange="columnchange" :value="multiIndex">
 									<view class="city_box" v-if="province !== '' && city !== ''">
 										{{province}} / {{city}} {{district ? '/' : ''}} {{district}}
 									</view>
@@ -93,7 +95,8 @@
 								详细地址：
 							</view>
 							<view class="right_item">
-								<uni-easyinput type="textarea" :inputBorder="false" autoHeight v-model="address" placeholder="请输入详细地址"></uni-easyinput>
+								<uni-easyinput type="textarea" :inputBorder="false" autoHeight v-model="address"
+									placeholder="请输入详细地址"></uni-easyinput>
 							</view>
 							<!-- <view class="right_icon" @click="handlePosition">
 								<image src="../../../static/image/position.png"></image>
@@ -318,7 +321,8 @@
 					success: (res) => {
 						if (res.confirm) {
 							uni.request({
-								url:getApp().globalData.baseUrl + '/address/delete?ids=' + this.addressId,
+								url: getApp().globalData.baseUrl + '/address/delete?ids=' + this
+									.addressId,
 								method: "POST",
 								header: {
 									'Blade-Auth': 'bearer ' + uni.getStorageSync('token')
@@ -402,9 +406,9 @@
 					var prevPage = pages[pages.length - 2]; // 上一个页面
 					console.log(pages)
 					console.log(prevPage)
-					if(prevPage.__route__ == 'pages/pages_zhentou/order/confirmOrder'){
+					if (prevPage.route == 'pages/pages_zhentou/order/confirmOrder') {
-						prevPage.__data__.changeAddress(item);
+						uni.setStorageSync('address', JSON.stringify(item))
-						uni.navigateBack()
+						uni.navigateBack();
 					}
 				}
 			},
@@ -414,7 +418,11 @@
 			},
 			// 获取地区数据
 			getData() {
-				this.locationArr = [[],[],[]]
+				this.locationArr = [
+					[],
+					[],
+					[]
+				]
 				this.allCityData.map(item => {
 					this.locationArr[0].push(item.province);
 				})
@@ -510,7 +518,8 @@
 											this.locationArr[1].push(item2.city)
 											if (item2.city == this.city) {
 												item2.areas.map(item3 => {
-													this.locationArr[2].push(item3.area)
+													this.locationArr[2]
+														.push(item3.area)
 												})
 											}
 										})
@@ -544,7 +553,8 @@
 					this.current = this.current + 1;
 					this.staus = 'loading';
 					uni.request({
-						url: getApp().globalData.baseUrl + '/address/list?id=' + this.userInfo.id + '&current=' + this
+						url: getApp().globalData.baseUrl + '/address/list?id=' + this.userInfo.id + '&current=' +
+							this
 							.current + '&size=' + this.size,
 						method: 'GET',
 						header: {
@@ -599,9 +609,11 @@
 					height: 25%;
 					display: flex;
 					align-items: center;
+
 					.no_checked_box {
 						width: 100%;
 						display: flex;
+
 						.no_checked {
 							width: 28rpx;
 							height: 28rpx;
@@ -616,6 +628,7 @@
 					.check_box {
 						width: 100%;
 						display: flex;
+
 						.checked {
 							width: 28rpx;
 							height: 28rpx;
@@ -642,6 +655,7 @@
 						font-size: 22rpx;
 						color: #D73232;
 					}
+
 					.no_default {
 						color: #B8B8B8;
 						font-size: 22rpx;
@@ -652,9 +666,11 @@
 					width: 100%;
 					height: 75%;
 					display: flex;
+
 					.top_item {
 						width: 85%;
 						margin-left: 30rpx;
+
 						.top {
 							margin-top: 30rpx;
 							display: flex;
@@ -684,6 +700,7 @@
 						}
 					}
 				}
+
 				.edit_box {
 					height: 100%;
 					display: flex;
@@ -702,6 +719,7 @@
 
 			}
 		}
+
 		.btn_box {
 			width: 100%;
 			height: 150rpx;
@@ -724,11 +742,14 @@
 				margin-top: 30rpx;
 			}
 		}
+
 		.pop_box {
 			width: 100%;
+
 			/deep/ .uni-popup {
 				width: 100%;
 			}
+
 			.popup-content {
 				width: 100%;
 				background: #fff;
@@ -765,6 +786,7 @@
 				.content_box {
 					width: 100%;
 					margin-top: 20rpx;
+
 					.content_item {
 						width: 100%;
 						padding: 30rpx 0;