caojunjie 1 год назад
Родитель
Сommit
7025f5803a

+ 3 - 2
pages/device/EquipmentArchives/EquipmentArchives.vue

@@ -109,10 +109,11 @@
 		.addbox {
 			margin-left: 20rpx;
 			border: 2rpx solid #dd451b;
-			border-radius: 9rpx;
-			color: #dd451b;
+			border-radius: 12rpx;
+			color: #fff;
 			padding: 5rpx 10rpx;
 			font-size: 28rpx;
+			background: #dd451b;
 		}
 	}
 	.screenflex {

+ 12 - 4
pages/device/FileDetails/FileDetails.vue

@@ -178,7 +178,7 @@
 			
 			
 			
-			<view class="cardBox">
+			<view class="cardBox" style="display: flex;align-items: center;">
 				<!-- <view class="filedetails_left">
 					<view>
 						<u--input prefixIcon="file-text" 
@@ -206,7 +206,14 @@
 				</view>
 				<view class="filedetails_right" @click="EquipmentAddConfirm = true">
 					<!-- <u-icon name="file-text" color="#101010" size="22"></u-icon> -->
-					<view style="font-size: 30rpx; width: 150rpx; height: 44rpx; background-color: #FD4B09; border-radius:44rpx; color: #fff;" @click="EquipmentAddConfirm = true">+添加设备</view>
+					<view style="font-size: 30rpx;
+					 width: 150rpx; 
+					 height: 44rpx; 
+					 background-color: #FD4B09; 
+					 border-radius:44rpx; 
+					 color: #fff;
+					 padding: 10rpx" 
+					@click="EquipmentAddConfirm = true">+添加设备</view>
 				</view>
 				
 				
@@ -879,11 +886,12 @@
 		.savebutton {
 			border-radius: 30rpx;
 			// color: #3f7cef;
-			color: #FD4B09;
+			color: #fff;
 			font-size: 34rpx;
 			// border: 2rpx solid #3f7cef;
 			border: 2rpx solid #FD4B09;
-			padding: 15rpx 40rpx;
+			background: #FD4B09;
+			padding: 10rpx 40rpx;
 			font-weight: 500;
 		}
 	}

+ 2 - 2
pages/device/RepairReportList/RepairReportList.vue

@@ -17,7 +17,7 @@
 				<view>
 					<text v-if="item.status == 1" style="color: #3c9cff; font-size: 28rpx">待派工</text>
 					<text v-if="item.status == 2" style="color: #fd4b09; font-size: 28rpx">待接单</text>
-					<text v-if="item.status == 3" style="color: rgba(222, 36, 18, 1); font-size: 28rpx">待提交</text>
+					<text v-if="item.status == 3" style="color: rgba(222, 36, 18, 1); font-size: 28rpx">待维修</text>
 					<text v-if="item.status == 4" style="color:  rgba(233, 157, 66, 1); font-size: 28rpx">待结算</text>
 					<text v-if="item.status == 5" style="color: rgba(129, 179, 55, 1); font-size: 28rpx">已完工</text>
 				</view>
@@ -70,7 +70,7 @@
 					},
 					{
 						id:'3',
-						name:'待提交'
+						name:'待维修'
 					},
 					{
 						id:'4',