Merge branch 'main' of https://git.tsl3060.com/jgl/photo_uniapp

pagesA/merge/face_1.vue

@@ -180,6 +180,7 @@
 				
 			},
 			subFace(){
+				
 				let data = {};
 				data.images = [];
 				let imgs =  uni.getStorageSync('ai_face_success');
@@ -200,7 +201,7 @@
 				let _this = this;
 				this.$api.post('/api/portrait/append',data,function(rs){
 					uni.redirectTo({
-						url:'/pagesA/photo/cartoon_4?from=idcard'
+						url:'/pagesA/merge/success?from=face'
 					})
 					
 				})

pagesA/merge/index.vue

@@ -231,7 +231,8 @@
 				//弹窗
 				tips_show: false,
 				content: `<p>目前系统还未存入您的面部档案信息，</p>
-							<p>请先前往创建需要生成写真的面部档案</p>`,
+						  <p>请先前往创建需要生成写真的面部档案</p>
+						  <p>创建成功后再次生成</p>`,
 				style: {
 							// 字符串的形式
 					

pagesA/merge/success.vue

@@ -10,7 +10,13 @@
 				<view class="photo_success_2">生成已提交</view>
 				<view class="photo_success_3">
 					<view>目前排队人数较多，请耐心等待</view> 
-					<view>可去<text>【我的】</text>页面查看生成结果</view>
+					
+					<view>可去
+						<text>【我的】</text>
+						页面查看
+						<text v-if="from == 'face'">面部档案</text>
+						<text v-if="from != 'face'">生成结果</text>
+					</view>
 				</view>
 				<view class="photo_success_4">
 					<image src="/static/img/common/photo_c2.png"/>
@@ -35,13 +41,16 @@
 				navbar_title: '',
 				theme: "blue",
 				margin_top: 0,
-
+				from:''
 
 			}
 		},
 
 		mounted() {
 
+		},
+		onLoad(opiton) {
+			this.from= opiton.from;
 		},
 		onPageScroll(e) {
 					if (e.scrollTop > 50) {