Merge branch 'master' into dev_delivery

subPackages/techan/manualIndex.vue

@@ -8,7 +8,7 @@
 				<image src="https://static.ticket.sz-trip.com/uploads/20250618/0c2a469b4216f8cd570822b642d0a0fe.png"></image>
 				<view style="padding:50rpx 0 67rpx">暂无数据</view>
 			</view>
-			<scroll-view class="right-container no-scrollbar" :scroll-y="true" @scrolltolower="scrollLow()" v-else>
+			<view class="right-container no-scrollbar" :scroll-y="true"  v-else>
 				<view class="search-result" >
 					<view  v-for="(item,i) in list" class="search-item" :key="i" @click="viewDetail(item)">
 						<image :src="showImg(item.headimg)" mode="aspectFill"></image>
@@ -21,7 +21,7 @@
 						</view>
 					</view>
 				</view>
-			</scroll-view >
+			</view>
 		</view>
 		<view style="height: 60rpx;"></view>
 	</view>
@@ -138,15 +138,9 @@
 	}
 	
 	
-	.data-container{
-		display: flex;
-		flex-direction: column;
-	}
 	
 	.right-container{
-		flex: 1;
 		width: 100%;
-		height: 1rpx;
 		.search-result{
 			display: flex;
 			flex-wrap: wrap;
@@ -219,7 +213,7 @@
 		}
 
 	}
-.placeholder-content{
+	.placeholder-content{
 		background: white;
 		position: relative;
 		.btn-cover{
@@ -247,7 +241,7 @@
 				color: #FFFFFF;
 			}
 		}
-}
+	}
 
 
 	.supplier-box{