提交 6848d38d 编写于 作者: 刘英杰's avatar 刘英杰

- 20240717 团队预约 新增预约咨询文字

上级 a610f409
流水线 #28144 已通过 ,包含阶段
in 36 second
...@@ -8,3 +8,5 @@ ...@@ -8,3 +8,5 @@
- 202400620 - 202400620
- 单位名称和车辆信息两项必填。车辆信息车牌和‘无’字都可以通过校验 - 单位名称和车辆信息两项必填。车辆信息车牌和‘无’字都可以通过校验
- 车辆信息旁边备注:填写正确的车牌信息(若无车辆填无) - 车辆信息旁边备注:填写正确的车牌信息(若无车辆填无)
- 202400730
- 新增闭管公告
...@@ -168,4 +168,12 @@ export function GetAppointmentInfo (data){ ...@@ -168,4 +168,12 @@ export function GetAppointmentInfo (data){
data, data,
}) })
} }
export function GetDoorClose (data){
//获取闭管公告
return request({
url:`/api/DoorClose/api/door/GetDoorClose`,
methods:'get',
data,
})
}
<template> <template>
<view class="container" > <view class="container">
<view class="header" > <view class="header">
<swiper style="width: 100%;height: 110%;"> <swiper style="width: 100%;height: 110%;">
<swiper-item v-for="(item,index) in imageList" :key="index"> <swiper-item v-for="(item,index) in imageList" :key="index">
<image :src="item.path" style="width: 100%;height: 100%;" ></image> <image :src="item.path" style="width: 100%;height: 100%;"></image>
</swiper-item> </swiper-item>
<!-- <swiper-item >-->
<!-- <image src="../../static/images/home.png" style="width: 100%;height: 100%;" ></image>-->
<!-- </swiper-item>-->
</swiper> </swiper>
<!-- <image src="../../static/images/logo.png" style=" width: 50vw;height: 4.3vh; position: absolute;top: 3vh;left: 3vw;"></image>--> <image src="../../static/images/logo.png"
<image src="../../static/images/logo.png" style=" max-width: 197px;max-height: 36px; width: 50vw;height: 4.3vh; position: absolute;top: 3vh;left: 10px;"></image> style=" max-width: 197px;max-height: 36px; width: 50vw;height: 4.3vh; position: absolute;top: 3vh;left: 10px;"></image>
</view> </view>
<view class="content"> <view class="content">
<view class="c-container"> <view class="c-container">
<view class="c-container-header"> <view class="c-container-header">
<view style=" margin-top:3vh; font-size: 25px;font-family: '宋体';font-weight: 600;color:rgb(116, 96, 88);">琼台书院博物馆</view> <view style=" margin-top:3vh; font-size: 25px;font-family: '宋体';font-weight: 600;color:rgb(116, 96, 88);">
<view @click="show = true" v-html="object.introduction" style="font-size: 1.5vh; margin-top:1vh; ">入馆须知</view> 琼台书院博物馆
<u-popup v-if="object.inform" :show="show" mode="center" round="40" > </view>
<!-- <slot>--> <view style="font-size: 1.5vh; margin-top:1vh; " @click="show = true" v-html="object.introduction">入馆须知
</view>
<!-- </slot>--> <!-- 入馆须知-->
<view class="popupContainer" > <u-popup v-if="object.inform" :show="show" mode="center" round="40">
<view class="popupContainer">
<view class="popupContainer-contaienr"> <view class="popupContainer-contaienr">
<view class="popupContainer-contaienr-header" > <view class="popupContainer-contaienr-header">
<span class="popupContainer-contaienr-header-text">入馆须知</span> <span class="popupContainer-contaienr-header-text">入馆须知</span>
</view> </view>
<view id="notice" class="popupContainer-contaienr-content" v-html="object.inform"></view>
<view id="notice" v-html="object.inform" class="popupContainer-contaienr-content" ></view> <view class="popupContainer-contaienr-footer">
<view class="popupContainer-contaienr-footer" > <u-button :disabled="!noticeFlag" color="#D89A7C" text="我已悉知" type="warning"
<!-- :disabled="!noticeFlag"--> @click="show = false;"></u-button>
<u-button color="#D89A7C" :disabled="!noticeFlag" type="warning" text="我已悉知" @click="show = false;"></u-button>
</view> </view>
</view> </view>
</view> </view>
</u-popup> </u-popup>
</view> </view>
<view class="c-container-content" >
<view class="c-container-content-center" @click="tourist" style="margin-bottom: 20px;margin-top: 20px;">
<!-- 闭管公告-->
<u-popup :show="Boolean(closeNotice.is_close)" mode="center" round="40">
<view class="popupContainer">
<view class="popupContainer-contaienr">
<view class="popupContainer-contaienr-header">
<span class="popupContainer-contaienr-header-text">闭管公告</span>
</view>
<view class="popupContainer-contaienr-content" style="padding: 10px;
box-sizing: border-box;" v-html="closeNotice.content"></view>
<view class="popupContainer-contaienr-footer">
<u-button color="#D89A7C" text="我已悉知" type="warning"
@click="closeNotice.is_close = 0 ;"></u-button>
</view>
</view>
</view>
</u-popup>
<view class="c-container-content">
<view class="c-container-content-center" style="margin-bottom: 20px;margin-top: 20px;" @click="tourist">
<view class="c-container-content-center-container"> <view class="c-container-content-center-container">
<view class="c-container-content-center-text"> <view class="c-container-content-center-text">
<span style="font-size: 21px"> <span style="font-size: 21px">
...@@ -50,30 +65,30 @@ ...@@ -50,30 +65,30 @@
</view> </view>
</view> </view>
</view> </view>
<!-- <view class="c-container-content-top " style="margin-bottom: 20px">--> <!-- <view class="c-container-content-top " style="margin-bottom: 20px">-->
<!-- <view class="c-container-content-top-right" @click="team">--> <!-- <view class="c-container-content-top-right" @click="team">-->
<!-- <view class="c-container-content-top-right-container">--> <!-- <view class="c-container-content-top-right-container">-->
<!-- <view class="c-container-content-top-right-text">--> <!-- <view class="c-container-content-top-right-text">-->
<!-- <span style="font-size: 21px">团队预约</span>--> <!-- <span style="font-size: 21px">团队预约</span>-->
<!-- </view>--> <!-- </view>-->
<!-- <view class="c-container-content-top-right-icon">--> <!-- <view class="c-container-content-top-right-icon">-->
<!-- <image src="../../static/images/0203_1.png" style="width: 70%;height: 50%;"></image>--> <!-- <image src="../../static/images/0203_1.png" style="width: 70%;height: 50%;"></image>-->
<!-- </view>--> <!-- </view>-->
<!-- </view>--> <!-- </view>-->
<!-- </view>--> <!-- </view>-->
<!-- <view class="c-container-content-top-left" @click="office">--> <!-- <view class="c-container-content-top-left" @click="office">-->
<!-- <view class="c-container-content-top-left-container">--> <!-- <view class="c-container-content-top-left-container">-->
<!-- <view class="c-container-content-top-left-text">--> <!-- <view class="c-container-content-top-left-text">-->
<!-- <span style="font-size: 21px"><p>公务接待</p>预约</span>--> <!-- <span style="font-size: 21px"><p>公务接待</p>预约</span>-->
<!-- </view>--> <!-- </view>-->
<!-- <view class="c-container-content-top-left-icon">--> <!-- <view class="c-container-content-top-left-icon">-->
<!-- <image src="../../static/images/0203_1.png" style="width: 70%;height: 50%;"></image>--> <!-- <image src="../../static/images/0203_1.png" style="width: 70%;height: 50%;"></image>-->
<!-- </view>--> <!-- </view>-->
<!-- </view>--> <!-- </view>-->
<!-- </view>--> <!-- </view>-->
<!-- </view>--> <!-- </view>-->
<view class="c-container-content-center" @click="team" style="margin-bottom: 20px"> <view class="c-container-content-center" style="margin-bottom: 20px" @click="team">
<view class="c-container-content-center-container" > <view class="c-container-content-center-container">
<view class="c-container-content-center-text"> <view class="c-container-content-center-text">
<span style="font-size: 21px"> <span style="font-size: 21px">
团队预约 团队预约
...@@ -86,20 +101,20 @@ ...@@ -86,20 +101,20 @@
</view> </view>
<!-- <view class="c-container-content-center" @click="office" style="margin-bottom: 15px">--> <!-- <view class="c-container-content-center" @click="office" style="margin-bottom: 15px">-->
<!-- <view class="c-container-content-center-container" >--> <!-- <view class="c-container-content-center-container" >-->
<!-- <view class="c-container-content-center-text">--> <!-- <view class="c-container-content-center-text">-->
<!-- <span style="font-size: 21px">--> <!-- <span style="font-size: 21px">-->
<!-- 公务接待预约--> <!-- 公务接待预约-->
<!-- </span>--> <!-- </span>-->
<!-- </view>--> <!-- </view>-->
<!-- <view class="c-container-content-center-icon">--> <!-- <view class="c-container-content-center-icon">-->
<!-- <image src="../../static/images/0203_1.png" style="width: 30%;height: 50%;"></image>--> <!-- <image src="../../static/images/0203_1.png" style="width: 30%;height: 50%;"></image>-->
<!-- </view>--> <!-- </view>-->
<!-- </view>--> <!-- </view>-->
<!-- </view>--> <!-- </view>-->
<view class="c-container-content-footer" @click="record" > <view class="c-container-content-footer" @click="record">
<view class="c-container-content-footer-container" > <view class="c-container-content-footer-container">
<view class="c-container-content-footer-text"> <view class="c-container-content-footer-text">
<span style="font-size: 21px"> <span style="font-size: 21px">
预约记录 预约记录
...@@ -113,52 +128,55 @@ ...@@ -113,52 +128,55 @@
</view> </view>
</view> </view>
</view> </view>
<!-- <u-button @click="login" text="登录"></u-button>--> <!-- <u-button @click="login" text="登录"></u-button>-->
</view> </view>
</template> </template>
<script> <script>
import * as api from "../../network/utils"; import * as api from "../../network/utils";
import {GetSysconfigurationInfoByWX} from "../../network/utils"; import {GetDoorClose, GetSysconfigurationInfoByWX} from "../../network/utils";
export default { export default {
data() { data() {
return { return {
noticeFlag:false, closeNotice: {
object:{}, "is_close": 0,
imageList:[], "content": ""
show:true, },
noticeFlag: false,
object: {},
imageList: [],
show: true,
title: 'Hello', title: 'Hello',
// rach:'<ul><li><span style="color: rgb(116, 96, 88);">l&nbsp;书院博物馆向社会</span><span style="color: rgb(221, 169, 143);">免费</span><span style="color: rgb(116, 96, 88);">开放。</span></li><li><span style="color: rgb(116, 96, 88);">开放时间:</span></li></ul><p><span style="color: rgb(116, 96, 88);">自2023年6月起,周一闭馆调休,周二至周日09:00(开馆)——16:00(停止入馆)——17:00(闭馆),逢节假日正常闭馆。</span></p><ul><li><span style="color: rgb(116, 96, 88);">l放开区域:</span></li></ul><p><span style="color: rgb(116, 96, 88);">书院二进展厅区、三进奎星楼文物区。</span></p><ul><li><span style="color: rgb(116, 96, 88);">&nbsp;通过网上预约,每天限量发放免费参观门票,限定上午、下午预约到馆参观散客人数为</span><span style="color: rgb(221, 169, 143);">80</span><span style="color: rgb(116, 96, 88);">人,入馆时通过扫二维码、刷身份证的方式进行登记验证。</span></li></ul>',
// intro:"<p><span style=\"color: rgb(116, 96, 88);\">开放时间:自2023年6月起,周一闭馆整休</span></p><p><span style=\"color: rgb(116, 96, 88);\">周二至周日09:00(开馆) - 16:00(停止入馆) - 17:00(闭馆)</span></p><p><span style=\"color: rgb(116, 96, 88);\">节假日正常开馆。</span><span style=\"color: rgb(216, 154, 124);\">入馆须知&gt;&gt;</span></p>"
//
} }
}, },
mounted() { mounted() {
document.body.style.overflow = 'hidden' document.body.style.overflow = 'hidden'
}, },
onLoad() { onLoad() {
setTimeout(()=>{ setTimeout(() => {
//获取须知节点 //获取须知节点
const element = document.getElementById('notice'); const element = document.getElementById('notice');
if (element) { if (element) {
console.log("🚀🚀获取到了element🚀,",element)
this.validateScroll(element); this.validateScroll(element);
}else { } else {
this.noticeFlag = true this.noticeFlag = true
} }
},1000) }, 1000)
this.getCloseNotice()
this.GetUseCarouselList() this.GetUseCarouselList()
this.GetSysconfigurationInfoByWX() this.GetSysconfigurationInfoByWX()
}, },
watch:{ watch: {},
},
methods: { methods: {
getCloseNotice() {
//获取闭管公告
api.GetDoorClose().then(res => {
this.closeNotice = res.response
})
},
validateScroll(element) { validateScroll(element) {
if (!element) { if (!element) {
console.log("🚀!element🚀🚀,")
this.noticeFlag = true this.noticeFlag = true
return; return;
} }
...@@ -168,34 +186,32 @@ ...@@ -168,34 +186,32 @@
const totalHeight = element.scrollHeight; const totalHeight = element.scrollHeight;
const currentScroll = element.scrollTop; const currentScroll = element.scrollTop;
const clientHeight = element.clientHeight; const clientHeight = element.clientHeight;
console.log("🚀触发到底了isScrolledToBottom🚀🚀,",totalHeight,currentScroll,clientHeight) console.log("🚀触发到底了isScrolledToBottom🚀🚀,", totalHeight, currentScroll, clientHeight)
return totalHeight - currentScroll === clientHeight|| (totalHeight - currentScroll) - clientHeight < 3; return totalHeight - currentScroll === clientHeight || (totalHeight - currentScroll) - clientHeight < 3;
} }
if (element.scrollHeight === element.clientHeight){ if (element.scrollHeight === element.clientHeight) {
this.noticeFlag = true this.noticeFlag = true
console.log("🚀element.scrollHeight === element.clientHeight🚀🚀,",element.scrollHeight , element.clientHeight) console.log("🚀element.scrollHeight === element.clientHeight🚀🚀,", element.scrollHeight, element.clientHeight)
}else { } else {
element.addEventListener('touchmove', () => { element.addEventListener('touchmove', () => {
console.log("🚀element.addEventListener('scroll',🚀🚀,",element.scrollHeight , element.clientHeight) console.log("🚀element.addEventListener('scroll',🚀🚀,", element.scrollHeight, element.clientHeight)
//监听notice节点scroll事件 //监听notice节点scroll事件
if (isScrolledToBottom()) { if (isScrolledToBottom()) {
this.noticeFlag = true this.noticeFlag = true
} }
}) })
} }
}, },
GetSysconfigurationInfoByWX(){ GetSysconfigurationInfoByWX() {
api.GetSysconfigurationInfoByWX().then(res=>{ api.GetSysconfigurationInfoByWX().then(res => {
this.object = res.response this.object = res.response
}) })
}, },
GetUseCarouselList(){ GetUseCarouselList() {
api.GetUseCarouselList().then(res=>{ api.GetUseCarouselList().then(res => {
res.response.map((cur,index)=>{ res.response.map((cur, index) => {
cur.path = window.location.protocol + '//' +window.location.host+cur.path cur.path = window.location.protocol + '//' + window.location.host + cur.path
}) })
this.imageList = res.response this.imageList = res.response
}) })
...@@ -219,31 +235,31 @@ ...@@ -219,31 +235,31 @@
// } // }
// }); // });
// }, // },
tourist(){ tourist() {
uni.navigateTo({ uni.navigateTo({
url:'/pages/tourist-appointment/index' url: '/pages/tourist-appointment/index'
}) })
}, },
team(){ team() {
uni.navigateTo({ uni.navigateTo({
url:'/pages/team-appointment/index' url: '/pages/team-appointment/index'
}) })
}, },
office(){ office() {
uni.navigateTo({ uni.navigateTo({
url:'/pages/official-appointment/index' url: '/pages/official-appointment/index'
}) })
}, },
record(){ record() {
uni.navigateTo({ uni.navigateTo({
url:'/pages/record-appointment/index' url: '/pages/record-appointment/index'
}) })
}, },
} }
} }
</script> </script>
<style scoped lang="scss"> <style lang="scss" scoped>
@import url("index.css"); @import url("index.css");
......
...@@ -102,16 +102,7 @@ ...@@ -102,16 +102,7 @@
<view class="c-f-f" style="background-color: #F4ECE6"> <view class="c-f-f" style="background-color: #F4ECE6">
<!-- <u-form style="width: 100%;" :model="item" :ref="'uForm'+index" labelWidth="80px">-->
<!-- <u-form-item label-style="{'color':'red'}" label-position="top" label="姓名" prop="name">-->
<!-- <u-input class="c-f-f-i-t input" v-model="item.name" />-->
<!-- </u-form-item>-->
<!-- <u-form-item label-style="{'color':'red'}" label-position="top" label="身份证号/护照号码" prop="identify_num">-->
<!-- <u-input class="c-f-f-i-t input" v-model="item.identify_num" />-->
<!-- </u-form-item>-->
<!-- <u-form-item label-style="{'color':'red'}" label-position="top" label="手机号码" prop="mobile">-->
<!-- <u-input class="c-f-f-i-t input" v-model="item.mobile" />-->
<!-- </u-form-item>-->
<view class="c-f-f-i" > <view class="c-f-f-i" >
<view class="c-f-f-i-t"> <view class="c-f-f-i-t">
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册 或