Merge branch 'main' of http://42.192.7.176:3000/lizhichao/hitap-chat

pages/index/index.vue

@@ -392,19 +392,21 @@
 		// background: linear-gradient(180deg, #FFFFFF 0%, rgba(255, 255, 255, 0) 100%);
 		background: #f8fafb;
 		// border-radius: 24px 24px 0px 0px;
-		padding: 20rpx 30rpx 0;
+		padding: 20rpx 30rpx;
 		font-family: Source Han Sans CN, Source Han Sans CN;
-		position: sticky;
+		position: fixed;
 		/* top: 418px; */
-		top: calc(var(--status-bar-height) + 798rpx);
+		top: calc(var(--status-bar-height) + 792rpx);
 		z-index: 99;
-		padding-bottom: 30rpx;
+		width: 100%;
+		// padding-bottom: 30rpx;
 	}
 
 	.Box {
 		.Content {
 			width: calc(100% - 48rpx);
 			padding-bottom: 100rpx;
+			margin-top: 100rpx;
 		}
 
 		.Unit {

pages/investigation/task.vue

@@ -79,7 +79,7 @@
 					<uni-forms-item label="道路宽度" name="roadWidth" required label-width="80">
 						<view class="Height100 Flex Flex_end Flex_C_S-Center" style="line-height: 37px; ">
 							<input v-if="isEdit" type="number" class="BorderNone Height100 formInput"
-								v-model="formData.roadWidth" placeholder="请输入道路宽度" @focus="focus" />
+								v-model="formData.roadWidth" placeholder="请输入道路宽度" @focus="focus" @blur="blur" />
 							<view class="Height100" v-else>{{ formData.roadWidth }}</view>
 							<view class="Height100">米</view>
 						</view>
@@ -87,7 +87,7 @@
 					<uni-forms-item label="车道数" name="laneCount" required label-width="80">
 						<view class="Height100 Flex Flex_end Flex_C_S-Center" style="line-height: 37px; ">
 							<input v-if="isEdit" type="number" class="BorderNone Height100 formInput"
-								v-model="formData.laneCount" placeholder="请输入车道数" @focus="focus" />
+								v-model="formData.laneCount" placeholder="请输入车道数" @focus="focus" @blur="blur" />
 							<view class="Height100" v-else>{{ formData.laneCount }}</view>
 							<view class="Height100">道</view>
 						</view>
@@ -95,7 +95,7 @@
 					<uni-forms-item label="路面结构">
 						<view class="Height100 Flex Flex_end Flex_C_S-Center" style="line-height: 37px; ">
 							<input v-if="isEdit" type="text" class="BorderNone Height100 formInput"
-								v-model="formData.roadStructure" placeholder="请输入路面结构" @focus="focus" />
+								v-model="formData.roadStructure" placeholder="请输入路面结构" @focus="focus" @blur="blur" />
 							<view class="Height100" v-else>{{ formData.roadStructure }}</view>
 							<view class="Height100"></view>
 						</view>
@@ -103,7 +103,7 @@
 					<uni-forms-item label="路侧防护">
 						<view class="Height100 Flex Flex_end Flex_C_S-Center" style="line-height: 37px; ">
 							<input v-if="isEdit" type="text" class="BorderNone Height100 formInput"
-								v-model="formData.sideProtec" placeholder="请输入路侧防护" @focus="focus" />
+								v-model="formData.sideProtec" placeholder="请输入路侧防护" @focus="focus" @blur="blur" />
 							<view class="Height100" v-else>{{ formData.sideProtec }}</view>
 							<view class="Height100"></view>
 						</view>
@@ -111,7 +111,7 @@
 					<uni-forms-item label="中央隔离">
 						<view class="Height100 Flex Flex_end Flex_C_S-Center" style="line-height: 37px; ">
 							<input v-if="isEdit" type="text" class="BorderNone Height100 formInput"
-								v-model="formData.centerSeparate" placeholder="请输入中央隔离" @focus="focus" />
+								v-model="formData.centerSeparate" placeholder="请输入中央隔离" @focus="focus" @blur="blur" />
 							<view class="Height100" v-else>{{ formData.centerSeparate }}</view>
 							<view class="Height100"></view>
 						</view>
@@ -119,7 +119,7 @@
 					<uni-forms-item label="设计时速" name="designSpeed" required label-width="80">
 						<view class="Height100 Flex Flex_end Flex_C_S-Center" style="line-height: 37px; ">
 							<input v-if="isEdit" type="number" class="BorderNone Height100 formInput"
-								v-model="formData.designSpeed" placeholder="请输入设计时速" @focus="focus" />
+								v-model="formData.designSpeed" placeholder="请输入设计时速" @focus="focus" @blur="blur" />
 							<view class="Height100" v-else>{{ formData.designSpeed }}</view>
 							<view class="Height100">Km/h</view>
 						</view>
@@ -127,7 +127,7 @@
 					<uni-forms-item label="限速" name="limitSpeed" required label-width="80">
 						<view class="Height100 Flex Flex_end Flex_C_S-Center" style="line-height: 37px; ">
 							<input v-if="isEdit" type="number" class="BorderNone Height100 formInput"
-								v-model="formData.limitSpeed" placeholder="请输入限速" @focus="focus" />
+								v-model="formData.limitSpeed" placeholder="请输入限速" @focus="focus" @blur="blur" />
 							<view class="Height100" v-else>{{ formData.limitSpeed }}</view>
 							<view class="Height100">Km/h</view>
 						</view>
@@ -1920,6 +1920,23 @@
 					}
 				}).exec(); // 执行查询
 			},
+			blur() {
+				const query = uni.createSelectorQuery().in(this);
+
+				// 选择我们想要的元素
+				query.select('#page').boundingClientRect(data => {
+					// data是选中元素的大小及位置信息
+					if (data) {
+						// 元素的高度
+						const height = data.height;
+						if (this.isEdit) {
+
+							this.boxHeight = height - 200
+						}
+						console.log('盒子的高度:', height);
+					}
+				}).exec(); // 执行查询
+			},
 			focus2() {
 				const query = uni.createSelectorQuery().in(this);
 

pages/knowledge/index.vue

@@ -11,7 +11,7 @@
 					<view class="titleTwo">
 						作为你的智能伙伴，我可以为你提供交通领域知识的答疑解惑。
 					</view>
-					<view class="text"> 你这样试着问我: </view>
+					<view class="text"> 你可以这样问我: </view>
 					<view class="tipQuestions">
 						<view class="" v-for="(item, index) in tipQuestions" :key="index">
 							<view class="tipItem" @click="handleBtn(item.text)">