From e2c892ef5570800b358cb3645cc327b6c5789449 Mon Sep 17 00:00:00 2001
From: aihe <961836564@qq.com>
Date: Sat, 4 May 2024 01:17:45 +0800
Subject: [PATCH] uu

---
 common/manageServer.js                        |  6 ++---
 .../buns-goodinfo-sheet.vue                   | 23 ++++++++++++-------
 .../bpe-good-kuaidi-tmp.vue                   |  4 ++--
 .../bpe-goodsize-tmp.vue                      |  8 +++----
 components/tpx-input/tpx-input.vue            |  7 +++++-
 pages/post/model.js                           |  4 ++--
 6 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/common/manageServer.js b/common/manageServer.js
index fa776ea..9f824e3 100644
--- a/common/manageServer.js
+++ b/common/manageServer.js
@@ -1,5 +1,6 @@
 import { goto } from "./untool";
 import { showToast, showLoading, hideLoading } from "./untool"
+import { setSessionXToken } from "@/session"
 
 // 请求接口
 function dealRequest(def, url, param) {
@@ -65,10 +66,9 @@ function handleResponse({
 		resolve(data)
 	} else {
 		if ( code == 401) { // 统一判断需要认证， 并作页面跳转
+			setSessionXToken()
 			showToast(msg)
-			setTimeout(() => {
-				goto("login/login", 2)
-			}, 3500)
+			goto("login/login", 2)
 			return reject({
 				code: {}
 			});
diff --git a/components/buns-goodinfo-sheet/buns-goodinfo-sheet.vue b/components/buns-goodinfo-sheet/buns-goodinfo-sheet.vue
index 62ca3d0..96a8fb5 100644
--- a/components/buns-goodinfo-sheet/buns-goodinfo-sheet.vue
+++ b/components/buns-goodinfo-sheet/buns-goodinfo-sheet.vue
@@ -10,7 +10,7 @@
 						</view>
 						<view class="dt-cont">
 							<view class="dt-block mt-10">
-								<tpx-tags v-model:value="checkedGoodId" type="single" :list="hotGoods"></tpx-tags>
+								<tpx-tags v-model:value="checkedGoodId" type="single" :list="goodsRes.list.slice(0,6)" @onChange="handleChooseGood"></tpx-tags>
 							</view>
 						</view>
 					</view>
@@ -26,7 +26,7 @@
 							<view class="edm-input-item">
 								<tpx-select v-model:value="checkedGoodId" v-model:resObject="goodsRes" :getListFun="getGoodsList" :transKeyVal="{valKey: 'goodsCode',titleKey: 'goodsName'}" 
 									mode="drop" 
-									:searchParam="goodsSearchParam" @onChange="handleWayChange" 
+									:searchParam="goodsSearchParam" @onChange="handleChooseGood" 
 								>
 									<u-input placeholder="物品名称" v-model="modelInfo.goodsName" font-size="26"
 										custom-style="border-radius: 30rpx;padding: 10rpx 20rpx;" 
@@ -40,7 +40,7 @@
 									<template v-slot:right>
 										<u-input placeholder="请填写" v-model="modelInfo.cargoQty" inputAlign="right" font-size="26"
 											custom-style="border:0;border-radius: 10rpx;padding: 14rpx 20rpx;" 
-											placeholder-style="color: #999; " 
+											placeholder-style="color: #999; "  type="number" 
 										>
 											<template #suffix>
 												<text class="font-26 clr-sub pl-10">件</text>
@@ -55,7 +55,7 @@
 									<template v-slot:right>
 										<u-input placeholder="请填写" v-model="modelInfo.price" inputAlign="right" font-size="26"
 											custom-style="border:0;border-radius: 10rpx;padding: 14rpx 20rpx;" 
-											placeholder-style="color: #999; " 
+											placeholder-style="color: #999; "  type="number" 
 										>
 											<template #suffix>
 												<text class="font-26 clr-sub pl-10">CNY</text>
@@ -201,10 +201,10 @@
 				modelInfo: {},
 				goodsRes: { list: [] },
 				checkedGoodId: '',
-				hotGoods: [
-					{ title: '热门1', val: 1 },
-					{ title: '热门2', val: 2 },
-				]
+				// hotGoods: [
+				// 	{ title: '604', val: 1 },
+				// 	{ title: '热门2', val: 2 },
+				// ]
 			}
 		},
 		created() {
@@ -225,6 +225,13 @@
 				this.$emit('onSure', this.modelInfo)
 				this.$emit('update:value', this.modelInfo)
 				this.handleCloseModal()
+			},
+			handleChooseGood(val) {
+				const item = this.goodsRes.list.filter(t=> t.val == val)[0]
+				this.modelInfo = {
+					...this.modelInfo,
+					...item
+				}
 			}
 		}
 	}
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 a5e376e..5c911ed 100644
--- a/components/buns-post-edit-templates/bpe-good-kuaidi-tmp.vue
+++ b/components/buns-post-edit-templates/bpe-good-kuaidi-tmp.vue
@@ -41,12 +41,12 @@
 		</tpx-text-item>
 	</view>
 	
