From cab86bd5a10b4e574ced9748a3718a5aa2d1b84b Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 08 五月 2024 17:56:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
h5/pages/visitorApplication/visitorApplication.vue | 54 +++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 49 insertions(+), 5 deletions(-)
diff --git a/h5/pages/visitorApplication/visitorApplication.vue b/h5/pages/visitorApplication/visitorApplication.vue
index 1838734..577f2ea 100644
--- a/h5/pages/visitorApplication/visitorApplication.vue
+++ b/h5/pages/visitorApplication/visitorApplication.vue
@@ -2,7 +2,7 @@
<view class="visit">
<view class="head">鎷滆淇℃伅</view>
<view class="list">
- <view class="list_item">
+ <!-- <view class="list_item">
<view class="list_item_label">
<text>琚浜烘墜鏈�</text>
<text>*</text>
@@ -18,6 +18,16 @@
</view>
<view class="list_item_content">
<input type="text" placeholder="璇疯緭鍏ュ鍚�" v-model="form1.receptMemberName" @blur="getUser" placeholder-style="color: #999999;" />
+ </view>
+ </view> -->
+ <view class="list_item">
+ <view class="list_item_label">
+ <text>琚浜�</text>
+ <text>*</text>
+ </view>
+ <view class="list_item_content" @click="showName = true">
+ <text :style="{color: form1.name ? '#000000' : ''}">{{form1.name ? form1.name : '璇烽�夋嫨'}}</text>
+ <u-icon name="arrow-right" color="#CCCCCC" size="20"></u-icon>
</view>
</view>
<view class="list_item">
@@ -51,6 +61,7 @@
<u-icon name="arrow-right" color="#CCCCCC" size="20"></u-icon>
</view>
</view>
+ <div class="empty"></div>
<view class="list_item">
<view class="list_item_label">
<text>鎷滆浜嬬敱</text>
@@ -58,6 +69,24 @@
</view>
<view class="list_item_content">
<input type="text" v-model="form1.reason" placeholder="璇疯緭鍏ユ潵璁夸簨鐢�" placeholder-style="color: #999999;" />
+ </view>
+ </view>
+ <view class="list_item">
+ <view class="list_item_label">
+ <text>鏄惁鏂藉伐浣滀笟</text>
+ <text>*</text>
+ </view>
+ <view class="list_item_content">
+ <switch color="#4e99a9" style="transform:scale(0.8)" @change="constructionChange" />
+ </view>
+ </view>
+ <view class="list_item">
+ <view class="list_item_label">
+ <text>鏂藉伐鍐呭</text>
+ <text>*</text>
+ </view>
+ <view class="list_item_content">
+ <input type="text" v-model="form1.ss" placeholder="璇疯緭鍏ユ柦宸ュ唴瀹�" placeholder-style="color: #999999;" />
</view>
</view>
<view class="list_item">
@@ -282,6 +311,7 @@
</view>
</u-popup>
<u-picker keyName="name" :show="show6" :columns="columns1" @confirm="seleIdcard" @cancel="show6 = false"></u-picker>
+ <u-picker keyName="name" :show="showName" :columns="columnsNames" @confirm="selectedName" @cancel="showName = false"></u-picker>
<!-- <tly-picture-cut ref="tlyPictureCut" :pictureSrc="photoSrc" @createImg="uploadImg"></tly-picture-cut> -->
<keyboardInput ref="keyboard" @export="setPlate" @close="closeInput" />
<qf-image-cropper ref="cropper" :width="280" :height="280" :radius="30" @crop="uploadImg"></qf-image-cropper>
@@ -299,6 +329,7 @@
photoSrc: '',
type: '',
inputType: '',
+ showName: false,
show: false,
show1: false,
show2: false,
@@ -310,6 +341,9 @@
fileList: [],
columns1: [
[{name: '韬唤璇�', id: 0}, {name: '娓境璇佷欢', id: 1},{name: '鎶ょ収', id: 2}],
+ ],
+ columnsNames: [
+ [{name: '寮犱笁', id: 0},{name: '寮犱笁', id: 1},{name: '寮犱笁', id: 2},]
],
columns: [],
cars: [],
@@ -372,6 +406,9 @@
},
closeInput() {
this.$refs.keyboard.close()
+ },
+ constructionChange(e) {
+ console.log(e.detail.value);
},
uploadImg(file) {
this.$refs.cropper.close()
@@ -564,8 +601,12 @@
seleIdcard(e) {
this.withUserList.idcardType = e.value[0].id
this.withUserList.idcardTypeName = e.value[0].name
- console.log(e);
this.show6 = false
+ },
+ selectedName(e) {
+ this.form1.name = e.value[0].name
+ this.form1.id = e.value[0].id
+ this.showName = false
},
submitCart() {
if (!this.carName) return uni.showToast({
@@ -1116,7 +1157,12 @@
padding: 0 30rpx;
box-sizing: border-box;
background-color: #ffffff;
-
+ .empty{
+ width: 750rpx;
+ height: 20rpx;
+ background-color: #f7f7f7;
+ margin: 0 -30rpx;
+ }
.list_item {
width: 100%;
// min-height: 98rpx;
@@ -1179,8 +1225,6 @@
padding: 30rpx;
box-sizing: border-box;
background-color: #ffffff;
- margin-top: 20rpx;
-
.cate_head {
font-size: 32rpx;
font-family: PingFangSC, PingFang SC;
--
Gitblit v1.9.3