From 59d22e7296e290f7eb3ffb245032e6f845d74a50 Mon Sep 17 00:00:00 2001
From: aihe <961836564@qq.com>
Date: Sun, 28 Apr 2024 11:27:41 +0800
Subject: [PATCH] uu

---
 .../bpe-goodsize-tmp.vue                      | 16 ++++-
 .../bpe-goodstatic-tmp.vue                    | 58 ++++++++++++++++---
 pages/post/model.js                           | 13 +++--
 3 files changed, 72 insertions(+), 15 deletions(-)

diff --git a/components/buns-post-edit-templates/bpe-goodsize-tmp.vue b/components/buns-post-edit-templates/bpe-goodsize-tmp.vue
index fe34556..516a23b 100644
--- a/components/buns-post-edit-templates/bpe-goodsize-tmp.vue
+++ b/components/buns-post-edit-templates/bpe-goodsize-tmp.vue
@@ -12,7 +12,7 @@
 			<u-row justify="between">
 				<text class="font-28">包裹重量</text>
 				<view>
-					<tpx-input v-model:value="modelInfo.billWeight" :isWhite="true" placeholder="" suffix="cm"></tpx-input>
+					<tpx-input v-model:value="modelInfo.billWeight" :isWhite="true" placeholder="" suffix="kg"></tpx-input>
 				</view>
 			</u-row>
 		</view>
@@ -33,7 +33,7 @@
 						</u-col>
 					</u-row>
 					
-					<u-row v-if="modelInfo.totalVolume" customStyle="margin: 20rpx 0 0 0;" justify="end">{{modelInfo.totalVolume}}m³</u-row>
+					<u-row v-if="totalVolume" customStyle="margin: 20rpx 0 0 0;" justify="end">{{modelInfo.totalVolume}}m³</u-row>
 				</view>				
 			</u-row>
 		</view>
@@ -47,6 +47,18 @@
 				get(){
 					return this.value
 				}
+			},
+			totalVolume() {
+				let totalVolume = this.modelInfo.totalVolume
+				const { chang, kuan, gao } = this.modelInfo
+				if(chang && kuan && gao){
+					totalVolume = chang/100 * kuan/100 * gao/100
+				}
+				if(totalVolume && totalVolume.toFixed) {
+					totalVolume = totalVolume.toFixed(2)
+					this.modelInfo.totalVolume = totalVolume
+				}
+				return totalVolume
 			}
 		},
 		props: {
diff --git a/components/buns-post-edit-templates/bpe-goodstatic-tmp.vue b/components/buns-post-edit-templates/bpe-goodstatic-tmp.vue
index e15e91a..8bc64ea 100644
--- a/components/buns-post-edit-templates/bpe-goodstatic-tmp.vue
+++ b/components/buns-post-edit-templates/bpe-goodstatic-tmp.vue
@@ -16,16 +16,54 @@
 	<view class="">
 		<view class="font-28">
 			<u-row justify="space-between">
-				<text>总件数:<text class="font-weight">{{modelInfo.parcelQty}}</text>件</text>
-				<text>总体积:<text class="font-weight">{{modelInfo.totalVolume}}</text>m³</text>
-				<text>实际重量:<text class="font-weight">{{modelInfo.billWeight}}</text>kg</text>
+				<view class="sta-t-item">
+					<view class="">
+						<text class="font-weight">{{modelInfo.parcelQty || '-'}}</text>
+						<text class="clr-sub">件</text>
+					</view>
+					<view class="sta-lbl clr-sub">总件数</view>
+				</view>
+				<view class="sta-t-item">
+					<view class="">
+						<text class="font-weight">{{modelInfo.totalVolume || '-'}}</text>
+						<text class="clr-sub">m³</text>
+					</view>
+					<view class="sta-lbl clr-sub">总体积</view>
+				</view>
+				<view class="sta-t-item">
+					<view class="">
+						<text class="font-weight">{{modelInfo.billWeight || '-'}}</text>
+						<text class="clr-sub">kg</text>
+					</view>
+					<view class="sta-lbl clr-sub">实际重量</view>
+				</view>
 			</u-row>
 		</view>
-		<view class="font-28 mt-10">
+		<view class="font-28 mt-20">
 			<u-row justify="space-between">
-				<text>总重量:<text class="font-weight">150</text>kg</text>
-				<text>体积重量:<text class="font-weight">150</text>kg</text>
-				<text class="pl-20">结算重量:<text class="font-weight">150</text>kg</text>
+				<view class="sta-t-item">
+					<view class="">
+						<text class="font-weight">{{modelInfo.totalWeight || '-'}}</text>
+						<text class="clr-sub">kg</text>
+					</view>
+					<view class="sta-lbl clr-sub">总重量</view>
+				</view>
+				
+				<view class="sta-t-item">
+					<view class="">
+						<text class="font-weight">{{modelInfo.volumeWeight || '-'}}</text>
+						<text class="clr-sub">kg</text>
+					</view>
+					<view class="sta-lbl clr-sub">体积重量</view>
+				</view>
+				
+				<view class="sta-t-item">
+					<view class="">
+						<text class="font-weight">{{modelInfo.settlementWeight || '-'}}</text>
+						<text class="clr-sub">kg</text>
+					</view>
+					<view class="sta-lbl clr-sub">结算重量</view>
+				</view>
 			</u-row>
 		</view>
 	</view>
@@ -69,6 +107,12 @@
 </script>
 
 <style scoped lang="scss">
+	.sta-t-item{
+		text-align: center;
+	}
+	.sta-lbl{
+		margin-top: 6rpx;
+	}
 	.yditem{
 		padding: 20rpx 20rpx;
 		background-color: #F6F6F6;
diff --git a/pages/post/model.js b/pages/post/model.js
index e8d4b1c..9fa5c8b 100644
--- a/pages/post/model.js
+++ b/pages/post/model.js
@@ -53,13 +53,13 @@ export const getOrderModels = () => {
 		"customerDeliveryBeginTime": undefined,
 		"goodsType": undefined,
 		"goodsInfo": undefined,
-		"totalWeight": undefined,
-		"totalVolume": undefined,
-		"parcelQty": undefined,
-		"billWeight": undefined,
-		"volumeWeight": undefined,
+		"totalWeight": undefined, // 总重量
+		"totalVolume": undefined, // 总体积
+		"parcelQty": undefined, // 总件数
+		"billWeight": undefined, // 实际重量
+		"volumeWeight": undefined, // 体积重量
 		"currency": undefined,
-		"settlementWeight": undefined,
+		"settlementWeight": undefined, // 结算重量
 		"feeWeight": undefined,
 		"freight": undefined,
 		"blOverLong": undefined,
@@ -119,6 +119,7 @@ export const getOrderModels = () => {
 			// 	"goodsModel": "规格",
 			// 	"orderNum": "序号",
 			//  "supplier": "供应商", // 
+			//  "abnormalQty": "异常数量", // 
 			// 	"isSave": "是否保存 1-保存"
 			// }
 		],