diff --git a/pages/post/detail.vue b/pages/post/detail.vue
index 457ee54..8df9cea 100644
--- a/pages/post/detail.vue
+++ b/pages/post/detail.vue
@@ -16,7 +16,7 @@
 						<u-button :plain="true" size="large" shape="circle"  custom-style="margin: 0 10rpx;height:80rpx;font-size: 30rpx;"
 						>取消
 						</u-button>
-						<u-button @click="goto(`post/openorder?copyBillCode=${queryOption.billCode}`)" type="primary" size="large" shape="circle"  custom-style="margin: 0 10rpx;height:80rpx;font-size: 30rpx;"
+						<u-button @click="goto(`post/post?copyBillCode=${queryOption.billCode}`)" type="primary" size="large" shape="circle"  custom-style="margin: 0 10rpx;height:80rpx;font-size: 30rpx;"
 						>再来一单
 						</u-button>
 					</u-row>
diff --git a/pages/post/freightCalculate.vue b/pages/post/freightCalculate.vue
index 228584a..c25a7d4 100644
--- a/pages/post/freightCalculate.vue
+++ b/pages/post/freightCalculate.vue
@@ -5,7 +5,8 @@
 				<view class="com-jianju pos-rlt pb-30" style="padding-top: 2rpx;">
 					
 					<view class="blcok-white">
-						
+						<!-- 地址选择 -->
+						<bpe-addressinfo-tmp v-model:value="submitParam" @onChange="handleAddressChange"></bpe-addressinfo-tmp>
 					</view>
 				
 					<view class="blcok-white" style="padding-top: 0;padding-bottom: 0;">
@@ -114,9 +115,11 @@
 </template>
 
 <script>
