From 91b8b511ff60837f58f2ca9b79905854b3453dc8 Mon Sep 17 00:00:00 2001
From: "SD-20230427NBFT\\Administrator" <609306725@qq.com>
Date: Wed, 31 Jul 2024 16:26:14 +0800
Subject: [PATCH] 111

---
 pages.json               |   8 ++
 pagesA/merge/idcard.vue  | 177 +++++++++++++++++++++++----------------
 pagesA/merge/success.vue |  71 ++++++++++++++++
 pagesA/merge/this.scss   |  23 +++++
 pagesA/photo/face.vue    |   9 +-
 5 files changed, 215 insertions(+), 73 deletions(-)
 create mode 100644 pagesA/merge/success.vue

diff --git a/pages.json b/pages.json
index d2e9b1e..d25e3a2 100644
--- a/pages.json
+++ b/pages.json
@@ -147,6 +147,14 @@
 					"navigationBarTitleText" : "二寸证件照",
 					"navigationStyle": "custom"
 				}
+			},
+			{
+				"path" : "merge/success",
+				"style" : 
+				{
+					"navigationBarTitleText" : "",
+					"navigationStyle": "custom"
+				}
 			}
 
 
diff --git a/pagesA/merge/idcard.vue b/pagesA/merge/idcard.vue
index b41287a..222d3eb 100644
--- a/pagesA/merge/idcard.vue
+++ b/pagesA/merge/idcard.vue
@@ -3,13 +3,17 @@
 		<view class="content photo_back">
 			<custom_navbar :title="navbar_title" @getNavHeight="getNavHeight" :theme="theme" />
 			<view class="photo_main" :style="'margin-top:'+margin_top+'px'" style="width: 100%;margin-left: 0;">
-				<view class="idcard_1">
-					<image :src="selectedImg" />
+				<view class="idcard_1_over">
+					<view class="idcard_1">
+						<image :src="selectedImg" />
+					</view>
 				</view>
 
+
 				<view class="idcard_2">
 					<view class="idcard_2_1">
-						<u-tabs :list="list1" lineWidth="30" lineColor="#5A8FFF" :activeStyle="{
+						<u-tabs @click="changeTab()" :current="this_tab" :list="list1" lineWidth="30"
+							lineColor="#5A8FFF" :activeStyle="{
 						              color: '#5A8FFF',
 						              fontWeight: 'bold',
 						              transform: 'scale(1.05)'
@@ -18,26 +22,33 @@
 						              transform: 'scale(1)'
 						          }"></u-tabs>
 					</view>
-					
+
 					<view class="idcard_2_2">
-						<scroll-view class="idcard_2_2_1" 
-						enable-flex="true"
-						scroll-x="true"
-						scroll-with-animation="true">
-							<view style="overflow: hidden;" class="idcard_2_2_1_one" v-for="(item,key) in tem_list" :key="key" @tap="selectThis(key)">
+						<scroll-view class="idcard_2_2_1" enable-flex="true" scroll-x="true"
+							scroll-with-animation="true">
+							<view style="overflow: hidden;" class="idcard_2_2_1_one" v-for="(item,key) in tem_list"
+								:key="key" @tap="selectThis(key)">
 								<view class="idcard_2_2_1_one_1">
-									<image :src="item.url"/>
+
+									<image :src="root_path+item.image" />
 								</view>
 								<view class="idcard_2_2_1_one_2" :style="key != selectedIndex ? 'display:none' : ''">
 									<view class="idcard_2_2_1_one_2_1">
-										<image src="/static/img/common/idcard_1.png"/>
+										<image src="/static/img/common/idcard_1.png" />
 									</view>
 								</view>
 							</view>
 						</scroll-view>
-						 
-						
+
+
+					</view>
+
+					<view class="idcard_2_3 photo_full_blue_btn" @tap="saveBtn()">
+						保存
 					</view>
+
+					<view class="idcard_2_4">剩余生成次数 <text style="color: #7A74F0;margin-left: 8rpx;margin-right: 8rpx;">
+							0 </text> / 30 张</view>
 				</view>
 			</view>
 
@@ -45,7 +56,35 @@
 
 		</view>
 
+		<u-popup :show="show_2" mode="center" bgColor="transparent" :round="12">
+			<view class="show_readme_div" style="height: 500rpx;">
+				<view class="show_readme_div_1">
+					请选择保存格式
+				</view>
+				<view class="show_readme_div_2">
+					<view class="show_readme_div_3" style="width: 100%;margin-left: 0;margin-top: 10rpx;">
+						PNG格式
+					</view>
+				</view>
+				<view class="show_readme_div_2">
+					<view class="show_readme_div_3" style="width: 100%;margin-left: 0;margin-top: 10rpx;background:#F3F2F8;color:#999999">
+						JPG格式
+					</view>
+				</view>
+				
+				
+				<view class="show_readme_div_line">
+					<view class="show_readme_div_4" style="width: 220rpx;" @tap="this.show_2 = false">
+						取消
+					</view>
+					<view class="show_readme_div_3" style="width: 220rpx;" @tap="goUrl('/pagesA/merge/success')">
+						确认
+					</view>
+				</view>
+				
 
+			</view>
+		</u-popup>
 
 	</view>
 </template>
@@ -62,66 +101,22 @@
 				navbar_title: '二寸证件照',
 				theme: "white1",
 				margin_top: 10,
-				selectedImg:'',
-				selectedIndex:0,
+				selectedImg: '',
+				selectedIndex: 0,
+				this_tab: 0,
+				root_path: '',
+				show_2: false,
+
 				list1: [{
-						id: 1,
+						id: 2,
 						name: '女装'
 					},
 					{
-						id: 2,
+						id: 1,
 						name: '男装'
 					},
 				],
-				tem_list: [{
-						id: 1,
-						url: '/static/img/index/banner.png'
-					},
-					{
-						id: 2,
-						url: 'https://img14.360buyimg.com/jdcms/s460x460_jfs/t1/234494/2/24198/178409/66a8aad1F59feafc5/41e6871120f47687.jpg'
-					},
-					{
-						id: 3,
-						url: '/static/img/index/banner.png'
-					},
-					{
-						id: 4,
-						url: 'https://img14.360buyimg.com/jdcms/s460x460_jfs/t1/234494/2/24198/178409/66a8aad1F59feafc5/41e6871120f47687.jpg'
-					},
-					{
-						id: 5,
-						url: '/static/img/index/banner.png'
-					},
-					{
-						id: 6,
-						url: 'https://img14.360buyimg.com/jdcms/s460x460_jfs/t1/234494/2/24198/178409/66a8aad1F59feafc5/41e6871120f47687.jpg'
-					},
-					{
-						id: 7,
-						url: '/static/img/index/banner.png'
-					},
-					{
-						id: 8,
-						url: 'https://img14.360buyimg.com/jdcms/s460x460_jfs/t1/234494/2/24198/178409/66a8aad1F59feafc5/41e6871120f47687.jpg'
-					},
-					{
-						id: 9,
-						url: '/static/img/index/banner.png'
-					},
-					{
-						id: 10,
-						url: 'https://img14.360buyimg.com/jdcms/s460x460_jfs/t1/234494/2/24198/178409/66a8aad1F59feafc5/41e6871120f47687.jpg'
-					},
-					{
-						id: 11,
-						url: '/static/img/index/banner.png'
-					},
-					{
-						id: 12,
-						url: 'https://img14.360buyimg.com/jdcms/s460x460_jfs/t1/234494/2/24198/178409/66a8aad1F59feafc5/41e6871120f47687.jpg'
-					},
-				]
+				tem_list: []
 
 			}
 		},
@@ -130,10 +125,13 @@
 
 		},
 		onLoad() {
+			this.changeTab();
+			this.root_path = this.$api.getOssurl();
+
 
 		},
 		onShow() {
-			
+
 		},
 
 
@@ -142,14 +140,49 @@
 			getNavHeight(e) {
 				this.margin_top += e;
 			},
-			selectThis(index){
-				this.selectedImg = this.tem_list[index].url;
+			selectThis(index) {
+				this.selectedImg = this.$api.getOssurl() + this.tem_list[index].image;
+
 				this.selectedIndex = index;
-			}
+			},
+			changeTab(e) {
+
+				if (typeof(e) != 'undefined' && e.index) {
+					this.this_tab = e.index;
+				} else {
+					this.this_tab = 0;
+				}
+
 
+				let data = {};
+				data.template_type = this.list1[this.this_tab].id;
+				let _this = this;
+				this.$api.get('/api/specs/template_list', data, function(res) {
+					if (res.length > 0) {
+						_this.tem_list = res;
+						_this.selectThis(0)
 
+					} else {
+						_this.tem_list = [];
+					}
+				});
+
+			},
+			
+			saveBtn() {
+				this.show_2 = true;
+			},
+			goUrl(url){
+				this.show_2 = false;
+				uni.navigateTo({
+					url:url
+				})
+			}
+			
+			
+		},
 
