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/visitorApplication/visitorApplication.vue | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/h5/pages/visitorApplication/visitorApplication.vue b/h5/pages/visitorApplication/visitorApplication.vue
index 2be75fd..135a850 100644
--- a/h5/pages/visitorApplication/visitorApplication.vue
+++ b/h5/pages/visitorApplication/visitorApplication.vue
@@ -102,7 +102,6 @@
</view>
</view>
</view>
- <view class="zw"></view>
<view class="footer">
<view class="footer_btn" @click="onSubmit">鎻愪氦</view>
</view>
@@ -119,6 +118,7 @@
v-if="form1.starttime"
:show="show5"
:minDate="formatTimeStamp(form1.starttime)"
+ :maxDate="formatTimeStamp(form1.starttime.slice(0,10) + ' 23:59')"
mode="datetime"
@cancel="show5 = false"
@confirm="setendtime"
@@ -775,7 +775,7 @@
this.form1.starttime = uni.$u.timeFormat(e.value, 'yyyy-mm-dd hh:MM')
// this.maxTime = getDaysAfterDate(uni.$u.timeFormat(e.value, 'yyyy-mm-dd hh:MM'), this.day)
this.maxTime = this.form1.starttime
- console.log(this.form1.starttime)
+ console.log(this.form1.starttime.slice(0,10))
this.show4 = false
},
setendtime(e) {
@@ -854,7 +854,7 @@
line-height: 100rpx;
text-align: center;
font-size: 32rpx;
- font-weight: 500;
+ font-weight: 600;
color: #222222;
}
.list {
@@ -910,7 +910,7 @@
text-align: center;
font-size: 32rpx;
font-family: PingFangSC, PingFang SC;
- font-weight: 500;
+ font-weight: 600;
color: #222222;
}
.adduser_list {
@@ -1032,7 +1032,7 @@
text-align: center;
font-size: 32rpx;
font-family: PingFangSC, PingFang SC;
- font-weight: 500;
+ font-weight: 600;
color: #222222;
}
.addcar_ipt {
@@ -1089,7 +1089,7 @@
width: 100%;
text-align: center;
font-size: 32rpx;
- font-weight: 500;
+ font-weight: 600;
color: #222222;
}
.search-box {
@@ -1232,7 +1232,7 @@
background: #025eef;
border-radius: 8rpx;
font-size: 28rpx;
- font-weight: 500;
+ font-weight: 600;
color: #ffffff;
}
}
@@ -1278,7 +1278,6 @@
font-size: 30rpx;
font-weight: 400;
color: #e42d2d;
-
}
&:nth-child(2) {
@@ -1324,7 +1323,7 @@
.cate_head {
font-size: 32rpx;
font-family: PingFangSC, PingFang SC;
- font-weight: 500;
+ font-weight: 600;
color: #222222;
}
@@ -1388,9 +1387,10 @@
padding: 0 30rpx;
padding-bottom: env(safe-area-inset-bottom);
box-sizing: border-box;
- position: fixed;
- left: 0;
- bottom: 30rpx;
+ margin-top: 80rpx;
+ // position: fixed;
+ // left: 0;
+ // bottom: 30rpx;
.footer_btn {
width: 100%;
@@ -1400,7 +1400,7 @@
background: #4c99a8;
border-radius: 44rpx;
font-size: 32rpx;
- font-weight: 500;
+ font-weight: 600;
color: #ffffff;
}
}
--
Gitblit v1.9.3