diff --git a/pagesA/merge/index.vue b/pagesA/merge/index.vue
index 230f67a..16cdbc7 100644
--- a/pagesA/merge/index.vue
+++ b/pagesA/merge/index.vue
@@ -170,7 +170,24 @@
 		            </view>
 		</u-popup>
 
-
+		
+		<u-popup :show="tips_show" :round="10" mode="center" bgColor="transparent" @close="close('tips_show')" @open="open('tips_show')">
+		            <view class="popupBox">
+		                <view class="popupTop">
+							提醒
+						</view>
+						<view class="popupDesc1">
+							<u-parse :content="content" :tagStyle="style"></u-parse>
+							
+						</view>
+						<view class="popupBtn">
+							<view class="sbtnBox1 a1" @click="close('tips_show')">暂不生成</view>
+							<view class="sbtnBox1 a2" @click="submit('tips_show')">前往创建</view>
+						</view>
+		            </view>
+		</u-popup>	
+		
+		
 	</view>
 </template>
 
@@ -208,6 +225,16 @@
 				custom_show:false,
 				//选面部档案 弹窗
 				select_show:false,
+				//弹窗
+				tips_show: false,
+				content: `<p>目前系统还未存入您的面部档案信息，</p>
+							<p>请先前往创建需要生成写真的面部档案</p>`,
+				style: {
+							// 字符串的形式
+					
+							p: 'font-weight: 400;font-size: 28rpx;color: #555555;line-height: 60rpx;',
+						
+					 },
 
 			}
 		},
@@ -377,7 +404,17 @@
 			//判断选择
 			checkHave(item){
 				var _this = this;
-				_this.select_show = true;
+				// 生成0到9之间的随机整数
+				var randomNumber = Math.floor(Math.random() * 10);
+				if(randomNumber > 5)
+				{
+					_this.select_show = true;
+				}
+				else
+				{
+					_this.tips_show = true;
+				}
+				
 			},
 			
 			
@@ -511,9 +548,13 @@
 	padding: 0rpx 20rpx;
 }
 
-.custom-input-height {
-  height: 40px !important;
-  min-height: 40px !important;
+.popupDesc1{
+	width:480rpx;
+	font-weight: 400;
+	font-size: 28rpx;
+	color: #555555;
+	height: auto;
+	padding: 0rpx 60rpx;
 }
 .inputLine{ width: 100%; height: 64rpx;  display: flex; margin: 10rpx auto;}
 .inputLine .item1{width: 200rpx; height: 64rpx; line-height: 64rpx;text-align: center;}
@@ -543,7 +584,7 @@
  }
 .imgBox{width: 160rpx; height: 160rpx; position: relative; margin: 0rpx 0rpx 0rpx 20rpx; display: inline-block;}
 .imgBox .imgBg{width: 160rpx; height: 160rpx; border-radius: 20rpx; position: absolute; left: 0; top: 0;}
-.imgBox .imgSelect{width: 40rpx; height: 40rpx;position: absolute; bottom: 0; right: 0; z-index: 5;}
+.imgBox .imgSelect{width: 40rpx; height: 34rpx;position: absolute; bottom: 0; right: 0; z-index: 5;}
 .a1{
 	background: linear-gradient( 270deg, rgba(46,87,241,0.15) 0%, rgba(131,88,246,0.15) 100%);
 	color:#7A74F0;