diff --git a/src/view/month-card.vue b/src/view/month-card.vue index dead9d4..59670cc 100644 --- a/src/view/month-card.vue +++ b/src/view/month-card.vue @@ -198,42 +198,10 @@ export default { if (sourceUserId) { couponModel.sourceUser(sourceUserId).then(res => {}); } - }, - 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 - ); - } } + // defaultLocalEstate(estateRes) { + + // } }, filters: { numFilter(value) { @@ -255,24 +223,41 @@ export default { this.uniqueId = ""; } let eId = this.$route.query.estateId; + var that = this; if (!isEmpty(eId)) { - return new Promise((resolve, reject) => { - chooseCommunityApi - .getEstateInfo({ - estateId: eId - }) - .then(res => { - if (isEmpty(res.response)) { - this.defaultLocalEstate(res.response); - } - }) - .catch(error => {}); - }); + chooseCommunityApi + .getEstateInfo({ + estateId: eId + }) + .then(res => { + if (!isEmpty(res.response)) { + var addressValue = + estateRes.provinceId + + "&" + + estateRes.provinceName + + "," + + estateRes.cityId + + "&" + + estateRes.cityName + + "," + + estateRes.districtId + + "&" + + estateRes.districtName + + "&" + + estateRes.merchantNo; + localStorage.setItem("cityName", addressValue); + localStorage.setItem( + "estate", + estateRes.housingEstateId + "&" + estateRes.housingEstateName + ); + } + }) + .catch(error => {}); } // 初始化 + // console.log('batchNo:'+this.batchNo) this.handleInit(); - // console.log('uniqueId:'+this.uniqueId) return new Promise((resolve, reject) => { var params = { salesmanUniqueIdentity: this.uniqueId