From 17ecbaae8d036bb1f59b1d74b153fa9dfe542f3f Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期四, 27 三月 2025 14:17:36 +0800
Subject: [PATCH] 解决h5访客申请bug
---
h5/pages/guidemap/guidemap.vue | 3 +
h5/pages/visitorApplication/visitorApplication.vue | 54 +++++++++++++++++++++++----
h5/pages/staffLogin/login.vue | 3 +
h5/utils/config.js | 4 +-
h5/pages/driver/reservedGuide.vue | 3 +
h5/pages/staff/signin.vue | 3 +
h5/pages/driver/reserved.vue | 19 +++++++++
h5/manifest.json | 2
h5/pages/visitorSubGuide/index.vue | 3 +
9 files changed, 78 insertions(+), 16 deletions(-)
diff --git a/h5/manifest.json b/h5/manifest.json
index 1367de7..98170d5 100644
--- a/h5/manifest.json
+++ b/h5/manifest.json
@@ -1,6 +1,6 @@
{
"name" : "laborVisitors",
- "appid" : "__UNI__BCCF400",
+ "appid" : "__UNI__91B8BB7",
"description" : "",
"versionName" : "1.0.0",
"versionCode" : "100",
diff --git a/h5/pages/driver/reserved.vue b/h5/pages/driver/reserved.vue
index 3571990..b5ff413 100644
--- a/h5/pages/driver/reserved.vue
+++ b/h5/pages/driver/reserved.vue
@@ -113,6 +113,7 @@
closeOnClickOverlay
:minDate="new Date().getTime()"
mode="datetime"
+ :formatter="formatter"
@close="showDatetime = false"
@cancel="showDatetime = false"
@confirm="setinDate"
@@ -151,6 +152,24 @@
this.initData()
},
methods: {
+ formatter(type, value) {
+ if (type === 'year') {
+ return `${value}骞碻
+ }
+ if (type === 'month') {
+ return `${value}鏈坄
+ }
+ if (type === 'day') {
+ return `${value}鏃
+ }
+ if (type === 'hour') {
+ return `${value}鏃禶
+ }
+ if (type === 'minute') {
+ return `${value}鍒哷
+ }
+ return value
+ },
checkSurplus() {
const { arriveDate, reasonId, totalNum } = this.param
if(!arriveDate || !reasonId || !totalNum) return
diff --git a/h5/pages/driver/reservedGuide.vue b/h5/pages/driver/reservedGuide.vue
index 2841be5..aca4af5 100644
--- a/h5/pages/driver/reservedGuide.vue
+++ b/h5/pages/driver/reservedGuide.vue
@@ -1,6 +1,7 @@
<template>
<view class="box">
- <mp-html :content="content" />
+ <!-- <mp-html :content="content" /> -->
+ <u-parse :content="content"></u-parse>
</view>
</template>
diff --git a/h5/pages/guidemap/guidemap.vue b/h5/pages/guidemap/guidemap.vue
index b2914b9..8da0c72 100644
--- a/h5/pages/guidemap/guidemap.vue
+++ b/h5/pages/guidemap/guidemap.vue
@@ -1,7 +1,8 @@
<template>
<view class="box">
<!-- <view v-html="info"></view> -->
- <mp-html :content="info" />
+ <!-- <mp-html :content="info" /> -->
+ <u-parse :content="info"></u-parse>
</view>
</template>
<script>
diff --git a/h5/pages/staff/signin.vue b/h5/pages/staff/signin.vue
index d1d44ee..a748d77 100644
--- a/h5/pages/staff/signin.vue
+++ b/h5/pages/staff/signin.vue
@@ -1,7 +1,8 @@
<template>
<view class="box">
<!-- <view v-html="info"></view> -->
- <mp-html :content="info" />
+ <!-- <mp-html :content="info" /> -->
+ <u-parse :content="info"></u-parse>
</view>
</template>
<script>
diff --git a/h5/pages/staffLogin/login.vue b/h5/pages/staffLogin/login.vue
index 6b8785f..28a2a8e 100644
--- a/h5/pages/staffLogin/login.vue
+++ b/h5/pages/staffLogin/login.vue
@@ -68,7 +68,8 @@
<view class="modal">
<!-- <view v-html="htmlText"></view> -->
<view class="content">
- <mp-html :content="htmlText" />
+ <!-- <mp-html :content="htmlText" /> -->
+ <u-parse :content="htmlText"></u-parse>
</view>
</view>
</u-popup>
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%;
diff --git a/h5/pages/visitorSubGuide/index.vue b/h5/pages/visitorSubGuide/index.vue
index 3f50a81..23b337c 100644
--- a/h5/pages/visitorSubGuide/index.vue
+++ b/h5/pages/visitorSubGuide/index.vue
@@ -1,7 +1,8 @@
<template>
<view class="box">
<!-- <view v-html="info"></view> -->
- <mp-html :content="info" />
+ <!-- <mp-html :content="info" /> -->
+ <u-parse :content="info"></u-parse>
</view>
</template>
<script>
diff --git a/h5/utils/config.js b/h5/utils/config.js
index 08884a3..05ff784 100644
--- a/h5/utils/config.js
+++ b/h5/utils/config.js
@@ -1,8 +1,8 @@
-export const baseUrl = 'zhyq_interface/'
+// export const baseUrl = 'zhyq_interface/'
// export const baseUrl = 'http://192.168.0.173/gateway_interface/'
// export const baseUrl = 'http://10.50.250.253:8088/gateway_interface/'
-// export const baseUrl = 'https://atwl.ahzyssl.com/zhyq_interface/'
+export const baseUrl = 'https://atwl.ahzyssl.com/zhyq_interface/'
export const app_url = 'https://atwl.ahzyssl.com/zhyq_h5/#/'
--
Gitblit v1.9.3