From ccf69ee82f77a2e67a565cec02f95e64324a283f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 15 五月 2024 09:16:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
h5/pages/userinfo/userinfo.vue | 57 ++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 34 insertions(+), 23 deletions(-)
diff --git a/h5/pages/userinfo/userinfo.vue b/h5/pages/userinfo/userinfo.vue
index fc49bd6..ea96237 100644
--- a/h5/pages/userinfo/userinfo.vue
+++ b/h5/pages/userinfo/userinfo.vue
@@ -2,45 +2,46 @@
<view class="container">
<view class="visitor-form">
<view class="cell">
- <view class="title">濮撳悕<b>*</b></view>
+ <view class="title"><b>*</b>濮撳悕</view>
<view class="content">
<input class="input" placeholder-style="color: #999999;" maxlength="30" v-model="visitorData.name" placeholder="璇疯緭鍏ユ偍鐨勭湡瀹炲鍚�" />
</view>
</view>
<view class="cell">
- <view class="title">鎵嬫満鍙�<b>*</b></view>
+ <view class="title"><b>*</b>鎵嬫満鍙�</view>
<view class="content">
<input class="input" maxlength="11" placeholder-style="color: #999999;" v-model="visitorData.phone" placeholder="璇疯緭鍏ユ偍鐨勬墜鏈哄彿" />
</view>
</view>
<view class="cell">
- <view class="title">璇佷欢绫诲瀷<b>*</b></view>
+ <view class="title"><b>*</b>璇佷欢绫诲瀷</view>
<view class="content" @click="show = true">
<text :style="{color: visitorData.idcardTypeName ? '#000000' : ''}">{{visitorData.idcardTypeName ? visitorData.idcardTypeName : '璇烽�夋嫨'}}</text>
- <u-icon name="arrow-right" color="#CCCCCC" size="20"></u-icon>
+ <u-icon name="arrow-right" color="#CCCCCC" size="16" class="ml6"></u-icon>
</view>
</view>
<view class="cell">
- <view class="title">璇佷欢鍙风爜<b>*</b></view>
+ <view class="title"><b>*</b>璇佷欢鍙风爜</view>
<view class="content">
<input class="input" maxlength="18" 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="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 style="color: red;">*</b></text>
+ <text class="title1_a"><b>*</b>浜鸿劯鐓х墖</text>
<text class="title1_b">1銆佽鎻愪緵浜斿畼娓呮櫚锛屼汉鑴稿眳涓殑姝ｉ潰浜鸿劯鍏嶅啝鐓х墖锛�</text>
<text class="title1_b">2銆佺収鐗囨棤閫嗗厜銆佹棤PS銆佹棤杩囧害缇庨澶勭悊</text>
</view>
<view class="content">
<view class="content_uplaod" @click="upload('faceImg')" v-if="!visitorData.faceImgUrl">
- <u-icon name="plus" color="rgb(153, 153, 153)" size="28"></u-icon>
+ <u-icon name="plus" color="rgb(153, 153, 153)" size="20"></u-icon>
</view>
<view class="content_uplaod" @click="upload('faceImg')" v-else>
<image :src="visitorData.faceImgUrl" mode="widthFix"></image>
@@ -48,7 +49,7 @@
</view>
</view>
<view style="height: 20rpx; background-color: #F7F7F7;"></view>
- <view class="cell">
+ <!-- <view class="cell">
<view class="title">鍋ュ悍璇�<b v-if="visit === '1'">*</b></view>
<view class="content">
<view class="content_uplaod" @click="upload('imgurl')" v-if="!visitorData.imgurlUrl">
@@ -58,7 +59,7 @@
<image :src="visitorData.imgurlUrl" mode="widthFix"></image>
</view>
</view>
- </view>
+ </view> -->
</view>
<view class="footer-box">
<view class="submit-button" @click="submit">涓嬩竴姝�</view>
@@ -73,6 +74,7 @@
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'
+ import { uploadUrl } from "@/utils/config"
export default {
data() {
return {
@@ -86,8 +88,8 @@
userAnswerId: '',
name: '',
phone: '',
- idcardType: '',
- idcardTypeName: '',
+ idcardType: '0',
+ idcardTypeName: '韬唤璇�',
idcardNo: '',
faceImg: '',
faceImgUrl: '',
@@ -198,7 +200,7 @@
that.$refs.cropper.close()
uni.showLoading({ title: '涓婁紶涓�', mask: true });
uni.uploadFile({
- url: `${this.$baseUrl}public/api/uploadFtp.do`,
+ url: uploadUrl,
filePath: file.tempFilePath,
name: 'file',
formData: {
@@ -221,7 +223,7 @@
var that = this
that.type = type
if (type === 'faceImg') {
- that.$refs.cropper.open()
+ that.$refs.cropper.chooseImage()
return
}
uni.chooseImage({
@@ -234,7 +236,7 @@
if (type === 'imgurl') {
uni.showLoading({ title: '涓婁紶涓�', mask: true });
uni.uploadFile({
- url: `${that.$baseUrl}public/api/uploadFtp.do`,
+ url: uploadUrl,
filePath: chooseImageRes.tempFilePaths[0],
name: 'file',
formData: {
@@ -276,7 +278,9 @@
.content_uplaod {
width: 120rpx;
height: 120rpx;
- background-color: #ececec;
+ background: #F7F7F7;
+ border-radius: 8rpx;
+ border: 2rpx solid #E5E5E5;
display: flex;
align-items: center;
justify-content: center;
@@ -285,6 +289,12 @@
.content_uplaod image {
width: 100%;
height: 100%;
+ }
+ .empty{
+ width: 750rpx;
+ height: 20rpx;
+ margin: 0 -30rpx;
+ background-color: #f7f7f7;;
}
.title {
font-size: 30rpx;
@@ -295,8 +305,8 @@
}
.title b {
- color: red;
- font-weight: bold;
+ color: #E42D2D;
+ margin-right: 4rpx;
}
.title1 {
@@ -310,8 +320,9 @@
align-items: center;
margin-bottom: 20rpx;
b {
- color: red;
- font-weight: bold;
+ color: #E42D2D;
+ margin-right: 4rpx;
+
}
}
.title1_b {
@@ -322,8 +333,8 @@
}
.add-other {
- border: 1rpx solid #025eef;
- color: #025eef;
+ border: 1rpx solid #4d99a8;
+ color: #4d99a8;
font-size: 11rpx;
padding: 0 12rpx;
height: 32rpx;
@@ -348,7 +359,7 @@
width: calc(100% - 60rpx);
height: 88rpx;
line-height: 88rpx;
- background: #025eef;
+ background: #4d99a8;
border-radius: 4rpx;
color: #fff;
border-radius: 44rpx;
--
Gitblit v1.9.3