From 7e048c369e05a09b201de2ab7b8d0828b9731afc Mon Sep 17 00:00:00 2001
From: aihe <961836564@qq.com>
Date: Wed, 31 Jan 2024 14:45:51 +0800
Subject: [PATCH] uu

---
 .../buns-post-edit-templates/bpe-cost-tmp.vue | 120 +++++++++---------
 .../bpe-goodsize-tmp.vue                      |  39 +-----
 components/tpx-input/tpx-input.vue            |  36 +++++-
 pages/post/openorder.vue                      |  12 +-
 4 files changed, 105 insertions(+), 102 deletions(-)

diff --git a/components/buns-post-edit-templates/bpe-cost-tmp.vue b/components/buns-post-edit-templates/bpe-cost-tmp.vue
index 82a05d0..f2bb4c6 100644
--- a/components/buns-post-edit-templates/bpe-cost-tmp.vue
+++ b/components/buns-post-edit-templates/bpe-cost-tmp.vue
@@ -1,73 +1,57 @@
 <template>
 	<view class="shet-cont">
-		<view class="jsfm-item">
-			<u-row justify="between">
-				<text class="font-28">件数</text>
-				<view>
-					<uni-number-box v-model="submitInfo.jianshu" :min="1" :max="10000"></uni-number-box>
+		<view class="jsfm-item" style="padding-top: 0;">
+			<u-row>
+				<view class="lft1 font-28">计费方式</view>
+				<view style="flex: 1;">
+					<u-radio-group v-model="submitInfo.costType"
+					    @change="groupChange"
+					  >
+					    <u-radio v-for="(item, index) in costTypeList" :label="item.title" :name="item.val" 
+							activeColor="#B12D29" size="30" labelSize="26" :custom-style="`margin-right: ${index+1<costTypeList.length?30:0}rpx;`"
+						>
+						</u-radio>
+					  </u-radio-group>
 				</view>
 			</u-row>
 		</view>
 		<view class="jsfm-item">
-			<u-row justify="between">
-				<text class="font-28">包裹重量</text>
-				<view>
-					<uni-number-box v-model="submitInfo.zhl" :min="1" :max="10000"></uni-number-box>
+			<u-row>
+				<view class="lft1 font-28">
+					<tpx-select :list="[]" v-model:value="submitInfo.kehuid" placeholder="清关费" mode="drop" :isWhite="true"></tpx-select>
+				</view>
+				<u-row custom-style="flex:1;">
+					<tpx-input v-model:value="submitInfo.ke1" :isWhite="true" custom-style="width: 120rpx;"></tpx-input>
+					<text class="font-26 pl-20 pr-10">续重</text>
+					<tpx-input v-model:value="submitInfo.xuzh" :isWhite="true" custom-style="width: 120rpx;" suffix="KG"></tpx-input>
+				</u-row>
+				<view class="delicon">
+					<u-icon name="minus-circle" size="30"></u-icon>
+				</view>
+			</u-row>
+			<view class="mt-10">运输费计算公式: </view>
+		</view>
+		
+		<view class="jsfm-item">
+			<u-row>
+				<view class="lft1 font-28">
+					<tpx-select :list="[]" v-model:value="submitInfo.kehuid" placeholder="清关费" mode="drop" :isWhite="true"></tpx-select>
+				</view>
+				<u-row custom-style="flex:1;">
+					<tpx-input v-model:value="submitInfo.fei" :isWhite="true" custom-style="" suffix="CNY"></tpx-input>					
+				</u-row>
+				<view class="delicon">
+					<u-icon name="minus-circle" size="30"></u-icon>
 				</view>
 			</u-row>
 		</view>
 		
