diff --git a/src/view/home.vue b/src/view/home.vue
index 0ae03cd..4adea5e 100644
--- a/src/view/home.vue
+++ b/src/view/home.vue
@@ -330,46 +330,42 @@ export default {
                             this.addressData = res.data.allAddress;
                             this.flag = true;
                             let data = res.data;
-                            // this.provinceId = data.userAddress.provinceId;
-                            this.cityId = data.userAddress.cityId
-                                ? data.userAddress.cityId
-                                : this.cityId;
-                            this.districtId = data.userAddress.districtId
-                                ? data.userAddress.districtId
-                                : this.districtId;
-                            this.defaultCity = data.userAddress.districtName
-                                ? data.userAddress.districtName
-                                : this.defaultCity;
-                            this.merchantNo = data.userAddress.merchantNo;
-                            if (
-                                data.userAddress.type != 1 &&
-                                data.userAddress.type != -1
-                            ) {
-                                // this.addressValue = [
-                                //     this.provinceId +
-                                //         "&" +
-                                //         data.userAddress.provinceName,
-                                //     this.cityId +
-                                //         "&" +
-                                //         data.userAddress.cityName,
-                                //     this.districtId +
-                                //         "&" +
-                                //         data.userAddress.districtName +
-                                //         "&" +
-                                //         data.userAddress.merchantNo
-                                // ];
-                                // localStorage.setItem(
-                                //     "cityName",
-                                //     this.addressValue.slice()
-                                // );
-                            }
-                            // console.log(data.userAddress)
                             if (data.userAddress.type == 1) {
                                 this.address =
                                     data.userAddress.cityName +
                                     data.userAddress.districtName;
                                 this.alertShow = true;
                             } else if (data.userAddress.type == 2) {
+                                this.provinceId = data.userAddress.provinceId
+                                    ? data.userAddress.provinceId
+                                    : this.provinceId;
+                                this.cityId = data.userAddress.cityId
+                                    ? data.userAddress.cityId
+                                    : this.cityId;
+                                this.districtId = data.userAddress.districtId
+                                    ? data.userAddress.districtId
+                                    : this.districtId;
+                                this.defaultCity = data.userAddress.districtName
+                                    ? data.userAddress.districtName
+                                    : this.defaultCity;
+                                this.merchantNo = data.userAddress.merchantNo;
+                                this.addressValue = [
+                                    this.provinceId +
+                                        "&" +
+                                        data.userAddress.provinceName,
+                                    this.cityId +
+                                        "&" +
+                                        data.userAddress.cityName,
+                                    this.districtId +
+                                        "&" +
+                                        data.userAddress.districtName +
+                                        "&" +
+                                        data.userAddress.merchantNo
+                                ];
+                                localStorage.setItem(
+                                    "cityName",
+                                    this.addressValue.slice()
+                                );
                                 this.$vux.confirm.show({
                                     title: "自动定位地址：",
                                     content: