From da400f96eb15dacda411bcfac122aa14cad4e01e Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 28 八月 2025 17:24:03 +0800
Subject: [PATCH] 前端

---
 small-program/pages/packaging-worker/packaging-worker.vue |   65 ++++++++++++++++++++++----------
 1 files changed, 44 insertions(+), 21 deletions(-)

diff --git a/small-program/pages/packaging-worker/packaging-worker.vue b/small-program/pages/packaging-worker/packaging-worker.vue
index 3e044c9..648fa1b 100644
--- a/small-program/pages/packaging-worker/packaging-worker.vue
+++ b/small-program/pages/packaging-worker/packaging-worker.vue
@@ -18,7 +18,7 @@
 					<view class="list-item-row" @click="selectAddress()">
 						<view class="list-item-row-label">鐢ㄥ伐鍦扮偣<b>*</b></view>
 						<view class="list-item-row-val">
-							<text>{{form.location ? form.location : '璇烽�夋嫨'}}</text>
+							<text style="width:80%;">{{form.location ? form.location : '璇烽�夋嫨'}}</text>
 							<u-icon name="arrow-right" color="#111111" size="16"></u-icon>
 						</view>
 					</view>
@@ -84,10 +84,14 @@
 						<view :class="form.carType === item.id ? 'list-item-cate-item active' : 'list-item-cate-item'" v-for="(item, index) in settlementType" :key="index" @click="clickType(item.id)">{{item.name}}</view>
 					</view>
 					<view class="list-item-row">
-						<view class="list-item-row-label">澶╂暟</view>
+						<view class="list-item-row-label" v-if="form.carType === 0">澶╂暟</view>
+						<view class="list-item-row-label" v-if="form.carType === 1">灏忔椂鏁�</view>
+						<view class="list-item-row-label" v-if="form.carType === 2">閲嶉噺</view>
 						<view class="list-item-row-val">
-							<input v-model="form.priceNum1" disabled @blur="getPrice" type="number" placeholder="璇疯緭鍏�" />
-							<text>澶�</text>
+							<input v-model="form.priceNum1" :disabled="form.carType === 0" @blur="getPrice" type="number" placeholder="璇疯緭鍏�" />
+							<text v-if="form.carType === 0">澶�</text>
+							<text v-if="form.carType === 1">灏忔椂</text>
+							<text v-if="form.carType === 2">鏂�</text>
 						</view>
 					</view>
 					<view class="list-item-row">
@@ -143,6 +147,7 @@
 			:show="show"
 			color="#00BC12"
 			mode="range"
+			 :allowSameDay="true"
 			@close="show = false"
 			@confirm="confirmDate" />
 		
@@ -198,11 +203,12 @@
 				},
 				settlementType: [
 					{ name: '鎸夊ぉ浠樿垂', id: 0 },
-					{ name: '鎸夋浠樿垂', id: 1 },
+					{ name: '鎸夊皬鏃朵粯璐�', id: 1 },
 					{ name: '鎸夐噸閲忎粯璐�', id: 2 }
 				],
 				cateList: [],
-				viewStatus: false
+				viewStatus: false,
+				workDays: 0
 			};
 		},
 		onLoad(option) {
@@ -211,16 +217,19 @@
 				this.$u.api.getDetail({
 					orderId: option.id
 				}).then(res => {
-					this.info = res.data
-					for (const key in this.form) {
-						this.form[key] = res.data[key]
+					if (res.code === 200) {
+						this.info = res.data
+						for (const key in this.form) {
+							this.form[key] = res.data[key]
+						}
+						this.form.days = res.data.totalDays
+						this.form.price = Number(this.form.price) / 100
+						if (!this.form.multifileList) {
+							this.form.multifileList = []
+						}
+						// this.clickType()
 					}
-					this.form.days = res.data.totalDays
-					this.form.price = Number(this.form.price) / 100
-					if (!this.form.multifileList) {
-						this.form.multifileList = []
-					}
-					// this.clickType()
+					
 				})
 			} else {
 				this.form.linkPhone = this.userInfo.telephone
@@ -266,7 +275,7 @@
 									uni.showToast({ title: '缂栬緫鎴愬姛', icon: 'success', mask: true, duration: 2000 })
 									setTimeout(() => {
 										uni.navigateBack({ delta: 1 });
-										uni.$emit('refresh')
+										// uni.$emit('refresh')
 									}, 1500)
 								}
 							}
@@ -283,14 +292,21 @@
 						type: this.form.type,
 						workType: this.form.workType
 					}).then(res => {
-						this.form.estimatedAccount = res.data
+						if (res.code === 200) {
+							this.form.estimatedAccount = res.data
+						}
+						
 					})
 				}
 			},
 			confirmDate(e) {
 				this.form.startDate = e[0]
 				this.form.endDate = e[e.length - 1]
-				this.form.priceNum1 = e.length;
+				let time = this.form.startDate == this.form.endDate ? 1 : 0
+				this.workDays = e.length - time;
+				if (this.form.carType === 0) {
+					this.form.priceNum1 = e.length - time;
+				}
 				this.show = false
 				this.getPrice()
 			},
@@ -299,7 +315,7 @@
 					success: (res) => {
 						this.form.lat = res.latitude
 						this.form.lgt = res.longitude
-						this.form.address = res.address
+						this.form.address =res.name ||  res.address
 					}
 				});
 			},
@@ -307,8 +323,13 @@
 				this.form.carType = id
 				if (id === 0) {
 					this.form.priceUnit = '鍏�/浜�/澶�'
-				} else {
+					this.form.priceNum1 = this.workDays
+				} else if (id === 1) {
 					this.form.priceUnit = '鍏�/浜�/灏忔椂'
+					this.form.priceNum1 = ''
+				} else {
+					this.form.priceUnit = '鍏�/鏂�'
+					this.form.priceNum1 = ''
 				}
 			},
 			confirmCategary(e) {
@@ -320,7 +341,9 @@
 				this.$u.api.getCategoryList({
 					type: 0
 				}).then(res => {
-					this.cateList = [res.data]
+					if (res.code === 200) {
+						this.cateList = [res.data]
+					}
 				})
 			},
 			uploadImg() {

--
Gitblit v1.9.3