|
|
|
@ -101,7 +101,7 @@ |
|
|
|
|
<image :src="$picUrl+'/static/detail/address.png'" |
|
|
|
|
style="width: 46rpx;height: 46rpx;margin-right: 7rpx;margin-left: 0;"> |
|
|
|
|
</image> |
|
|
|
|
<text style="margin-right: 10rpx;">{{addressResult.city}}:{{stockValue}}</text> |
|
|
|
|
<text style="margin-right: 10rpx;">{{addressInfo.region?addressInfo.region.city:addressResult.city}}:{{stockValue}}</text> |
|
|
|
|
<u-icon name="arrow-right" color="#B7B7B7" size="22"></u-icon> |
|
|
|
|
</picker> |
|
|
|
|
</view> |
|
|
|
@ -139,7 +139,7 @@ |
|
|
|
|
</view> |
|
|
|
|
<view class="box" @click="choseAddress()"> |
|
|
|
|
<view class="address"> |
|
|
|
|
{{addressInfo.region?addressInfo.region.province +'-'+addressInfo.region.city+'-'+addressInfo.region.region:'全国'}} |
|
|
|
|
{{addressInfo.region?(addressInfo.region.province +'-'+addressInfo.region.city+'-'+addressInfo.region.region):(addressResult?addressResult.province +'-'+addressResult.city+'-'+addressResult.district:'全国')}} |
|
|
|
|
</view> |
|
|
|
|
<u-icon name="arrow-right" color="#B7B7B7"></u-icon> |
|
|
|
|
</view> |
|
|
|
@ -572,9 +572,9 @@ |
|
|
|
|
goods_id: this.goodsId, |
|
|
|
|
num: this.selectNum |
|
|
|
|
}], |
|
|
|
|
province: this.addressResult ? this.addressResult.province : '江苏省', |
|
|
|
|
city: this.addressResult ? this.addressResult.city : '南京市', |
|
|
|
|
district: this.addressResult ? this.addressResult.district : '玄武区' |
|
|
|
|
province: this.addressInfo.region?this.addressInfo.region.province:(this.addressResult ? this.addressResult.province : '江苏省'), |
|
|
|
|
city: this.addressInfo.region?this.addressInfo.region.city:(this.addressResult ? this.addressResult.city : '南京市'), |
|
|
|
|
district: this.addressInfo.region?this.addressInfo.region.region:(this.addressResult ? this.addressResult.district : '玄武区') |
|
|
|
|
} |
|
|
|
|
let { |
|
|
|
|
status, |
|
|
|
@ -815,7 +815,6 @@ |
|
|
|
|
}, |
|
|
|
|
//获取收货地址 |
|
|
|
|
getDefaultAddress() { |
|
|
|
|
console.log('5855555') |
|
|
|
|
const that = this |
|
|
|
|
return new Promise((resolve, reject) => { |
|
|
|
|
address.defaultId().then(res => { |
|
|
|
@ -823,9 +822,12 @@ |
|
|
|
|
for (var i = 0; i < that.addressList.length; i++) { |
|
|
|
|
if (res.data.defaultId == that.addressList[i].address_id) { |
|
|
|
|
that.addressInfo = that.addressList[i]; |
|
|
|
|
console.log(that.addressInfo, '获取地址') |
|
|
|
|
console.log('kkkkkkkkk') |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
if(that.addressInfo){ |
|
|
|
|
that.getGoodsStockInfor() |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
}) |
|
|
|
|
.catch() |
|
|
|
|