This commit is contained in:
aihe 2024-06-11 18:11:55 +08:00
parent 0bb3b0269a
commit 146f6f27fe
2 changed files with 26 additions and 89 deletions

View File

@ -1,11 +1,11 @@
<template> <template>
<view> <view>
<u-row @click="handleAddressChoose(1)" custom-style="position:relative;" align="top" <u-row @click="handleAddressChoose(1)" custom-style="position:relative;gap:30rpx;" align="top"
justify="between"> >
<view> <view>
<image style="height: 50rpx;width: 42rpx;" :src="getCdnUrl(`post/ji.png`)"></image> <image style="height: 50rpx;width: 42rpx;" :src="getCdnUrl(`post/ji.png`)"></image>
</view> </view>
<view style="width: 420rpx;padding: 0 30rpx;"> <view style="flex-grow: 1;">
<view> <view>
<view v-if="modelInfo.sender && modelInfo.sender.name" style="word-wrap: break-word;"> <view v-if="modelInfo.sender && modelInfo.sender.name" style="word-wrap: break-word;">
<text class="font-weight pr-10">{{modelInfo.sender.name}}</text> <text class="font-weight pr-10">{{modelInfo.sender.name}}</text>
@ -19,7 +19,7 @@
<u-text :text="sendDetail" size="26" color="#999"></u-text> <u-text :text="sendDetail" size="26" color="#999"></u-text>
</view> </view>
</view> </view>
<view class="flex-column-center"> <view v-if="!disabled" class="flex-column-center">
<image style="height: 32rpx;width: 28rpx;" :src="getCdnUrl(`post/adress.png`)"> <image style="height: 32rpx;width: 28rpx;" :src="getCdnUrl(`post/adress.png`)">
</image> </image>
<u-text align="center" text="地址薄" size="26" :bold="true" <u-text align="center" text="地址薄" size="26" :bold="true"
@ -29,11 +29,13 @@
<u-line custom-style="height:100%;" direction="col" dashed="true"></u-line> <u-line custom-style="height:100%;" direction="col" dashed="true"></u-line>
</view> </view>
</u-row> </u-row>
<view style="padding-left: 76rpx;"> <view style="padding-left: 76rpx;">
<u-line margin="20rpx 0"></u-line> <u-line margin="20rpx 0"></u-line>
</view> </view>
<u-row @click="handleAddressChoose(2)" custom-style="position:relative;" align="top"
justify="between"> <u-row @click="handleAddressChoose(2)" custom-style="position:relative;gap:30rpx;" align="top"
>
<view style="position: absolute;left: 20rpx;top: -20rpx;bottom: 100%;"> <view style="position: absolute;left: 20rpx;top: -20rpx;bottom: 100%;">
<u-line custom-style="height:100%;" direction="col" dashed="true"></u-line> <u-line custom-style="height:100%;" direction="col" dashed="true"></u-line>
</view> </view>
@ -41,7 +43,7 @@
<image style="height: 50rpx;width: 42rpx;" :src="getCdnUrl(`post/shou.png`)"> <image style="height: 50rpx;width: 42rpx;" :src="getCdnUrl(`post/shou.png`)">
</image> </image>
</view> </view>
<view style="width: 420rpx;padding: 0 30rpx;"> <view style="flex-grow: 1;">
<view > <view >
<view v-if="modelInfo.reciever && modelInfo.reciever.name" style="word-wrap: break-word;"> <view v-if="modelInfo.reciever && modelInfo.reciever.name" style="word-wrap: break-word;">
<text class="font-weight pr-10">{{modelInfo.reciever.name}}</text> <text class="font-weight pr-10">{{modelInfo.reciever.name}}</text>
@ -55,7 +57,7 @@
<u-text :text="recieverDetail" size="26" color="#999"></u-text> <u-text :text="recieverDetail" size="26" color="#999"></u-text>
</view> </view>
</view> </view>
<view class="flex-column-center"> <view v-if="!disabled" class="flex-column-center">
<image style="height: 32rpx;width: 28rpx;" :src="getCdnUrl(`post/adress.png`)"> <image style="height: 32rpx;width: 28rpx;" :src="getCdnUrl(`post/adress.png`)">
</image> </image>
<u-text align="center" text="地址薄" size="26" :bold="true" <u-text align="center" text="地址薄" size="26" :bold="true"
@ -94,6 +96,11 @@
default () { default () {
return { } return { }
} }
},
disabled: {
default () {
return false
}
} }
}, },
data() { data() {
@ -112,10 +119,14 @@
methods: { methods: {
handleAddressChoose(type) { // 1 寄件地址 2收件地址 handleAddressChoose(type) { // 1 寄件地址 2收件地址
if(!this.disabled){
this.goto(`address/list?tab=${type}&type=choose`) this.goto(`address/list?tab=${type}&type=choose`)
}
}, },
initEvent() { initEvent() {
if(!this.disabled) {
uni.$on(pageEventNames.chooseAddress, this.chooseAddressEventBack) uni.$on(pageEventNames.chooseAddress, this.chooseAddressEventBack)
}
}, },
chooseAddressEventBack({ data, queryOption }){ chooseAddressEventBack({ data, queryOption }){
const { tab } = queryOption const { tab } = queryOption

View File

@ -1,84 +1,15 @@
<template> <template>
<view> <bpe-addressinfo-tmp :value="value" :disabled="true"></bpe-addressinfo-tmp>
<u-row custom-style="position:relative;" align="top"
justify="between">
<view>
<image style="height: 50rpx;width: 42rpx;" :src="getCdnUrl(`post/ji.png`)"></image>
</view>
<view style="flex: 1;padding: 0 30rpx;">
<view style="flex: 1;">
<template v-if="modelInfo.sender && modelInfo.sender.name">
<text class="font-weight pr-10">{{modelInfo.sender.name}}</text>
<text class="">{{modelInfo.sender.phone}}</text>
</template>
<template v-else>
<text class="font-weight">寄件人信息</text>
</template>
</view>
<view style="margin: 8rpx 0 0 0;">
<u-text :text="sendDetail" size="26" color="#999"></u-text>
</view>
</view>
<view style="position: absolute;left: 20rpx;bottom: -20rpx;top: 46rpx;">
<u-line custom-style="height:100%;" direction="col" dashed="true"></u-line>
</view>
</u-row>
<view style="padding-left: 76rpx;">
<u-line margin="20rpx 0"></u-line>
</view>
<u-row custom-style="position:relative;" align="top"
justify="between">
<view style="position: absolute;left: 20rpx;top: -20rpx;bottom: 100%;">
<u-line custom-style="height:100%;" direction="col" dashed="true"></u-line>
</view>
<view>
<image style="height: 50rpx;width: 42rpx;" :src="getCdnUrl(`post/shou.png`)">
</image>
</view>
<view class="pr-30 pl-30" style="flex: 1;">
<view style="flex: 1;">
<template v-if="modelInfo.reciever && modelInfo.reciever.name">
<text class="font-weight pr-10">{{modelInfo.reciever.name}}</text>
<text class="">{{modelInfo.reciever.phone}}</text>
</template>
<template v-else>
<text class="font-weight">收件人信息</text>
</template>
</view>
<view style="margin: 8rpx 0 0 0;">
<u-text :text="recieverDetail" size="26" color="#999"></u-text>
</view>
</view>
</u-row>
</view>
</template> </template>
<script> <script>
import { pageEventNames } from "@/common/enum" import BpeAddressinfoTmp from "./bpe-addressinfo-tmp"
import { getAddressDetail } from "@/common/util"
export default { export default {
components: { BpeAddressinfoTmp },
computed: { computed: {
modelInfo: {
get(){
return this.value
}
},
sendDetail: {
get(){
const { sender: item } = this.modelInfo
return getAddressDetail(item) || '请填写寄件人国家、姓名,电话'
}
},
recieverDetail: {
get(){
const { reciever: item } = this.modelInfo
return getAddressDetail(item) || '请填写收件人国家、姓名,电话'
}
},
}, },
props: { props: {
value: { value: {
@ -107,11 +38,6 @@
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
.shet-cont{
padding: 10rpx 0 30rpx 0;
}
.jsfm-item{
margin-top: 30rpx;
}
</style> </style>