调整

aircraft/server/equipment/equipment.vue

@@ -5,15 +5,14 @@
 				我的设备
 			</view>
 			<view class="device-item" v-for="(item, index) in deviceList" :key="index">
-				<u-image class="device-image" :src="item.image||(ordFileUrl+defaultIcon)" 
+				<u-image class="device-image" :src="item.deviceImg||(ordFileUrl+defaultIcon)" 
 				mode="widthFix" @click="preview(item.image||(ordFileUrl+defaultIcon))" />
 				<view class="device-info">
 					<text class="device-name">{{ item.name }}</text>
 					<text class="device-model">{{ item.model }}</text>
 				</view>
-				<button class="detail-btn" @click="goToDetail(item.id)">
-					查看详情
-				</button>
+				<u-button class="detail-btn" type="warning" :custom-style="customStyle"
+				:hair-line="false" @click="goToDetail(item.id)">查看详情</u-button>
 			</view>
 			<u-loadmore v-if="deviceList.length>0" @loadmore="getMore" :status="form.isFinish" color="#333333" marginTop="30" marginBottom="20" />
 			<view class="device-empty" :style="{marginTop: CustomBar+100+'px'}" v-else>
@@ -136,6 +135,9 @@
 				background: #f3f3f3;
 				border-radius: 12rpx;
 				border: 2rpx solid #cccccc;
+				&::v-deep .u-image__image{
+					border-radius: 12rpx !important;
+				}
 			}
 
 			.device-info {
@@ -162,13 +164,18 @@
 				
 			}
 			.detail-btn {
-			  border: none;
-			  background: #fee547;
-			  border-radius: 12rpx;
-			  font-family: Source Han Sans SC;
-			  font-weight: bold;
-			  font-size: 30rpx;
-			  color: #333333;
+				&::v-deep .u-btn--warning{
+					border: none;
+					background: #fee547;
+					border-radius: 12rpx;
+					font-family: Source Han Sans SC;
+					font-weight: bold;
+					font-size: 30rpx;
+					color: #333333;
+					height: 72rpx !important;
+					line-height: 72rpx !important;
+					padding: 0 22rpx !important;
+				}
 			}
 		}
 		

aircraft/server/equipment/equipmentDetail.vue

@@ -216,7 +216,7 @@ export default {
             }));
           } else {
             this.equipmentImages = [{
-              image: "/static/drone.png",
+              image: this.fileUrl+"drone.png",
               title: "默认图片"
             }];
           }

aircraft/server/route/route.vue

@@ -1,14 +1,14 @@
 <template>
-	<view class="">
-		路线
-	<!-- <view class="aircraft-route" :style="{backgroundImage: `url(${fileUrl+bgIcon})`}">
+	<!-- <view class="">
+		路线 -->
+	<view class="aircraft-route" :style="{backgroundImage: `url(${fileUrl+bgIcon})`}">
 		<view class="route-content">
 			<view class="top-abs" :style="{top: StatusBar+'px',height: CustomBar-StatusBar+'px'}">
 				路线
 			</view>
 			<view :style="{height: CustomBar + 'px'}" />
 			<view class="route-search">
-				<u-icon :name="fileUrl+searchIcon" size="36" />
+				<u-icon class="route-search-icon" :name="fileUrl+searchIcon" size="36" @click="search" />
 				<searchCombox style="flex: 1;margin: 0 10rpx;" :candidates="scenics" :isJSON="true" keyName="name" placeholder="搜索景区" 
 				v-model="query" @select="handleSearchSelect" selectedColor="#F8B500" />
 				<u-icon class="triangle" :name="fileUrl+triangleIcon" size="24" />
@@ -41,7 +41,7 @@
 				src="/static/empty.png" icon-size="300" font-size="40"
 				margin-top="250"></u-empty>
 			</view>
-		</view> -->
+		</view>
 		<u-toast ref="uToast"></u-toast>
 	</view>
 </template>
@@ -88,14 +88,14 @@ export default {
 				size: 10,
 				// 是否结束——loadmore加载更多，loading加载中，nomore无更多
 				isFinish: 'nomore',
-				routeId: ''
+				scenicId: ''
 			},
 		}
 	},
 	methods:{
 		// 初始化
 		async init(){
-			this.form = {size: 10,current: 1,isFinish: 'nomore',routeId: ''};
+			this.form = {size: 10,current: 1,isFinish: 'nomore',scenicId: ''};
 			await this.getRouteList();
 			// 查询全部景区
 			let scenRes = await this.$api.allScenic();
@@ -106,6 +106,7 @@ export default {
 		// 搜索
 		search(){
 			this.form = { ...this.form, current: 1, isFinish: 'nomore' };
+			if(!this.query) this.form.scenicId = '';
 			this.getRouteList();
 		},
 		// 查询订单列表
@@ -130,7 +131,8 @@ export default {
 		},
 		// 搜索
 		handleSearchSelect(e){
-			console.log('触发搜索：',e.id);
+			this.form.scenicId = e.id;
+			this.search();
 		},
 		// 查看详情
 		showDetail(item){
@@ -177,6 +179,11 @@ export default {
 			.triangle{
 				animation: spinBack 0.1s linear;
 			}
+			&-icon{
+				&:active{
+					opacity: 0.7;
+				}
+			}
 		}
 		.route-item{
 			margin-top: 26rpx;