-	<view class="edm-input-item">
+	<view v-if="modelInfo.blPrepareInFreight" class="edm-input-item">
 		<tpx-text-item label="代垫预估">
 			<template v-slot:right>
 				<u-input placeholder="" v-model="modelInfo.prepareInEstFee" inputAlign="right"
 					custom-style="width: 366rpx;flex: none;border:0;border-radius: 10rpx;background-color: #F6F6F6;padding: 11rpx 20rpx;" 
-					placeholder-style="color: #999; " 
+					placeholder-style="color: #999; " type="number"
 				>
 					<template #suffix>
 						<text class="font-26 clr-sub pl-10">CNY</text>
diff --git a/components/buns-post-edit-templates/bpe-goodsize-tmp.vue b/components/buns-post-edit-templates/bpe-goodsize-tmp.vue
index f8fa4c5..50b0e59 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="kg"></tpx-input>
+					<tpx-input v-model:value="modelInfo.billWeight" :isWhite="true" placeholder="" suffix="kg" type="number"></tpx-input>
 				</view>
 			</u-row>
 		</view>
@@ -23,13 +23,13 @@
 				<view style="width: 70%;">
 					<u-row justify="between">
 						<u-col span="3.7">
-							<tpx-input v-model:value="modelInfo.chang" :isWhite="true" placeholder="长" suffix="cm"></tpx-input>
+							<tpx-input v-model:value="modelInfo.chang" :isWhite="true" placeholder="长" suffix="cm"  type="number"></tpx-input>
 						</u-col>
 						<u-col span="3.7">
-							<tpx-input v-model:value="modelInfo.kuan" :isWhite="true" placeholder="宽" suffix="cm"></tpx-input>
+							<tpx-input v-model:value="modelInfo.kuan" :isWhite="true" placeholder="宽" suffix="cm" type="number"></tpx-input>
 						</u-col>
 						<u-col span="3.7">
-							<tpx-input v-model:value="modelInfo.gao" :isWhite="true" placeholder="高" suffix="cm"></tpx-input>
+							<tpx-input v-model:value="modelInfo.gao" :isWhite="true" placeholder="高" suffix="cm" type="number"></tpx-input>
 						</u-col>
 					</u-row>
 					
diff --git a/components/tpx-input/tpx-input.vue b/components/tpx-input/tpx-input.vue
index b952fae..ebacc58 100644
--- a/components/tpx-input/tpx-input.vue
+++ b/components/tpx-input/tpx-input.vue
@@ -1,6 +1,6 @@
 <template>
 	<u-input shape="circle" :placeholder="placeholder" :modelValue="value" :clearable="clearable" 
-		:custom-style="inputStyle" :readonly="readonly"
+		:custom-style="inputStyle" :readonly="readonly" :type="type"
 		:placeholder-style="`color: #999;${placeholderStyle};` " @change="handleChange"
 	>
 		<template v-if="suffix" #suffix>
@@ -35,6 +35,11 @@
 					return false
 				}
 			},
+			type: {
+				default () {
+					return ''
+				}
+			},
 			readonly: {
 				default () {
 					return false
diff --git a/pages/post/model.js b/pages/post/model.js
index d143be3..34f4c24 100644
--- a/pages/post/model.js
+++ b/pages/post/model.js
@@ -131,8 +131,8 @@ export const getOrderModels = () => {
 		"prepareInBillCode": undefined, // 快递单号
 		"prepareInRemark": undefined, // 预入仓自定义标识
 		"prepareInSupplier": undefined, // 预入仓供应商
-		"warehouseInNo": "", // 进仓单号
+		"warehouseInNo": [], // 进仓单号
 		"meterRate": undefined, // 泡重比
-		"goodsPics": "", // 货物图片
+		"goodsPics": [], // 货物图片
 	}
 }
\ No newline at end of file