提交

pages/addHandle/index.vue

@@ -93,7 +93,10 @@
 		<!-- </view> -->
 
 		<view class="symptom">
-			<RedDot text="备注"></RedDot>
+			<!-- <RedDot text="备注"></RedDot> -->
+			<text class="u-cell-text">
+				备注
+			</text>
 			<u--textarea border="none" style="margin: 32rpx 0 72rpx 0; padding: 0;" v-model="formData.remark"
 				placeholder="请输入" autoHeight></u--textarea>
 		</view>

pages/face/index.vue

@@ -10,9 +10,9 @@
 			<cover-image v-show="faceImgData" :src="faceImgData" class="image" ></cover-image>
 		</cover-view>
 
-		<view class="reload">
+		<view class="reload" @click="refresh">
 			<text>{{type == 1 ? '识别中' : type == 2 ? this.nameTwo : '重新识别'}}
-				<u-icon class="ic" name="reload" color="#8C8C8C" size="40rpx" @click="refresh"></u-icon>
+				<u-icon class="ic" name="reload" color="#8C8C8C" size="40rpx"></u-icon>
 			</text>
 		</view>
 
@@ -182,9 +182,13 @@
 							if (!this.faceData && !this.image) {
 								_this.closeCamera()
 								_this.show = false
-								clearInterval(_this.intervalTakeImg)
-								_this.intervalTakeImg = null
-								_this.$emit('timeOutLogin')
+								_this.type = 3
+								if(this.intervalTakeImg) {
+									clearInterval(_this.intervalTakeImg)
+									_this.intervalTakeImg = null
+									_this.$emit('timeOutLogin')
+								}
+								
 							}
 							// this.noLogin()
 						}, 15000)
@@ -309,11 +313,20 @@
 							this.type = 2
 							this.name = res.data[0].name
 							this.getBasics()
+							this.closeCamera()
+							if(this.intervalTakeImg){
+								this.show = false
+								clearInterval(this.intervalTakeImg)
+								this.intervalTakeImg = null
+							}
+							// clearInterval(this.intervalTakeImg)
 							return
 						}else{
 							// this.toAdd(res.data[0].name)
 							console.log('w')
 							this.type = 3
+							this.closeCamera()
+							
 							return
 						}
 					}
@@ -356,6 +369,10 @@
 
 			// 刷新人脸
 			refresh() {
+				if(this.type == 1){
+					return
+				}
+				
 				this.faceImgData = null
 				this.type = 1
 				this.callCamera()