Merge branch 'dev' of https://git.yfzx.zjtys.com.cn/privateNetwork/inspection-pad-web into dev

components/searchCom/index.vue

@@ -105,9 +105,10 @@
 		.search-com-left {
 			display: flex;
 			align-items: center;
-
+			::v-deep .uni-select{
+				border: none !important;
+			}
 			.uni-search-item {
-				width: 132px;
 				height: 36px;
 				margin-right: 16px;
 				background: #fff;

pages/listingManagement/index.vue

@@ -16,7 +16,7 @@
 		<uni-nav-bar v-else :fixed="true" background-color="#FFF" status-bar leftWidth="300" rightWidth="300">
 			<block slot="left">
 				<view class="header-left" @click="headerClose">
-					<text class="close">X</text>
+					<uni-icons size="21" type="closeempty" class="close"></uni-icons>
 					<view class="selected-count"> 已选择{{ selectedCount }}张图片</view>
 				</view>
 			</block>
@@ -26,7 +26,7 @@
             class="iconfont icon-quanxuan"
             @click.stop="toggleSelectAll"
           ></text> -->
-					<text class="iconfont icon-shanchu" @click.stop="deletePhotos">删除</text>
+					<text class="iconfont icon-shanchu" @click.stop="deletePhotos"></text>
 				</view>
 			</block>
 		</uni-nav-bar>
@@ -37,23 +37,23 @@
 					<view class="group-header">
 						<view class="circle-button" :class="{ active: isDateAllSelected(group, date) }"
 							@click.stop="toggleSelectDate(date)">
-							<text v-if="isDateAllSelected(group, date)" class="iconfont icon-wancheng"></text>
+
 						</view>
+						<view v-if="isDateAllSelected(group, date)" class="iconfont icon-wancheng" @click.stop="toggleSelectDate(date)"></view>
 						<text class="date">{{ date }}</text>
 					</view>
 					<view class="card-list">
 						<view v-for="(photo, index) in group" :key="index" class="card"
 							@click="previewPhoto(photo, index)">
+							<view class="mask" v-if="photo.selected"></view>
 							<image :src="photo.imgPath" mode="aspectFill" class="photo"></image>
 							<view class="photo-mask">
-								<view>照片编号：{{photo.id}}</view>
 								<view>拍摄时间：{{photo.time}}</view>
-								<view>数据同步：{{ photo.synchronization ? "已同步" : "待同步"}}</view>
 							</view>
 							<view class="check-icon" :class="{ active: photo.selected }"
 								@click.stop="toggleSelect(photo)">
-								<text v-if="photo.selected" class="iconfont icon-wancheng"></text>
 							</view>
+							<view v-if="photo.selected" class=" check-icon iconfont icon-wancheng" @click.stop="toggleSelect(photo)"></view>
 							<!-- <text
                 class="delete-icon iconfont icon-shanchu"
                 @click.stop="deletePhoto(photo)"
@@ -355,7 +355,7 @@
 	.header-left {
 		display: flex;
 		justify-content: flex-start;
-
+		align-items: center;
 		.close {
 			font-size: 20px;
 		}
@@ -429,32 +429,28 @@
 						line-height: 14.4px;
 						border-radius: 50%;
 						border: 1px solid rgba(199, 199, 199, 1);
-						display: flex;
-						align-items: center;
-						justify-content: center;
 						cursor: pointer;
 						transition: all 0.3s ease;
-						margin-bottom: 2px;
 						text-align: center;
-						position: absolute;
-						bottom: 4px;
 
-						.icon-wancheng {
-							color: #3774f6;
-							font-size: 16px;
-							border: 1px solid #fff;
-							background-color: #fff;
-							border-radius: 50%;
-						}
+
+					}
+
+					.icon-wancheng {
+						color: #3774f6;
+						font-size: 14.4px;
+						border: 1px solid #fff;
+						background-color: #fff;
+						border-radius: 50%;
+						position: absolute;
 					}
 
 					.date {
-						font-size: 20.8px;
+						font-size: 14.4px;
 						color: #000000;
 						line-height: 14.4px;
-						font-weight: 500;
-						margin-left: 18px;
-						margin-bottom: 6.4px;
+						font-weight: bold;
+						margin-left: 6.4px;
 					}
 				}
 
@@ -486,15 +482,18 @@
 							display: flex;
 							justify-content: center;
 							align-items: center;
-							line-height: 20px;
-
-							.icon-wancheng {
-								color: #3774f6;
-								font-size: 20px;
-								// border: 1px solid #fff;
-								background-color: #fff;
-								border-radius: 50%;
-							}
+							line-height: 1;
+							z-index: 4;
+
+
+						}
+
+						.icon-wancheng {
+							color: #3774f6;
+							font-size: 20px;
+							// border: 1px solid #fff;
+							background-color: #fff;
+							border-radius: 50%;
 						}
 
 						.delete-icon {
@@ -577,4 +576,12 @@
 		text-align: center;
 		font-weight: 400;
 	}
+
+	.mask {
+		z-index: 2;
+		background-color: rgba(255, 255, 255, 0.24);
+		position: absolute;
+		width: 168px;
+		height: 168px;
+	}
 </style>
\ No newline at end of file