pages/addHandle/index.vue

@@ -28,7 +28,7 @@
 				<u-popup v-if="type != 2" @close="nameShow=false" :closeOnClickOverlay="true" @cancel="nameShow=false" :overlay="false"
 					:show="nameShow">
 					<view style="height: 500rpx; position: relative; display: flex; justify-content: center;">
-						<view style="position: absolute; top: 20rpx; z-index: 999999;">
+						<view style="position: absolute; top: 80rpx; z-index: 999999; background: #fff;">
 							<input class="inp" confirm-type="search" v-model="key" @input="serName"
 								placeholder="学生姓名" />
 							<u-icon class="inp-img" name="search" color="#8C8C8C" size="49rpx"></u-icon>
@@ -295,9 +295,10 @@
 					console.log(res)
 					this.getClass(res.data.classId)
 					this.classCheck.label = res.data.className
+					this.classCheck.value = res.data.classId
 					this.nameCheck.label = res.data.name
+					this.nameCheck.value = id
 					this.formData.sex = res.data.sex
-
 					for (let item of this.formData.disposeRecords) {
 						item.studentId = res.data.studentId
 					}

pages/details/index.vue

@@ -22,16 +22,22 @@
 		
 		<view class="text-block">
 			<text class="text-title">症状体征照片</text>
-			<text class="text-img" v-for="item in detailsData.symptomImgs">
-				<image :src="item"></image>
-			</text>
+			<view class="text-img" v-if="detailsData.symptomImgs != '' ">
+				<text class="text-img-nei" v-for="item in detailsData.symptomImgs">
+					<image :src="item"></image>
+				</text>
+			</view>
+			<text v-else>无</text>
 		</view>
 		
 		<view class="text-block">
 			<text class="text-title">处置后照片</text>
-			<text class="text-img" v-for="item in detailsData.emergencyImgs">
-				<image :src="item"></image>
-			</text>
+			<view class="text-img" v-if="detailsData.emergencyImgs != '' ">
+				<text class="text-img-nei" v-for="item in detailsData.emergencyImgs">
+					<image :src="item"></image>
+				</text>
+			</view>
+			<text v-if="detailsData.emergencyImgs== '' ">无</text>
 		</view>
 		
 		<view class="text-block">
@@ -98,8 +104,13 @@
 						item.createTime = item.createTime.slice(0, item.createTime.length - 3)
 						
 					}
-					res.data.detail.symptomImgs = res.data.detail.symptomImgs.split(',')
-					res.data.detail.emergencyImgs = res.data.detail.emergencyImgs.split(',')
+					if(res.data.detail.symptomImgs != ''){
+						res.data.detail.symptomImgs = res.data.detail.symptomImgs.split(',')
+					}
+					if(res.data.detail.emergencyImgs != ''){
+						res.data.detail.emergencyImgs = res.data.detail.emergencyImgs.split(',')
+					}
+					
 					this.detailsData = res.data.detail
 					console.log(this.detailsData)
 				})
@@ -146,6 +157,12 @@
 	}
 	
 	.text-img{
+		width: 440rpx;
+		display: inline-block;
+		margin-top: 20rpx;
+	}
+	
+	.text-img-nei{
 		width: 160rpx;
 		height: 160rpx;
 		border-radius: 13px;
@@ -160,6 +177,7 @@
 		}
 	}
 	
+	
 	.handle-time{
 		height: 80rpx;
 		line-height: 80rpx;

pages/face/index.vue

@@ -471,7 +471,7 @@
 	}
 
 	.submit {
-		margin-top: 580rpx;
+		margin-top: 450rpx;
 	}
 
 	.skip {
@@ -537,8 +537,8 @@
 
 	.btn {
 		--hue: 190;
-		--btn-bg-color: hsl(var(--hue), 100%, 50%);
-		--btn-bg-color-darker: hsl(var(--hue), 100%, 45%);
+		// --btn-bg-color: hsl(var(--hue), 100%, 50%);
+		// --btn-bg-color-darker: hsl(var(--hue), 100%, 45%);
 		position: relative;
 		padding: 0.75rem 1.5rem;
 		margin: 1rem;

pages/index/index.vue

@@ -24,7 +24,7 @@
 
 		<view v-if="tobu == 1">
 			<u-swipe-action>
-				<u-swipe-action-item style="margin-bottom: 32rpx;" v-for="(item, index) in listData" :options="swipe"
+				<u-swipe-action-item :threshold="60" style="margin-bottom: 32rpx;" v-for="(item, index) in listData" :options="swipe"
 					:disabled="swipeShow" @click="cancelT(item)" :key="index">
 
 					<!-- 任务分块部分 -->
@@ -318,6 +318,7 @@
 				if (this.status == 'loading') {
 					return
 				}
+				this.key = ''
 				this.page = 1
 				this.tobu = data
 				this.listData = []

pages/leave/index.vue

@@ -173,7 +173,6 @@
 			<image src="../../static/icon.svg"></image>
 		</view>
 		
-		<u-loading-page :loading="loading" loading-text="加载中" bg-color="rgba(0,0,0,0.60)" style="z-index: 999999;"></u-loading-page>
 	</view>
 </template>
 
@@ -247,7 +246,6 @@
 		methods: {
 			// 获取数据
 			getData(){
-				this.loading = true
 				this.$request({
 					url: this.$api.leave.orgStudentWork,
 					header: {
@@ -266,14 +264,8 @@
 					}else{
 						this.leaveData = res.data[0]
 					}
-					setTimeout(()=> {
-						this.loading = false
-					}, 1000)
 				}).catch(err=>{
 					console.log('err' , err)
-					setTimeout(()=> {
-						this.loading = false
-					}, 1000)
 				})
 			},
 			
@@ -383,7 +375,6 @@
 			
 			// 记录获取列表数据
 			getListTwo(){
-				this.loading = true
 				let tenantId = localStorage.getItem('tenant_id')
 				this.$request({
 					url: this.$api.leave.page,
@@ -401,14 +392,8 @@
 				}).then(res=>{
 					// console.log('res', res)
 					this.listDataTwo = res.data.records
-					setTimeout(()=> {
-						this.loading = false
-					}, 1000)
 				}).catch(err=>{
 					console.log('err' , err)
-					setTimeout(()=> {
-						this.loading = false
-					}, 1000)
 				})
 			},