-	import getCdnUrl from "@/common/getCdnUrl"
-	import { goto } from "@/common/untool"
+
+	import BpeAddressinfoTmp from "@/components/buns-post-edit-templates/bpe-addressinfo-tmp"
+	import * as apiService from "@/common/api"
 	export default {
+		components: { BpeAddressinfoTmp },
 		props: {
 			// hasLeftWin: {
 			// 	type: Boolean
@@ -128,13 +131,8 @@
 		data() {
 			return {
 				proList: [
-					{val: 1 },{ val: 2 }
-				],
-				tipsList: [
-					{ title: '请带纸箱', val: '请带纸箱' },
-					{ title: '需要爬楼', val: '需要爬楼' },
-					{ title: '来前电话', val: '来前电话' },
 				],
+				
 				hasCalcuPost: false,
 				countryModal: {
 					show: false
@@ -146,22 +144,12 @@
 					show: false
 				},
 				submitParam: {
-					stockRoomId: '',
-					countryId: '',
-					wayId: '',
-					type: '',
-					paytype: '',
-					otherDes: '',
-					prodId: 1,
-					tips: [],
-					revtime: ''
+					
 				}
 			}
 		},
 		onShareAppMessage() {
 			return {
-				// title: '',
-				// path: 'TODO'
 			}
 		},
 		onLoad() {
@@ -174,12 +162,6 @@
 			getCdnUrl,
 
 			initData() {
-				// uni.showLoading({
-				// 	title: '加载中'
-				// });
-			},
-			handleAddressChoose(type) { // 1 寄件地址 2收件地址
-				goto(`address/list?tab=${type}&type=choose`)
 			},
 			
 			handleDialogClick(curModal){
@@ -188,9 +170,6 @@
 			handleCalPost() {
 				this.hasCalcuPost = true
 			},
-			handleGoXiaDan(){
-				goto(`post/post?id=${222}`)
-			},
 		}
 	}
 </script>
diff --git a/pages/post/locus.vue b/pages/post/locus.vue
index d399195..b9a8813 100644
--- a/pages/post/locus.vue
+++ b/pages/post/locus.vue
@@ -38,7 +38,7 @@
 							custom-style="margin: 0 10rpx;height:80rpx;font-size: 30rpx;">
 							返回
 						</u-button>
-						<u-button @click="goto(`post/openorder?copyBillCode=${queryOption.billCode}`)" type="primary" size="large" shape="circle"
+						<u-button @click="goto(`post/post?copyBillCode=${queryOption.billCode}`)" type="primary" size="large" shape="circle"
 							custom-style="margin: 0 10rpx;height:80rpx;font-size: 30rpx;">再来一单
 						</u-button>
 					</u-row>
diff --git a/pages/post/post.vue b/pages/post/post.vue
index d7ef374..44e6d48 100644
--- a/pages/post/post.vue
+++ b/pages/post/post.vue
@@ -1,300 +1,245 @@
 <template>
-	<tpx-layout>
-		<template v-slot:body>
-			<view class="com-jianju pos-rlt pb-30" style="padding-top: 2rpx;">
-				<view class="blcok" style="background-color: #0E0708;">
-					<u-row>
-						<image class="mr-20" style="height: 28rpx;width: 34rpx;"
-							:src="getCdnUrl(`post/gangbo.png`)"></image>
-						<u-text size="24" color="#fff" text="下单后会有业务员及时联系您，请保持电话畅通!"></u-text>
-					</u-row>
-				</view>
-			
-				<view class="blcok-white">
-					<view>
-						<u-row @click="handleAddressChoose(1)" 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;">
-								<u-text text="寄件人信息" size="28" :bold="true"></u-text>
-								<view style="margin: 8rpx 0 0 0;">
-									<u-text text="请新建您的寄件地址信息" size="26" color="#999"></u-text>
-								</view>
-							</view>
-							<view class="flex-column-center">
-								<image style="height: 32rpx;width: 28rpx;" :src="getCdnUrl(`post/adress.png`)">
-								</image>
-								<u-text align="center" text="地址薄" size="26" :bold="true"
-									margin="8rpx 0 0 0"></u-text>
-							</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 @click="handleAddressChoose(2)" 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;">
-								<u-text text="收件人信息" size="28" :bold="true"></u-text>
-								<view style="margin: 8rpx 0 0 0;">
-									<u-text text="请填写收件人国家、姓名，电话" size="26" color="#999"></u-text>
-								</view>
-							</view>
-							<view class="flex-column-center">
-								<image style="height: 32rpx;width: 28rpx;" :src="getCdnUrl(`post/adress.png`)">
-								</image>
-								<u-text align="center" text="地址薄" size="26" :bold="true"
-									margin="8rpx 0 0 0"></u-text>
-							</view>
+	<tpx-page>
+		<tpx-layout  v-if="!pageLoading">
+			<template v-slot:body>
+				<view class="com-jianju pos-rlt pb-30" style="padding-top: 2rpx;">
+					<view class="blcok" style="background-color: #0E0708;">
+						<u-row>
+							<image class="mr-20" style="height: 28rpx;width: 34rpx;"
+								:src="getCdnUrl(`post/gangbo.png`)"></image>
+							<u-text size="24" color="#fff" text="下单后会有业务员及时联系您，请保持电话畅通!"></u-text>
 						</u-row>
 					</view>
-				</view>
-			
-				<view class="blcok-white">
-					<view style="width: 80%;">
-						<tpx-tabs :list="sendTypeList" v-model:value="submitParam.type" @tabchange="(val)=> { }">
-						</tpx-tabs>
+				
+					<view class="blcok-white">
+						<!-- 地址选择 -->
+						<bpe-addressinfo-tmp v-model:value="submitParam" @onChange="handleAddressChange"></bpe-addressinfo-tmp>
 					</view>
-			
-					<view>
-						<view @click="handleDialogClick(countryModal)" class="pt-30 pb-30" style="border-bottom: 2rpx solid #F6F6F6;" >
-							<u-row>
-								<view>
-									<u-text text="目的国" size="28" :bold="true"></u-text>
-								</view>
-								<u-row custom-style="flex: 1;" justify="end" align="center">
-									<u-text align="right" margin="0 12rpx 0 0" size="26" text="柬埔寨"></u-text>
-									<u-icon size="26" name="arrow-right" color="#333"></u-icon>
-								</u-row>
-							</u-row>
-						</view>
-			
-						<view @click="handleDialogClick(wayModal)" class="pt-30 pb-30" style="border-bottom: 2rpx solid #F6F6F6;;">
-							<u-row>
-								<view>
-									<u-text text="选择线路" size="28" :bold="true"></u-text>
-								</view>
-								<u-row custom-style="flex: 1;" justify="end" align="center">
-									<u-text align="right" margin="0 12rpx 0 0" size="26" color="#999"
-										text="请选择"></u-text>
-									<u-icon size="26" name="arrow-right" color="#333"></u-icon>
-								</u-row>
-							</u-row>
-						</view>
-			
-						<view @click="handleChooseGoods" class="pt-30 pb-30" style="border-bottom: 2rpx solid #F6F6F6;;">
-							<u-row>
-								<view>
-									<u-text text="货物信息(必填)" size="28" :bold="true"></u-text>
-								</view>
-								<u-row custom-style="flex: 1;" justify="end" align="center">
-									<u-text align="right" margin="0 12rpx 0 0" size="26" color="#999"
-										text="填写物品信息"></u-text>
-									<u-icon size="26" name="arrow-right" color="#333"></u-icon>
-								</u-row>
-							</u-row>
-						</view>
-			
-						<view @click="handleDialogClick(goodChooseModal)" class="pt-30 pb-30" style="border-bottom: 2rpx solid #F6F6F6;;"
-							v-if="submitParam.type != sendTypeEnum.container"
-						>
-							<u-row>
-								<view>
-									<u-text text="重量/体积" size="28" :bold="true"></u-text>
-								</view>
-								<u-row custom-style="flex: 1;" justify="end" align="center">
-									<u-text align="right" margin="0 12rpx 0 0" size="26" color="#999"
-										text="填写重量体积"></u-text>
-									<u-icon size="26" name="arrow-right" color="#333"></u-icon>
-								</u-row>
-							</u-row>
+					
+					<view class="com-section mt-30">路线信息</view>
+					<view class="blcok-white">
+						<view class="yunf-input-item">
+							<tpx-select v-model:value="submitParam.pickupMethod" :list="dicData.emis_qujian_fangshi"
+								mode="drop" 
+							>
+								<tpx-text-item label="取件方式" :value="submitParam.pickupMethod" :list="dicData.emis_qujian_fangshi"></tpx-text-item>
+							</tpx-select>
 						</view>
 						
-						<view @click="handleDialogClick(stockRoomModal)" class="pt-30 pb-30" style="border-bottom: 2rpx solid #F6F6F6;;"
-							 v-if="submitParam.type != sendTypeEnum.home"
-						>
-							<u-row>
-								<view>
-									<u-text text="选择仓库" size="28" :bold="true"></u-text>
-								</view>
-								<u-row custom-style="flex: 1;" justify="end" align="center">
-									<u-text align="right" margin="0 12rpx 0 0" size="26" color="#999"
-										text="请选择"></u-text>
-									<u-icon size="26" name="arrow-right" color="#333"></u-icon>
-								</u-row>
-							</u-row>
+						<template v-if="submitParam.reciever.country && submitParam.sender.country">
+							<view class="yunf-input-item">
+								<tpx-select v-model:value="submitParam.transLine" v-model:text="submitParam.transLineTypeName" v-model:resObject="wayRes" 
+									:getListFun="getTransLineList" :transKeyVal="{valKey: 'lineCode',titleKey: 'lineName'}" 
+									:searchParam="waySearchParam" @onChange="handleWayChange" placeholder="请选择路线" 
+								>
+									<tpx-text-item label="路线" :value="submitParam.transLineTypeName"></tpx-text-item>
+								</tpx-select>
+							</view>
+						</template>
+						
+						<view v-if="submitParam.transLine" class="yunf-input-item">
+							<tpx-select v-model:value="submitParam.destinationCode" v-model:text="submitParam.destinationName" v-model:resObject="destPostRes" :getListFun="getDestPositionList" :transKeyVal="{valKey: 'destCode',titleKey: 'destName'}" :isWhite="true" 
+								:searchParam="destPostParam" @onChange="handleDestPostChange" placeholder="请选择目的地"
+							>
+								<tpx-text-item label="目的地" :value="submitParam.destinationName"></tpx-text-item>
+							</tpx-select>
 						</view>
-			
-						<view @click="handleDialogClick(revtimeModal)" class="pt-30 pb-30" style="border-bottom: 2rpx solid #F6F6F6;;">
-							<u-row>
-								<view>
-									<u-text text="期望上门时间 " size="28" :bold="true"></u-text>
-								</view>
-								<u-row custom-style="flex: 1;" justify="end" align="center">
-									<u-text align="right" margin="0 12rpx 0 0" size="26" text="1小时内"></u-text>
-									<u-icon size="26" name="arrow-right" color="#333"></u-icon>
-								</u-row>
-							</u-row>
+						
+						<view v-if="submitParam.destinationCode" class="yunf-input-item">
+							<tpx-text-item label="目的网点">
+								<template v-slot:right>{{submitParam.dispatchUnderlingSiteName}}</template>
+							</tpx-text-item>
 						</view>
-			
-						<view @click="handleDialogClick(paytypeModal)" style="padding: 30rpx 0;border-bottom: 2rpx solid #F6F6F6;;">
-							<u-row>
-								<view>
-									<u-text text="付款方式" size="28" :bold="true"></u-text>
-								</view>
-								<u-row custom-style="flex: 1;" justify="end" align="center">
-									<u-text align="right" margin="0 12rpx 0 0" size="26" text="1现金/月结"></u-text>
-									<u-icon size="26" name="arrow-right" color="#333"></u-icon>
+				
+						<view>
+							<view class="pt-30 pb-30" style="border-bottom: 2rpx solid #F6F6F6;;"
+								 
+							>
+								<u-row>
+									<view>
+										<u-text text="选择仓库" size="28" :bold="true"></u-text>
+									</view>
+									<u-row custom-style="flex: 1;" justify="end" align="center">
+										<u-text align="right" margin="0 12rpx 0 0" size="26" color="#999"
+											text="请选择"></u-text>
+										<u-icon size="26" name="arrow-right" color="#333"></u-icon>
+									</u-row>
 								</u-row>
-							</u-row>
+							</view>
+				
+							<view  class="pt-30 pb-30" style="border-bottom: 2rpx solid #F6F6F6;;">
+								<u-row>
+									<view>
+										<u-text text="期望上门时间 " size="28" :bold="true"></u-text>
+									</view>
+									<u-row custom-style="flex: 1;" justify="end" align="center">
+										<u-text align="right" margin="0 12rpx 0 0" size="26" text="1小时内"></u-text>
+										<u-icon size="26" name="arrow-right" color="#333"></u-icon>
+									</u-row>
+								</u-row>
+							</view>
+				
+							<view class="yunf-input-item">
+								<tpx-select v-model:value="submitParam.paymentType" :list="dicData.emis_payment_type"
+									mode="drop" 
+								>
+									<tpx-text-item label="付款方式" :value="submitParam.paymentType" :list="dicData.emis_payment_type"></tpx-text-item>
+								</tpx-select>
+							</view>
+							<template v-if="isShowYueJie">
+								<view class="yunf-input-item">
+									<tpx-select v-model:value="submitParam.custNo" v-model:text="submitParam.customerName" v-model:resObject="yuejieRes" :getListFun="getMonthpayAccountList" :transKeyVal="{valKey: 'custNo',titleKey: 'custName'}" 
+										@onChange="handleYueJieSelect" placeholder="请选择月结账户"
+									>
+										<tpx-text-item label="月结账户" :value="submitParam.customerName"></tpx-text-item>
+									</tpx-select>
+								</view>
+								<template v-if="submitParam.custNo">
+									<view class="yunf-input-item">
+										<tpx-text-item label="月结编号">
+											<template v-slot:right>{{submitParam.custNo}}</template>
+										</tpx-text-item>
+									</view>
+								</template>
+							</template>
+				
 						</view>
-			
 					</view>
-				</view>
-			
-				<view class="com-section mt-30">产品类型</view>
-				<view class="blcok-white yunf-list" style="padding-bottom: 2rpx;">
 					
-					<tpx-checkitems :list="proList" v-model:value="submitParam.prodId" v-slot="curPro" min-checked="1" type="single">
-						<view slot :class="`yunf-item ${curPro.checked?'active':''}`">
-							<u-row justify="between">
-								<u-col span="8">
-									<u-text :text="`柬埔寨-国际特快`" size="28" :bold="true"></u-text>
-									<u-text margin="6rpx" text="1-2工作日 ￥80元起" size="26" color="#999"></u-text>
-								</u-col>
-								<u-col span="4">
-									<u-text align="right" text="运费预估" size="26" color="#999"></u-text>
-									<u-text align="right" margin="6rpx" text="32" size="26" :bold="true" mode="price"
-										color="#B12D29"></u-text>
-								</u-col>
-							</u-row>
-						</view>
-					</tpx-checkitems>
-				</view>
-			
-				<view class="com-section mt-30">给快递员捎话</view>
-				<view class="blcok-white">
-					<tpx-tags :list="tipsList" v-model:value="submitParam.tips"></tpx-tags>
-					<u-textarea v-model="submitParam.otherDes" border="surround" height="160" placeholder="其他说明"
-						maxlength="50" count></u-textarea>
-					<u-line margin="20rpx 0 10rpx 0"></u-line>
-					<u-row justify="between">
-						<u-text text="您的专属快递员" size="26" color="#999"></u-text>
-						<u-row>
-							<u-text text="李晓" size="28" :bold="true" margin="0 30rpx 0 0"></u-text>
-							<view>
-								<u-avatar size="50" :src="''"></u-avatar>
-							</view>
+					<view class="com-section mt-30" @click="handleDialogClick(goodChooseModal)">
+						<u-row justify="space-between">
+							<text>货物信息</text>
+							<u-icon name="edit-pen" size="42"></u-icon>
 						</u-row>
-					</u-row>
-				</view>
-			
-			</view>
-		</template>
-		<template v-slot:footer>
-			<view class="pos-rlt blcok-white" style="border-radius: 0;margin-top: 0;">
-				<u-row justify="between">
-					<view>
-						<u-row align="top">
-							<u-checkbox-group placement="column" @change="handleAgree()">
-								<u-checkbox size="26" labelSize="26" :checked="agreePrivateRule" label="我已同意接受"
-									label-color=":#999" activeColor="#B12D29" 
-									custom-style="margin-bottom: 10rpx;"></u-checkbox>
-							</u-checkbox-group>
-							<view @click="handleDialogClick(privacyModal)" class="pl-10" style="padding-top: 6rpx;">
-								<u-text text="《快件运单契约条款》" size="26"></u-text>
-							</view>
-						</u-row>
-						<view @click="handleAgree()">
-							<u-row>
-								<view class="mr-10">
-									<u-text text="预估" :bold="true" size="28"></u-text>
-								</view>
-								<u-text :text="80" mode="price" color="#B12D29" :bold="true" size="28"></u-text>
-							</u-row>
-							<u-text margin="10rpx 0 0 0" text="温馨提示：具体费用以快递小哥核实为准" color="#999" size="26"></u-text>
-						</view>
 					</view>
-					<u-row>
-						<u-button size="large" shape="circle"
-							custom-style="width: 200rpx;height:80rpx;font-size: 30rpx;" type="primary">下单</u-button>
+					<view class="blcok-white">
+						<bpe-goodstatic-tmp v-model:value="submitParam"></bpe-goodstatic-tmp>
+					</view>
+				
+					<view class="com-section mt-30">产品类型</view>
+					<view class="blcok-white yunf-list" style="padding-bottom: 2rpx;">
+						<tpx-checkitems :list="[{}]" v-model:value="submitParam.prodId" v-slot="curPro" min-checked="1" type="single">
+							<view slot :class="`yunf-item ${curPro.checked?'active':''}`">
+								<u-row justify="between">
+									<u-col span="8">
+										<u-text :text="`柬埔寨-国际特快`" size="28" :bold="true"></u-text>
+										<u-text margin="6rpx" text="1-2工作日 ￥80元起" size="26" color="#999"></u-text>
+									</u-col>
+									<u-col span="4">
+										<u-text align="right" text="运费预估" size="26" color="#999"></u-text>
+										<u-text align="right" margin="6rpx" text="32" size="26" :bold="true" mode="price"
+											color="#B12D29"></u-text>
+									</u-col>
+								</u-row>
+							</view>
+						</tpx-checkitems>
+						<tpx-empty v-if="false" size="sm"></tpx-empty>
+					</view>
+				
+					<view class="com-section mt-30">给快递员捎话</view>
+					<view class="blcok-white">
+						<tpx-tags :list="[{}]" v-model:value="submitParam.tips"></tpx-tags>
+						<u-textarea v-model="submitParam.otherDes" border="surround" height="160" placeholder="其他说明"
+							maxlength="50" count></u-textarea>
+						<u-line margin="20rpx 0 10rpx 0"></u-line>
+						<u-row justify="between">
+							<text class="clr-sub">您的专属快递员</text>
+							<u-row>
+								<text class="">李晓</text>
+								<view class="ml-10">
+									<u-avatar size="50" :src="''"></u-avatar>
+								</view>
+							</u-row>
+						</u-row>
+					</view>
+				
+				</view>
+			</template>
+			<template v-slot:footer>
+				<view class="pos-rlt blcok-white" style="border-radius: 0;margin-top: 0;">
+					<u-row justify="between">
+						<view>
+							<u-row align="top">
+								<u-checkbox-group placement="column" @change="handleAgree()">
+									<u-checkbox size="26" labelSize="26" :checked="agreePrivateRule" label="我已同意接受"
+										label-color=":#999" activeColor="#B12D29" 
+										custom-style="margin-bottom: 10rpx;"></u-checkbox>
+								</u-checkbox-group>
+								<view @click="handleDialogClick(privacyModal)" class="pl-10" style="padding-top: 6rpx;">
+									<u-text text="《快件运单契约条款》" size="26"></u-text>
+								</view>
+							</u-row>
+							<view @click="handleAgree()">
+								<u-row>
+									<view class="mr-10">
+										<u-text text="预估" :bold="true" size="28"></u-text>
+									</view>
+									<u-text :text="80" mode="price" color="#B12D29" :bold="true" size="28"></u-text>
+								</u-row>
+								<u-text margin="10rpx 0 0 0" text="温馨提示：具体费用以快递小哥核实为准" color="#999" size="26"></u-text>
+							</view>
+						</view>
+						<u-row>
+							<u-button size="large" shape="circle"
+								custom-style="width: 200rpx;height:80rpx;font-size: 30rpx;" type="primary">下单</u-button>
+						</u-row>
 					</u-row>
-				</u-row>
+				</view>
+			</template>
+		</tpx-layout>
+		<buns-privacy-dialog v-model:show="privacyModal.show"> </buns-privacy-dialog>
+		<buns-revtime-sheet v-model:show="revtimeModal.show" v-model:value="submitParam.revtime"></buns-revtime-sheet>
+		<buns-edit-sheet percentHeight="70" title="货物信息" v-model:show="goodChooseModal.show" v-model:value="submitParam" v-slot="tempObject" @onSure="handleGoodInfoSure">
+			<bpe-goodsize-tmp ref="goodSize" :value="tempObject.value"></bpe-goodsize-tmp>
+			<view class="mt-30">
+				<bpe-gooditem-edit-tmp :value="tempObject.value"></bpe-gooditem-edit-tmp>
 			</view>
-		</template>
-	</tpx-layout>
-	<buns-privacy-dialog v-model:show="privacyModal.show"> </buns-privacy-dialog>
-	<buns-revtime-sheet v-model:show="revtimeModal.show" v-model:value="submitParam.revtime"></buns-revtime-sheet>
+			<view class="mt-30">
+				<bpe-goodphoto-tmp :value="tempObject.value" filedName="goodsPics">
+					<template v-slot:title>
+						<text class="font-weight font-28">货物照片</text>
+					</template>
+				</bpe-goodphoto-tmp>
+			</view>
+		</buns-edit-sheet>
+	</tpx-page>
 </template>
 
 <script>
-	import getCdnUrl from "@/common/getCdnUrl"
-	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 BpeGooditemEditTmp from "@/components/buns-post-edit-templates/bpe-gooditem-edit-tmp"
+	import BpeGoodphotoTmp from "@/components/buns-post-edit-templates/bpe-goodphoto-tmp"
+	import BpeGoodsizeTmp from "@/components/buns-post-edit-templates/bpe-goodsize-tmp"
+	import { debounce } from "@/common/util"
+	import * as apiService from "@/common/api"
+	import { getOrderModels } from "./model"
+	
 	export default {
+		components: { BpeAddressinfoTmp, BpeGoodstaticTmp, BpeGooditemEditTmp, BpeGoodphotoTmp, BpeGoodsizeTmp },
 		props: {
 			// hasLeftWin: {
 			// 	type: Boolean
 			// }
 		},
 		computed: {
-
+			waySearchParam() {
+				return { country: this.submitParam.reciever.country, fromCountry: this.submitParam.sender.country }
+			},
+			destPostParam(){ 
+				const { country } = this.submitParam.reciever
+				return { lineCode: this.submitParam.transLine, countryCode: country }
+			},
+			dicData() {
+			  return this.$store.getters.dicData
+			},
+			isShowYueJie(){
+				let { submitParam } = this
+				return submitParam.paymentType == 2 || submitParam.paymentType == 4 || submitParam.paymentType == 5
+			},
 		},
 		data() {
-			return {
-				proList: [
-					{val: 1 },{ val: 2 }
-				],
-				tipsList: [
-					{ title: '请带纸箱', val: '请带纸箱' },
-					{ title: '需要爬楼', val: '需要爬楼' },
-					{ title: '来前电话', val: '来前电话' },
-				],
-				showCladar: false,
-				agreePrivateRule: false,
-				countryModal: {
-					show: false
-				},
-				wayModal: {
-					show: false,
-				},
-				stockRoomModal: {
-					show: false,
-				},
-				paytypeModal: {
-					show: false,
-				},
-				privacyModal: {
-					show: false,
-				},
-				revtimeModal: {
-					show: false,
-				},
-				goodChooseModal: {
-					show: false,
-				},
-				submitParam: {
-					stockRoomId: '',
-					countryId: '',
-					wayId: '',
-					type: sendTypeList[0].val,
-					paytype: '',
-					otherDes: '',
-					prodId: 1,
-					tips: [],
-					revtime: ''
-				}
-			}
+			return this.getDefaultData()
 		},
 		onShareAppMessage() {
 			return {
@@ -309,24 +254,94 @@
 
 		},
 		methods: {
-			getCdnUrl,
-			goto,
-			initData() {
-				// uni.showLoading({
-				// 	title: '加载中'
-				// });
+			getTransLineList: apiService.getTransLineList,
+			getDefaultData() { // data的默认数据
+				return {
+					pageLoading: true,
+					isEdit: false,
+					queryOption: {
+						type: '', // edit 修改
+						defaultSubParams: '', // 提交默认参数
+						billCode: '', // 运单id
+						orderSn: '', // 订单id
+						copyBillCode: '', // 复制的运单id
+					},
+					wayRes: { list: [] },
+					productRes: { list: [] },
+					yuejieRes: { list: [] },
+					destPostRes: { list: [] },
+					wareRes: { list: [] },
+					agreePrivateRule: false,
+					privacyModal: {
+						show: false,
+					},
+					revtimeModal: {
+						show: false,
+					},
+					goodChooseModal: { 
+						show: false,
+					},
+					submitParam: {
+						...getOrderModels(),
+						sendSiteCode: this.$store.getters.userInfo.ownerSiteCode,
+					}
+				}
 			},
-			handleAddressChoose(type) { // 1 寄件地址 2收件地址
-				goto(`address/list?tab=${type}&type=choose`)
+			async initData() { // 初始化
+				this.queryOption.billCode = this.queryOption.billCode || this.queryOption.copyBillCode
+				this.isEdit = Boolean(this.queryOption.billCode || this.queryOption.orderSn)
+				if(this.queryOption.defaultSubParams) {
+					try{
+						this.queryOption.defaultSubParams = JSON.parse(decodeURIComponent(this.queryOption.defaultSubParams))
+						Object.assign(this.submitParam, this.queryOption.defaultSubParams)
+					}catch(e){
+						console.error("queryOption.defaultSubParams=====转换失败===", this.queryOption.defaultSubParams)
+					}
+				}
+				if(this.isEdit) {
+					let res = await apiService.getOrderDetail({...this.queryOption, _loading: true})
+					let data = res.data || {}
+					data.goodsPics = (data.goodsPics && data.goodsPics.split(",")) || []
+					this.submitParam = res.data
+					// 复制场景 清除billCode orderSn
+					if(this.queryOption.copyBillCode) {
+						delete this.submitParam.billCode
+						delete this.submitParam.orderSn
+					}
+				}
+				this.pageLoading = false
+			},
+			handleAddressChange() { // 地址切换
+				let { wayRes, submitParam } = this.getDefaultData()
+				if(this.submitParam.reciever.country && this.submitParam.sender.country) {
+					this.submitParam.transLine = submitParam.transLine
+					this.submitParam.transLineTypeName = submitParam.transLineTypeName
+					this.handleWayChange() // 调用线路切换，清空后续数据
+				}
+			},
+			handleWayChange(val) { // 线路切换
+				let { productRes, submitParam } = this.getDefaultData()
+				// 清空产品类型数据
+				this.submitParam.productType = submitParam.productType
+				this.submitParam.productTypeName = submitParam.productTypeName
+				const item = this.wayRes.list.filter(t=> t.val == val)[0]
+				this.updateDltDestSite({ lineCode: val })
+			},
+			async updateDltDestSite({ lineCode }) {
+				const { country, province, city, county, address } = this.submitParam.reciever
+				let res = await apiService.getCaculteDestSite({ lineCode, country, province, city, county, address })
+				// 更新路线推荐的默认目的地
+				let data = res.data || {}
+				this.submitParam.destinationCode = data.destCode
+				this.submitParam.destinationName = data.destName
+				this.submitParam.dispatchUnderlingSiteCode = data.siteCode;
+				this.submitParam.dispatchUnderlingSiteName = data.siteName;
 			},
 			handleAgree() {
 				this.agreePrivateRule = !this.agreePrivateRule
 			},
 			handleDialogClick(curModal){
 				curModal.show = true
-			},
-			handleChooseGoods(){
-				goto(`goods/edit?type=choose`)
 			}
 		}
 	}
@@ -351,4 +366,8 @@
 			border-color: $uni-color-primary;
 		}
 	}
+	.yunf-input-item{
+		padding: 26rpx 0;
+		border-bottom: 2rpx solid #F6F6F6;
+	}
 </style>
\ No newline at end of file