From bfc5e77446dbe9d3b7a86ac86facaac26be41751 Mon Sep 17 00:00:00 2001
From: aihe <961836564@qq.com>
Date: Tue, 11 Jun 2024 18:54:43 +0800
Subject: [PATCH] uu

---
 .../bpe-addressinfo-tmp.vue                   | 35 +++++---
 .../bpe-addressjiami-tmp.vue                  | 84 ++-----------------
 2 files changed, 28 insertions(+), 91 deletions(-)

diff --git a/components/buns-post-edit-templates/bpe-addressinfo-tmp.vue b/components/buns-post-edit-templates/bpe-addressinfo-tmp.vue
index cfa920f..1462897 100644
--- a/components/buns-post-edit-templates/bpe-addressinfo-tmp.vue
+++ b/components/buns-post-edit-templates/bpe-addressinfo-tmp.vue
@@ -1,11 +1,11 @@
 <template>
 	<view>
-		<u-row @click="handleAddressChoose(1)" custom-style="position:relative;" align="top"
-			justify="between">
-			<view>
+		<u-row @click="handleAddressChoose(1)" custom-style="position:relative;gap:30rpx;" align="top"
+			>
+			<view style="flex-shrink:0;">
 				<image style="height: 50rpx;width: 42rpx;" :src="getCdnUrl(`post/ji.png`)"></image>
 			</view>
-			<view style="width: 420rpx;padding: 0 30rpx;">
+			<view style="flex: 1;flex-shrink:1;overflow: auto;">
 				<view>
 					<view v-if="modelInfo.sender && modelInfo.sender.name" style="word-wrap: break-word;">
 						<text class="font-weight pr-10">{{modelInfo.sender.name}}</text>
@@ -19,7 +19,7 @@
 					<u-text :text="sendDetail" size="26" color="#999"></u-text>
 				</view>
 			</view>
-			<view class="flex-column-center">
+			<view v-if="!disabled" class="flex-column-center" style="flex-shrink:0;">
 				<image style="height: 32rpx;width: 28rpx;" :src="getCdnUrl(`post/adress.png`)">
 				</image>
 				<u-text align="center" text="地址薄" size="26" :bold="true"
@@ -29,19 +29,21 @@
 				<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 @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%;">
 				<u-line custom-style="height:100%;" direction="col" dashed="true"></u-line>
 			</view>
-			<view>
+			<view style="flex-shrink:0;">
 				<image style="height: 50rpx;width: 42rpx;" :src="getCdnUrl(`post/shou.png`)">
 				</image>
 			</view>
-			<view style="width: 420rpx;padding: 0 30rpx;">
+			<view style="flex: 1;flex-shrink:1;overflow: auto;">
 				<view >
 					<view v-if="modelInfo.reciever && modelInfo.reciever.name" style="word-wrap: break-word;">
 						<text class="font-weight pr-10">{{modelInfo.reciever.name}}</text>
@@ -55,7 +57,7 @@
 					<u-text :text="recieverDetail" size="26" color="#999"></u-text>
 				</view>
 			</view>
-			<view class="flex-column-center">
+			<view v-if="!disabled" class="flex-column-center" style="flex-shrink:0;">
 				<image style="height: 32rpx;width: 28rpx;" :src="getCdnUrl(`post/adress.png`)">
 				</image>
 				<u-text align="center" text="地址薄" size="26" :bold="true"
@@ -94,6 +96,11 @@
 				default () {
 					return { }
 				}
+			},
+			disabled: {
+				default () {
+					return false
+				}
 			}
 		},
 		data() {
@@ -112,10 +119,14 @@
 	
 		methods: {
 			handleAddressChoose(type) { // 1 寄件地址 2收件地址
-				this.goto(`address/list?tab=${type}&type=choose`)
+				if(!this.disabled){
+					this.goto(`address/list?tab=${type}&type=choose`)
+				}
 			},
 			initEvent() {
-				uni.$on(pageEventNames.chooseAddress, this.chooseAddressEventBack)
+				if(!this.disabled) {
+					uni.$on(pageEventNames.chooseAddress, this.chooseAddressEventBack)
+				}
 			},
 			chooseAddressEventBack({ data, queryOption }){
 				const { tab } = queryOption
diff --git a/components/buns-post-edit-templates/bpe-addressjiami-tmp.vue b/components/buns-post-edit-templates/bpe-addressjiami-tmp.vue
index a1688e2..fbdc0d1 100644
--- a/components/buns-post-edit-templates/bpe-addressjiami-tmp.vue
+++ b/components/buns-post-edit-templates/bpe-addressjiami-tmp.vue
@@ -1,84 +1,15 @@
 <template>
-	<view>
-		<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>
+	<bpe-addressinfo-tmp :value="value" :disabled="true"></bpe-addressinfo-tmp>
 </template>
 
 <script>
 	
-	import { pageEventNames } from "@/common/enum"
-	import { getAddressDetail } from "@/common/util"
+	import BpeAddressinfoTmp from "./bpe-addressinfo-tmp"
 	
 	export default {
+		components: { BpeAddressinfoTmp },
 		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: {
 			value: {
@@ -107,11 +38,6 @@
 </script>
 
 <style scoped lang="scss">
-	.shet-cont{
-		padding: 10rpx 0 30rpx 0;
-	}
-	.jsfm-item{
-		margin-top: 30rpx;
-	}
+	
 	
 </style>
\ No newline at end of file