Merge branch 'master' into 'main'

Master

See merge request lab-equipment-project/lab-equipment-mini-program!5

pages/borrow/borrow.vue

@@ -153,8 +153,8 @@
 			</view>
 			<text style="font-size: 24rpx;">归还时间以实际归还时间为准</text>
 			<view class="btn-area">
-				<u-button text="借用" color="#000" v-if="assetObj.borrowStatus?assetObj.borrowStatus=='可借出'?true:false:false" @click="toBorrowAsset">借用</u-button>
-				<u-button text="归还" color="#000" v-else-if="assetObj.borrowStatus?assetObj.borrowStatus=='可借出'?false:true:true" @click="toReturnAsset">归还</u-button>
+				<u-button text="借用" color="#67C23A" v-if="assetObj.borrowStatus?assetObj.borrowStatus=='可借出'?true:false:false" @click="toBorrowAsset">借用</u-button>
+				<u-button text="归还" color="#67C23A" v-else-if="assetObj.borrowStatus?assetObj.borrowStatus=='可借出'?false:true:true" @click="toReturnAsset">归还</u-button>
 			</view>
 			<view class="repair-btn" @click="toRepeat">
 				<i class="iconfont icon-a-shezhi2"></i>

pages/fault/fault-handle/fault-handle.vue

@@ -90,7 +90,7 @@
 			</view>
 		</view>
 		<view class="btn-area" v-if="model1.processState==='0'?true:false">
-			<u-button color="#000" size="small" @click="toSaveProcess">保存</u-button>
+			<u-button color="#67C23A" size="small" @click="toSaveProcess">保存</u-button>
 		</view>
 	</view>
 </template>
@@ -170,7 +170,7 @@
 
 <style lang="scss">
 page{
-	background-color: #eae9e9;
+	background-color: #f5f6fa;
 }
 .home{
 	// padding: 20rpx 0;
@@ -194,6 +194,8 @@ page{
 	}
 }
 .btn-area{
-	padding: 20rpx 20rpx 20rpx 500rpx;
+	// padding: 20rpx 20rpx 20rpx 500rpx;
+	margin-top: 120rpx;
+	padding: 0 250rpx;
 }
 </style>

pages/fault/fault-report/fault-report.vue

@@ -41,7 +41,7 @@
 			maxlength="-1"></u--textarea>
 		</view>
 		<view class="btn-area">
-			<u-button color="#000" size="small" @click="toReportFault">上报</u-button>
+			<u-button color="#67C23A" size="small" @click="toReportFault">上报</u-button>
 		</view>
 		<u-toast ref="uToast"></u-toast>
 	</view>
@@ -144,7 +144,7 @@
 
 <style lang="scss">
 page{
-	background-color: #eae9e9;
+	background-color: #f5f6fa;
 }
 .home{
 	// padding: 20rpx 0;
@@ -165,6 +165,8 @@ page{
 	padding: 0 20rpx;
 }
 .btn-area{
-	padding: 20rpx 20rpx 20rpx 500rpx;
+	// padding: 20rpx 20rpx 20rpx 500rpx;
+	margin-top: 120rpx;
+	padding: 0 250rpx;
 }
 </style>

pages/notice-list/notice-list.vue

@@ -2,7 +2,7 @@
 	<view style="padding:30rpx 0 0 0;height: 100vh;box-sizing: border-box;">
 		<u-list @scrolltolower="scrolltolower" class="notice-ul" height="100%">
 			<u-list-item  v-for="data in noticeData" :key="data.noticeId">
-				<view class="notice-area">
+				<view class="notice-area"  @click="toNotice(data.noticeId)">
 					<view class="area-header">
 						<view style="width: 100%;display: flex;">
 							<i class="iconfont icon-tongzhi"></i>
@@ -44,6 +44,11 @@
 			};
 		},
 		methods:{
+			toNotice(id){
+				uni.navigateTo({
+					url:'/pages/notice/notice?id='+id,
+				})
+			},
 			handleDate(val){
 				let date = new Date(val)
 				let year = date.getFullYear()

pages/return/return.vue

@@ -58,8 +58,9 @@
 	// height: 100vh;
 	box-sizing: border-box;
 	.detail-area{
-		border: 2rpx solid #000;
+		// border: 2rpx solid #000;
 		padding: 0 20rpx;
+		box-shadow: 0 2rpx 8rpx 0 rgba(0, 0, 0, 0.2);
 	}
 }
 </style>