|
|
@ -101,7 +101,8 @@ |
|
|
|
<image :src="$picUrl+'/static/detail/address.png'" |
|
|
|
<image :src="$picUrl+'/static/detail/address.png'" |
|
|
|
style="width: 46rpx;height: 46rpx;margin-right: 7rpx;margin-left: 0;"> |
|
|
|
style="width: 46rpx;height: 46rpx;margin-right: 7rpx;margin-left: 0;"> |
|
|
|
</image> |
|
|
|
</image> |
|
|
|
<text style="margin-right: 10rpx;">{{addressInfo.region?addressInfo.region.city: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> |
|
|
|
<u-icon name="arrow-right" color="#B7B7B7" size="22"></u-icon> |
|
|
|
</picker> |
|
|
|
</picker> |
|
|
|
</view> |
|
|
|
</view> |
|
|
@ -572,9 +573,12 @@ |
|
|
|
goods_id: this.goodsId, |
|
|
|
goods_id: this.goodsId, |
|
|
|
num: this.selectNum |
|
|
|
num: this.selectNum |
|
|
|
}], |
|
|
|
}], |
|
|
|
province: this.addressInfo.region?this.addressInfo.region.province:(this.addressResult ? this.addressResult.province : '江苏省'), |
|
|
|
province: this.addressInfo.region ? this.addressInfo.region.province : (this.addressResult ? |
|
|
|
city: this.addressInfo.region?this.addressInfo.region.city:(this.addressResult ? this.addressResult.city : '南京市'), |
|
|
|
this.addressResult.province : '江苏省'), |
|
|
|
district: this.addressInfo.region?this.addressInfo.region.region:(this.addressResult ? this.addressResult.district : '玄武区') |
|
|
|
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 { |
|
|
|
let { |
|
|
|
status, |
|
|
|
status, |
|
|
@ -822,11 +826,19 @@ |
|
|
|
for (var i = 0; i < that.addressList.length; i++) { |
|
|
|
for (var i = 0; i < that.addressList.length; i++) { |
|
|
|
if (res.data.defaultId == that.addressList[i].address_id) { |
|
|
|
if (res.data.defaultId == that.addressList[i].address_id) { |
|
|
|
that.addressInfo = that.addressList[i]; |
|
|
|
that.addressInfo = that.addressList[i]; |
|
|
|
console.log('kkkkkkkkk') |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
if(that.addressInfo){ |
|
|
|
if (that.addressInfo) { |
|
|
|
that.getGoodsStockInfor() |
|
|
|
this.addressResult.province = this.addressInfo.region ? this.addressInfo |
|
|
|
|
|
|
|
.region.province : (this.addressResult ? this.addressResult.province : |
|
|
|
|
|
|
|
'江苏省'); |
|
|
|
|
|
|
|
this.addressResult.city = this.addressInfo.region ? this.addressInfo.region |
|
|
|
|
|
|
|
.city : (this.addressResult ? this.addressResult.city : '南京市'); |
|
|
|
|
|
|
|
this.addressResult.district = this.addressInfo.region ? this.addressInfo |
|
|
|
|
|
|
|
.region.region : (this.addressResult ? this.addressResult.district : |
|
|
|
|
|
|
|
'江苏省'); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
that.getGoodsStockInfor(); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
}) |
|
|
|
}) |
|
|
@ -1004,7 +1016,7 @@ |
|
|
|
return; |
|
|
|
return; |
|
|
|
} |
|
|
|
} |
|
|
|
uni.navigateTo({ |
|
|
|
uni.navigateTo({ |
|
|
|
url: '/pages/member/index?type='+(this.userInfo.user_type != 30?'hy':'fx') |
|
|
|
url: '/pages/member/index?type=' + (this.userInfo.user_type != 30 ? 'hy' : 'fx') |
|
|
|
}) |
|
|
|
}) |
|
|
|
}, |
|
|
|
}, |
|
|
|
toFuwu() { |
|
|
|
toFuwu() { |
|
|
@ -1376,7 +1388,7 @@ |
|
|
|
height: 82rpx; |
|
|
|
height: 82rpx; |
|
|
|
display: flex; |
|
|
|
display: flex; |
|
|
|
align-items: center; |
|
|
|
align-items: center; |
|
|
|
margin: 20rpx 28rpx 0 28rpx; |
|
|
|
margin: 20rpx 28rpx 0 28rpx; |
|
|
|
|
|
|
|
|
|
|
|
.proMem { |
|
|
|
.proMem { |
|
|
|
width: 142rpx; |
|
|
|
width: 142rpx; |
|
|
@ -1414,6 +1426,7 @@ |
|
|
|
|
|
|
|
|
|
|
|
.goodsDetail { |
|
|
|
.goodsDetail { |
|
|
|
margin: 0 26rpx; |
|
|
|
margin: 0 26rpx; |
|
|
|
|
|
|
|
|
|
|
|
.goodsContent { |
|
|
|
.goodsContent { |
|
|
|
justify-content: space-between; |
|
|
|
justify-content: space-between; |
|
|
|
display: flex; |
|
|
|
display: flex; |
|
|
@ -1491,7 +1504,7 @@ |
|
|
|
.operaImg { |
|
|
|
.operaImg { |
|
|
|
display: flex; |
|
|
|
display: flex; |
|
|
|
align-items: center; |
|
|
|
align-items: center; |
|
|
|
|
|
|
|
|
|
|
|
image { |
|
|
|
image { |
|
|
|
width: 49rpx; |
|
|
|
width: 49rpx; |
|
|
|
height: 49rpx; |
|
|
|
height: 49rpx; |
|
|
|