From eb49564ab17c6695d8928d5a63a57c58b3cfd79c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 11 十二月 2024 18:21:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
h5/pages/userinfo/userinfo.vue | 70 ++++++++++++++++++-----------------
1 files changed, 36 insertions(+), 34 deletions(-)
diff --git a/h5/pages/userinfo/userinfo.vue b/h5/pages/userinfo/userinfo.vue
index 2796036..6d579f0 100644
--- a/h5/pages/userinfo/userinfo.vue
+++ b/h5/pages/userinfo/userinfo.vue
@@ -4,13 +4,13 @@
<view class="cell">
<view class="title"><b>*</b>濮撳悕</view>
<view class="content">
- <input class="input" placeholder-style="color: #999999;" maxlength="30" v-model="visitorData.name" placeholder="璇疯緭鍏ユ偍鐨勭湡瀹炲鍚�" />
+ <input class="input" @focus="showKeyboard = true" @blur="showKeyboard = false" placeholder-style="color: #999999;" maxlength="30" v-model="visitorData.name" placeholder="璇疯緭鍏ユ偍鐨勭湡瀹炲鍚�" />
</view>
</view>
<view class="cell">
<view class="title"><b>*</b>鎵嬫満鍙�</view>
<view class="content">
- <input type="number" class="input" maxlength="11" placeholder-style="color: #999999;" v-model="visitorData.phone" placeholder="璇疯緭鍏ユ偍鐨勬墜鏈哄彿" />
+ <input type="number" @focus="showKeyboard = true" @blur="showKeyboard = false" class="input" maxlength="11" placeholder-style="color: #999999;" v-model="visitorData.phone" placeholder="璇疯緭鍏ユ偍鐨勬墜鏈哄彿" />
</view>
</view>
<view class="cell">
@@ -23,14 +23,14 @@
<view class="cell">
<view class="title"><b>*</b>璇佷欢鍙风爜</view>
<view class="content">
- <input class="input" maxlength="18" placeholder-style="color: #999999;" v-model="visitorData.idcardNo" placeholder="璇疯緭鍏ユ偍鐨勮瘉浠跺彿鐮�" />
+ <input class="input" maxlength="18" @focus="showKeyboard = true" @blur="showKeyboard = false" placeholder-style="color: #999999;" v-model="visitorData.idcardNo" placeholder="璇疯緭鍏ユ偍鐨勮瘉浠跺彿鐮�" />
</view>
</view>
<view class="empty"></view>
<view class="cell">
<view class="title"><b>*</b>鍏徃鍚嶇О</view>
<view class="content">
- <input class="input" maxlength="50" placeholder-style="color: #999999;" v-model="visitorData.companyName" placeholder="璇疯緭鍏ユ偍鐨勫叕鍙稿悕绉�" />
+ <input class="input" maxlength="50" @focus="showKeyboard = true" @blur="showKeyboard = false" placeholder-style="color: #999999;" v-model="visitorData.companyName" placeholder="璇疯緭鍏ユ偍鐨勫叕鍙稿悕绉�" />
</view>
</view>
<view class="cell">
@@ -61,12 +61,12 @@
</view>
</view> -->
</view>
- <view class="footer-box">
+ <view v-if="!showKeyboard" class="footer-box">
<view class="submit-button" @click="submit">涓嬩竴姝�</view>
</view>
<!-- <tly-picture-cut ref="tlyPictureCut" :pictureSrc="photoSrc" @createImg="uploadImg"></tly-picture-cut> -->
<u-picker :show="show" :columns="columns" keyName="name" @cancel="show = false" @confirm="confirm"></u-picker>
- <qf-image-cropper ref="cropper" :width="280" :height="280" :radius="30" @crop="uploadImg"></qf-image-cropper>
+ <qf-image-cropper ref="cropper" :width="280" :height="280" :radius="0" fileType="jpg" @crop="uploadImg"></qf-image-cropper>
</view>
</template>
@@ -81,6 +81,7 @@
return {
photoSrc: "",
show: false,
+ showKeyboard: false,
visit: '',
type: '',
columns: [[{name: '韬唤璇�', id: 0}, {name: '娓境璇佷欢', id: 1},{name: '鎶ょ収', id: 2}]],
@@ -89,7 +90,7 @@
userAnswerId: '',
name: '',
phone: '',
- idcardType: '0',
+ idcardType: 0,
idcardTypeName: '韬唤璇�',
idcardNo: '',
faceImg: '',
@@ -100,36 +101,35 @@
}
}
},
-
- computed: {
- ...mapState(['member'])
- },
-
components: { tlyPictureCut, QfImageCropper },
onLoad(option) {
- if (this.member) {
- this.visitorData.name = this.member.name
- this.visitorData.phone = this.member.phone
- this.visitorData.idcardNo = this.member.idcardDecode
- this.visitorData.companyName = this.member.visitCompanyName
- this.visitorData.faceImg = this.member.faceImg
- if (this.member.faceImg) {
- this.visitorData.faceImgUrl = this.member.prefixUrl + this.member.faceImg
- }
- this.visitorData.imgurl = this.member.imgurl
- if (this.member.imgurl) {
- this.visitorData.imgurlUrl = this.member.prefixUrl + this.member.imgurl
- }
- this.visitorData.idcardType = this.member.idcardType
- if (this.member.idcardType === 0) {
- this.visitorData.idcardTypeName = '韬唤璇�'
- } else if (this.member.idcardType === 1) {
- this.visitorData.idcardTypeName = '娓境璇佷欢'
- } else if (this.member.idcardType === 2) {
- this.visitorData.idcardTypeName = '鎶ょ収'
- }
+ const visitorData = uni.getStorageSync('visitorData')
+ if(visitorData && visitorData.name){
+ this.visitorData = visitorData
}
+ // if (this.member ) {
+ // this.visitorData.name = this.member.name
+ // this.visitorData.phone = this.member.phone
+ // this.visitorData.idcardNo = this.member.idcardDecode
+ // this.visitorData.companyName = this.member.visitCompanyName
+ // this.visitorData.faceImg = this.member.faceImg
+ // if (this.member.faceImg) {
+ // this.visitorData.faceImgUrl = this.member.prefixUrl + this.member.faceImg
+ // }
+ // this.visitorData.imgurl = this.member.imgurl
+ // if (this.member.imgurl) {
+ // this.visitorData.imgurlUrl = this.member.prefixUrl + this.member.imgurl
+ // }
+ // this.visitorData.idcardType = this.member.idcardType
+ // if (this.member.idcardType === 0) {
+ // this.visitorData.idcardTypeName = '韬唤璇�'
+ // } else if (this.member.idcardType === 1) {
+ // this.visitorData.idcardTypeName = '娓境璇佷欢'
+ // } else if (this.member.idcardType === 2) {
+ // this.visitorData.idcardTypeName = '鎶ょ収'
+ // }
+ // }
this.visitorData.userAnswerId = option.answerId || ''
// this.getVisit()
// uni.$on('update', (data) => {
@@ -182,6 +182,7 @@
// icon: 'none'
// })
// }
+ uni.setStorageSync('visitorData', this.visitorData)
uni.navigateTo({
url: `/pages/visitorApplication/visitorApplication?data=${JSON.stringify(this.visitorData)}`
});
@@ -206,7 +207,8 @@
filePath: file.tempFilePath,
name: 'file',
formData: {
- folderCode: 'MEMBER_IMG'
+ folderCode: 'MEMBER_IMG',
+ isFace: 0
},
success: (uploadFileRes) => {
let res = JSON.parse(uploadFileRes.data)
--
Gitblit v1.9.3