From 43942a545271345ce26e40d82bb97138c5ea7611 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 28 六月 2024 13:54:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
h5/pages/visitorApplication/visitorApplication.vue | 71 ++++++++++++-----------------------
1 files changed, 25 insertions(+), 46 deletions(-)
diff --git a/h5/pages/visitorApplication/visitorApplication.vue b/h5/pages/visitorApplication/visitorApplication.vue
index aa41896..439734d 100644
--- a/h5/pages/visitorApplication/visitorApplication.vue
+++ b/h5/pages/visitorApplication/visitorApplication.vue
@@ -1,29 +1,11 @@
<template>
<view class="visit">
- <view class="head">鎷滆淇℃伅</view>
+ <!-- <view class="head">鎷滆淇℃伅</view> -->
<view class="list">
- <!-- <view class="list_item">
- <view class="list_item_label">
- <text>琚浜烘墜鏈�</text>
- <text>*</text>
- </view>
- <view class="list_item_content">
- <input type="number" maxlength="11" v-model="form1.phone1" :placeholder="verify == '0' ? '杈撳叆鎵嬫満鍙峰悗鑷姩鑾峰彇' : '璇疯緭鍏ユ墜鏈哄彿'" @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">
- <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>
+ <text>琚浜�</text>
</view>
<view class="list_item_content" @click="showName = true">
<text :style="{ color: form1.receptMemberName ? '#000000' : '' }">{{
@@ -34,8 +16,8 @@
</view>
<view class="list_item">
<view class="list_item_label">
- <text>鍏ュ洯鏃堕棿</text>
<text>*</text>
+ <text>鍏ュ洯鏃堕棿</text>
</view>
<view class="list_item_content" @click="show4 = true">
<text :style="{ color: form1.starttime ? '#000000' : '' }">{{
@@ -46,8 +28,8 @@
</view>
<view class="list_item">
<view class="list_item_label">
- <text>绂诲洯鏃堕棿</text>
<text>*</text>
+ <text>绂诲洯鏃堕棿</text>
</view>
<view class="list_item_content" @click="openLC">
<text :style="{ color: form1.endtime ? '#000000' : '' }">{{
@@ -69,8 +51,8 @@
<div class="empty"></div>
<view class="list_item">
<view class="list_item_label">
- <text>鎷滆浜嬬敱</text>
<text>*</text>
+ <text>鎷滆浜嬬敱</text>
</view>
<view class="list_item_content" @click="showReason = true">
<text :style="{ color: form1.reason ? '#000000' : '' }">{{
@@ -81,8 +63,8 @@
</view>
<view class="list_item">
<view class="list_item_label">
+ <text></text>
<text>鏄惁鏂藉伐浣滀笟</text>
- <text>*</text>
</view>
<view class="list_item_content">
<switch
@@ -94,6 +76,7 @@
</view>
<view v-if="form1.type == '1'" class="list_item">
<view class="list_item_label">
+ <text></text>
<text>鏂藉伐鍐呭</text>
<!-- <text>*</text> -->
</view>
@@ -108,8 +91,8 @@
</view>
<view class="list_item">
<view class="list_item_label">
- <text>闅忚杞﹁締</text>
<text></text>
+ <text>闅忚杞﹁締</text>
</view>
<view class="list_item_content" @click="openInput(1)">
<text :style="{ color: form1.carNos ? '#000000' : '' }">{{
@@ -323,8 +306,8 @@
</view>
<view class="adduser_list_item">
<view class="adduser_list_item_label">
- <text>鍏徃</text>
<text>*</text>
+ <text>鍏徃</text>
</view>
<view class="adduser_list_item_ipt">
<input
@@ -337,8 +320,8 @@
</view>
<view class="adduser_list_item">
<view class="adduser_list_item_label">
- <text>闅忚杞﹁締</text>
<text></text>
+ <text>闅忚杞﹁締</text>
</view>
<view class="adduser_list_item_ipt" @click="openInput(2)">
<text :style="{ color: withUserList.carNos ? '#000000' : '' }">{{
@@ -603,7 +586,7 @@
withUserList: this.personnel
}).then(res => {
if (res.code === 200) {
- uni.reLaunch({
+ uni.navigateTo({
url: `/pages/appointmentDetails/appointmentDetails?id=${res.data}`
})
}
@@ -871,7 +854,7 @@
line-height: 100rpx;
text-align: center;
font-size: 32rpx;
- font-weight: 500;
+ font-weight: 600;
color: #222222;
}
.list {
@@ -908,7 +891,7 @@
align-items: center;
justify-content: center;
border-radius: 10rpx;
- background-color: #025eef;
+ background-color: $uni-color-primary;
color: #ffffff;
font-size: 26rpx;
margin-left: 30rpx;
@@ -927,7 +910,7 @@
text-align: center;
font-size: 32rpx;
font-family: PingFangSC, PingFang SC;
- font-weight: 500;
+ font-weight: 600;
color: #222222;
}
.adduser_list {
@@ -968,18 +951,14 @@
flex-shrink: 0;
display: flex;
align-items: center;
+ font-family: PingFangSC, PingFang SC;
+ font-size: 30rpx;
text {
&:nth-child(1) {
- font-size: 30rpx;
- font-family: PingFangSC, PingFang SC;
- font-weight: 400;
- color: #222222;
+ color: #e0312a;
}
&:nth-child(2) {
- font-size: 30rpx;
- font-family: PingFangSC, PingFang SC;
- font-weight: 400;
- color: #e0312a;
+ color: #222222;
}
}
}
@@ -1053,7 +1032,7 @@
text-align: center;
font-size: 32rpx;
font-family: PingFangSC, PingFang SC;
- font-weight: 500;
+ font-weight: 600;
color: #222222;
}
.addcar_ipt {
@@ -1110,7 +1089,7 @@
width: 100%;
text-align: center;
font-size: 32rpx;
- font-weight: 500;
+ font-weight: 600;
color: #222222;
}
.search-box {
@@ -1253,7 +1232,7 @@
background: #025eef;
border-radius: 8rpx;
font-size: 28rpx;
- font-weight: 500;
+ font-weight: 600;
color: #ffffff;
}
}
@@ -1298,13 +1277,13 @@
&:nth-child(1) {
font-size: 30rpx;
font-weight: 400;
- color: #222222;
+ color: #e42d2d;
}
&:nth-child(2) {
font-size: 30rpx;
font-weight: 400;
- color: #e42d2d;
+ color: #222222;
}
}
}
@@ -1344,7 +1323,7 @@
.cate_head {
font-size: 32rpx;
font-family: PingFangSC, PingFang SC;
- font-weight: 500;
+ font-weight: 600;
color: #222222;
}
@@ -1420,7 +1399,7 @@
background: #4c99a8;
border-radius: 44rpx;
font-size: 32rpx;
- font-weight: 500;
+ font-weight: 600;
color: #ffffff;
}
}
--
Gitblit v1.9.3