Fix:3299 【礼品功能】有转赠按钮,填写地址按钮会挤压变形
This commit is contained in:
@@ -16,21 +16,21 @@
|
||||
|
||||
</view>
|
||||
<view class="btn-wrap">
|
||||
<view v-if="!isReceive && card.giftProducts[0].isCurrentUser !== 1" class="address-btn v12-white-text v12-primary" @click="setAddress(0)">
|
||||
<button v-if="!isReceive && card.giftProducts[0].isCurrentUser !== 1" class="share-btn v12-white-text v12-primary" @click="setAddress(0)">
|
||||
填写地址并收下
|
||||
</view>
|
||||
</button>
|
||||
<button v-if="card.canTransfer !== 0 && !isReceive && card.giftProducts[0].isCurrentUser !== 1" open-type="share" class="share-btn v12-white v12-primary-text v12-d-flex" >
|
||||
点击转赠给好友
|
||||
<u-icon :name="webUrl + '/icon/share.png'" ></u-icon>
|
||||
</button>
|
||||
</view>
|
||||
<view v-if="isReceive || card.giftProducts[0].isCurrentUser === 1" @click="toOrder" style="z-index: 89999">
|
||||
<view v-if="!isReceive && card.giftProducts[0].isCurrentUser === 1" @click="toOrder" style="z-index: 10">
|
||||
<view class="address-btn v12-white-text v12-primary">
|
||||
您已领取礼包
|
||||
</view>
|
||||
<view class="v12-text-center v12-font-26 v12-primary-text v12-mt-3">查看礼包详情>></view>
|
||||
</view>
|
||||
<view v-if="isReceive && card.giftProducts[0].isCurrentUser === 0" @click="toHome" style="z-index: 89999">
|
||||
<view v-if="isReceive && card.giftProducts[0].isCurrentUser === 0" @click="toHome" style="z-index: 10">
|
||||
<view class="address-btn v12-white-text v12-primary">
|
||||
礼包已被领取
|
||||
</view>
|
||||
@@ -138,13 +138,12 @@ export default {
|
||||
this.$refs.addressDialog.close()
|
||||
this.$refs.AddressList.close()
|
||||
this.order = res.data.orderId
|
||||
this.$emit('receive')
|
||||
this.$emit('receive', this.order)
|
||||
}).finally(() => {
|
||||
uni.hideLoading()
|
||||
})
|
||||
},
|
||||
setAddress(flag) {
|
||||
console.log(flag);
|
||||
getAddressList().then(res => {
|
||||
if (res.data.length === 0) {
|
||||
this.$refs.addressDialog.open()
|
||||
|
||||
Reference in New Issue
Block a user