diff --git a/common/api/user.js b/common/api/user.js
index 867319d..f4c3be7 100644
--- a/common/api/user.js
+++ b/common/api/user.js
@@ -9,5 +9,5 @@ export const getInfoByApp = (data = {})=> {
 	return coreRequest(url.getInfoByApp, data, {}, 'GET')
 }
 export const updatePwdByApp = (data = {})=> {
-	return coreRequest(url.updatePwdByApp, data, {})
+	return coreRequest(url.updatePwdByApp, data, {}, 'GET')
 }
diff --git a/components/buns-post-edit-templates/bpe-cost-tmp.vue b/components/buns-post-edit-templates/bpe-cost-tmp.vue
index cf16c9f..1c4d0b1 100644
--- a/components/buns-post-edit-templates/bpe-cost-tmp.vue
+++ b/components/buns-post-edit-templates/bpe-cost-tmp.vue
@@ -32,31 +32,39 @@
 			<!-- 手动添加的才能删除 -->
 			<u-row justify="between">
 				<view >
-					<text class="">应收:</text> {{item.fee || 0}}
+					<text class="font-weight font-30">{{item.feeName}}</text>
 				</view>
 				<view v-if="item.blAutoGen == 0" @click="handleDelFee(index)" class="delicon">
 					<u-icon name="trash" size="32"></u-icon>
 				</view>
 			</u-row>
-			<u-row style="width:450rpx;margin-top:10rpx;">
-				<text class="font-26 pr-20">{{item.feeName}}</text>
-				<tpx-input v-model:value="item.realFee" @change="(val)=> { handleRlFeeChange(item, val) }" _digit="5" :isWhite="true" custom-style="width: 120rpx;height: 46rpx;"
-					:disabled="modelInfo.blSpecialQuote != 1" suffix="CNY"></tpx-input>
-			</u-row>
 			<u-row custom-style="gap: 20rpx;margin-top:10rpx;">
-				<u-row custom-style="flex: 1">
-					<text class="font-26 pr-10">续重单价</text>
-					<tpx-input v-model:value="item.addWeightPrice" @change="(val)=> { handleAwPriceChange(item, val) }" _digit="5" :isWhite="true"
-						:disabled="modelInfo.blSpecialQuote != 1" custom-style="width: 120rpx;height: 46rpx;" suffix="CNY"></tpx-input>
-				</u-row>
 				<u-row custom-style="flex: 1">
 					<text class="font-26 pr-10">首重费</text>
 					<tpx-input v-model:value="item.initialWeightFee" @change="(val)=> { handleIwFeeChange(item, val) }" _digit="5"  :isWhite="true"
 						:disabled="modelInfo.blSpecialQuote != 1" custom-style="width: 120rpx;height: 46rpx;" suffix="CNY"></tpx-input>
 				</u-row>
+				<u-row custom-style="flex: 1">
+					<text class="font-26 pr-10">续重单价</text>
+					<tpx-input v-model:value="item.addWeightPrice" @change="(val)=> { handleAwPriceChange(item, val) }" _digit="5" :isWhite="true"
+						:disabled="modelInfo.blSpecialQuote != 1" custom-style="width: 120rpx;height: 46rpx;" suffix="CNY"></tpx-input>
+				</u-row>
 			</u-row>
-			<view v-if="item.calcExp" class="mt-10">
+			<u-row style="margin-top:10rpx;" justify="between">
+				<view>
+					<text class="">应收:</text> {{item.fee || 0}}
+				</view>
+				<u-row custom-style="width:360rpx;">
+					<text class="font-26 pr-20">实收</text>
+					<tpx-input v-model:value="item.realFee" @change="(val)=> { handleRlFeeChange(item, val) }" _digit="5" :isWhite="true" custom-style="width: 120rpx;height: 46rpx;"
+						:disabled="modelInfo.blSpecialQuote != 1" suffix="CNY"></tpx-input>
+				</u-row>
+			</u-row>
+			<!-- <view v-if="item.calcExp" class="mt-10">
 				<text class="">计算公式:</text> {{item.calcExp}}
+			</view> -->
+			<view class="mt-20">
+				<tpx-input v-model:value="item.remark" :disabled="modelInfo.blSpecialQuote != 1" placeholder="费用描述" isWhite="true"></tpx-input>
 			</view>
 		</view>
 
@@ -71,14 +79,12 @@
 		</tpx-select>
 		
 		<view class="pt-20">
-			<u-row custom-style="flex: 1" justify="between">
+			<u-row custom-style="flex:1;" justify="between">
 				<text class="font-26 pr-10">总费用</text>
-				<view v-if="modelInfo.calcFeeType==3">
+				<view style="width: 360rpx;">
 					<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>
