From 22917583607018ac6aec4378fd6c3eb2e09b9784 Mon Sep 17 00:00:00 2001 From: lfs3 Date: Fri, 20 Sep 2019 22:25:39 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E5=AE=9A=E4=BD=8D?= =?UTF-8?q?=E5=BC=B9=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/view/home.vue | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/view/home.vue b/src/view/home.vue index 4a96437..b375930 100644 --- a/src/view/home.vue +++ b/src/view/home.vue @@ -475,20 +475,20 @@ export default { localStorage.setItem("longitude", location.creditLongitude); _this.lat = location.creditLatitude; _this.lng = location.creditLongitude; - alert( - "省-" + - location.creditProvince + - ";市-" + - location.creditCity + - ";区-" + - location.creditArea + - ";街道-" + - location.creditStreet + - ";lat-" + - location.creditLatitude + - ";lng-" + - location.creditLongitude - ); + // alert( + // "省-" + + // location.creditProvince + + // ";市-" + + // location.creditCity + + // ";区-" + + // location.creditArea + + // ";街道-" + + // location.creditStreet + + // ";lat-" + + // location.creditLatitude + + // ";lng-" + + // location.creditLongitude + // ); _this.getId(); _this.getAddressInfo(); } From 88e43fc35a3a40e9b47047891b58f47ece7de191 Mon Sep 17 00:00:00 2001 From: lfs3 Date: Fri, 20 Sep 2019 22:36:45 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=AE=9A=E4=BD=8D=E5=BC=B9=E6=A1=86?= =?UTF-8?q?=E5=8E=BB=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/models/wxLocation.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/models/wxLocation.js b/src/models/wxLocation.js index 492ff2c..c7a0dd9 100644 --- a/src/models/wxLocation.js +++ b/src/models/wxLocation.js @@ -64,7 +64,6 @@ Vue.prototype.wxLocation = function () { } // alert("lat:" + localStorage.getItem("latitude") + ";lng:" + localStorage.getItem("longitude")); wx.error(function (res) { - alert("wx-js初始化: " + res); resolve("定位失败") }); }); From 715c994dbbe533ebc77e64cb5b89bb59bd8ae1fc Mon Sep 17 00:00:00 2001 From: lfs3 Date: Sat, 21 Sep 2019 11:19:19 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E5=95=86=E6=88=B7=E7=BC=96=E5=8F=B7?= =?UTF-8?q?=E8=8E=B7=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/view/home.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/view/home.vue b/src/view/home.vue index b375930..f9e0ec4 100644 --- a/src/view/home.vue +++ b/src/view/home.vue @@ -402,8 +402,8 @@ export default { let districtArr = arr[2].split("&"); this.districtId = districtArr[0]; this.defaultDistrict = districtArr[1]; - // this.merchantNo = cityNameArr[2]; - this.merchantNo = 2; + this.merchantNo = arr[2].split("&")[2]; + // this.merchantNo = 2; } if (!estateStr) { } else { From 9d3ebdc10e0c5f47cc42b7e15bbb7ad9b67e5508 Mon Sep 17 00:00:00 2001 From: lfs3 Date: Sun, 22 Sep 2019 12:23:28 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=8A=B5=E5=88=86?= =?UTF-8?q?=E4=BA=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/view/month-card.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/view/month-card.vue b/src/view/month-card.vue index acd41bc..dead9d4 100644 --- a/src/view/month-card.vue +++ b/src/view/month-card.vue @@ -292,7 +292,7 @@ export default { couponNo: this.batchNo, source: 20, url: encodeURIComponent(url), - shareUrl: encodeURIComponent("http://" + location.host + "/v2/home") + shareUrl: encodeURIComponent(url) }); } else { this.$vux.toast.text(res.msg, "middle"); From b6f137b32b0d7236c860678a301b811c9659a951 Mon Sep 17 00:00:00 2001 From: lfs3 Date: Sun, 22 Sep 2019 13:36:04 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=8A=B5=E5=88=86?= =?UTF-8?q?=E4=BA=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/view/month-card.vue | 81 +++++++++++++++++------------------------ 1 file changed, 33 insertions(+), 48 deletions(-) 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 From 645ab60534aa07406d2d74ec7cd4cb09de6c5daa Mon Sep 17 00:00:00 2001 From: lfs3 Date: Sun, 22 Sep 2019 21:09:48 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E5=BE=AE=E4=BF=A1?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E5=BC=B9=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/models/wxShare.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/models/wxShare.js b/src/models/wxShare.js index e32aaf4..a912bf4 100644 --- a/src/models/wxShare.js +++ b/src/models/wxShare.js @@ -121,7 +121,7 @@ wxShareModel.getWXCheck().then(response =>{ // alert("lat:" + localStorage.getItem("latitude") + ";lng:" + localStorage.getItem("longitude")); wx.error(function (res) { console.log("--------wx") - alert("wx-js初始化: " + res); + // alert("wx-js初始化: " + res); }); }); });