-		<view class="jsfm-item">
-			<u-row justify="between" align="top">
-				<text class="font-28 pt-20">体积</text>
-				<view style="width: 70%;">
-					<u-row justify="between">
-						<u-col span="3.7">
-							<u-input placeholder="长" v-model="submitInfo.chang" 
-								custom-style="border:0;border-radius: 10rpx;background-color: #F6F6F6;padding: 11rpx 20rpx;" 
-								placeholder-style="color: #999; " 
-							>
-								<template #suffix>
-									<text class="font-26 clr-sub pl-10">cm</text>
-								</template>
-							</u-input>
-						</u-col>
-						<u-col span="3.7">
-							<u-input placeholder="宽" v-model="submitInfo.kuan" 
-								custom-style="border:0;border-radius: 10rpx;background-color: #F6F6F6;padding: 11rpx 20rpx;" 
-								placeholder-style="color: #999;" 
-							>
-								<template #suffix>
-									<text class="font-26 clr-sub pl-10">cm</text>
-								</template>
-							</u-input>
-						</u-col>
-						<u-col span="3.7">
-							<u-input placeholder="高" v-model="submitInfo.gao" 
-								custom-style="border:0;border-radius: 10rpx;background-color: #F6F6F6;padding: 11rpx 20rpx;" 
-								placeholder-style="color: #999; " 
-							>
-								<template #suffix>
-									<text class="font-26 clr-sub pl-10">cm</text>
-								</template>
-							</u-input>
-						</u-col>
-					</u-row>
-					
-					<u-row customStyle="margin: 20rpx 0 0 0;">
-						<u-input placeholder="" v-model="submitInfo.pingfang" 
-							custom-style="border:0;border-radius: 10rpx;background-color: #F6F6F6;padding: 11rpx 20rpx;" 
-							placeholder-style="color: #999;" 
-						>
-							<template #suffix>
-								<text class="font-26 clr-sub pl-10">m³</text>
-							</template>
-						</u-input>
-					</u-row>
-				</view>
-				
-			</u-row>
-		</view>
+		<u-row justify="center">
+			<u-button custom-style="border-radius: 16rpx;height:60rpx;font-size: 30rpx;margin-top: 30rpx;" :plain="true" type="primary">
+				<u-icon name="plus" size="30" color="#B12D29"></u-icon>
+				<text class="pl-10">增加收费项</text>
+			</u-button>
+		</u-row>
 	</view>	
 </template>
 