+						:disabled="modelInfo.calcFeeType!=3" 
+						 inputAlign="right" custom-style="height: 46rpx;" suffix="CNY"></tpx-input>
 				</view>
 			</u-row>
 		</view>
diff --git a/components/buns-post-edit-templates/bpe-gooditem-edit-tmp.vue b/components/buns-post-edit-templates/bpe-gooditem-edit-tmp.vue
index c105d9b..ff2d598 100644
--- a/components/buns-post-edit-templates/bpe-gooditem-edit-tmp.vue
+++ b/components/buns-post-edit-templates/bpe-gooditem-edit-tmp.vue
@@ -119,7 +119,7 @@
 	.yditem{
 		padding: 20rpx 20rpx;
 		// background-color: #F6F6F6;
-		background-color: #e1e1e1;
+		background-color: #F6F6F6;
 		border-radius: 10rpx;
 		margin-bottom: 20rpx;
 	}
diff --git a/components/buns-post-edit-templates/bpe-goodstatic-tmp.vue b/components/buns-post-edit-templates/bpe-goodstatic-tmp.vue
index 443aa03..b78cfb4 100644
--- a/components/buns-post-edit-templates/bpe-goodstatic-tmp.vue
+++ b/components/buns-post-edit-templates/bpe-goodstatic-tmp.vue
@@ -6,12 +6,7 @@
 		<!-- <view class="pt-10">
 			<text class="clr-sub pr-10">货物大类</text> {{modelInfo.goodsType}}
 		</view> -->
-		<view class="pt-10">
-			<u-row justify="">
-				<text class="clr-sub pr-10">包装类型</text> 
-				<tpx-text-dic :value="modelInfo.packType" :list="dicData.emis_tab_packing_type"></tpx-text-dic>
-			</u-row>
-		</view>
+		
 	</view>
 	
 	<view v-for="(item) in modelInfo.cargoList" class="yditem">
@@ -20,21 +15,6 @@
 		</view>
 		
 		<u-row justify="between" custom-style="flex-wrap: wrap;">
-			<u-col v-if="item.nationArea" span="6">
-				<view class="pt-5">
-					<text class="clr-sub pr-10">产地</text>{{item.nationArea}}
-				</view>
-			</u-col>
-			<u-col span="6">
-				<view class="pt-5">
-					<text class="clr-sub pr-10">件数</text> {{item.cargoQty}}
-				</view>
-			</u-col>
-			<u-col v-if="item.price" span="6">
-				<view class="pt-5">
-					<text class="clr-sub pr-10">单价</text>{{item.price}} CNY
-				</view>
-			</u-col>
 			<u-col span="12">
 				<view class="pt-5">
 					<text class="clr-sub pr-10">尺寸</text>
@@ -43,12 +23,29 @@
 					{{item.length || '0'}}cm
 				</view>
 			</u-col>
-			<u-col span="12">
+			<u-col v-if="item.nationArea" span="6">
 				<view class="pt-5">
-					<text class="clr-sub pr-10">体积</text>
-					{{item.volume || '0'}}m³
+					<text class="clr-sub pr-10">产地</text>{{item.nationArea}}
 				</view>
 			</u-col>
+			<u-col span="12">
+				<u-row justify="between">
+					<view class="pt-5">
+						<text class="clr-sub pr-10">件数</text> {{item.cargoQty}}
+					</view>
+					<view class="pt-5">
+						<text class="clr-sub pr-10">体积</text>
+						{{item.volume || '0'}}m³
+					</view>
+				</u-row>
+			</u-col>
+			<u-col v-if="item.price" span="6">
+				<view class="pt-5">
+					<text class="clr-sub pr-10">单价</text>{{item.price}} CNY
+				</view>
+			</u-col>
+			
+			
 		</u-row>
 	</view>
 	
@@ -71,29 +68,29 @@
 				</view>
 				<view class="sta-t-item">
 					<view class="">
-						<text class="font-weight">{{modelInfo.billWeight || '-'}}</text>
+						<text class="font-weight">{{modelInfo.volumeWeight || '-'}}</text>
 						<text class="clr-sub">kg</text>
 					</view>
-					<view class="sta-lbl clr-sub">实际重量</view>
+					<view class="sta-lbl clr-sub">体积重量</view>
 				</view>
 			</u-row>
 		</view>
 		<view class="font-28 mt-20">
 			<u-row justify="space-between">
-				<view class="sta-t-item">
+				<!-- <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> -->
 				
 				<view class="sta-t-item">
 					<view class="">
-						<text class="font-weight">{{modelInfo.volumeWeight || '-'}}</text>
+						<text class="font-weight">{{modelInfo.billWeight || '-'}}</text>
 						<text class="clr-sub">kg</text>
 					</view>
-					<view class="sta-lbl clr-sub">体积重量</view>
+					<view class="sta-lbl clr-sub">实际重量</view>
 				</view>
 				
 				<view class="sta-t-item">
