From 4414d3f71f20b1d8182d07fadbbb4cb40f3c1707 Mon Sep 17 00:00:00 2001
From: aihe <961836564@qq.com>
Date: Tue, 28 May 2024 12:32:43 +0800
Subject: [PATCH] uu

---
 components/buns-post-edit-templates/bpe-cost-tmp.vue | 11 ++++++++---
 components/tpx-input/tpx-input.vue                   |  7 ++++++-
 pages/address/list.vue                               |  2 +-
 pages/post/freightCalculate.vue                      |  2 ++
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/components/buns-post-edit-templates/bpe-cost-tmp.vue b/components/buns-post-edit-templates/bpe-cost-tmp.vue
index b6c951e..efbbef5 100644
--- a/components/buns-post-edit-templates/bpe-cost-tmp.vue
+++ b/components/buns-post-edit-templates/bpe-cost-tmp.vue
@@ -45,10 +45,15 @@
 		</tpx-select>
 		
 		<view class="pt-20">
-			<u-row custom-style="flex: 1">
+			<u-row custom-style="flex: 1" justify="between">
 				<text class="font-26 pr-10">总费用</text>
-				<tpx-input v-model:value="modelInfo.freight" :isWhite="true" _digit="5"
-					custom-style="width: 120rpx;height: 46rpx;" suffix="CNY"></tpx-input>
+				<view v-if="modelInfo.calcFeeType==3">
+					<tpx-input v-model:value="modelInfo.freight" :isWhite="true" _digit="5" 
+						 inputAlign="right" custom-style="width: 460rpx;height: 46rpx;" suffix="CNY"></tpx-input>
+				</view>
+				<view v-else>
+					{{modelInfo.freight || 0}}<text class="clr-sub pl-10">CNY</text>
+				</view>
 			</u-row>
 		</view>
 		<view class="pt-20">
diff --git a/components/tpx-input/tpx-input.vue b/components/tpx-input/tpx-input.vue
index 8f3811a..160d926 100644
--- a/components/tpx-input/tpx-input.vue
+++ b/components/tpx-input/tpx-input.vue
@@ -2,7 +2,7 @@
 	<u-input shape="circle" :placeholder="placeholder" :modelValue="value" :clearable="clearable" 
 		:custom-style="inputStyle" :readonly="readonly" :type="type" :inputAlign="inputAlign"
 		:placeholder-style="`color: #999;${placeholderStyle};` " @change="handleChange"
-		:formatter="formatter"
+		:formatter="formatter" :disabled="disabled"
 	>
 		<template v-if="suffix" #suffix>
 			<text class="font-26 clr-sub pl-10">{{suffix}}</text>
@@ -51,6 +51,11 @@
 					return ''
 				}
 			},
+			disabled:{
+				default () {
+					return false
+				}
+			},
 			placeholder:{
 				default () {
 					return ''
diff --git a/pages/address/list.vue b/pages/address/list.vue
index 8bbc4d0..bf80b6a 100644
--- a/pages/address/list.vue
+++ b/pages/address/list.vue
@@ -88,7 +88,7 @@
 	const tabList = [
 		{ title: '寄件地址',  val: 1 },
 		{ title: '收件地址', val: 2 },
-		{ title: '其他', val: 3 }
+		// { title: '其他', val: 3 }
 	]
 	export default {
 		props: {
diff --git a/pages/post/freightCalculate.vue b/pages/post/freightCalculate.vue
index 18b810f..af929f4 100644
--- a/pages/post/freightCalculate.vue
+++ b/pages/post/freightCalculate.vue
@@ -260,6 +260,8 @@
 			async handleCalPost(type) {
 				let params = JSON.parse(JSON.stringify(this.submitParam));
 				params.calcFeeType = 1 // "计费类型 1-重量计费 2-体积计费"
+				this.proTypeList = []
+				this.submitParam.productType = ''
 				let res = await apiService.preCalcWaybillFee({ ...params, _loading: true })
 				this.proTypeList = res.data || []
 				if(this.proTypeList.length > 0) {