调整

pages/otherFunctions/equipmentRetrieval/equipmentDetail.vue

@@ -38,63 +38,66 @@
 							</view>
 						</view>
 						
+						
 						<view class="item" >
 							<view class="item-title">
-								购置时间
+								库存数量
 							</view>
 							<view class="item-value">
-								{{info.buyTime}}
+								{{count}}
 							</view>
 						</view>
+						
 						<view class="item" >
 							<view class="item-title">
-								数量
+								单位
 							</view>
 							<view class="item-value">
-								{{info.count}}
+								{{info.unit}}
 							</view>
 						</view>
-						
 						<view class="item" >
 							<view class="item-title">
-								单位
+								制造厂家
 							</view>
 							<view class="item-value">
-								{{info.unit}}
+								{{info.manufactor}}
 							</view>
 						</view>
-						<view class="item" >
+						<!-- <view class="item" >
 							<view class="item-title">
-								试验时间
+								单价
 							</view>
 							<view class="item-value">
-								{{info.experimentLastTime}}
+								{{info.unitPrice?info.unitPrice+'元':'无'}}
 							</view>
-						</view>
-						<view class="item" >
+						</view> -->
+						<view class="item " style="width: 100%;"   v-if="false">
 							<view class="item-title">
-								制造厂家
+								购置时间
 							</view>
 							<view class="item-value">
-								{{info.manufactor}}
+								{{info.buyTime}}
 							</view>
 						</view>
-						<view class="item" >
+						<view class="item" style="width: 100%;" v-if="false"  >
 							<view class="item-title">
-								试验周期
+								巡检时间
 							</view>
 							<view class="item-value">
-								{{info.experimentPeriod?info.experimentPeriod+'天':''}}
+								{{info.experimentLastTime}}
 							</view>
 						</view>
-						<view class="item" >
+						
+						<view class="item"  v-if="false">
 							<view class="item-title">
-								单价
+								试验周期
 							</view>
 							<view class="item-value">
-								{{info.unitPrice?info.unitPrice+'元':'无'}}
+								{{info.experimentPeriod?info.experimentPeriod+'天':''}}
 							</view>
 						</view>
+						
 					</view>
 					
 				</view>
@@ -118,7 +121,7 @@
 				</view>
 			</view>
 			<!-- 巡检记录 -->
-			<view class="content">
+			<view class="content"  v-if="false">
 				<view class="infos">
 					<view class="name">
 					<view class="icon"><img src="@/assets/img/riLine-device-recover-line@1x.png" alt=""></view>
@@ -162,7 +165,7 @@
 				</view>
 			</view>
 			<!-- 出入库记录 -->
-			<view class="content">
+			<view class="content"  v-if="false">
 				<view class="infos">
 					<view class="name">
 					<view class="icon"><img src="@/assets/img/riLine-todo-line@1x.png" alt=""></view>
@@ -265,6 +268,7 @@
 		data() {
 			return {
 				name:"",
+				count:"",
 				info:{},
 				description: '下次巡检时间：2023/03/30',
 				list: [{
@@ -299,6 +303,7 @@
 				}).then((res) => {
 					uni.hideLoading();
 					this.info=res.data.deviceInfo;
+					this.count=res.data.count;
 				}).catch(error => {
 					uni.showToast({
 						title: error,
@@ -415,6 +420,7 @@
 			  display: flex;
 			  justify-content: space-between;
 			  flex-wrap: wrap;
+			  
 			  .item{
 				  display: flex;
 				  margin-bottom: 16rpx;

pages/otherFunctions/homePage.vue

@@ -261,7 +261,7 @@
 					this.carhelp.logoff();
 				
 					
-					uni.reLaunch({
+					uni.redirectTo({
 						url:"/"
 					})
 					
@@ -278,7 +278,12 @@
 		}
 	}
 </script>
-
+<style >
+	page{
+		background-color: rgba(1,122,255,1);
+		padding-bottom: 100rpx;
+	}
+</style>
 <style lang="scss" scoped>
 	
 	.options{