diff --git a/src/common/util.js b/src/common/util.js
index 47b904a..af8a178 100644
--- a/src/common/util.js
+++ b/src/common/util.js
@@ -57,7 +57,13 @@ export default {
       return null
     }
 
-  }
+  },
+};
 
+export function isEmpty(val) {
+    return (
+      val === undefined ||
+      val === null ||
+      val === "undefined" ||
+      val === "")
 }
-
diff --git a/src/view/choose-community.vue b/src/view/choose-community.vue
index 4f0164b..0d9ed84 100644
--- a/src/view/choose-community.vue
+++ b/src/view/choose-community.vue
@@ -33,7 +33,7 @@
         <div class="title">
           <span class="f-ml15 f-font-14 f-text-666">附近小区</span>
         </div>
-        <div v-for="item in communityList" :key="item.housingEstateId" v-if="item.housingEstateId != estateId" class="f-flex f-flex-justify f-h60 f-ml15 f-mr15" style="border-bottom: 1px solid #f3f3f3;" @click="chooseCommunity(item)">
+        <div v-for="item in communityList" :key="item.housingEstateId"  v-if="item.housingEstateId != estateId"  class="f-flex f-flex-justify f-h60 f-ml15 f-mr15" style="border-bottom: 1px solid #f3f3f3;" @click="chooseCommunity(item)">
           <div>
             <div class="f-text-333  f-font-16">{{item.housingEstateName}}</div>
             <div class="f-text-666  f-font-12">{{item.prefixAddress}}</div>
@@ -42,7 +42,7 @@
         </div>
       </div>
       <!-- 无限加载 -->
-      <div :class="loadMoreHide ? 'load-more-hide' : 'load-more-normal'" v-infinite-scroll="fetchCommunityList" infinite-scroll-disabled="busy" infinite-scroll-distance="10">
+      <div :class="loadMoreHide ? 'load-more-hide' : 'load-more-normal'" v-infinite-scroll="fetchCommunityList" infinite-scroll-disabled="busy" infinite-scroll-distance="10" >
         <span class="load-more-tips f-flex f-flex-center" v-show="!noRecords && loadMoreTips" style="padding-top:4px">没有更多了</span>
       </div>
     </div>
@@ -52,7 +52,7 @@
   </div>
 </template>
 <script>
-import myScroll from "@/utils/scroll";
+import myScroll from '@/utils/scroll'
 import chooseCommunityApi from "../models/choose-community";
 import homeApi from "../models/home-model.js";
 import { Alert, Toast, Loading } from "vux";
@@ -97,9 +97,9 @@ export default {
       showLoading: false
     };
   },
