From d33d5a5bbe9e0eea5d3ff38c9e113a430a7ddbb6 Mon Sep 17 00:00:00 2001
From: huliyong <2783385703@qq.com>
Date: Wed, 13 Nov 2024 23:53:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                       |  2 +-
 api/api.js                    |  2 +-
 config.js                     |  2 +-
 pages/subPack/human/human.vue | 53 ++++++++++++++++++++++++++++++++++++++-----
 store/store.js                |  6 ++++-
 5 files changed, 55 insertions(+), 10 deletions(-)

diff --git a/App.vue b/App.vue
index cc050ac..b5a0552 100644
--- a/App.vue
+++ b/App.vue
@@ -1,11 +1,11 @@
 <script>
 	export default {
 		onLaunch: function() {
+			// this.$store.commit('getUserInfo')
 		},
 		onShow: function() {
 			// this.$store.commit('initConfig')
 			this.$store.commit('getTeam')
-			this.$store.commit('getUserInfo')
 		},
 		onHide: function() {
 		}
diff --git a/api/api.js b/api/api.js
index 7967913..3107fc0 100644
--- a/api/api.js
+++ b/api/api.js
@@ -34,7 +34,7 @@ const config = {
 		url: '/user/info',
 		method: 'GET',
 		auth: true, 
-		limit : 800,
+		limit : 200,
 	},
 	//隐私政策
 	getPrivacyPolicy: {
diff --git a/config.js b/config.js
index a328ebc..178d43d 100644
--- a/config.js
+++ b/config.js
@@ -6,7 +6,7 @@ import uvUI from '@/uni_modules/uv-ui-tools'
 Vue.use(uvUI);
 
 // 当前环境
-const type = 'dev'
+const type = 'prod'
 
 
 // 环境配置
diff --git a/pages/subPack/human/human.vue b/pages/subPack/human/human.vue
index 1882dba..2469992 100644
--- a/pages/subPack/human/human.vue
+++ b/pages/subPack/human/human.vue
@@ -38,11 +38,22 @@
 				<view class="text">正对充足</view>
 			</view>
 		</view>
-
-		<!-- 立即核验 -->
-		<div @click="photo" class="btn">
-			立即核验
+		
+		
+		<div class="btn">
+			<uv-upload 
+			multiple 
+			:maxCount="1" 
+			capture="camera"
+			height="180rpx"
+			@afterRead="afterRead">
+				<view style="display: flex;justify-content: center;
+				width: 600rpx;">
+					立即核验
+				</view>
+			</uv-upload>
 		</div>
+
 	</view>
 </template>
 
@@ -59,6 +70,7 @@
 				form : {
 					pic : '',
 				},
+				isLocationSubmit : false,
 			}
 		},
 		computed: {
@@ -72,15 +84,35 @@
 				self.form.lat = res.position.latitude
 				self.form.lon = res.position.longitude
 				self.form.address = res.address
+				if(self.isLocationSubmit){
+					self.submit()
+				}
 			})
 		},
 		methods: {
+			afterRead(e) {
+				let self = this
+				e.file.forEach(file => {
+					self.$Oss.ossUpload(file.url).then(url => {
+						self.form.pic = url
+						if(self.form.lat){
+							self.submit()
+						}else{
+							uni.showLoading({
+								title: '定位中...'
+							})
+							self.isLocationSubmit = true
+						}
+					})
+				})
+			},
 			// 人脸认证通过后拍照
 			photo() {
 				let self = this
 				uni.chooseImage({
 					count: 1, //默认9
-					sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
+					sizeType: ['compressed'], //可以指定是原图还是压缩图，默认二者都有
+					// sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
 					sourceType: ['camera '], //这要注意，camera掉拍照，album是打开手机相册
 					success: function(res) {
 						console.log(JSON.stringify(res.tempFilePaths));
@@ -88,7 +120,16 @@
 						
 						self.$Oss.ossUpload(res.tempFilePaths[0]).then(url => {
 							self.form.pic = url
-							self.submit()
+							
+							if(self.form.lat){
+								self.submit()
+							}else{
+								uni.showLoading({
+									title: '定位中...'
+								})
+								self.isLocationSubmit = true
+							}
+							
 						})
 						
 						
diff --git a/store/store.js b/store/store.js
index 3805676..99d486c 100644
--- a/store/store.js
+++ b/store/store.js
@@ -89,7 +89,11 @@ const store = new Vuex.Store({
 				if(res.code == 200){
 					state.userInfo = res.result
 					
-					if(!state.userInfo.team){
+					if(!state.userInfo.nickName || !state.userInfo.headImage){
+						uni.navigateTo({
+							url: '/pages/login/wxUserInfo'
+						})
+					}else if(!state.userInfo.team){
 						uni.navigateTo({
 							url: "/pages/subPack/team/team"
 						})