From a077e0915958577fdced7ff39d76ce681639fbe1 Mon Sep 17 00:00:00 2001
From: aihe <961836564@qq.com>
Date: Wed, 10 Jul 2024 13:33:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../buns-order-templates/bo-scanlist-tmp.vue  | 19 ++++++++++++++++---
 .../bpd-send-reciever-tmp.vue                 |  7 ++++---
 .../bpe-good-kuaidi-tmp.vue                   | 12 +++++++++---
 .../bpe-gooditem-edit-tmp.vue                 |  9 +++++++++
 .../bpe-goodstatic-tmp.vue                    |  2 +-
 components/page-foot/page-foot.vue            |  2 +-
 components/tpx-com-dialog/tpx-com-dialog.vue  | 14 +++++++++++++-
 components/tpx-dialog/tpx-dialog.vue          |  2 +-
 components/tpx-input/tpx-input.vue            |  4 ++--
 .../tpx-scroll-view/tpx-scroll-view.vue       |  1 +
 .../tpx-select/default-select-input.vue       |  4 ++--
 pages/login/login.vue                         | 17 ++++++++++++++---
 12 files changed, 73 insertions(+), 20 deletions(-)

diff --git a/components/buns-order-templates/bo-scanlist-tmp.vue b/components/buns-order-templates/bo-scanlist-tmp.vue
index 36293ac..1f39f11 100644
--- a/components/buns-order-templates/bo-scanlist-tmp.vue
+++ b/components/buns-order-templates/bo-scanlist-tmp.vue
@@ -5,10 +5,10 @@
 			<view class="pb-20">
 				<u-row>
 					<u-col span="8">
-						<text class="font-weight">运单号</text>
+						<text class="font-weight">{{customTabelConf.head[0] || '运单号'}}</text>
 					</u-col>
 					<u-col span="4">
-						<text class="font-weight">扫描时间</text>
+						<text class="font-weight">{{customTabelConf.head[1] || '扫描时间'}}</text>
 					</u-col>
 				</u-row>
 			</view>
@@ -52,6 +52,13 @@
 				default () {
 					return false
 				}
+			},
+			customTabelConf: {
+				default () {
+					return {
+						head: []
+					}
+				}
 			}
 		},
 		data() {
@@ -79,5 +86,11 @@
 	
 </style>
 <style scoped lang="scss">
-	
+	.yditem{
+		padding: 20rpx 0;
+		border-top: 2px solid #F6F6F6;
+		&:last-child{
+			padding-bottom: 0;
+		}
+	}
 </style>
\ No newline at end of file
diff --git a/components/buns-post-detail-templates/bpd-send-reciever-tmp.vue b/components/buns-post-detail-templates/bpd-send-reciever-tmp.vue
index 720e46e..d7e5955 100644
--- a/components/buns-post-detail-templates/bpd-send-reciever-tmp.vue
+++ b/components/buns-post-detail-templates/bpd-send-reciever-tmp.vue
@@ -2,7 +2,8 @@
 	<u-row justify="between">
 		<u-row @click="setClipboardData(modelInfo.billCode)">
 			<view>
-				<u-text :text="`运单号：${modelInfo.billCode}` " size="26"></u-text>
+				<u-text v-if="modelInfo.billCode" :text="`运单号：${modelInfo.billCode}` " size="26"></u-text>
+				<u-text v-else :text="`订单号：${modelInfo.orderSn}` " size="26"></u-text>
 			</view>
 			<view class="pl-10">
 				<u-icon name="file-text" size="32" custom-style=""></u-icon>
@@ -24,9 +25,9 @@
 					align="center"></u-text>
 			</u-col>
 			<u-col span="4" justify="center" align="center" custom-style="text-align: center;">
-				<image style="width: 70rpx;height: 14rpx;" :src="getCdnUrl('search/toline.png')">
+				<image style="width: 70rpx;height: 14rpx;" :src="getCdnUrl('post/toline.png')">
 				</image>
-				<!-- getCdnUrl('search/toline-grey.png') -->
+				<!-- getCdnUrl('post/toline-grey.png') -->
 				<view class="mt-10">
 					<tpx-text-dic :value="modelInfo.waybillStatus" :list="dicData.emis_waybill_status" ></tpx-text-dic>
 				</view>
diff --git a/components/buns-post-edit-templates/bpe-good-kuaidi-tmp.vue b/components/buns-post-edit-templates/bpe-good-kuaidi-tmp.vue
index be75f39..15b6471 100644
--- a/components/buns-post-edit-templates/bpe-good-kuaidi-tmp.vue
+++ b/components/buns-post-edit-templates/bpe-good-kuaidi-tmp.vue
@@ -30,12 +30,14 @@
 		<view class="edm-input-item">
 			<tpx-text-item label="是否需要代垫运费">
 				<template v-slot:right>
-					<u-switch v-model="modelInfo.blPrepareInFreight" activeValue="1" inactiveValue="0" active-color="#B12D29" size="34"></u-switch>
+					<u-switch v-model="modelInfo.blPrepareInFreight" @change="handleDDianSwitch"
+						activeValue="1" inactiveValue="0" active-color="#B12D29" size="34"
+					></u-switch>
 				</template>
 			</tpx-text-item>
 		</view>
 		
-		<view v-if="modelInfo.blPrepareInFreight" class="edm-input-item">
+		<view v-if="modelInfo.blPrepareInFreight == '1'" class="edm-input-item">
 			<tpx-text-item label="代垫预估">
 				<template v-slot:right>
 					<tpx-input v-model:value="modelInfo.prepareInEstFee" _digit="5" inputAlign="right" suffix="CNY"></tpx-input>
@@ -98,7 +100,11 @@
 		},
 
 		methods: {
-			
+			handleDDianSwitch(val){
+				if(val!=1) {
+					this.modelInfo.prepareInEstFee = undefined
+				}
+			}
 		}
 	}
 </script>
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 2a33aa3..339d2f2 100644
--- a/components/buns-post-edit-templates/bpe-gooditem-edit-tmp.vue
+++ b/components/buns-post-edit-templates/bpe-gooditem-edit-tmp.vue
@@ -61,6 +61,15 @@
 		</u-row>
 	</view>
 	