-  beforeRouteLeave(to, from, next) {
-    from.meta.keepAlive = false;
-    next();
+   beforeRouteLeave(to, from, next) {
+    from.meta.keepAlive = false
+    next()
   },
   mixins: [myScroll],
   methods: {
@@ -172,7 +172,7 @@ export default {
       //   localStorage.setItem("cityName", list);
       this.show = false;
       this.pageNum = 1;
-      this.communityName = "";
+      this.communityName ="";
 
       this.fetchCommunityList();
     },
@@ -199,10 +199,10 @@ export default {
       this.showFlag = false;
       this.communityName = "";
       this.busy = false;
-      this.pageNum++;
-      this.loadMoreHide = false;
-      this.loadMoreTips = false;
-      this.communityList = [];
+              this.pageNum++;
+              this.loadMoreHide = false;
+              this.loadMoreTips = false;
+              this.communityList = [];
       this.fetchCommunityList();
     },
     searchByName(event) {
@@ -218,7 +218,7 @@ export default {
       }
       this.isRequesting = true;
       //this.busy = true;
-      var _this = this;
+      var _this = this
       return new Promise((resolve, reject) => {
         var params = {
           pageNo: this.pageNum,
@@ -235,7 +235,7 @@ export default {
           if (res.code == 0) {
             _this.communityList = _this.communityList.concat(res.dataList);
             if (!_this.communityList.length) _this.noRecords = true;
-
+           
             if (_this.pageSize > res.dataList.length) {
               _this.busy = true; // 已经是最后一页了，不需要再触发滚动加载了
               _this.loadMoreHide = true;
@@ -261,10 +261,7 @@ export default {
         item.districtId + "&" + item.districtName + "&" + item.merchantNo
       ];
       localStorage.setItem("cityName", addressValue.slice());
-      localStorage.setItem(
-        "estate",
-        item.housingEstateId + "&" + item.housingEstateName
-      );
+      localStorage.setItem("estate", item.housingEstateId + "&" + item.housingEstateName);
       this.estateId = item.housingEstateId;
       this.countPartner();
       this.$router.push({
diff --git a/src/view/home.vue b/src/view/home.vue
index 45fc583..f108703 100644
--- a/src/view/home.vue
+++ b/src/view/home.vue
@@ -149,6 +149,7 @@ import chooseCommunityApi from "../models/choose-community";
 import homeApi from "../models/home-model.js";
 import configs from "../configs";
 import { Alert, Toast, Loading } from "vux";
+import {isEmpty}  from "@/common/util";
 import routerFooter from "../components/nav-bottom";
 import popupPicker from "../components/popup-picker.vue";
 import Qs from "qs";
@@ -330,21 +331,54 @@ export default {
                     : "");
                 this.alertShow = true;
               } else if (data.userAddress.type == 2) {
-                this.$vux.confirm.show({
-                  title: "自动定位地址：",
-                  content:
-                    data.userAddress.cityName +
-                    (data.userAddress.districtName
-                      ? data.userAddress.districtName
-                      : ""),
-                  cancelText: "切换地址",
-                  onCancel: () => {
-                    this.chooseCommunity();
-                  },
-                  onConfirm: () => {
-                    this.defaultLocalEstate(data.estateInfo);
-                    this.getGoodsList();
-                  }
+                return new Promise((resolve, reject) => {
+                  chooseCommunityApi
+                    .getEstateList({
+                      draw: 0,
+                      lat: this.lat,
+                      lng: this.lng,
+                      num: 1
+                    })
+                    .then(res => {
+                        //获取定位地址
+                      if (res.dataList.length > 0) {
+                        var addreRes = res.dataList[0];
+                        this.$vux.confirm.show({
+                          title: "自动定位小区：",
+                          content:addreRes.housingEstateName,
+                          cancelText: "切换地址",
+                          onCancel: () => {
+                            this.chooseCommunity();
+                          },
+                          onConfirm: () => {
+                            this.defaultLocalEstate(addreRes);
+                            this.getGoodsList();
+                          }
+                        });
+                      }else{
+                          this.$vux.confirm.show({
+                          title: "自动定位地址：",
+                          content:
+                            data.userAddress.cityName +
+                            (data.userAddress.districtName
+                              ? data.userAddress.districtName
+                              : ""),
+                          confirmText: "选择小区",
+                          cancelText: "切换地址",
+                          onCancel: () => {
+                            this.chooseCommunity();
+                          },
+                          onConfirm: () => {
+                            this.defaultLocalEstate(data.estateInfo);
+                            this.chooseCommunity();
+                          }
+                        });
+                      }
+                      this.showLoading = false;
+                    })
+                    .catch(error => {
+                      this.showLoading = false;
+                    });
                 });
               } else if (data.userAddress.type == 0) {
                 this.getGoodsList();
@@ -414,14 +448,7 @@ export default {
         this.getCity();
       }
     },
-    isEmpty(val) {
-      return (
-        typeof val === undefined ||
-        val === "undefined" ||
-        val === null ||
-        val === ""
-      );
-    },
+    
     getCity() {
       let _this = this;
       var geolocation = new BMap.Geolocation();
@@ -499,21 +526,22 @@ export default {
       this.defaultCommunity = estateRes.housingEstateName
         ? estateRes.housingEstateName
         : this.defaultCommunity;
-      localStorage.setItem(
-        "estate",
-        this.estateId + "&" + this.defaultCommunity
-      );
+        if(!isEmpty(this.estateId)){
+            localStorage.setItem("estate",this.estateId + "&" + this.defaultCommunity);
+        }
+      
     }
   },
-  mounted() {
+mounted() {
     //异步加载
     // this.getdefaultAddress();
     // this.getAddress();
     // this.getLocation();
     this.getId();
     let eId = this.$route.query.estateId;
-    if (!this.isEmpty(eId)) {
-      if (!this.isEmpty(this.estateId)) {
+   
+    if (!isEmpty(eId) )  {
+      if (!isEmpty(this.estateId)) {
         this.showLoading = true;
         return new Promise((resolve, reject) => {
           chooseCommunityApi
@@ -521,7 +549,7 @@ export default {
               estateId: this.estateId ? this.estateId : ""
             })
             .then(res => {
-              if (this.isEmpty(res.response)) {
+              if (isEmpty(res.response)) {
                 //本地小区无效
                 this.estateId = eId;
                 this.getData();
@@ -535,7 +563,7 @@ export default {
                     })
                     .then(res => {
                       this.showLoading = false;
-                      if (this.isEmpty(res.response)) {
+                      if (isEmpty(res.response)) {
                         //链接小区无效
                         this.defaultLocalEstate(loclEstate);
                       } else {
@@ -543,7 +571,7 @@ export default {
                         var linkEstate = res.response;
                         this.$vux.confirm.show({
                           title: "切换小区",
-                          content:linkEstate.housingEstateName,
+                          content: linkEstate.housingEstateName,
                           confirmText: "不切换",
                           cancelText: "切换",
                           onCancel: () => {
@@ -576,7 +604,7 @@ export default {
     }
 
     var uuniqueId = this.$route.query.uniqueId;
-    if (!this.isEmpty(uuniqueId)) {
+    if (!isEmpty(uuniqueId)) {
       this.uniqueId = uuniqueId;
     }
     return new Promise((resolve, reject) => {
diff --git a/src/view/month-card.vue b/src/view/month-card.vue
index dac6f7d..c678f54 100644
--- a/src/view/month-card.vue
+++ b/src/view/month-card.vue
@@ -1,82 +1,84 @@
 <template>
-    <div class="">
-        <div class="m-slider">
-            <img src="../assets/images/slider-img.png" width="100%" height="100%" alt="">
-        </div>
+  <div class="">
+    <div class="m-slider">
+      <img src="../assets/images/slider-img.png" width="100%" height="100%" alt="">
+    </div>
 
-        <div class="month-card-title f-text-center">
-            <h4 class="">{{getData.goodsName}}</h4>
-            <p class="f-mt5">{{getData.shortDesc}}</p>
-            <p class="f-price f-mt10 f-flex justify-center">
-                <span class="s-gray f-mr15">市场价 : &nbsp;<span class="line-through">￥{{getData.originalPrice | numFilter}}</span></span>
-                <span>券后价 : </span><span class="f-font-23 s-red">￥{{getData.couponPrice | numFilter}}</span>
-            </p>
-        </div>
+    <div class="month-card-title f-text-center">
+      <h4 class="">{{getData.goodsName}}</h4>
+      <p class="f-mt5">{{getData.shortDesc}}</p>
+      <p class="f-price f-mt10 f-flex justify-center">
+        <span class="s-gray f-mr15">市场价 : &nbsp;<span class="line-through">￥{{getData.originalPrice | numFilter}}</span></span>
+        <span>券后价 : </span><span class="f-font-23 s-red">￥{{getData.couponPrice | numFilter}}</span>
+      </p>
+    </div>
 
-        <div class="month-card-area">
-            <div class="month-card f-flex" style="margin-bottom: -35px;">
-                <div class="month-card-left" style="width: 76%;">
-                    <div class="f-flex f-mt9">
-                        <div class="f-mb20 f-mr10">
-                            <p v-show="getData.type != 3" class="f-font-15" style="line-height:1;">￥</p>
-                            <!-- 定额券 -->
-                            <div v-show="getData.type == 1" class="f-bold f-font-45" style="text-shadow: 1px 1px #852B0E;">{{getData.amount | numFilter}}</div>
-                            <!-- 满减券 -->
-                            <div v-show="getData.type == 2" class="f-bold f-font-45" style="text-shadow: 1px 1px #852B0E;">{{getData.amount | numFilter}}</div>
-                            <!-- 折扣 -->
-                            <div v-show="getData.type == 3" class="f-bold f-font-45" style="text-shadow: 1px 1px #852B0E;">{{Number(getData.discount/10)}}折</div>
-
-                            <!-- 定额券 -->
-                            <p v-show="getData.type != 2" class="f-font-12 f-mt5" style="margin-left: 6px;">{{couponType[getData.type]}}</p>
-
-                            <!-- 满减券 -->
-                            <p v-show="getData.type == 2" class="f-font-12 f-mt5" style="margin-left: 6px;">满{{getData.fullAmount | numFilter}}可用</p>
-                        </div>
-                        <div class="f-mb20">
-                            <p class="new-man">{{getData.batchName}}</p>
-                            <p class="limit-buy">({{getData.goodsDesc}})</p>
-                            <p class="end-date">{{getData.invalidTimeDesc}}</p>
-                        </div>
-                    </div>
-
-                </div>
-                <div class="month-card-right justify-center" style="margin-left:10px;">
-                    <div v-show="getData.couponStatus == 0" class="f-mt-15 f-flex">
-                        <img src="../assets/images/arrow-right_03.png" width="7" height="12" alt="" class="f-mr15">
-                        <button class="get-btn" v-on:click="handleGetCoupon">点击领取</button>
-                    </div>
-                    <img v-show="getData.couponStatus > 0" src="../assets/images/get.png" width="60" height="60" alt="" class="f-mt-10">
-                </div>
-            </div>
-            <div class="f-mt10 f-text-center" v-show="getData.couponStatus > 0">
+    <div class="month-card-area">
+      <div class="month-card f-flex" style="margin-bottom: -35px;">
+        <div class="month-card-left" style="width: 76%;">
+          <div class="f-flex f-mt9">
+            <div class="f-mb20 f-mr10">
+              <p v-show="getData.type != 3" class="f-font-15" style="line-height:1;">￥</p>
+              <!-- 定额券 -->
+              <div v-show="getData.type == 1" class="f-bold f-font-45" style="text-shadow: 1px 1px #852B0E;">{{getData.amount | numFilter}}</div>
+              <!-- 满减券 -->
+              <div v-show="getData.type == 2" class="f-bold f-font-45" style="text-shadow: 1px 1px #852B0E;">{{getData.amount | numFilter}}</div>
+              <!-- 折扣 -->
+              <div v-show="getData.type == 3" class="f-bold f-font-45" style="text-shadow: 1px 1px #852B0E;">{{Number(getData.discount/10)}}折</div>
 
-                <button style="background-color:#F45252" v-show="getData.couponStatus != 30" v-on:click="handleUseCoupon" class="btn-md bg-gray s-white f-font-18">立即使用</button>
+              <!-- 定额券 -->
+              <p v-show="getData.type != 2" class="f-font-12 f-mt5" style="margin-left: 6px;">{{couponType[getData.type]}}</p>
 
-                <button v-show="getData.couponStatus == 30" v-on:click="handleUseCoupon" class="btn-md bg-gray s-white f-font-18">已使用</button>
+              <!-- 满减券 -->
+              <p v-show="getData.type == 2" class="f-font-12 f-mt5" style="margin-left: 6px;">满{{getData.fullAmount | numFilter}}可用</p>
             </div>
-            <div style="padding: 0 10px 20px;">
-                <p class="s-gray-1 f-font-11 f-mt20" style="line-height: 18px;">使用范围：{{getData.authAreaStr}}</p>
-                <p class="f-mt10 f-font-11 s-orange-2">
-                    使用流程：领券下单→关注公众号→预约服务
-                </p>
-                <div class="f-text-center">
-                    <div class="qrcode-img">
-                        <img src="../assets/images/qrcode.png" width='100%' height="100%" alt="">
-                    </div>
-                    <p class="f-font-11 f-mt5 s-black-1">预约服务请关注公众号</p>
-                </div>
+            <div class="f-mb20">
+              <p class="new-man">{{getData.batchName}}</p>
+              <p class="limit-buy">({{getData.goodsDesc}})</p>
+              <p class="end-date">{{getData.invalidTimeDesc}}</p>
             </div>
+          </div>
+
         </div>
+        <div class="month-card-right justify-center" style="margin-left:10px;">
+          <div v-show="getData.couponStatus == 0" class="f-mt-15 f-flex">
+            <img src="../assets/images/arrow-right_03.png" width="7" height="12" alt="" class="f-mr15">
+            <button class="get-btn" v-on:click="handleGetCoupon">点击领取</button>
+          </div>
+          <img v-show="getData.couponStatus > 0" src="../assets/images/get.png" width="60" height="60" alt="" class="f-mt-10">
+        </div>
+      </div>
+      <div class="f-mt10 f-text-center" v-show="getData.couponStatus > 0">
+
+        <button style="background-color:#F45252" v-show="getData.couponStatus != 30" v-on:click="handleUseCoupon" class="btn-md bg-gray s-white f-font-18">立即使用</button>
 
+        <button v-show="getData.couponStatus == 30" v-on:click="handleUseCoupon" class="btn-md bg-gray s-white f-font-18">已使用</button>
+      </div>
+      <div style="padding: 0 10px 20px;">
+        <p class="s-gray-1 f-font-11 f-mt20" style="line-height: 18px;">使用范围：{{getData.authAreaStr}}</p>
+        <p class="f-mt10 f-font-11 s-orange-2">
+          使用流程：领券下单→关注公众号→预约服务
+        </p>
+        <div class="f-text-center">
+          <div class="qrcode-img">
+            <img src="../assets/images/qrcode.png" width='100%' height="100%" alt="">
+          </div>
+          <p class="f-font-11 f-mt5 s-black-1">预约服务请关注公众号</p>
+        </div>
+      </div>
     </div>
+
+  </div>
 </template>
 
 <script>
 import couponModel from "../models/coupon-model";
 import configs from "../configs";
 import { Alert, Toast, Popup, Picker } from "vux";
-import Qs from 'qs';
+import Qs from "qs";
 import homeApi from "../models/home-model.js";
+import { isEmpty } from "@/common/util";
+import chooseCommunityApi from "../models/choose-community";
 
 var strCookie = document.cookie;
 var cookieName = "1hjz_mall_login_access_token=";
@@ -84,171 +86,224 @@ var token = strCookie.slice(cookieName.length);
 var locationUrl = configs.locationUrl;
 
 export default {
-    data() {
-        return {
-            uniqueId:this.$route.query.uniqueId,
-            loading: false,
-            getData: {},
-            couponType: {
-                "1": "定额券",
-                "2": "满减券",
-                "3": "折扣券"
-            },
-            batchNo: this.$route.query.batchNo
+  data() {
+    return {
+      uniqueId: this.$route.query.uniqueId,
+      loading: false,
+      getData: {},
+      couponType: {
+        "1": "定额券",
+        "2": "满减券",
+        "3": "折扣券"
+      },
+      batchNo: this.$route.query.batchNo
+    };
+  },
+  components: {
+    Toast,
+    Popup,
+    Picker
+  },
+  methods: {
+    // 初始化
+    handleInit() {
+      let that = this;
+
+      // 回去优惠券信息
+      couponModel.getCouponInfo(that.batchNo, token).then(function(result) {
+        //    console.log("xx",result.response);
+        that.loading = false;
+        if (result.code == 0) {
+          if (result.response.isLogin) {
+            that.sourceUser();
+          }
+          that.getData = result.response;
+        } else {
+          console.log(result.msg);
+          // alert(result.msg);
+        }
+      });
+    },
+    countExtend() {
+      return new Promise((resolve, reject) => {
+        var params = {
+          buryingPointType: 0,
+          salesmanUniqueIdentity: this.uniqueId,
+          timeStr: this.getTime(Date.now())
         };
+        homeApi.countExtend(params).then(res => {
+          resolve();
+        });
+      });
     },
-    components: {
-        Toast,
-        Popup,
-        Picker
+    getTime(time) {
+      let date = new Date(time);
+      let year = date.getFullYear();
+      let month = this.checkTime(date.getMonth() + 1);
+      let day = this.checkTime(date.getDate());
+      let str = year + "-" + month + "-" + day;
+      return str;
     },
-    methods: {
-        // 初始化
-        handleInit() {
-            
-            let that = this;
-
-            // 回去优惠券信息
-            couponModel
-                .getCouponInfo(that.batchNo, token)
-                .then(function(result) {
-                    //    console.log("xx",result.response);
-                    that.loading = false;
-                    if (result.code == 0) {
-                        if (result.response.isLogin) {
-                            that.sourceUser();
-                        }
-                        that.getData = result.response;
-                    } else {
-                        console.log(result.msg);
-                        // alert(result.msg);
-                    }
-                });
-        },
-        countExtend() {
-            return new Promise((resolve, reject) => {
-                var params = {
-                    buryingPointType: 0,
-                    salesmanUniqueIdentity: this.uniqueId,
-                    timeStr: this.getTime(Date.now())
-                };
-                homeApi.countExtend(params).then(res => {
-
-                    resolve();
-                });
-            });
-        },
-        getTime(time) {
-            let date = new Date(time);
-            let year = date.getFullYear();
-            let month = this.checkTime(date.getMonth() + 1);
-            let day = this.checkTime(date.getDate());
-            let str =
-                year + "-" + month + "-" + day;
-            return str;
-        },
-        checkTime(i) {
-            if (i < 10) {
-                i = "0" + i;
-            }
-            return i;
-        },
-        // 立即使用优惠券
-        handleUseCoupon() {
+    checkTime(i) {
+      if (i < 10) {
+        i = "0" + i;
+      }
+      return i;
+    },
+    // 立即使用优惠券
+    handleUseCoupon() {
+      window.location.href =
+        locationUrl + "/mall/web/vgoods/detail/" + this.getData.goodsNo;
+    },
+
+    // 领取优惠券
+    handleGetCoupon() {
+      let that = this;
+
+      this.loading = true;
+
+      let params = {
+        batchNo: that.batchNo
+      };
+
+      // 调用领券接口
+      couponModel.giveCoupon(params, token).then(function(result) {
+        that.loading = false;
+        console.log("信息", result);
+        if (result.code === 0 || result.code === 3) {
+          that.$vux.toast.text("领取成功!", "middle");
+          that.handleInit();
+        } else if (result.code === 666) {
+          that.$vux.toast.text("您还没登录，请先登录!", "middle");
+          setTimeout(function() {
             window.location.href =
-                locationUrl + "/mall/web/vgoods/detail/" + this.getData.goodsNo;
-        },
-
-        // 领取优惠券
-        handleGetCoupon() {
-            let that = this;
-
-            this.loading = true;
-
-            let params = {
-                batchNo: that.batchNo
-            };
-
-            // 调用领券接口
-            couponModel.giveCoupon(params, token).then(function(result) {
-                that.loading = false;
-                console.log("信息", result);
-                if (result.code === 0 || result.code === 3) {
-                    that.$vux.toast.text("领取成功!", "middle");
-                    that.handleInit();
-                } else if (result.code === 666) {
-                    that.$vux.toast.text("您还没登录，请先登录!", "middle");
-                    setTimeout(function() {
-                        window.location.href =
-                            locationUrl +
-                            "/mall/web/user/login?callback=" +
-                            encodeURIComponent(window.location.href);
-                    }, 1000);
-                } else {
-                    if (
-                        result.msg === "" ||
-                        result.msg === undefined ||
-                        result.msg == null
-                    ) {
-                        result.msg = "操作失败，请刷新重试";
-                    }
-                    alert(result.msg);
-                }
-            });
-        },
-        sourceUser() {
-            var sourceUserId = this.$route.query.sourceUserId;
-            if (sourceUserId) {
-                couponModel.sourceUser(sourceUserId).then(res => {});
-            }
+              locationUrl +
+              "/mall/web/user/login?callback=" +
+              encodeURIComponent(window.location.href);
+          }, 1000);
+        } else {
+          if (
+            result.msg === "" ||
+            result.msg === undefined ||
+            result.msg == null
+          ) {
+            result.msg = "操作失败，请刷新重试";
+          }
+          alert(result.msg);
         }
+      });
     },
-    filters: {
-        numFilter(value) {
-            // 截取当前数据到小数点后三位
-            let transformVal = Number(value / 100).toFixed(1);
-            let realVal = transformVal.substring(0, transformVal.length - 1);
-            // num.toFixed(3)获取的是字符串
-            return Number(realVal);
-        }
+    sourceUser() {
+      var sourceUserId = this.$route.query.sourceUserId;
+      if (sourceUserId) {
+        couponModel.sourceUser(sourceUserId).then(res => {});
+      }
     },
-    mounted() {
-        // let uuniqueId = Qs.parse(location.search.substring(1)).uniqueId
-        var url = location.href.split('?')[0]
-        if(this.uniqueId === undefined || this.uniqueId === null || this.uniqueId === ""){
-           this.uniqueId = ''
-        }
-        // 初始化
-        this.handleInit();
-        // console.log('uniqueId:'+this.uniqueId)
-        return new Promise((resolve, reject) => {
-                var params = {
-                    salesmanUniqueIdentity: this.uniqueId,
-                };
-                homeApi.updateUniqueId(params).then(res => {
-                    this.showLoading = false;
-                    if (res.code == 0) {
-                        this.uniqueId=this.$cookies.get('1hjz_mall_unique_id')
-                        if(this.uniqueId !== undefined && this.uniqueId !== null && this.uniqueId !== ""){
-                            this.countExtend();
-                        }
-                        this.wxShare({
-                            couponNo: this.batchNo,
-                            source: 20,
-                            url: encodeURIComponent(url)
-                            });
-                    } else {
-                        this.$vux.toast.text(res.msg, "middle");
-                    }
-                    resolve();
-                });
-            });
-        
+    defaultLocalEstate(estateRes) {
+      this.provinceId = estateRes.provinceId
+        ? estateRes.provinceId
+        : this.provinceId;
+      this.cityId = estateRes.cityId ? estateRes.cityId : this.cityId;
+      this.districtId = estateRes.districtId
+        ? estateRes.districtId
+        : this.districtId;
+      this.defaultCity = estateRes.districtName
+        ? estateRes.districtName
+        : this.defaultCity;
+      this.merchantNo = estateRes.merchantNo;
+      this.addressValue = [
+        this.provinceId + "&" + estateRes.provinceName,
+        this.cityId + "&" + estateRes.cityName,
+        this.districtId +
+          "&" +
+          estateRes.districtName +
+          "&" +
+          estateRes.merchantNo
+      ];
+      localStorage.setItem("cityName", this.addressValue.slice());
+      this.estateId = estateRes.housingEstateId
+        ? estateRes.housingEstateId
+        : this.estateId;
+      this.defaultCommunity = estateRes.housingEstateName
+        ? estateRes.housingEstateName
+        : this.defaultCommunity;
+      if (!isEmpty(this.estateId)) {
+        localStorage.setItem(
+          "estate",
+          this.estateId + "&" + this.defaultCommunity
+        );
+      }
+    }
+  },
+  filters: {
+    numFilter(value) {
+      // 截取当前数据到小数点后三位
+      let transformVal = Number(value / 100).toFixed(1);
+      let realVal = transformVal.substring(0, transformVal.length - 1);
+      // num.toFixed(3)获取的是字符串
+      return Number(realVal);
     }
+  },
+  mounted() {
+    // let uuniqueId = Qs.parse(location.search.substring(1)).uniqueId
+    var url = location.href.split("?")[0];
+    if (
+      this.uniqueId === undefined ||
+      this.uniqueId === null ||
+      this.uniqueId === ""
+    ) {
+      this.uniqueId = "";
+    }
+    let eId = this.$route.query.estateId;
+    if (!isEmpty(eId)) {
+      return new Promise((resolve, reject) => {
+        chooseCommunityApi
+          .getEstateInfo({
+            estateId: eId
+          })
+          .then(res => {
+            if (isEmpty(res.response)) {
+              this.defaultLocalEstate(res.response);
+            }
+          })
+          .catch(error => {});
+      });
+    }
+
+    // 初始化
+    this.handleInit();
+    // console.log('uniqueId:'+this.uniqueId)
+    return new Promise((resolve, reject) => {
+      var params = {
+        salesmanUniqueIdentity: this.uniqueId
+      };
+      homeApi.updateUniqueId(params).then(res => {
+        this.showLoading = false;
+        if (res.code == 0) {
+          this.uniqueId = this.$cookies.get("1hjz_mall_unique_id");
+          if (
+            this.uniqueId !== undefined &&
+            this.uniqueId !== null &&
+            this.uniqueId !== ""
+          ) {
+            this.countExtend();
+          }
+          this.wxShare({
+            couponNo: this.batchNo,
+            source: 20,
+            url: encodeURIComponent(url)
+          });
+        } else {
+          this.$vux.toast.text(res.msg, "middle");
+        }
+        resolve();
+      });
+    });
+  }
 };
 </script>
 <style>
 body {
-    background-color: #fff3e8;
+  background-color: #fff3e8;
 }
 </style>
diff --git a/src/view/order-check.vue b/src/view/order-check.vue
index 0811bb2..33aecc3 100644
--- a/src/view/order-check.vue
+++ b/src/view/order-check.vue
@@ -1,707 +1,681 @@
 <template>
-    <div class="order-check-whole">
-        <back-header :path="'/mall/web/vgoods/detail/'+goodsNo">
-            订单确认
-        </back-header>
-        <div class="top">
-            <div class="item-top">
-                <div class="item-top-left">
-                    <img src="../assets/images/order-list/address.png">
-                    <div class="item-top-address">{{info.merchantName}}</div>
-                </div>
-                <!-- <div class="item-top-state" :class="'state'+state">{{stateText}}</div> -->
-            </div>
-            <div class="goods-container">
-                <img :src="imghost+info.goodsImgUrl">
-                <div class="goods-main-container">
-                    <div class="name">{{info.goodsName}}</div>
-                    <div class="box">
-                        <div class="box-text">{{info.shortDesc}}</div>
-                        <div class="box-price">¥{{info.totalPrice?info.totalPrice/100:''}}</div>
-                    </div>
-                    <div class="tag-box">
-                        <i class="tag" v-for="item in labelList" v-if="item.labelText">{{item.labelText}}</i>
-                        <!-- <i class="tag">新人优惠</i> -->
-                    </div>
-                </div>
-            </div>
-            <div class="gift-container" v-if="info.gifts&&info.gifts.length>0">
-                <div class="gift-item" v-for="item in info.gifts">
-                    <div class="text">【赠品】</div>
-                    <div class="name">{{item.name}}</div>
-                    <div class="num">x{{item.num}}</div>
-                </div>
-            </div>
+  <div class="order-check-whole">
+    <back-header :path="'/mall/web/vgoods/detail/'+goodsNo">
+      订单确认
+    </back-header>
+    <div class="top">
+      <div class="item-top">
+        <div class="item-top-left">
+          <img src="../assets/images/order-list/address.png">
+          <div class="item-top-address">{{info.merchantName}}</div>
         </div>
-        <div class="service-area">
-            <div class="title">
-                <img src="../assets/images/order-list/location.png">
-                服务区域：
-            </div>
-            <div class="area-text">
-                {{info.serviceAreaStr}}
-            </div>
+        <!-- <div class="item-top-state" :class="'state'+state">{{stateText}}</div> -->
+      </div>
+      <div class="goods-container">
+        <img :src="imghost+info.goodsImgUrl">
+        <div class="goods-main-container">
+          <div class="name">{{info.goodsName}}</div>
+          <div class="box">
+            <div class="box-text">{{info.shortDesc}}</div>
+            <div class="box-price">¥{{info.totalPrice?info.totalPrice/100:''}}</div>
+          </div>
+          <div class="tag-box">
+            <i class="tag" v-for="item in labelList" v-if="item.labelText">{{item.labelText}}</i>
+            <!-- <i class="tag">新人优惠</i> -->
+          </div>
         </div>
-        <div class="coupon-container" @click="go()">
-            <div class="coupon-left">
-                <div class="left-box">
-                    <img src="../assets/images/order-list/coupon.png">
-                    <div class="text">
-                        优惠券：
-                    </div>
-                    <div class="name" v-if="info.primeCoupon">{{info.primeCoupon.couponName}}</div>
-                </div>
-                <div class="price" v-if="info.primeCoupon">-￥{{info.primeCoupon?info.primeCoupon.amount/100:""}}</div>
-            </div>
-            <img class="icon" src="../assets/images/order-list/arrow.png">
+      </div>
+      <div class="gift-container" v-if="info.gifts&&info.gifts.length>0">
+        <div class="gift-item" v-for="item in info.gifts">
+          <div class="text">【赠品】</div>
+          <div class="name">{{item.name}}</div>
+          <div class="num">x{{item.num}}</div>
         </div>
-        <div class="message-container">
-            <div class="title">
-                <img src="../assets/images/order-list/edit.png">
-                留言备注：
-            </div>
-            <textarea v-model="info.text" placeholder="为了更好地为您服务，请简单说明您家的格局面积与保洁史"></textarea>
-        </div>
-        <div class="pay-container">
-            <div class="text">支付方式：</div>
-            <div class="pay">
-                <img src="../assets/images/order-list/wechat.png">
-                微信支付
-            </div>
-        </div>
-        <div class="clause">
-            <div class="true-box" @click="agree=!agree">
-                <img v-show="agree" src="../assets/images/order-list/true.png">
-            </div>
-            <div @click="agree=!agree">
-                我已阅读并同意
-            </div>
-            <a class="tips" href="http://www.yihaojiazheng.cn/mall/web/agreement">
-                《一号家政服务协议书》
-            </a>
-        </div>
-        <div class="fill"></div>
-        <div class="button" role="button">
-            <div class="button-text">
-                还需支付：
-                <div class="num">¥{{price}}</div>
-            </div>
-            <button :class="{disabled:!agree}" @click="pay()">立即付款</button>
+      </div>
+    </div>
+    <div class="service-area">
+      <div class="title">
+        <img src="../assets/images/order-list/location.png">
+        服务区域：
+      </div>
+      <div class="area-text">
+        {{info.serviceAreaStr}}
+      </div>
+    </div>
+    <div class="coupon-container" @click="go()">
+      <div class="coupon-left">
+        <div class="left-box">
+          <img src="../assets/images/order-list/coupon.png">
+          <div class="text">
+            优惠券：
+          </div>
+          <div class="name" v-if="info.primeCoupon">{{info.primeCoupon.couponName}}</div>
         </div>
+        <div class="price" v-if="info.primeCoupon">-￥{{info.primeCoupon?info.primeCoupon.amount/100:""}}</div>
+      </div>
+      <img class="icon" src="../assets/images/order-list/arrow.png">
+    </div>
+    <div class="message-container">
+      <div class="title">
+        <img src="../assets/images/order-list/edit.png">
+        留言备注：
+      </div>
+      <textarea v-model="info.text" placeholder="为了更好地为您服务，请简单说明您家的格局面积与保洁史"></textarea>
+    </div>
+    <div class="pay-container">
+      <div class="text">支付方式：</div>
+      <div class="pay">
+        <img src="../assets/images/order-list/wechat.png">
+        微信支付
+      </div>
+    </div>
+    <div class="clause">
+      <div class="true-box" @click="agree=!agree">
+        <img v-show="agree" src="../assets/images/order-list/true.png">
+      </div>
+      <div @click="agree=!agree">
+        我已阅读并同意
+      </div>
+      <a class="tips" href="http://www.yihaojiazheng.cn/mall/web/agreement">
+        《一号家政服务协议书》
+      </a>
     </div>
+    <div class="fill"></div>
+    <div class="button" role="button">
+      <div class="button-text">
+        还需支付：
+        <div class="num">¥{{price}}</div>
+      </div>
+      <button :class="{disabled:!agree}" @click="pay()">立即付款</button>
+    </div>
+  </div>
 </template>
 <script>
 import backHeader from "../components/back-header.vue";
 import orderApi from "../models/order-model.js";
 var qs = require("qs");
-import Qs from 'qs';
+import Qs from "qs";
 export default {
-    data() {
-        return {
-            info: {
-                text: ""
-            },
-            agree: false,
-            goodsNo: ""
-        };
-    },
-    components: {
-        "back-header": backHeader
-    },
-    computed: {
-        price() {
-            let price = this.info.payPrice;
-            let discount = this.info.primeCoupon
-                ? this.info.primeCoupon.amount
-                : 0;
-            return price / 100 - discount / 100;
-        },
-        labelList() {
-            let str = this.info.smallLabel;
-            return str ? JSON.parse(str) : "";
-        }
+  data() {
+    return {
+      info: {
+        text: ""
+      },
+      agree: false,
+      goodsNo: ""
+    };
+  },
+  components: {
+    "back-header": backHeader
+  },
+  computed: {
+    price() {
+      let price = this.info.payPrice;
+      let discount = this.info.primeCoupon ? this.info.primeCoupon.amount : 0;
+      return price / 100 - discount / 100;
     },
-    methods: {
-        getData() {
-            let goodsNo = this.getParam("goodsNo");
-            let couponNo = this.getParam("couponNo") || "";
-            let goodsVersion =
-                this.getParam("goodsVersion") ||
-                sessionStorage.getItem("goodsVersion");
-            orderApi
-                .checkOrder(
-                    qs.stringify({
-                        goodsNo: goodsNo,
-                        couponNo: couponNo,
-                        goodsVersion: goodsVersion
-                    })
-                )
-                .then(res => {
-                    if (res.code == 0) {
-                        this.agree = true;
-                        let data = res.response;
-                        this.info = data;
-                        this.wechat(data.merchantNo);
-                    } else if (res.code == 666) {
-                        this.$vux.toast.text("您还没登录，请先登录!", "middle");
-                        setTimeout(function() {
-                            window.location.href = "/mall/web/user/login";
-                        }, 2000);
-                    } else {
-                        if (
-                            res.msg == "" ||
-                            res.msg == undefined ||
-                            res.msg == null
-                        ) {
-                            res.msg = "操作失败，请刷新重试";
-                        }
-                        this.$vux.toast.text(res.msg, "middle");
-                    }
-                    this.$vux.loading.hide();
-                });
-        },
-        pay() {
-            if (!this.agree) {
-                this.$vux.toast.text(
-                    "请先勾选同意《一号家政服务协议书》",
-                    "middle"
-                );
-                return;
+    labelList() {
+      let str = this.info.smallLabel;
+      return str ? JSON.parse(str) : "";
+    }
+  },
+  methods: {
+    getData() {
+      let goodsNo = this.getParam("goodsNo");
+      let couponNo = this.getParam("couponNo") || "";
+      let goodsVersion =
+        this.getParam("goodsVersion") || sessionStorage.getItem("goodsVersion");
+      orderApi
+        .checkOrder(
+          qs.stringify({
+            goodsNo: goodsNo,
+            couponNo: couponNo,
+            goodsVersion: goodsVersion
+          })
+        )
+        .then(res => {
+          if (res.code == 0) {
+            this.agree = true;
+            let data = res.response;
+            this.info = data;
+            this.wechat(data.merchantNo);
+          } else if (res.code == 666) {
+            this.$vux.toast.text("您还没登录，请先登录!", "middle");
+            setTimeout(function() {
+              window.location.href = "/mall/web/user/login";
+            }, 2000);
+          } else {
+            if (res.msg == "" || res.msg == undefined || res.msg == null) {
+              res.msg = "操作失败，请刷新重试";
             }
-            this.addOrder().then(res => {
-                this.$vux.loading.show({
-                    text: "正在调起支付"
-                });
-                if (this.isWeixin() && res.data.payPrice > 0) {
-                    //微信内打开，直接调起微信公众号支付
-                    this.$vux.loading.hide();
-                    location.href = res.authUrl.replace(
-                        "state=2",
-                        "state=2" + "," + res.data.orderNo
-                    );
+            this.$vux.toast.text(res.msg, "middle");
+          }
+          this.$vux.loading.hide();
+        });
+    },
+    pay() {
+      if (!this.agree) {
+        this.$vux.toast.text("请先勾选同意《一号家政服务协议书》", "middle");
+        return;
+      }
+      this.addOrder().then(res => {
+        this.$vux.loading.show({
+          text: "正在调起支付"
+        });
+        if (this.isWeixin() && res.data.payPrice > 0) {
+          //微信内打开，直接调起微信公众号支付
+          this.$vux.loading.hide();
+          location.href = res.authUrl.replace(
+            "state=2",
+            "state=2" + "," + res.data.orderNo
+          );
+        } else {
+          var paymentType = res.data.payPrice > 0 ? 7 : 10;
+          orderApi
+            .payMoney(
+              qs.stringify({
+                orderNo: res.data.orderNo,
+                paymentType: paymentType
+              })
+            )
+            .then(data => {
+              this.$vux.loading.hide();
+              if (data && data.code === 0) {
+                if (paymentType === 7) {
+                  var transMessageOutput = data.response;
+                  var transInfo = transMessageOutput.weixinTransParameters;
+                  if (
+                    transInfo.prepayid !== "" &&
+                    transInfo.prepayid !== undefined &&
+                    transInfo.prepayid != null
+                  ) {
+                    window.location.href = transInfo.mwebUrl;
+                  }
                 } else {
-                    var paymentType = res.data.payPrice > 0 ? 7 : 10;
-                    orderApi
-                        .payMoney(
-                            qs.stringify({
-                                orderNo: res.data.orderNo,
-                                paymentType: paymentType
-                            })
-                        )
-                        .then(data => {
-                            this.$vux.loading.hide();
-                            if (data && data.code === 0) {
-                                if (paymentType === 7) {
-                                    var transMessageOutput = data.response;
-                                    var transInfo =
-                                        transMessageOutput.weixinTransParameters;
-                                    if (
-                                        transInfo.prepayid !== "" &&
-                                        transInfo.prepayid !== undefined &&
-                                        transInfo.prepayid != null
-                                    ) {
-                                        window.location.href =
-                                            transInfo.mwebUrl;
-                                    }
-                                } else {
-                                    setTimeout(function() {
-                                        window.location.href = "/v2/order-list";
-                                    }, 2000);
-                                }
-                            } else if (data.code === 666) {
-                                this.$vux.toast.text(
-                                    "您还没登录，请先登录!",
-                                    "middle"
-                                );
-                                setTimeout(function() {
-                                    window.location.href =
-                                        "/mall/web/user/login";
-                                }, 2000);
-                            } else {
-                                if (
-                                    data.msg === "" ||
-                                    data.msg === undefined ||
-                                    data.msg == null
-                                ) {
-                                    data.msg = "操作失败，请刷新重试";
-                                }
-                                this.$vux.toast.text(data.msg, "middle");
-                                setTimeout(function() {
-                                    window.location.href = "/v2/order-list";
-                                }, 2000);
-                            }
-                        });
+                  setTimeout(function() {
+                    window.location.href = "/v2/order-list";
+                  }, 2000);
+                }
+              } else if (data.code === 666) {
+                this.$vux.toast.text("您还没登录，请先登录!", "middle");
+                setTimeout(function() {
+                  window.location.href = "/mall/web/user/login";
+                }, 2000);
+              } else {
+                if (
+                  data.msg === "" ||
+                  data.msg === undefined ||
+                  data.msg == null
+                ) {
+                  data.msg = "操作失败，请刷新重试";
                 }
+                this.$vux.toast.text(data.msg, "middle");
+                setTimeout(function() {
+                  window.location.href = "/v2/order-list";
+                }, 2000);
+              }
             });
-        },
-        addOrder() {
-            let goodsNo = this.getParam("goodsNo");
-            let couponNo = this.info.primeCoupon
-                ? this.info.primeCoupon.couponNo
-                : "";
-            console.log(couponNo);
-            let goodsVersion =
-                this.getParam("goodsVersion") ||
-                sessionStorage.getItem("goodsVersion");
-            var estateId="";
-            let estateStr = localStorage.getItem("estate") || "";
-            if (!estateStr) {
-            } else {
-                let estateArr = estateStr.split("&");
-                estateId = estateArr[0];
+        }
+      });
+    },
+    addOrder() {
+      let goodsNo = this.getParam("goodsNo");
+      let couponNo = this.info.primeCoupon
+        ? this.info.primeCoupon.couponNo
+        : "";
+      console.log(couponNo);
+      let goodsVersion =
+        this.getParam("goodsVersion") || sessionStorage.getItem("goodsVersion");
+      var estateId = "";
+      let estateStr = localStorage.getItem("estate") || "";
+      if (!estateStr) {
+      } else {
+        let estateArr = estateStr.split("&");
+        estateId = estateArr[0];
       }
-            let promise = new Promise((resolve, reject) => {
-                orderApi
-                    .addOrder(
-                        qs.stringify({
-                            goodsNo: goodsNo,
-                            couponNo: couponNo,
-                            goodsVersion: goodsVersion,
-                            salesmanUniqueIdentity:this.$cookies.get('1hjz_mall_unique_id'),
-                            housingEstateId:estateId,
-                            remark: this.info.text
-                        })
-                    )
-                    .then(res => {
-                        if (res.code == 0) {
-                            resolve(res.response);
-                        } else if (res.code === 666) {
-                            this.$vux.toast.text(
-                                "您还没登录，请先登录!",
-                                "middle"
-                            );
-                            setTimeout(function() {
-                                window.location.href = "/mall/web/user/login";
-                            }, 2000);
-                        } else if (res.code === 200) {
-                            this.$vux.toast.text(res.msg, "middle");
-                            setTimeout(function() {
-                                window.location.href = "/mall/web/order_index";
-                            }, 2000);
-                        } else {
-                            if (
-                                res.msg === "" ||
-                                res.msg === undefined ||
-                                res.msg == null
-                            ) {
-                                res.msg = "操作失败，请刷新重试";
-                            }
-                            this.$vux.toast.text(res.msg, "middle");
-                        }
-                    });
-            });
-            return promise;
-        },
-        wechat(merchantNo) {
-            this.wxShare({
-                merchantNo: merchantNo,
-                source: 0,
-                url: encodeURIComponent(location.href),
-                shareUrl: encodeURIComponent(
-                    "http://" + location.host + "/v2/home"
-                )
-            });
-        },
-        go() {
-            let goodsVersion = this.getParam("goodsVersion") || "";
-            if (goodsVersion) {
-                sessionStorage.setItem("goodsVersion", goodsVersion);
+      let promise = new Promise((resolve, reject) => {
+        orderApi
+          .addOrder(
+            qs.stringify({
+              goodsNo: goodsNo,
+              couponNo: couponNo,
+              goodsVersion: goodsVersion,
+              salesmanUniqueIdentity: this.$cookies.get("1hjz_mall_unique_id"),
+              housingEstateId: estateId,
+              remark: this.info.text
+            })
+          )
+          .then(res => {
+            if (res.code == 0) {
+              resolve(res.response);
+            } else if (res.code === 666) {
+              this.$vux.toast.text("您还没登录，请先登录!", "middle");
+              setTimeout(function() {
+                window.location.href = "/mall/web/user/login";
+              }, 2000);
+            } else if (res.code === 200) {
+              this.$vux.toast.text(res.msg, "middle");
+              setTimeout(function() {
+                window.location.href = "/mall/web/order_index";
+              }, 2000);
+            } else {
+              if (res.msg === "" || res.msg === undefined || res.msg == null) {
+                res.msg = "操作失败，请刷新重试";
+              }
+              this.$vux.toast.text(res.msg, "middle");
             }
-            location.href =
-                "/mall/web/coupon_index?" + this.goodsNo + "&&" + goodsVersion;
-        }
+          });
+      });
+      return promise;
+    },
+    wechat(merchantNo) {
+      this.wxShare({
+        merchantNo: merchantNo,
+        source: 0,
+        url: encodeURIComponent(location.href),
+        shareUrl: encodeURIComponent("http://" + location.host + "/v2/home")
+      });
     },
-    mounted() {
-        this.getData();
-        this.goodsNo = this.getParam("goodsNo");
+    go() {
+      let goodsVersion = this.getParam("goodsVersion") || "";
+      if (goodsVersion) {
+        sessionStorage.setItem("goodsVersion", goodsVersion);
+      }
+      location.href =
+        "/mall/web/coupon_index?" + this.goodsNo + "&&" + goodsVersion;
     }
+  },
+  mounted() {
+    this.getData();
+    this.goodsNo = this.getParam("goodsNo");
+  }
 };
 </script>
 <style lang="scss" scoped>
 .top {
-    margin-bottom: 0.18rem;
+  margin-bottom: 0.18rem;
 }
 .item-top {
-    height: 0.65rem;
-    width: 100%;
-    background-color: white;
-    margin-top: 0.15rem;
-    border-bottom: 0.01rem solid #e5e5e5;
-    box-sizing: border-box;
-    font-size: 0.3rem;
+  height: 0.65rem;
+  width: 100%;
+  background-color: white;
+  margin-top: 0.15rem;
+  border-bottom: 0.01rem solid #e5e5e5;
+  box-sizing: border-box;
+  font-size: 0.3rem;
+  display: flex;
+  justify-content: space-between;
+  width: 100%;
+  padding: 0 0.36rem 0 0.3rem;
+  line-height: 1;
+  align-items: center;
+  img {
+    width: 0.34rem;
+    height: 0.28rem;
+    margin-right: 0.2rem;
+  }
+  .item-top-left {
     display: flex;
-    justify-content: space-between;
-    width: 100%;
-    padding: 0 0.36rem 0 0.3rem;
-    line-height: 1;
     align-items: center;
-    img {
-        width: 0.34rem;
-        height: 0.28rem;
-        margin-right: 0.2rem;
-    }
-    .item-top-left {
-        display: flex;
-        align-items: center;
-    }
-    .item-top-address {
-    }
-    .item-top-state {
-        color: #999;
-        font-size: 0.28rem;
-    }
-    .state0 {
-        color: #fcac21;
-    }
-    .state10 {
-        color: #00ba86;
-    }
-    .state11 {
-        color: #00ba86;
-    }
-    .state20 {
-        color: #fc4f21;
-    }
+  }
+  .item-top-address {
+  }
+  .item-top-state {
+    color: #999;
+    font-size: 0.28rem;
+  }
+  .state0 {
+    color: #fcac21;
+  }
+  .state10 {
+    color: #00ba86;
+  }
+  .state11 {
+    color: #00ba86;
+  }
+  .state20 {
+    color: #fc4f21;
+  }
 }
 .goods-container {
-    width: 100%;
-    color: #333;
-    height: 1.6rem;
-    background-color: white;
+  width: 100%;
+  color: #333;
+  height: 1.6rem;
+  background-color: white;
+  display: flex;
+  box-sizing: border-box;
+  padding: 0.16rem 0.37rem 0rem 0.22rem;
+  img {
+    width: 1.28rem;
+    height: 1.28rem;
+    margin-right: 0.33rem;
+  }
+  .goods-main-container {
+    flex-grow: 1;
     display: flex;
-    box-sizing: border-box;
-    padding: 0.16rem 0.37rem 0rem 0.22rem;
-    img {
-        width: 1.28rem;
-        height: 1.28rem;
-        margin-right: 0.33rem;
+    flex-direction: column;
+    padding-top: 0.06rem;
+    .name {
+      line-height: 1.2;
+      font-size: 0.3rem;
+      text-overflow: ellipsis;
+      overflow: hidden;
+      display: -webkit-box;
+      -webkit-box-orient: vertical;
+      -webkit-line-clamp: 1;
+      word-wrap: break-word;
+      // margin-top: 0.1rem;
+      white-space: normal;
+      word-break: break-all;
+      margin-bottom: 0.15rem;
     }
-    .goods-main-container {
-        flex-grow: 1;
-        display: flex;
-        flex-direction: column;
-        padding-top: 0.06rem;
-        .name {
-            line-height: 1.2;
-            font-size: 0.3rem;
-            text-overflow: ellipsis;
-            overflow: hidden;
-            display: -webkit-box;
-            -webkit-box-orient: vertical;
-            -webkit-line-clamp: 1;
-            word-wrap: break-word;
-            // margin-top: 0.1rem;
-            white-space: normal;
-            word-break: break-all;
-            margin-bottom: 0.15rem;
-        }
-        .box {
-            display: flex;
-            justify-content: space-between;
-            align-items: flex-end;
-            margin-bottom: 0.15rem;
-            .box-text {
-                font-size: 0.24rem;
-                line-height: 1.1;
-                text-overflow: ellipsis;
-                overflow: hidden;
-                display: -webkit-box;
-                -webkit-box-orient: vertical;
-                -webkit-line-clamp: 1;
-                word-wrap: break-word;
-                white-space: normal;
-                word-break: break-all;
-                color: #999;
-                height: 0.24rem;
-                margin-right: 0.2rem;
-            }
-            .box-price {
-                line-height: 1;
-                font-weight: 400;
-                font-size: 0.38rem;
-                color: #333;
-            }
-        }
-        .tag-box {
-            font-size: 0.2rem;
-            display: flex;
-            height: 0.3rem;
-            overflow: hidden;
-            .tag {
-                flex-shrink: 1;
-                height: 100%;
-                font-style: normal;
-                background: #ffe2c7;
-                padding: 0rem 0.1rem;
-                line-height: 0.28rem;
-                color: #ff8a1d;
-                border-radius: 0.15rem;
-                // margin-bottom: 0.1rem;
-                flex-shrink: 1;
-                overflow: hidden;
-                display: -webkit-box;
-                margin-right: 0.1rem;
-                -webkit-box-orient: vertical;
-                -webkit-line-clamp: 1;
-                line-height: 0.3rem;
-                word-wrap: break-word;
-                white-space: normal;
-                word-break: break-all;
-            }
-        }
+    .box {
+      display: flex;
+      justify-content: space-between;
+      align-items: flex-end;
+      margin-bottom: 0.15rem;
+      .box-text {
+        font-size: 0.24rem;
+        line-height: 1.1;
+        text-overflow: ellipsis;
+        overflow: hidden;
+        display: -webkit-box;
+        -webkit-box-orient: vertical;
+        -webkit-line-clamp: 1;
+        word-wrap: break-word;
+        white-space: normal;
+        word-break: break-all;
+        color: #999;
+        height: 0.24rem;
+        margin-right: 0.2rem;
+      }
+      .box-price {
+        line-height: 1;
+        font-weight: 400;
+        font-size: 0.38rem;
+        color: #333;
+      }
+    }
+    .tag-box {
+      font-size: 0.2rem;
+      display: flex;
+      height: 0.3rem;
+      overflow: hidden;
+      .tag {
+        flex-shrink: 1;
+        height: 100%;
+        font-style: normal;
+        background: #ffe2c7;
+        padding: 0rem 0.1rem;
+        line-height: 0.28rem;
+        color: #ff8a1d;
+        border-radius: 0.15rem;
+        // margin-bottom: 0.1rem;
+        flex-shrink: 1;
+        overflow: hidden;
+        display: -webkit-box;
+        margin-right: 0.1rem;
+        -webkit-box-orient: vertical;
+        -webkit-line-clamp: 1;
+        line-height: 0.3rem;
+        word-wrap: break-word;
+        white-space: normal;
+        word-break: break-all;
+      }
     }
+  }
 }
 .gift-container {
-    width: 100%;
-    box-sizing: border-box;
-    padding: 0.2rem;
-    background-color: #fff;
-    border-top: 0.01rem solid rgba(243, 243, 243, 1);
+  width: 100%;
+  box-sizing: border-box;
+  padding: 0.2rem;
+  background-color: #fff;
+  border-top: 0.01rem solid rgba(243, 243, 243, 1);
+  display: flex;
+  flex-direction: column;
+  color: #666;
+  font-size: 0.24rem;
+  .gift-item {
     display: flex;
-    flex-direction: column;
-    color: #666;
-    font-size: 0.24rem;
-    .gift-item {
-        display: flex;
-        line-height: 1.2;
-        align-items: center;
-        .text {
-            flex-shrink: 0;
-        }
-        .name {
-            text-overflow: ellipsis;
-            overflow: hidden;
-            display: -webkit-box;
-            -webkit-box-orient: vertical;
-            -webkit-line-clamp: 1;
-            word-wrap: break-word;
-            white-space: normal;
-            margin-right: 0.1rem;
-            word-break: break-all;
-        }
-        .num {
-            flex-shrink: 0;
-        }
+    line-height: 1.2;
+    align-items: center;
+    .text {
+      flex-shrink: 0;
     }
+    .name {
+      text-overflow: ellipsis;
+      overflow: hidden;
+      display: -webkit-box;
+      -webkit-box-orient: vertical;
+      -webkit-line-clamp: 1;
+      word-wrap: break-word;
+      white-space: normal;
+      margin-right: 0.1rem;
+      word-break: break-all;
+    }
+    .num {
+      flex-shrink: 0;
+    }
+  }
 }
 .service-area {
-    padding: 0.36rem 0.2rem;
-    background-color: #fff;
+  padding: 0.36rem 0.2rem;
+  background-color: #fff;
+  display: flex;
+  flex-direction: column;
+  color: #666;
+  margin-bottom: 0.1rem;
+  .title {
     display: flex;
-    flex-direction: column;
-    color: #666;
-    margin-bottom: 0.1rem;
-    .title {
-        display: flex;
-        font-size: 0.3rem;
-        align-items: center;
-        line-height: 1;
-        margin-bottom: 0.2rem;
-        font-weight: normal;
-        img {
-            width: 0.32rem;
-            height: 0.3rem;
-            margin-right: 0.08rem;
-        }
-    }
-    .area-text {
-        padding-left: 0.4rem;
-        font-size: 0.26rem;
+    font-size: 0.3rem;
+    align-items: center;
+    line-height: 1;
+    margin-bottom: 0.2rem;
+    font-weight: normal;
+    img {
+      width: 0.32rem;
+      height: 0.3rem;
+      margin-right: 0.08rem;
     }
+  }
+  .area-text {
+    padding-left: 0.4rem;
+    font-size: 0.26rem;
+  }
 }
 .coupon-container {
-    width: 100%;
-    height: 1rem;
+  width: 100%;
+  height: 1rem;
+  display: flex;
+  align-items: center;
+  padding-left: 0.2rem;
+  font-size: 0.3rem;
+  line-height: 1.1;
+  background-color: #fff;
+  box-sizing: border-box;
+  justify-content: space-between;
+  margin-bottom: 0.1rem;
+  .coupon-left {
+    flex-grow: 1;
     display: flex;
     align-items: center;
-    padding-left: 0.2rem;
-    font-size: 0.3rem;
-    line-height: 1.1;
-    background-color: #fff;
-    box-sizing: border-box;
     justify-content: space-between;
-    margin-bottom: 0.1rem;
-    .coupon-left {
-        flex-grow: 1;
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-        margin-right: 0.43rem;
-        img {
-            flex-grow: 0;
-            width: 0.32rem;
-            flex-shrink: 0;
-            height: 0.3rem;
-            margin-right: 0.08rem;
-        }
-        .text {
-            flex-grow: 0;
-            flex-shrink: 0;
-            margin-right: 0.5rem;
-        }
-        .name {
-            flex-grow: 1;
-            // flex-shrink: 1;
-            text-overflow: ellipsis;
-            overflow: hidden;
-            font-size: 0.28rem;
-            display: -webkit-box;
-            -webkit-box-orient: vertical;
-            -webkit-line-clamp: 1;
-            word-wrap: break-word;
-            white-space: normal;
-            // max-width: 3rem;
-            word-break: break-all;
-        }
-        .price {
-            color: #f42525;
-            flex-shrink: 0;
-            font-size: 0.34rem;
-        }
+    margin-right: 0.43rem;
+    img {
+      flex-grow: 0;
+      width: 0.32rem;
+      flex-shrink: 0;
+      height: 0.3rem;
+      margin-right: 0.08rem;
     }
-    .left-box {
-        display: flex;
-        align-items: center;
-        flex-grow: 1;
-        margin-right: 0.2rem;
+    .text {
+      flex-grow: 0;
+      flex-shrink: 0;
+      margin-right: 0.5rem;
     }
-    .icon {
-        width: 0.16rem;
-        margin-right: 0.37rem;
-        height: 0.27rem;
+    .name {
+      flex-grow: 1;
+      // flex-shrink: 1;
+      text-overflow: ellipsis;
+      overflow: hidden;
+      font-size: 0.28rem;
+      display: -webkit-box;
+      -webkit-box-orient: vertical;
+      -webkit-line-clamp: 1;
+      word-wrap: break-word;
+      white-space: normal;
+      // max-width: 3rem;
+      word-break: break-all;
     }
+    .price {
+      color: #f42525;
+      flex-shrink: 0;
+      font-size: 0.34rem;
+    }
+  }
+  .left-box {
+    display: flex;
+    align-items: center;
+    flex-grow: 1;
+    margin-right: 0.2rem;
+  }
+  .icon {
+    width: 0.16rem;
+    margin-right: 0.37rem;
+    height: 0.27rem;
+  }
 }
 .message-container {
-    width: 100%;
-    background-color: #fff;
-    height: 2.48rem;
-    margin-bottom: 0.1rem;
-    padding: 0.36rem 0.3rem 0 0.2rem;
-    box-sizing: border-box;
+  width: 100%;
+  background-color: #fff;
+  height: 2.48rem;
+  margin-bottom: 0.1rem;
+  padding: 0.36rem 0.3rem 0 0.2rem;
+  box-sizing: border-box;
+  display: flex;
+  flex-direction: column;
+  color: #666;
+  .title {
     display: flex;
-    flex-direction: column;
-    color: #666;
-    .title {
-        display: flex;
-        font-size: 0.3rem;
-        align-items: center;
-        line-height: 1;
-        margin-bottom: 0.17rem;
-        font-weight: normal;
-        img {
-            width: 0.32rem;
-            height: 0.3rem;
-            margin-right: 0.08rem;
-        }
-    }
-    textarea {
-        border-style: none;
-        text-shadow: none;
-        -webkit-appearance: none;
-        -webkit-user-select: text;
-        outline-color: transparent;
-        font-family: "AvantGardGothEF-Book";
-        padding-left: 0.4rem;
-        height: 1.5rem;
-        box-shadow: none;
-        outline: none;
-        outline-style: none;
-        border: none;
-        background-color: white;
-    }
-}
-.pay-container {
-    width: 100%;
-    height: 1rem;
-    box-sizing: border-box;
-    padding: 0 0.3rem 0 0.2rem;
-    background-color: white;
     font-size: 0.3rem;
-    line-height: 1;
-    justify-content: space-between;
-    margin-bottom: 0.3rem;
-    display: flex;
     align-items: center;
-    .pay {
-        display: flex;
-        align-items: center;
-        img {
-            width: 0.63rem;
-            margin-right: 0.2rem;
-            height: 0.52rem;
-        }
+    line-height: 1;
+    margin-bottom: 0.17rem;
+    font-weight: normal;
+    img {
+      width: 0.32rem;
+      height: 0.3rem;
+      margin-right: 0.08rem;
     }
+  }
+  textarea {
+    border-style: none;
+    text-shadow: none;
+    -webkit-appearance: none;
+    -webkit-user-select: text;
+    outline-color: transparent;
+    font-family: "AvantGardGothEF-Book";
+    padding-left: 0.4rem;
+    height: 1.5rem;
+    box-shadow: none;
+    outline: none;
+    outline-style: none;
+    border: none;
+    background-color: white;
+  }
 }
-.clause {
-    // width: 100%;
-    padding-left: 0.36rem;
+.pay-container {
+  width: 100%;
+  height: 1rem;
+  box-sizing: border-box;
+  padding: 0 0.3rem 0 0.2rem;
+  background-color: white;
+  font-size: 0.3rem;
+  line-height: 1;
+  justify-content: space-between;
+  margin-bottom: 0.3rem;
+  display: flex;
+  align-items: center;
+  .pay {
     display: flex;
-    font-size: 0.28rem;
     align-items: center;
-    margin-bottom: 0.66rem;
-    line-height: 1;
-    .true-box {
-        width: 0.23rem;
-        height: 0.23rem;
-        margin-right: 0.11rem;
-        border: 0.02rem solid #d0d0d0;
-        border-radius: 0.03rem;
-        position: relative;
-        z-index: 1;
-    }
     img {
-        position: absolute;
-        left: 0;
-        // right: 0;
-        width: 0.31rem;
-        bottom: 0;
-        z-index: 2;
-        // width: 0.29rem;
-        // height: 0.23rem;
-    }
-    .tips {
-        color: #00ba86;
+      width: 0.63rem;
+      margin-right: 0.2rem;
+      height: 0.52rem;
     }
+  }
+}
+.clause {
+  // width: 100%;
+  padding-left: 0.36rem;
+  display: flex;
+  font-size: 0.28rem;
+  align-items: center;
+  margin-bottom: 0.66rem;
+  line-height: 1;
+  .true-box {
+    width: 0.23rem;
+    height: 0.23rem;
+    margin-right: 0.11rem;
+    border: 0.02rem solid #d0d0d0;
+    border-radius: 0.03rem;
+    position: relative;
+    z-index: 1;
+  }
+  img {
+    position: absolute;
+    left: 0;
+    // right: 0;
+    width: 0.31rem;
+    bottom: 0;
+    z-index: 2;
+    // width: 0.29rem;
+    // height: 0.23rem;
+  }
+  .tips {
+    color: #00ba86;
+  }
 }
 .fill {
-    width: 100%;
-    height: 1rem;
-    background-color: rgba(247, 247, 247, 0);
+  width: 100%;
+  height: 1rem;
+  background-color: rgba(247, 247, 247, 0);
 }
 .button {
-    width: 100%;
-    height: 1rem;
+  width: 100%;
+  height: 1rem;
+  display: flex;
+  position: fixed;
+  bottom: 0;
+  z-index: 1;
+  justify-content: space-between;
+  background-color: white;
+  .button-text {
+    flex-grow: 1;
     display: flex;
-    position: fixed;
-    bottom: 0;
-    z-index: 1;
-    justify-content: space-between;
-    background-color: white;
-    .button-text {
-        flex-grow: 1;
-        display: flex;
-        font-size: 0.3rem;
-        align-items: center;
-        line-height: 1;
-        padding-left: 0.3rem;
-        color: #333;
-        .num {
-            font-size: 0.36rem;
-            color: #f42525;
-        }
-    }
-    button {
-        width: 3.5rem;
-        height: 1rem;
-        background: #00ba86;
-        color: #fff;
-        border-radius: 0px;
-        border: none;
-        color: white;
-        font-size: 0.36rem;
-    }
-    .disabled {
-        opacity: 0.6;
+    font-size: 0.3rem;
+    align-items: center;
+    line-height: 1;
+    padding-left: 0.3rem;
+    color: #333;
+    .num {
+      font-size: 0.36rem;
+      color: #f42525;
     }
+  }
+  button {
+    width: 3.5rem;
+    height: 1rem;
+    background: #00ba86;
+    color: #fff;
+    border-radius: 0px;
+    border: none;
+    color: white;
+    font-size: 0.36rem;
+  }
+  .disabled {
+    opacity: 0.6;
+  }
 }
 </style>