提交 93888a2d 编写于 作者: 刘英杰's avatar 刘英杰

- 202400620

    - 单位名称和车辆信息两项必填。车辆信息车牌和‘无’字都可以通过校验
    - 车辆信息旁边备注:填写正确的车牌信息(若无车辆填无)
上级 258a9db0
流水线 #26973 已通过 ,包含阶段
in 46 second
## 琼台博物馆预约
### 单点方式
浏览器手机号登录 /pages/loginPC/index
### 更新日志
- 202400620
- 单位名称和车辆信息两项必填。车辆信息车牌和‘无’字都可以通过校验
- 车辆信息旁边备注:填写正确的车牌信息(若无车辆填无)
...@@ -24,5 +24,22 @@ export function week (value){ ...@@ -24,5 +24,22 @@ export function week (value){
} }
} }
export const userAgent = ()=>{ export const userAgent = ()=>{
console.log(window.navigator.userAgent,'window.navigator.userAgent'); console.log(window.navigator.userAgent,'window.navigator.userAgent');
} }
\ No newline at end of file export function isVehicleNumber(vehicleNumber) {
//车牌号验证方法 无和车牌 都正确
if (vehicleNumber === '无') {
return true;
}
var xreg = /^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领A-Z]{1}[A-Z]{1}(([0-9]{5}[DF]$)|([DF][A-HJ-NP-Z0-9][0-9]{4}$))|无/;
var creg = /^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领A-Z]{1}[A-Z]{1}[A-HJ-NP-Z0-9]{4}[A-HJ-NP-Z0-9挂学警港澳]{1}|无$/;
if (vehicleNumber.length == 7) {
return creg.test(vehicleNumber);
} else if (vehicleNumber.length == 8) {
return xreg.test(vehicleNumber);
} else {
return false;
}
}
...@@ -50,28 +50,41 @@ ...@@ -50,28 +50,41 @@
</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 class="c-container-content-center" @click="team" style="margin-bottom: 20px">
<view class="c-container-content-center-container" >
<view class="c-container-content-center-text">
<span style="font-size: 21px">
团队预约
</span>
</view>
<view class="c-container-content-center-icon">
<image src="../../static/images/0203_1.png" style="width: 30%;height: 50%;"></image>
</view> </view>
</view> </view>
</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" >-->
......
...@@ -99,23 +99,23 @@ ...@@ -99,23 +99,23 @@
<view class="c-f-f" style="background-color: #F4ECE6"> <view class="c-f-f" style="background-color: #F4ECE6">
<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">
单位名称 <span style="color: red">*</span>单位名称
</view> </view>
<view class="c-f-f-i-f"> <view class="c-f-f-i-f">
<u-input v-model="formDateValidate.unit" class="input"></u-input> <u-input @blur="leaderInformation('zzUnit')" v-model="formDateValidate.unit" class="input"></u-input>
</view> </view>
</view> <span style="color: red" v-if="zzUnit">*{{zzUnit}}</span>
</view>
<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">
<span style="color: red">*</span>领队真实信息 <span style="color: red">*</span>领队真实信息
</view> </view>
<view class="c-f-f-i-f"> <view class="c-f-f-i-f">
<u-input @blur="leaderInformation('zzName')" v-model="formDateValidate.name" class="input"></u-input> <u-input @blur="leaderInformation('zzName')" v-model="formDateValidate.name" class="input"></u-input>
</view> </view>
<span style="color: red" v-if="zzName">*{{zzName}}</span> <span style="color: red" v-if="zzName">*{{zzName}}</span>
</view> </view>
<view class="c-f-f-i" :key="aaa"> <view class="c-f-f-i" >
<view class="c-f-f-i-t"> <view class="c-f-f-i-t">
<span style="color:red">*</span>领队身份证号/护照号码 <span style="color:red">*</span>领队身份证号/护照号码
</view> </view>
...@@ -135,12 +135,13 @@ ...@@ -135,12 +135,13 @@
</view> </view>
<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">
<!-- <span style="color: red">*</span>--> <span style="color: red">*</span>
车辆信息 车辆信息(填写正确的车牌信息,“若无车辆填无”)
</view> </view>
<view class="c-f-f-i-f"> <view class="c-f-f-i-f">
<u-input v-model="formDateValidate.plate_number" class="input"></u-input> <u-input @blur="leaderInformation('zzPlateNumber')" v-model="formDateValidate.plate_number" class="input"></u-input>
</view> </view>
<span style="color: red" v-if="zzPlateNumber">*{{zzPlateNumber}}</span>
</view> </view>
<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">
...@@ -156,13 +157,7 @@ ...@@ -156,13 +157,7 @@
</u-number-box> </u-number-box>
</view> </view>
</view> </view>
<!-- ??????????????????-->
<!-- <view class="delete-button" v-if="peopleList.length >1" @click="deleteAddPeole(index)">-->
<!-- <view class="delete-button-close">-->
<!-- <u-icon name="close" color="#FFFFFF" ></u-icon>-->
<!-- </view>-->
<!-- </view>-->
<!-- ??????????????????-->
</view> </view>
</view> </view>
<view ref="people-list" v-if="!!peopleList.length" v-for="(item,index) in peopleList" :key="index" class="content-footer-container1" > <view ref="people-list" v-if="!!peopleList.length" v-for="(item,index) in peopleList" :key="index" class="content-footer-container1" >
...@@ -180,7 +175,7 @@ ...@@ -180,7 +175,7 @@
</view> </view>
<view v-if="item.zzName" style="color: red">*{{item.zzName}}</view> <view v-if="item.zzName" style="color: red">*{{item.zzName}}</view>
</view> </view>
<view class="c-f-f-i" :key="aaa"> <view class="c-f-f-i" >
<view class="c-f-f-i-t"> <view class="c-f-f-i-t">
<span style="color: red">*</span>身份证号/护照号码 <span style="color: red">*</span>身份证号/护照号码
</view> </view>
...@@ -254,6 +249,8 @@ ...@@ -254,6 +249,8 @@
zzIdentity_num:'', zzIdentity_num:'',
zzMobile:'', zzMobile:'',
zzName:'', zzName:'',
zzUnit:'',
zzPlateNumber:'',
loading1:false, loading1:false,
loading2:false, loading2:false,
formDateValidate:{ formDateValidate:{
...@@ -330,6 +327,20 @@ ...@@ -330,6 +327,20 @@
}else { }else {
this.zzName = '' this.zzName = ''
} }
},
'zzUnit':()=>{
if (this.formDateValidate.unit =='' ) {
this.zzUnit = '请填写单位名称'
}else {
this.zzUnit = ''
}
},
'zzPlateNumber':()=>{
if (!hooks.isVehicleNumber(this.formDateValidate.plate_number)) {
this.zzPlateNumber = '请填写正确的车牌信息(若无车辆填无)'
}else {
this.zzPlateNumber = ''
}
} }
} }
object[key]() object[key]()
...@@ -429,7 +440,7 @@ ...@@ -429,7 +440,7 @@
this.loading2 = true this.loading2 = true
api.TeamOrOfficialCreate(this.formDateValidate).then((res)=>{ api.TeamOrOfficialCreate(this.formDateValidate).then((res)=>{
this.loading2 = false; this.loading2 = false;
if(res.code !==1) this.$u.toast(res.msg_detail) if(res.code !==1) this.$u.toast(res.msg_detail)
else { else {
this.$u.toast(res.msg) this.$u.toast(res.msg)
setTimeout(()=>{ setTimeout(()=>{
...@@ -441,12 +452,14 @@ ...@@ -441,12 +452,14 @@
}) })
} }
} }
if(Object.keys(this.formDateValidate).filter(cur=>cur!=='users').every(cur=>{return this.formDateValidate[cur]!==''})&&this.peopleList.every(cur=>{return cur.name && cur.identity_num})) { if(Object.keys(this.formDateValidate).filter(cur=>cur!=='users').every(cur=>{return this.formDateValidate[cur]!==''})&&this.peopleList.every(cur=>{return cur.name && cur.identity_num})) {
object[e]() object[e]()
} }
else { else {
this.$u.toast('请完善表单') this.$u.toast('请完善表单')}
}
}, },
valChange(e) { valChange(e) {
......
<!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>museum-reservation</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)')) <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>museum-reservation</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=./static/index.97465e7b.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=./static/js/chunk-vendors.6ddea1d3.js></script><script src=./static/js/index.6377bffc.js></script></body></html> document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=./static/index.97465e7b.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=./static/js/chunk-vendors.6ddea1d3.js></script><script src=./static/js/index.456d87e4.js></script></body></html>
\ No newline at end of file \ No newline at end of file
...@@ -285,6 +285,19 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && ...@@ -285,6 +285,19 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
// //
// //
// //
//
//
//
//
//
//
//
//
//
//
//
//
//
var _default = { var _default = {
data: function data() { data: function data() {
return { return {
......
<view class="container data-v-57280228"><view class="header data-v-57280228"><swiper style="width:100%;height:110%;" class="data-v-57280228"><block wx:for="{{imageList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><swiper-item class="data-v-57280228"><image style="width:100%;height:100%;" src="{{item.path}}" class="data-v-57280228"></image></swiper-item></block></swiper><image style="max-width:197px;max-height:36px;width:50vw;height:4.3vh;position:absolute;top:3vh;left:10px;" src="../../static/images/logo.png" class="data-v-57280228"></image></view><view class="content data-v-57280228"><view class="c-container data-v-57280228"><view class="c-container-header data-v-57280228"><view style="margin-top:3vh;font-size:25px;font-family:'宋体';font-weight:600;color:rgb(116, 96, 88);" class="data-v-57280228">琼台书院博物馆</view><view data-event-opts="{{[['tap',[['e0',['$event']]]]]}}" style="font-size:1.5vh;margin-top:1vh;" bindtap="__e" class="data-v-57280228"><rich-text nodes="{{object.introduction}}"></rich-text></view><block wx:if="{{object.inform}}"><u-popup vue-id="8dd740cc-1" show="{{show}}" mode="center" round="40" class="data-v-57280228" bind:__l="__l" vue-slots="{{['default']}}"><view class="popupContainer data-v-57280228"><view class="popupContainer-contaienr data-v-57280228"><view class="popupContainer-contaienr-header data-v-57280228"><label class="popupContainer-contaienr-header-text _span data-v-57280228">入馆须知</label></view><view class="popupContainer-contaienr-content data-v-57280228" id="notice"><rich-text nodes="{{object.inform}}"></rich-text></view><view class="popupContainer-contaienr-footer data-v-57280228"><u-button vue-id="{{('8dd740cc-2')+','+('8dd740cc-1')}}" color="#D89A7C" disabled="{{!noticeFlag}}" type="warning" text="我已悉知" data-event-opts="{{[['^click',[['e1']]]]}}" bind:click="__e" class="data-v-57280228" bind:__l="__l"></u-button></view></view></view></u-popup></block></view><view class="c-container-content data-v-57280228"><view data-event-opts="{{[['tap',[['tourist',['$event']]]]]}}" class="c-container-content-center data-v-57280228" style="margin-bottom:20px;margin-top:20px;" bindtap="__e"><view class="c-container-content-center-container data-v-57280228"><view class="c-container-content-center-text data-v-57280228"><label style="font-size:21px;" class="_span data-v-57280228">散客预约</label></view><view class="c-container-content-center-icon data-v-57280228"><image style="width:30%;height:50%;" src="../../static/images/0203_1.png" class="data-v-57280228"></image></view></view></view><view class="c-container-content-top data-v-57280228" style="margin-bottom:20px;"><view data-event-opts="{{[['tap',[['team',['$event']]]]]}}" class="c-container-content-top-right data-v-57280228" bindtap="__e"><view class="c-container-content-top-right-container data-v-57280228"><view class="c-container-content-top-right-text data-v-57280228"><label style="font-size:21px;" class="_span data-v-57280228">团队预约</label></view><view class="c-container-content-top-right-icon data-v-57280228"><image style="width:70%;height:50%;" src="../../static/images/0203_1.png" class="data-v-57280228"></image></view></view></view><view data-event-opts="{{[['tap',[['office',['$event']]]]]}}" class="c-container-content-top-left data-v-57280228" bindtap="__e"><view class="c-container-content-top-left-container data-v-57280228"><view class="c-container-content-top-left-text data-v-57280228"><label style="font-size:21px;" class="_span data-v-57280228"><view class="_p data-v-57280228">公务接待</view>预约</label></view><view class="c-container-content-top-left-icon data-v-57280228"><image style="width:70%;height:50%;" src="../../static/images/0203_1.png" class="data-v-57280228"></image></view></view></view></view><view data-event-opts="{{[['tap',[['record',['$event']]]]]}}" class="c-container-content-footer data-v-57280228" bindtap="__e"><view class="c-container-content-footer-container data-v-57280228"><view class="c-container-content-footer-text data-v-57280228"><label style="font-size:21px;" class="_span data-v-57280228">预约记录</label></view><view class="c-container-content-footer-icon data-v-57280228"><image style="width:30%;height:50%;" src="../../static/images/0203_1.png" class="data-v-57280228"></image></view></view></view></view></view></view></view> <view class="container data-v-57280228"><view class="header data-v-57280228"><swiper style="width:100%;height:110%;" class="data-v-57280228"><block wx:for="{{imageList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><swiper-item class="data-v-57280228"><image style="width:100%;height:100%;" src="{{item.path}}" class="data-v-57280228"></image></swiper-item></block></swiper><image style="max-width:197px;max-height:36px;width:50vw;height:4.3vh;position:absolute;top:3vh;left:10px;" src="../../static/images/logo.png" class="data-v-57280228"></image></view><view class="content data-v-57280228"><view class="c-container data-v-57280228"><view class="c-container-header data-v-57280228"><view style="margin-top:3vh;font-size:25px;font-family:'宋体';font-weight:600;color:rgb(116, 96, 88);" class="data-v-57280228">琼台书院博物馆</view><view data-event-opts="{{[['tap',[['e0',['$event']]]]]}}" style="font-size:1.5vh;margin-top:1vh;" bindtap="__e" class="data-v-57280228"><rich-text nodes="{{object.introduction}}"></rich-text></view><block wx:if="{{object.inform}}"><u-popup vue-id="8dd740cc-1" show="{{show}}" mode="center" round="40" class="data-v-57280228" bind:__l="__l" vue-slots="{{['default']}}"><view class="popupContainer data-v-57280228"><view class="popupContainer-contaienr data-v-57280228"><view class="popupContainer-contaienr-header data-v-57280228"><label class="popupContainer-contaienr-header-text _span data-v-57280228">入馆须知</label></view><view class="popupContainer-contaienr-content data-v-57280228" id="notice"><rich-text nodes="{{object.inform}}"></rich-text></view><view class="popupContainer-contaienr-footer data-v-57280228"><u-button vue-id="{{('8dd740cc-2')+','+('8dd740cc-1')}}" color="#D89A7C" disabled="{{!noticeFlag}}" type="warning" text="我已悉知" data-event-opts="{{[['^click',[['e1']]]]}}" bind:click="__e" class="data-v-57280228" bind:__l="__l"></u-button></view></view></view></u-popup></block></view><view class="c-container-content data-v-57280228"><view data-event-opts="{{[['tap',[['tourist',['$event']]]]]}}" class="c-container-content-center data-v-57280228" style="margin-bottom:20px;margin-top:20px;" bindtap="__e"><view class="c-container-content-center-container data-v-57280228"><view class="c-container-content-center-text data-v-57280228"><label style="font-size:21px;" class="_span data-v-57280228">散客预约</label></view><view class="c-container-content-center-icon data-v-57280228"><image style="width:30%;height:50%;" src="../../static/images/0203_1.png" class="data-v-57280228"></image></view></view></view><view data-event-opts="{{[['tap',[['team',['$event']]]]]}}" class="c-container-content-center data-v-57280228" style="margin-bottom:20px;" bindtap="__e"><view class="c-container-content-center-container data-v-57280228"><view class="c-container-content-center-text data-v-57280228"><label style="font-size:21px;" class="_span data-v-57280228">团队预约</label></view><view class="c-container-content-center-icon data-v-57280228"><image style="width:30%;height:50%;" src="../../static/images/0203_1.png" class="data-v-57280228"></image></view></view></view><view data-event-opts="{{[['tap',[['record',['$event']]]]]}}" class="c-container-content-footer data-v-57280228" bindtap="__e"><view class="c-container-content-footer-container data-v-57280228"><view class="c-container-content-footer-text data-v-57280228"><label style="font-size:21px;" class="_span data-v-57280228">预约记录</label></view><view class="c-container-content-footer-icon data-v-57280228"><image style="width:30%;height:50%;" src="../../static/images/0203_1.png" class="data-v-57280228"></image></view></view></view></view></view></view></view>
\ No newline at end of file \ No newline at end of file
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册 或