@@ -105,6 +102,12 @@
 				</view>
 			</u-row>
 		</view>
+		<view class="pt-30">
+			<u-row justify="">
+				<text class="clr-sub pr-10">包装类型</text> 
+				<tpx-text-dic :value="modelInfo.packType" :list="dicData.emis_tab_packing_type"></tpx-text-dic>
+			</u-row>
+		</view>
 	</view>
 	
 </template>
diff --git a/components/tpx-input/tpx-input.vue b/components/tpx-input/tpx-input.vue
index 85f1657..5d1893f 100644
--- a/components/tpx-input/tpx-input.vue
+++ b/components/tpx-input/tpx-input.vue
@@ -17,7 +17,11 @@
 			inputStyle(){
 				let bgColor = '#F6F6F6'
 				let sty1 = 'border:0;border-radius: 10rpx;padding: 11rpx 20rpx;'
-				if(this.isWhite) {
+				// if(this.isWhite) {
+				// 	bgColor = '#fff'
+				// 	sty1 += 'border: 1rpx solid #dadbde;'
+				// }
+				if(true) {
 					bgColor = '#fff'
 					sty1 += 'border: 1rpx solid #dadbde;'
 				}
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 179ac55..84c2a35 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -56,7 +56,7 @@
 		data() {
 			return {
 				submitParams: {
-					// isEncrypt: true,
+					isEncrypt: true,
 					username: '',
 					password: '',
 					remberPassport: []
@@ -80,8 +80,12 @@
 				const { submitParams } = this
 				this.showLoading()
 				try{
-					await this.$store.dispatch(USERKEY.LOGIN, { ...submitParams, 
-						// password: encrypt(submitParams.password) 
+					await this.$store.dispatch(USERKEY.LOGIN, { 
+						...submitParams, 
+						...(submitParams.isEncrypt ? { 
+							password: encrypt(submitParams.password),
+							username: encrypt(submitParams.username),
+						} : {})
 					})
 					await this.$store.dispatch(USERKEY.GETUSERINFO)
 					setSessionLoginInfo(submitParams)
diff --git a/pages/post/model.js b/pages/post/model.js
index 932c261..4f9401a 100644
--- a/pages/post/model.js
+++ b/pages/post/model.js
@@ -154,5 +154,9 @@ export const getOrderModels = () => {
 		blSpecialQuote: 0, // 特殊报价
 		blSpecialGoods: 0, // 敏感物
 		
+		blGenSubbill: '1', // 生成子单 
+		custOrderId: '', // 合同号 
+		
+		
 	}
 }
\ No newline at end of file
diff --git a/pages/post/openorder.vue b/pages/post/openorder.vue
index 14c81a6..3e82298 100644
--- a/pages/post/openorder.vue
+++ b/pages/post/openorder.vue
@@ -177,6 +177,22 @@
 								</tpx-select>
 							</view>
 							
+							<view class="yunf-input-item">
+								<tpx-text-item label="生成子单">
+									<template v-slot:right>
+										<u-switch v-model="submitParam.blGenSubbill" activeValue="1" inactiveValue="0" active-color="#B12D29" size="34"></u-switch>
+									</template>
+								</tpx-text-item>
+							</view>
+							
+							<view class="yunf-input-item">
+								<tpx-text-item label="合同号">
+									<template v-slot:right>
+										<tpx-input v-model:value="submitParam.custOrderId" inputAlign="right"></tpx-input>
+									</template>
+								</tpx-text-item>
+							</view>
+							
 							<view class="yunf-input-item">
 								<tpx-text-item label="寄件短信">
 									<template v-slot:right>
diff --git a/pages/user/updatePassword.vue b/pages/user/updatePassword.vue
index c72e577..39ea06a 100644
--- a/pages/user/updatePassword.vue
+++ b/pages/user/updatePassword.vue
@@ -35,9 +35,11 @@
 
 <script>
 	import { USERKEY } from "@/store/actionKey"
+	import { encrypt } from "@/common/libs/jsencrypt_utils"
 	import * as apiService from "@/common/api"
 	import { checkParams } from "@/common/validate"
 	import { getSessionLoginInfo, setSessionLoginInfo } from "@/session"
+	
 	export default {
 		props: {
 		},
@@ -88,7 +90,11 @@
 				
 			},
 			async handleSubmit() {
-				let params = { ...this.submitParam }
+				let params = { 
+					...this.submitParam,
+					// oldPassword: encrypt(this.submitParam.oldPassword),
+					// newPassword: encrypt(this.submitParam.newPassword),
+				}
 				await checkParams(this.submitParam, this.submitValidConfig)
 				await apiService.updatePwdByApp(params)
 				this.showToast("修改成功，请重新登录")