Merge remote-tracking branch 'origin/master'

src/assets/css/xpwyfyy.css

@@ -1500,11 +1500,9 @@ h3 {
 	border-radius: initial;
 }
 
-.vongi-wordcard-sp #item2mobile .mui-btn-danger,
-.vongi-wordcard-sp #item2mobile .mui-btn-success {
-	border-radius: 16px;
+.vongi-wordcard-sp .mui-slider-item .mui-btn-danger,
+.vongi-wordcard-sp .mui-slider-item .mui-btn-success {
 	padding: 2px 10px;
-	right: 25px
 }
 
 .vongi-wordcard-sp .mui-table-view {
@@ -1541,11 +1539,6 @@ h3 {
 	padding: 11px 0
 }
 
-.vongi-wordcard-sp #item2mobile .mui-navigate-right:after,
-#item2mobile .mui-push-right:after {
-	right: 0
-}
-
 .vongi-work .vongi-qingjia li {
 	margin-bottom: 10px
 }

src/projects/business/views/Master/Attendance/VerifyList.vue

@@ -50,10 +50,12 @@
 								<ul class="mui-table-view mui-table-view-chevron">
 									<li v-for="(item,index) in recordList" :key="item.id" class="mui-table-view-cell mui-media">
 										<router-link :to="{name:'MasterAttendanceVerifyInfo',query:{id:item.id}}" class="mui-navigate-right">
-											<div class="mui-media-object mui-pull-left"><img :src="item.faceImageUrl"></div>
+											<div class="mui-media-object mui-pull-left vongi-buka"><img :src="item.faceImageUrl"></div>
 											<div class="mui-media-body">
 												{{item.personName}}
 												<p class='mui-ellipsis'><span class="colorfe616c" v-text="item.typeN"></span>申请</p>
+												<p class='mui-ellipsis' v-if="item.type=='1' && item.address">打卡位置：{{item.address}}</p>
+												<p class='mui-ellipsis' v-if="item.type=='2' && item.content">申请理由：{{item.content}}</p>
 											</div>
 											<button type="button" :class="'mui-btn mui-btn-success mui-btn-outlined '+(item.status>0?(item.status==1?'status_a':'status_r'):'')"
 											 v-text="item.statusN"></button>