From d27af342aade7a0dc23533a6d21115b4961ec0b6 Mon Sep 17 00:00:00 2001
From: fengchengzhi <fengchengzhi@3ncto.com>
Date: Fri, 14 Sep 2018 22:32:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/view/home.vue | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/view/home.vue b/src/view/home.vue
index e167c2c..5cf05d1 100644
--- a/src/view/home.vue
+++ b/src/view/home.vue
@@ -20,7 +20,7 @@
 				</swiper>
 				
 			</div>
-			<div class="coupon" v-if="promotionImgList == {}">
+			<div class="coupon" v-if="promotionImgList.imgUrl">
 				<a :href="promotionImgList.linkUrl || ''"><img :src="promotionImgList.imgUrl"/></a>
 			</div>
 			<div class="new-card" v-for="item in goodsList">
@@ -168,14 +168,15 @@
 		   	//获取默认地址信息
 		   	getdefaultAddress (){
 		   		homeApi.getdefaultAddress().then(res => {
-		   		//	console.log('默认地址信息',res)
+		   			console.log('默认地址信息',res)
 		   			if ( res.code == 0 ){
 		   				if ( !res.data ){
 		   					this.show = true
+		   					this.merchantNo = 2
 		   				} else {
 		   					this.defaultCity = res.data.districtName || ''
 		   					this.districtId = res.data.districtId || ''
-		   					this.merchantNo = res.data.merchantNo || ''
+		   					this.merchantNo = res.data.merchantNo || 2
 		   					this.addressValue = []
 		   					this.addressValue.push(res.data.provinceId)
 		   					this.addressValue.push(res.data.cityId)
@@ -184,14 +185,15 @@
 		   			} else {
 		   				this.$vux.toast.text(res.msg,"middle");
 		   			}
+		   			console.log(this.merchantNo)
+		   			this.getGoodsList()
 				});
-
+				
 		   	},
 		},
 		mounted() {
 	        //异步加载
 	      	this.getdefaultAddress()
-	      	this.getGoodsList()
 	      	this.getAddress()
 		}
 	};