@@ -89,6 +73,11 @@
 		},
 		data() {
 			return {
+				costTypeList: [
+					{ title: '按重量', val: 1 },
+					{ title: '按体积', val: 2 },
+					{ title: '一口价', val: 3 },
+				]
 			}
 		},
 		created() {
@@ -109,10 +98,17 @@
 
 <style scoped lang="scss">
 	.shet-cont{
-		padding: 10rpx 0 30rpx 0;
 	}
 	.jsfm-item{
-		margin-top: 30rpx;
+		padding: 20rpx 0;
+		border-bottom: 2rpx solid #F6F6F6;
+		.lft1{
+			width: 150rpx;
+			margin-right: 10rpx;
+		}
+		.delicon{
+			padding: 16rpx 0 16rpx 20rpx;
+		}
 	}
 	
 </style>
\ No newline at end of file
diff --git a/components/buns-post-edit-templates/bpe-goodsize-tmp.vue b/components/buns-post-edit-templates/bpe-goodsize-tmp.vue
index ac692ba..616bfc3 100644
--- a/components/buns-post-edit-templates/bpe-goodsize-tmp.vue
+++ b/components/buns-post-edit-templates/bpe-goodsize-tmp.vue
@@ -23,49 +23,20 @@
 				<view style="width: 70%;">
 					<u-row justify="between">
 						<u-col span="3.7">
-							<u-input placeholder="长" v-model="submitInfo.chang" 
-								custom-style="border:0;border-radius: 10rpx;background-color: #F6F6F6;padding: 11rpx 20rpx;" 
-								placeholder-style="color: #999; " 
-							>
-								<template #suffix>
-									<text class="font-26 clr-sub pl-10">cm</text>
-								</template>
-							</u-input>
+							<tpx-input v-model:value="submitInfo.chang" :isWhite="true" placeholder="长" suffix="cm"></tpx-input>
 						</u-col>
 						<u-col span="3.7">
-							<u-input placeholder="宽" v-model="submitInfo.kuan" 
-								custom-style="border:0;border-radius: 10rpx;background-color: #F6F6F6;padding: 11rpx 20rpx;" 
-								placeholder-style="color: #999;" 
-							>
-								<template #suffix>
-									<text class="font-26 clr-sub pl-10">cm</text>
-								</template>
-							</u-input>
+							<tpx-input v-model:value="submitInfo.kuan" :isWhite="true" placeholder="宽" suffix="cm"></tpx-input>
 						</u-col>
 						<u-col span="3.7">
-							<u-input placeholder="高" v-model="submitInfo.gao" 
-								custom-style="border:0;border-radius: 10rpx;background-color: #F6F6F6;padding: 11rpx 20rpx;" 
-								placeholder-style="color: #999; " 
-							>
-								<template #suffix>
-									<text class="font-26 clr-sub pl-10">cm</text>
-								</template>
-							</u-input>
+							<tpx-input v-model:value="submitInfo.gao" :isWhite="true" placeholder="高" suffix="cm"></tpx-input>
 						</u-col>
 					</u-row>
 					
 					<u-row customStyle="margin: 20rpx 0 0 0;">
-						<u-input placeholder="" v-model="submitInfo.pingfang" 
-							custom-style="border:0;border-radius: 10rpx;background-color: #F6F6F6;padding: 11rpx 20rpx;" 
-							placeholder-style="color: #999;" 
-						>
-							<template #suffix>
-								<text class="font-26 clr-sub pl-10">m³</text>
-							</template>
-						</u-input>
+						<tpx-input v-model:value="submitInfo.pingfang" :isWhite="true" placeholder="" suffix="m³"></tpx-input>
 					</u-row>
-				</view>
-				
+				</view>				
 			</u-row>
 		</view>
 	</view>	
diff --git a/components/tpx-input/tpx-input.vue b/components/tpx-input/tpx-input.vue
index f11ef76..8f22b53 100644
--- a/components/tpx-input/tpx-input.vue
+++ b/components/tpx-input/tpx-input.vue
@@ -1,14 +1,40 @@
 <template>
-	<u-input shape="circle" :placeholder="placeholder" :modelValue="value" :clearable="true" 
-		:custom-style="`border:0;border-radius: 10rpx;background-color: #F6F6F6;padding: 11rpx 20rpx;${customStyle};`" 
-		:placeholder-style="`color: #0E0708;${placeholderStyle};` " @change="handleChange"
-	></u-input>
+	<u-input shape="circle" :placeholder="placeholder" :modelValue="value" :clearable="clearable" 
+		:custom-style="inputStyle" 
+		:placeholder-style="`color: #999;${placeholderStyle};` " @change="handleChange"
+	>
+		<template v-if="suffix" #suffix>
+			<text class="font-26 clr-sub pl-10">{{suffix}}</text>
+		</template>
+		
+	</u-input>
 </template>
 
 <script>
 	export default {
-		
+		computed: {
+			inputStyle(){
+				let sty1 = 'border:0;border-radius: 10rpx;background-color: #F6F6F6;padding: 11rpx 20rpx;'
+				this.isWhite && (sty1 += 'background-color: #fff;border: 1rpx solid #dadbde;')
+				return `${sty1};${this.customStyle};`
+			}
+		},
 		props: {
+			isWhite: {
+				default () {
+					return false
+				}
+			},
+			suffix: {
+				default () {
+					return ''
+				}
+			},
+			clearable: {
+				default () {
+					return false
+				}
+			},
 			value: {
 				default () {
 					return ''
diff --git a/pages/post/openorder.vue b/pages/post/openorder.vue
index ec46e27..e914742 100644
--- a/pages/post/openorder.vue
+++ b/pages/post/openorder.vue
@@ -249,6 +249,15 @@
 					<bpe-goodstatic-tmp v-model:value="submitParam"></bpe-goodstatic-tmp>
 				</view>
 				
+				<view class="com-section mt-30">
+					<u-row justify="space-between">
+						<text>计费信息</text>
+					</u-row>
+				</view>
+				<view class="blcok-white">
+					<bpe-cost-tmp v-model:value="submitParam"></bpe-cost-tmp>
+				</view>
+				
 			</view>
 		</template>
 		<template v-slot:footer>
@@ -279,10 +288,11 @@
 	import { goto } from "@/common/untool"
 	import BpeAddressinfoTmp from "@/components/buns-post-edit-templates/bpe-addressinfo-tmp"
 	import BpeGoodstaticTmp from "@/components/buns-post-edit-templates/bpe-goodstatic-tmp"
+	import BpeCostTmp from "@/components/buns-post-edit-templates/bpe-cost-tmp"
 	
 	
 	export default {
-		components: { BpeAddressinfoTmp, BpeGoodstaticTmp },
+		components: { BpeAddressinfoTmp, BpeGoodstaticTmp, BpeCostTmp },
 		props: {
 			// hasLeftWin: {
 			// 	type: Boolean