From e8158d16a13c2ea1f2d8566578137db4394ab610 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期四, 28 三月 2024 18:36:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
h5/pages/userinfo/userinfo.vue | 126 ++++++++++++++++++++++++++++++++---------
1 files changed, 98 insertions(+), 28 deletions(-)
diff --git a/h5/pages/userinfo/userinfo.vue b/h5/pages/userinfo/userinfo.vue
index ae9cb78..11fbad0 100644
--- a/h5/pages/userinfo/userinfo.vue
+++ b/h5/pages/userinfo/userinfo.vue
@@ -27,14 +27,14 @@
</view>
</view>
<view class="cell">
- <view class="title">鍏徃</view>
+ <view class="title">鍏徃<b>*</b></view>
<view class="content">
<input class="input" maxlength="50" placeholder-style="color: #999999;" v-model="visitorData.companyName" placeholder="璇疯緭鍏ユ偍鐨勫叕鍙稿悕绉�" />
</view>
</view>
<view class="cell">
<view class="title1">
- <text class="title1_a">浜鸿劯鐓х墖<b>*</b></text>
+ <text class="title1_a">浜鸿劯鐓х墖<b style="color: red;">*</b></text>
<text class="title1_b">1銆佽鎻愪緵浜斿畼娓呮櫚锛屼汉鑴稿眳涓殑姝ｉ潰浜鸿劯鍏嶅啝鐓х墖锛�</text>
<text class="title1_b">2銆佺収鐗囨棤閫嗗厜銆佹棤PS銆佹棤杩囧害缇庨澶勭悊</text>
</view>
@@ -63,36 +63,75 @@
<view class="footer-box">
<view class="submit-button" @click="submit">涓嬩竴姝�</view>
</view>
- <u-picker keyName="name" :show="show" :columns="columns" @confirm="confirm" @cancel="show = false"></u-picker>
+ <!-- <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>
</view>
</template>
<script>
+ import tlyPictureCut from "@/components/tly-picture-cut/tlyPictureCut.vue";
+ import QfImageCropper from '@/uni_modules/qf-image-cropper/components/qf-image-cropper/qf-image-cropper.vue';
+ import { mapState } from 'vuex'
export default {
data() {
return {
+ photoSrc: "",
show: false,
visit: '',
+ type: '',
columns: [[{name: '韬唤璇�', id: 0}, {name: '娓境璇佷欢', id: 1},{name: '鎶ょ収', id: 2}]],
fileList: [],
visitorData: {
userAnswerId: '',
name: '',
phone: '',
- idcardType: '',
- idcardTypeName: '',
+ idcardType: '0',
+ idcardTypeName: '韬唤璇�',
idcardNo: '',
faceImg: '',
faceImgUrl: '',
imgurl: '',
- imgurlUrl: ''
+ imgurlUrl: '',
+ companyName: ''
}
}
},
+ 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 = '鎶ょ収'
+ }
+ }
this.visitorData.userAnswerId = option.userAnswerId
this.getVisit()
+ // uni.$on('update', (data) => {
+ // this.uploadImg(data.tempFilePath)
+ // })
},
methods: {
@@ -125,6 +164,10 @@
icon: 'none'
})
}
+ if (!this.visitorData.companyName) return uni.showToast({
+ title: '鍏徃涓嶈兘涓虹┖',
+ icon: 'none'
+ })
if (!this.visitorData.faceImg) return uni.showToast({
title: '浜鸿劯鐓х墖涓嶈兘涓虹┖',
icon: 'none'
@@ -150,40 +193,67 @@
}
})
},
+ uploadImg(file) {
+ var that = this
+ that.$refs.cropper.close()
+ uni.showLoading({ title: '涓婁紶涓�', mask: true });
+ uni.uploadFile({
+ url: `${this.$baseUrl}public/api/uploadFtp.do`,
+ filePath: file.tempFilePath,
+ name: 'file',
+ formData: {
+ folderCode: 'MEMBER_IMG'
+ },
+ success: (uploadFileRes) => {
+ let res = JSON.parse(uploadFileRes.data)
+ this.visitorData.faceImg = res.data.halfPath
+ this.visitorData.faceImgUrl = res.data.prefixPath + res.data.folder + res.data.halfPath
+ },
+ fail(err) {
+ alert('澶辫触')
+ },
+ complete() {
+ uni.hideLoading();
+ }
+ });
+ },
upload(type) {
+ var that = this
+ that.type = type
+ if (type === 'faceImg') {
+ that.$refs.cropper.chooseImage()
+ return
+ }
uni.chooseImage({
+ count: 1,
success: (chooseImageRes) => {
- // console.log(chooseImageRes.tempFilePaths[0])
- uni.navigateTo({
- url: `/pages/cropping/cropping?item=${JSON.stringify({ tempFilePath: chooseImageRes.tempFilePaths[0] })}`
- })
- return
- uni.showLoading({ title: '涓婁紶涓�', mask: true });
- for (let i = 0; i < chooseImageRes.tempFilePaths.length; i++) {
+ // if (type === 'faceImg') {
+ // that.photoSrc = chooseImageRes.tempFilePaths[0];
+ // that.$refs.tlyPictureCut.showPop();
+ // }
+ if (type === 'imgurl') {
+ uni.showLoading({ title: '涓婁紶涓�', mask: true });
uni.uploadFile({
- url: `${this.$baseUrl}public/api/uploadFtp.do`,
- filePath: chooseImageRes.tempFilePaths[i],
+ url: `${that.$baseUrl}public/api/uploadFtp.do`,
+ filePath: chooseImageRes.tempFilePaths[0],
name: 'file',
formData: {
folderCode: 'MEMBER_IMG'
},
+ timeout: 60000,
success: (uploadFileRes) => {
let res = JSON.parse(uploadFileRes.data)
- if (type === 'faceImg') {
- this.visitorData.faceImg = res.data.halfPath
- this.visitorData.faceImgUrl = res.data.prefixPath + res.data.folder + res.data.halfPath
- } else {
- this.visitorData.imgurl = res.data.halfPath
- this.visitorData.imgurlUrl = res.data.prefixPath + res.data.folder + res.data.halfPath
- }
+ that.visitorData.imgurl = res.data.halfPath
+ that.visitorData.imgurlUrl = res.data.prefixPath + res.data.folder + res.data.halfPath
},
complete() {
- if (i === chooseImageRes.tempFilePaths.length - 1) {
- uni.hideLoading();
- }
+ uni.hideLoading();
}
});
}
+ },
+ fail(err) {
+ alert('api鎶ラ敊')
}
});
},
@@ -196,7 +266,7 @@
}
</script>
-<style>
+<style lang="scss">
page {
background-color: #F7F7F7 !important;
}
@@ -233,7 +303,7 @@
display: flex;
flex-direction: column;
.title1_a {
- font-size: 30rpx;
+ font-size: 30rpx !important;
font-weight: 400;
color: #222222;
display: flex;
@@ -245,7 +315,7 @@
}
}
.title1_b {
- font-size: 24rpx;
+ font-size: 24rpx !important;
font-weight: 400;
color: #999999;
}
--
Gitblit v1.9.3