-		}
+		
 	}
 </script>
 
@@ -157,6 +190,6 @@
 	@import './this.scss';
 
 	.photo_back {
-		background-color: #F5F6FB;
+		background-color: #fff;
 	}
 </style>
\ No newline at end of file
diff --git a/pagesA/merge/success.vue b/pagesA/merge/success.vue
new file mode 100644
index 0000000..f9e3c58
--- /dev/null
+++ b/pagesA/merge/success.vue
@@ -0,0 +1,71 @@
+<template>
+	<view>
+		<view class="content ">
+			<custom_navbar :title="navbar_title" @getNavHeight="getNavHeight" :theme="theme" />
+			<view class="photo_main_face" :style="'margin-top:-'+margin_top+'px'">
+				<view class="photo_main_face_head"></view>
+				<view class="photo_success_1">
+					<image src="/static/img/common/photo_c1.png"/>
+				</view>
+				<view class="photo_success_2">生成已提交</view>
+				<view class="photo_success_3">
+					<view>目前排队人数较多，请耐心等待</view> 
+					<view>可去<text>【我的】</text>页面查看生成结果</view>
+				</view>
+				<view class="photo_success_4">
+					<image src="/static/img/common/photo_c2.png"/>
+				</view>
+			</view>
+
+		</view>
+
+
+	</view>
+</template>
+
+<script>
+	import custom_navbar from "../photo/components/photo_header.vue";
+	export default {
+		components: {
+			custom_navbar
+
+		},
+		data() {
+			return {
+				navbar_title: '',
+				theme: "blue",
+				margin_top: 0,
+
+
+			}
+		},
+
+		mounted() {
+
+		},
+		onPageScroll(e) {
+					if (e.scrollTop > 50) {
+						this.theme = 'white';
+				
+					} else {
+				
+						this.theme = 'blue';
+					}
+				},
+		methods: {
+
+			getNavHeight(e) {
+				this.margin_top += e;
+			}
+
+
+
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import '../photo/this.scss';
+
+	
+</style>
\ No newline at end of file
diff --git a/pagesA/merge/this.scss b/pagesA/merge/this.scss
index e57b2b5..57ea413 100644
--- a/pagesA/merge/this.scss
+++ b/pagesA/merge/this.scss
@@ -234,6 +234,12 @@ image{
 
 
 // ----------------idcard
+
+.idcard_1_over{
+	overflow: hidden;
+	width: 100%;
+	background-color: #F5F6FB;
+}
 .idcard_1{
 	width: 516rpx;
 	height: 720rpx;
@@ -301,4 +307,21 @@ image{
 			}
 		}
 	}
+	
+	.idcard_2_3{
+		width: 702rpx;
+		height: 80rpx;
+		margin: 30rpx auto;
+	}
+	
+	.idcard_2_4{
+		width: 702rpx;
+		height:30rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		font-size: 24rpx;
+		color: #555555;
+		margin-left: 24rpx;
+	}
 }
\ No newline at end of file
diff --git a/pagesA/photo/face.vue b/pagesA/photo/face.vue
index 6b3aee0..a1e9b15 100644
--- a/pagesA/photo/face.vue
+++ b/pagesA/photo/face.vue
@@ -240,10 +240,17 @@
 					let filePath = edetail;
 					let _date = new Date();
 					let ext_name = filePath.substr(filePath.lastIndexOf('.'));
+					if (ext_name !== 'png' && ext_name !== 'jpg' && ext_name !== 'jpeg') {
+						 _this.$com.showError('请上传 png / jpg / jpeg 格式的图片');
+						 return false;
+					}
 					let address = _date.getFullYear() + '' + (_date.getMonth() + 1) + '' + _date.getDate();
 					let fileName = address + _date.getTime() + ext_name;
 					const img_info = await unit.getImgInfo(filePath);
-
+					if(typeof(img_info) == 'undefined' || !img_info){
+						this.$com.showError('图片格式错误!请重试!');
+						return false;
+					}
 					let {
 						width,
 						height