样式调整

components/equipmentRetrieval.vue

@@ -25,7 +25,7 @@
 		<view class="main">
 			<!-- 分类 -->
 			<view class="classify calc10080 " v-if="!queryContentBl&&!isreturn">
-				<scroll-view scroll-y="true" class="calc10080" >
+				<scroll-view scroll-y="true" :class="iscomponents!=1?'calc10082':'calc10081'" >
 				
 				<view class="item " v-for="(item,index) in menuList" :key="index" @click="toggle(index)"
 					:class="{'checked':index ==checkindex }">
@@ -39,12 +39,14 @@
 			<!-- 	<view class="title"  v-for="item in 4">
 					设备类型一
 				</view> -->
-				<scroll-view scroll-y="true"  class="calc10080"  @scrolltolower="myLoadmoreonReachBottom()">
+				<scroll-view scroll-y="true" :class="iscomponents!=1?'calc10082':'calc10081'"  @scrolltolower="myLoadmoreonReachBottom()">
 				
 				<view class="content"  >
 					<view class="item" v-for="(item,i) in indexList"  @click="viewItem(item)" :key="i">
 						<view class="picture">
-							<img :src="item.imgUrl" alt="">
+							<img :src="item.imgUrl"  alt="">
+							
+
 						</view>
 						<view class="infos" :class="{
 							infosQuery:queryContentBl||isreturn
@@ -52,7 +54,7 @@
 							<view class="name">
 								{{item.title}}
 							</view>
-							<view class="model">
+							<view class="model" >
 								<view class="infos-title">
 									型号：
 								</view>
@@ -60,7 +62,7 @@
 									{{item.model}}
 								</view>
 							</view>
-							<view class="model">
+							<view class="model" v-if="item.specifications">
 								<view class="infos-title">
 									规格：
 								</view>
@@ -331,8 +333,6 @@
 			},
 			getList(){
 				
-				
-				
 				uni.showLoading({
 					title: "加载中",
 					mask: true,
@@ -518,7 +518,15 @@
 		}
 	}
 	.calc10080{
+			//height: calc(95vh - 90px);
+	}
+	.calc10081{
+			//height: calc(95vh - 90px);
+			height:700rpx
+	}
+	.calc10082{
 			height: calc(95vh - 90px);
+			//height:750rpx
 	}
 	.main {
 		display: flex;

config/.env.dev.js

@@ -4,8 +4,7 @@ const UNI_APP = {
 	BASE_URL:"https://equipment.xiaoxinda.com/equipment-manage-server/",
 	//IMG_URL:"http://www.jsrailway.com.cn/",
 	//BASE_URL: 'https://charging.xiaoxinda.com/charging-station-test/',
-	//BASE_URL:'http://192.168.77.162:8081/railroad-server/',
-	BASE_URL: 'http://192.168.77.162:8086/equipment-manage-server/',
+	//BASE_URL: 'http://192.168.77.162:8086/equipment-manage-server/',
 	
 	//BASE_URL:'http://192.168.77.222:8086/railroad-server/',
 	PREFIX : "jp-Equipment-Jingli_openid",
@@ -17,8 +16,8 @@ const UNI_APP = {
 	//openId:"123",// 项目部 - 审批1
 	//openId:"223",// 项目部 - 审批2
 	//openId:"323",// 项目部 - 审批3
-	//openId:"oBEnI6PiaBMNUMTnjT0ffT1R2JOk",//杨所
-	//openId:"oBEnI6N9gRq3xOVlw34JfYjhtB9k",//  伊明
+	openId:"oBA__5fiKEszHSigQGwZbLCVbg5A",//杨所
+	openId:"oBA__5X5N82jX6moeOFkbnRNjPog",//  sz
 	//openId:"oK9Wr58zNwDernF0TL6o3mdUxk2A",
 	//openId:"oK9Wr5xRUoP9EygZqBec0xkJMVTs",
 	//openId:"oK9Wr55J1J1eL6BqI2tW749NTxNU",//zq

pages/projectDepartment/exportApplication/deliveryFrom.vue

@@ -212,12 +212,12 @@
 						</view>
 					</view>
 				</view>
-				<scroll-view scroll-y="true" style="height: 800rpx;" @scrolltolower="refscrolltolower()">
+				<view >
 					
 				
 				<equipmentRetrieval  @ckItem="ckItem" :list="list"
 				 ref="equipmentRetrievalRef" :iscomponents="1"></equipmentRetrieval>
-				</scroll-view>
+				</view>
 	 		</u-popup>
 	<!-- 确认出库 -->
 	<view class="bottom"  >

pages/projectDepartment/exportReturn/deliveryFrom.vue

@@ -199,13 +199,13 @@
 								</view>
 							</view>
 						</view>
-						<scroll-view scroll-y="true" style="height: 800rpx;" @scrolltolower="refscrolltolower()">
+						<view  @scrolltolower="refscrolltolower()">
 							
 						
 						<equipmentRetrieval   @ckItem="ckItem" :list="list" :scanList="scanList"
 						
 						 ref="equipmentRetrievalRef" :iscomponents="1" :isreturn="1" ></equipmentRetrieval>
-						</scroll-view>
+						</view>
 				</u-popup>
 				 
 		<!-- 确认出库 -->