From 80e8fce03fb67ddc17923ca122be33335432b48a Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 27 三月 2025 16:46:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
h5/pages/visitorApplication/visitorApplication.vue | 54 ++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 46 insertions(+), 8 deletions(-)
diff --git a/h5/pages/visitorApplication/visitorApplication.vue b/h5/pages/visitorApplication/visitorApplication.vue
index 0fd3b21..20b6bd2 100644
--- a/h5/pages/visitorApplication/visitorApplication.vue
+++ b/h5/pages/visitorApplication/visitorApplication.vue
@@ -82,7 +82,7 @@
</view>
</view>
</view> -->
- <view v-if="form1.type == '1'" class="list_item">
+ <view v-if="form1.type == 1" class="list_item">
<view class="list_item_label">
<text></text>
<text>鏂藉伐鍐呭</text>
@@ -106,13 +106,13 @@
</view>
</view>
</view>
- <view class="footer">
- <view class="footer_btn" @click="onSubmit">鎻愪氦</view>
+ <view class="footer-box">
+ <view class="submit-button" @click="onSubmit">鎻愪氦</view>
</view>
<!-- 鍏ュ洯鏃堕棿 -->
- <u-datetime-picker :show="show4" :minDate="new Date().getTime()" mode="datetime" :formatter="formatter"
+ <u-datetime-picker :show="show4" :minDate="new Date().getTime()" :formatter="formatter" mode="datetime"
@cancel="show4 = false" @confirm="setstarttime"></u-datetime-picker>
- <!-- 绂诲洯鏃堕棿 -->
+ <!-- 绂诲洯鏃堕棿 -->
<u-datetime-picker v-if="form1.starttime" :show="show5" :formatter="formatter"
:minDate="formatTimeStamp(form1.starttime)" :maxDate="formatTimeStamp(form1.starttime.slice(0,10) + ' 23:59')"
mode="datetime" @cancel="show5 = false" @confirm="setendtime"></u-datetime-picker>
@@ -416,6 +416,15 @@
},
methods: {
formatter(type, value) {
+ // if (type === 'year') {
+ // return `${value}骞碻
+ // }
+ // if (type === 'month') {
+ // return `${value}鏈坄
+ // }
+ // if (type === 'day') {
+ // return `${value}鏃
+ // }
if (type === 'year') {
return `${value}骞碻
}
@@ -425,9 +434,15 @@
if (type === 'day') {
return `${value}鏃
}
-// <<<<<<< HEAD
- this.$forceUpdate()
- this.closeInput()
+ if (type === 'hour') {
+ return `${value}鏃禶
+ }
+ if (type === 'minute') {
+ return `${value}鍒哷
+ }
+ // this.$forceUpdate()
+ // this.closeInput()
+ return value
},
closeInput() {
this.$refs.keyboard.close()
@@ -1361,6 +1376,29 @@
}
}
}
+
+ .footer-box {
+ width: 100%;
+ position: fixed;
+ bottom: 30rpx;
+ height: 80rpx;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ .submit-button {
+ width: calc(100% - 60rpx);
+ height: 88rpx;
+ line-height: 88rpx;
+ background: #4d99a8;
+ border-radius: 4rpx;
+ color: #fff;
+ border-radius: 44rpx;
+ font-size: 32rpx;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ }
+ }
.head {
width: 100%;
--
Gitblit v1.9.3