From 2f0f13c472e3cb663c3f6cbb417cffe760a497f0 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 05 九月 2025 18:32:09 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/jinkuai

---
 small-program/pages/sorting/sorting.vue |   26 ++++++++++++++------------
 1 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/small-program/pages/sorting/sorting.vue b/small-program/pages/sorting/sorting.vue
index 99002d5..590cce0 100644
--- a/small-program/pages/sorting/sorting.vue
+++ b/small-program/pages/sorting/sorting.vue
@@ -17,7 +17,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>
@@ -50,13 +50,13 @@
 							<text>浜�</text>
 						</view>
 					</view>
-					<view class="list-item-row" v-if="viewStatus">
+					<view class="list-item-row"  >
 						<view class="list-item-row-label">闇�姹傝ˉ鍏�</view>
 						<view class="list-item-row-val">
 							<textarea v-model="form.supplement" cols="30" rows="10" placeholder="濡傛灉鏈夌壒娈婅姹傦紝璇峰湪姝ゅ璇存槑" maxlength="200"></textarea>
 						</view>
 					</view>
-					<view class="list-item-row" v-if="viewStatus">
+					<view class="list-item-row" >
 						<view class="list-item-row-label">鍥剧墖</view>
 						<view class="list-item-row-upload">
 							<view class="upload-item" v-for="(item, index) in form.multifileList" :key="index">
@@ -69,10 +69,10 @@
 							</view>
 						</view>
 					</view>
-					<view class="list-item-zk" @click="viewStatus = !viewStatus">
+				<!-- 	<view class="list-item-zk" @click="viewStatus = !viewStatus">
 						<text>{{viewStatus ? '鏀惰捣' : '琛ュ厖闇�姹�'}}</text>
 						<u-icon :name="viewStatus ? 'arrow-up' : 'arrow-down'" color="#00BC12" size="16"></u-icon>
-					</view>
+					</view> -->
 				</view>
 				<view class="list-item">
 					<view class="list-item-label">
@@ -126,9 +126,9 @@
 				</view>
 			</view>
 			<view class="footer-bottom">
-				<div class="footer-bottom-btn" @click="submit">
-					<text>绔嬪嵆涓嬪崟</text>
-					<text>锛堟湇鍔″畬鎴愬悗浠樻锛�</text>
+				<div class="footer-bottom-btn" @click="submit" >
+					<text>{{form.id?'纭淇敼':'绔嬪嵆涓嬪崟'}}</text>
+					<text v-if="!form.id">锛堟湇鍔″畬鎴愬悗浠樻锛�</text>
 				</div>
 			</view>
 			<view style="width: 100%; height: env(safe-area-inset-bottom);"></view>
@@ -139,6 +139,7 @@
 			:show="show"
 			color="#00BC12"
 			mode="range"
+			 :allowSameDay="true"
 			@close="show = false"
 			@confirm="confirmDate" />
 		
@@ -192,7 +193,7 @@
 					type: 0
 				},
 				cateList: [],
-				viewStatus: false
+				viewStatus: true
 			};
 		},
 		onLoad(option) {
@@ -215,6 +216,7 @@
 					
 				})
 			} else {
+				this.form.linkName = this.userInfo.name
 				this.form.linkPhone = this.userInfo.telephone
 				this.form.priceNum1 = option.days
 				this.form.startDate = option.startDate
@@ -257,7 +259,7 @@
 								uni.showToast({ title: '缂栬緫鎴愬姛', icon: 'success', mask: true, duration: 2000 })
 								setTimeout(() => {
 									uni.navigateBack({ delta: 1 });
-									uni.$emit('refresh')
+									// uni.$emit('refresh')
 								}, 1500)
 							}
 						})
@@ -271,7 +273,7 @@
 						priceUnit: this.form.priceUnit,
 						priceNum1: this.form.priceNum1,
 						priceNum2: this.form.priceNum2,
-						type: this.form.type,
+						type: this.form.type, 
 						workType: this.form.workType
 					}).then(res => {
 						if (res.code === 200) {
@@ -293,7 +295,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
 					}
 				});
 			},

--
Gitblit v1.9.3