+	<view class="edm-input-item">
+		<u-row justify="between" align="top">
+			<text class="font-28 pt-20 font-weight">货值</text>
+			<view>
+				<tpx-input v-model:value="modelInfo.realValue" placeholder="" inputAlign="right" suffix="美元" _digit="5"></tpx-input>
+			</view>				
+		</u-row>
+	</view>
+	
 </template>
 
 <script>
diff --git a/components/buns-post-edit-templates/bpe-goodstatic-tmp.vue b/components/buns-post-edit-templates/bpe-goodstatic-tmp.vue
index 856748e..792ef77 100644
--- a/components/buns-post-edit-templates/bpe-goodstatic-tmp.vue
+++ b/components/buns-post-edit-templates/bpe-goodstatic-tmp.vue
@@ -20,7 +20,7 @@
 					<text class="clr-sub pr-10">尺寸</text>
 					{{item.length || '0'}}cm<text class="clr-sub pl-10 pr-10">*</text>
 					{{item.width || '0'}}cm<text class="clr-sub pl-10 pr-10 ">*</text>
-					{{item.length || '0'}}cm
+					{{item.height || '0'}}cm
 				</view>
 			</u-col>
 			<u-col v-if="item.nationArea" span="6">
diff --git a/components/page-foot/page-foot.vue b/components/page-foot/page-foot.vue
index 1154dbe..7f5fc09 100644
--- a/components/page-foot/page-foot.vue
+++ b/components/page-foot/page-foot.vue
@@ -33,6 +33,6 @@
 	}
 
 	.submit {
-		border-bottom: 1rpx solid #BEBEBE;
+		border-bottom: 2rpx solid #BEBEBE;
 	}
 </style>
diff --git a/components/tpx-com-dialog/tpx-com-dialog.vue b/components/tpx-com-dialog/tpx-com-dialog.vue
index ffae9b6..10f1354 100644
--- a/components/tpx-com-dialog/tpx-com-dialog.vue
+++ b/components/tpx-com-dialog/tpx-com-dialog.vue
@@ -55,7 +55,7 @@
 		},
 		data() {
 			return {
-				
+				curDealPromise: {}
 			}
 		},
 		created() {
@@ -74,11 +74,23 @@
 			handleBtnCheck(type) {
 				if(type == 'yes') {
 					this.$emit('onSure')
+					this.curDealPromise?.resolve?.(true)
 				} else {
 					this.handleCloseModal()
+					this.curDealPromise?.resolve?.(false)
 					this.$emit('onClose')
 					this.$emit('onCancel')
 				}
+				this.curDealPromise = {}
+			},
+			getConfirmResult(){
+				// 显示弹框，并返回promise
+				this.$emit('update:show', true)
+				return new Promise((resolve, reject)=> {
+					this.curDealPromise = {
+						resolve
+					}
+				})
 			}
 		}
 	}
