Fix:4457 【旅居商城小程序】收礼—【商品】类的填写地址弹窗需改回原来的样式
This commit is contained in:
@@ -84,6 +84,8 @@
|
|||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<giftTips ref="giftTips" :richText="giftNotice"></giftTips>
|
<giftTips ref="giftTips" :richText="giftNotice"></giftTips>
|
||||||
|
<AddressDialog ref="addressDialog" @save="getReceive"></AddressDialog>
|
||||||
|
<AddressList ref="AddressList" :addressList="address" @save="getReceive"></AddressList>
|
||||||
<GiftAddressForm
|
<GiftAddressForm
|
||||||
ref="giftAddressForm"
|
ref="giftAddressForm"
|
||||||
:show="showAddressForm"
|
:show="showAddressForm"
|
||||||
@@ -99,14 +101,18 @@
|
|||||||
<script>
|
<script>
|
||||||
import { getGiftCardSendNotice, getGiftCardReceive, receiveSojoumGroupBuyGift } from '@/api/gift'
|
import { getGiftCardSendNotice, getGiftCardReceive, receiveSojoumGroupBuyGift } from '@/api/gift'
|
||||||
import cookie from "@/utils/store/cookie";
|
import cookie from "@/utils/store/cookie";
|
||||||
import { getAddressList } from '@/api/user'
|
import { getAddressList } from '@/api/user'
|
||||||
import giftTips from './giftTips.vue'
|
import giftTips from './giftTips.vue'
|
||||||
import GiftAddressForm from './GiftAddressForm.vue'
|
import GiftAddressForm from './GiftAddressForm.vue'
|
||||||
|
import AddressDialog from './AddressDialog.vue'
|
||||||
|
import AddressList from './AddressList.vue'
|
||||||
export default {
|
export default {
|
||||||
name: 'GiftCard',
|
name: 'GiftCard',
|
||||||
components: {
|
components: {
|
||||||
giftTips,
|
giftTips,
|
||||||
GiftAddressForm
|
GiftAddressForm,
|
||||||
|
AddressDialog,
|
||||||
|
AddressList
|
||||||
},
|
},
|
||||||
props: {
|
props: {
|
||||||
isTravelGroup: {
|
isTravelGroup: {
|
||||||
@@ -129,6 +135,7 @@ export default {
|
|||||||
// 组件数据
|
// 组件数据
|
||||||
giftNotice: '',
|
giftNotice: '',
|
||||||
order: '',
|
order: '',
|
||||||
|
address: [],
|
||||||
showAddressForm: false,
|
showAddressForm: false,
|
||||||
unavailableDates: ['2025-08-13', '2025-08-14', '2025-08-15', '2025-08-16', '2025-08-17', '2025-08-18', '2025-08-19', '2025-08-20', '2025-08-21', '2025-08-22', '2025-08-23']
|
unavailableDates: ['2025-08-13', '2025-08-14', '2025-08-15', '2025-08-16', '2025-08-17', '2025-08-18', '2025-08-19', '2025-08-20', '2025-08-21', '2025-08-22', '2025-08-23']
|
||||||
}
|
}
|
||||||
@@ -140,7 +147,7 @@ export default {
|
|||||||
return gitfNum === isReceiveNum
|
return gitfNum === isReceiveNum
|
||||||
},
|
},
|
||||||
isLogin() {
|
isLogin() {
|
||||||
return !!cookie.get('login_status');
|
return !!cookie.get('login_status');
|
||||||
},
|
},
|
||||||
myGift() {
|
myGift() {
|
||||||
return this.card.giftProducts && this.card.giftProducts.filter(item => item.isCurrentUser === 1).length > 0 && this.card.giftProducts.filter(item => item.isCurrentUser === 1)[0] || this.card.giftProduct && this.card.giftProducts[0]
|
return this.card.giftProducts && this.card.giftProducts.filter(item => item.isCurrentUser === 1).length > 0 && this.card.giftProducts.filter(item => item.isCurrentUser === 1)[0] || this.card.giftProduct && this.card.giftProducts[0]
|
||||||
@@ -218,8 +225,16 @@ export default {
|
|||||||
}).finally(() => {
|
}).finally(() => {
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
setAddress() {
|
setAddress(flag) {
|
||||||
this.showAddressForm = true;
|
getAddressList().then(res => {
|
||||||
|
if (res.data.length === 0) {
|
||||||
|
this.$refs.addressDialog.open()
|
||||||
|
} else {
|
||||||
|
this.address = res.data
|
||||||
|
if(flag) return
|
||||||
|
this.$refs.AddressList.open()
|
||||||
|
}
|
||||||
|
})
|
||||||
},
|
},
|
||||||
|
|
||||||
closeAddressForm() {
|
closeAddressForm() {
|
||||||
|
|||||||
Reference in New Issue
Block a user