littlegreen 1 year ago
parent
commit
4525d64d82

+ 2 - 1
pages/borrow/borrow.vue

@@ -434,7 +434,8 @@ page{
 	position: fixed;
 	bottom: 20rpx;
 	right: 20rpx;
-	background: #ffffff;
+	background: rgb(69,140,214);
+	color: white;
 	z-index:100;
 	.iconfont{
 		font-size: 42rpx;

+ 1 - 1
pages/fault/fault-report/fault-report.vue

@@ -37,7 +37,7 @@
 			border="none" 
 			v-model="fault" 
 			placeholder="请输入故障现象" 
-			autoHeight
+			height='80'
 			maxlength="-1"></u--textarea>
 		</view>
 		<view class="btn-area">

+ 1 - 1
pages/home/home.vue

@@ -187,7 +187,7 @@ page{
 	box-sizing: border-box;
 }
 .search-area{
-	margin-bottom: 20rpx ;
+	margin-bottom: 30rpx ;
 	flex-shrink: 0;
 	position: relative;
 	input{

+ 5 - 0
pages/menus/borrow-record/borrow-record.vue

@@ -120,6 +120,11 @@
 						url:'/pages/return/return?id='+id
 					})
 				}
+			},
+			scrolltolower(){
+				if(!this.isOver){
+					this.init(this.page,false)
+				}
 			}
 		},
 		onShow() {

+ 3 - 3
pages/visitor/assetDetail/assetDetail.vue

@@ -12,7 +12,7 @@
 					</view>
 				</scroll-view>
 				
-				<view class="name2">设备详情</view>
+				<!-- <view class="name2">设备详情</view>
 				<scroll-view class="content1" scroll-y="true">
 					<view v-if="assetInfo.specificationsModel">规格:<text selectable="true">{{assetInfo.specificationsModel}}</text></view>
 					<view v-if="assetInfo.purpose">用途:<text selectable="true">{{assetInfo.purpose}}</text></view>
@@ -23,7 +23,7 @@
 					<view v-if="assetInfo.manufacturer">厂商:<text selectable="true">{{assetInfo.manufacturer}}</text></view>
 					<view>编号:<text selectable="true">{{assetInfo.number}}</text></view>
 					<view>条形码:<text selectable="true">{{assetInfo.barCode}}</text></view>
-				</scroll-view>
+				</scroll-view> -->
 			</view>
 		</view>
 		<view class="videoBox" v-if="videoList">
@@ -95,7 +95,7 @@ page{
 				margin-bottom: 10rpx;
 			}
 			.content{
-				height: 175rpx;
+				height: 350rpx;
 				line-height: 68rpx;
 				// width: 100%;
 				// overflow: auto;