diff --git a/components/tpx-dialog/tpx-dialog.vue b/components/tpx-dialog/tpx-dialog.vue
index cb7829f..a8a8c1b 100644
--- a/components/tpx-dialog/tpx-dialog.vue
+++ b/components/tpx-dialog/tpx-dialog.vue
@@ -11,7 +11,7 @@
 						<u-icon name="close" size="32" color="#999"></u-icon>
 					</view>
 				</u-row>
-				<view style="height: 1rpx;background-color: rgb(214, 215, 217);position: absolute;left: 0rpx;right: 0rpx;;"></view>
+				<view style="height: 2rpx;background-color: rgb(214, 215, 217);position: absolute;left: 0rpx;right: 0rpx;;"></view>
 			</view>
 			<view class="lgd-body" :style="`padding: 0rpx 30rpx;${contentStyle}`">
 				<slot></slot>
diff --git a/components/tpx-input/tpx-input.vue b/components/tpx-input/tpx-input.vue
index 06f9775..97633aa 100644
--- a/components/tpx-input/tpx-input.vue
+++ b/components/tpx-input/tpx-input.vue
@@ -20,11 +20,11 @@
 				let sty1 = 'border:0;border-radius: 10rpx;padding: 11rpx 20rpx;'
 				// if(this.isWhite) {
 				// 	bgColor = '#fff'
-				// 	sty1 += 'border: 1rpx solid #dadbde;'
+				// 	sty1 += 'border: 2rpx solid #dadbde;'
 				// }
 				if(true) {
 					bgColor = '#fff'
-					sty1 += 'border: 1rpx solid #dadbde;'
+					sty1 += 'border: 2rpx solid #dadbde;'
 				}
 				if(!this.disabled) {
 					sty1 += `background-color:${bgColor};`
diff --git a/components/tpx-scroll-view/tpx-scroll-view.vue b/components/tpx-scroll-view/tpx-scroll-view.vue
index 024b2fc..2fb2b18 100644
--- a/components/tpx-scroll-view/tpx-scroll-view.vue
+++ b/components/tpx-scroll-view/tpx-scroll-view.vue
@@ -114,6 +114,7 @@
 					return
 				}
 				if (reload) {
+					this.$emit('onListReload', this.searchParam)
 					this.page.pageNum = 1
 					this.showLoading()
 				}
diff --git a/components/tpx-select/default-select-input.vue b/components/tpx-select/default-select-input.vue
index e81d5ae..e28164e 100644
--- a/components/tpx-select/default-select-input.vue
+++ b/components/tpx-select/default-select-input.vue
@@ -96,10 +96,10 @@
 }
 .c-white{
 	background-color: #fff;
-	border: 1rpx solid #dadbde;
+	border: 2rpx solid #dadbde;
 }
 .c-grey{
 	background-color: #F6F6F6;
-	border: 1rpx solid #dadbde;
+	border: 2rpx solid #dadbde;
 }
 </style>
\ No newline at end of file
diff --git a/pages/login/login.vue b/pages/login/login.vue
index bc518b2..29b7a3e 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -46,7 +46,9 @@
 </template>
 <script>
 	import { USERKEY } from "@/store/actionKey"
-	import { getSessionLoginInfo, setSessionLoginInfo } from "@/session"
+	import { getSessionLoginInfo, setSessionLoginInfo, setSessionXToken } from "@/session"
+	import { encrypt } from "@/common/libs/jsencrypt_utils"
+	
 	
 	export default {
 		props: {
@@ -54,6 +56,7 @@
 		data() {
 			return {
 				submitParams: {
+					isEncrypt: true,
 					username: '',
 					password: '',
 					remberPassport: []
@@ -77,11 +80,19 @@
 				const { submitParams } = this
 				this.showLoading()
 				try{
-					await this.$store.dispatch(USERKEY.LOGIN, submitParams)
+					setSessionXToken() // 登录前先清除xtoke
+					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)
-					this.goto("tabBar/home/home")
+					this.goto("tabBar/sending/sending")
 				}catch(e){
+					console.error("USERKEY.LOGIN===catch error:", e)
 				}
 				this.hideLoading()
 			}