master
lion 1 year ago
parent 2330c1aedb
commit 4edb972be6

@ -9,7 +9,7 @@
<block v-for="(item,index) in listOrder" :key="index"> <block v-for="(item,index) in listOrder" :key="index">
<view class="orderBox" :class="{'cancelBox':item.status==0}" @click="toinfo(item.id)"> <view class="orderBox" :class="{'cancelBox':item.status==0}" @click="toinfo(item.id)">
<view class="orderBoxTitle flex-row"> <view class="orderBoxTitle flex-row">
<text class="orderBoxTitleTxt">{{item.type==1?"团队预约":"个人预约"}}</text> <text class="orderBoxTitleTxt">{{item.type==1?"团队信息":"个人信息"}}</text>
<view :class="item.status!=1?'cancelStatus orderBoxStatus':'orderBoxStatus'"> <view :class="item.status!=1?'cancelStatus orderBoxStatus':'orderBoxStatus'">
{{item.status_name}} {{item.status_name}}
</view> </view>

@ -3,7 +3,7 @@
<view class="orderBoxList"> <view class="orderBoxList">
<view class="orderBox"> <view class="orderBox">
<view class="orderBoxTitle flex-row"> <view class="orderBoxTitle flex-row">
<text class="orderBoxTitleTxt">{{info.type==1?"团队预约信息":"个人预约信息"}}</text> <text class="orderBoxTitleTxt">{{info.type==1?"团队信息":"个人信息"}}</text>
</view> </view>
<view class="orderBoxInfo flex-col"> <view class="orderBoxInfo flex-col">

@ -9,7 +9,7 @@
<block v-for="(item,index) in listOrder" :key="index"> <block v-for="(item,index) in listOrder" :key="index">
<view class="orderBox" :class="{'cancelBox':item.status==0}" @click="toinfo(item.id)"> <view class="orderBox" :class="{'cancelBox':item.status==0}" @click="toinfo(item.id)">
<view class="orderBoxTitle flex-row"> <view class="orderBoxTitle flex-row">
<text class="orderBoxTitleTxt">{{item.type==1?"团队预约":"个人预约"}}</text> <text class="orderBoxTitleTxt">{{item.type==1?"团队信息":"个人信息"}}</text>
<view :class="item.status!=1?'orderBoxStatus cancelStatus':'orderBoxStatus'">{{item.status_name}} <view :class="item.status!=1?'orderBoxStatus cancelStatus':'orderBoxStatus'">{{item.status_name}}
</view> </view>
</view> </view>
@ -19,7 +19,7 @@
<!-- <text class="iconfont icon-youkexuzhi"></text> --> <!-- <text class="iconfont icon-youkexuzhi"></text> -->
<!-- <text class="orderBoxInfoRowTxt"> <!-- <text class="orderBoxInfoRowTxt">
订单信息{{timeFormat(item.date, 'MM月DD日')}}{{item.time}}{{item.details_count}} 位观众</text> --> 订单信息{{timeFormat(item.date, 'MM月DD日')}}{{item.time}}{{item.details_count}} 位观众</text> -->
<text class="orderBoxInfoRowTxt">预约时间{{timeFormat(item.date, 'MM月DD日')}}{{item.time?item.time:''}}</text> <text class="orderBoxInfoRowTxt">参观时间{{timeFormat(item.date, 'MM月DD日')}}{{item.time?item.time:''}}</text>
</view> </view>
<view class="orderBoxInfoRow flex-row" style="margin-top: 20rpx;"> <view class="orderBoxInfoRow flex-row" style="margin-top: 20rpx;">
<text class="orderBoxInfoRowTxt">入馆人数{{item.total}} 位观众</text> <text class="orderBoxInfoRowTxt">入馆人数{{item.total}} 位观众</text>
@ -39,7 +39,7 @@
<view class="orderBoxFooter flex-row flex_end"> <view class="orderBoxFooter flex-row flex_end">
<view class="fbtn cancel" v-if="item.status==1" style="margin-right: 23rpx;" <view class="fbtn cancel" v-if="item.status==1" style="margin-right: 23rpx;"
@click.stop="tocancel(item.id)">取消预约</view> @click.stop="tocancel(item.id)">取消参观</view>
<view class="fbtn" :class="{'cancel':item.status!=1}" @click.stop="toinfo(item.id)">查看详情</view> <view class="fbtn" :class="{'cancel':item.status!=1}" @click.stop="toinfo(item.id)">查看详情</view>
</view> </view>
</view> </view>
@ -93,7 +93,7 @@
tocancel(id) { tocancel(id) {
var that = this; var that = this;
uni.showModal({ uni.showModal({
title: '确认要取消预约', title: '确认要取消参观',
success: function(res) { success: function(res) {
if (res.confirm) { if (res.confirm) {
that.util.request({ that.util.request({

@ -95,7 +95,7 @@
</view> </view>
<view class="activityBox-row" style="margin-top: 20rpx;color: #cf995a;" <view class="activityBox-row" style="margin-top: 20rpx;color: #cf995a;"
@click="showSelectorder=true"> @click="showSelectorder=false">
<text>选择信息{{selectInfo.info||"暂未选择"}}</text> <text>选择信息{{selectInfo.info||"暂未选择"}}</text>
</view> </view>
</view> </view>
@ -175,7 +175,7 @@
id: 1 id: 1
}], }],
currentPark: 0, currentPark: 0,
btnDisabled: false, btnDisabled: true,
showSelectorder: false, showSelectorder: false,
listOrder: [], listOrder: [],
listActivtyOrder: [], listActivtyOrder: [],
@ -223,11 +223,11 @@
that.loadOrder(function(res) { that.loadOrder(function(res) {
that.loadactivityOrder(function(r) { that.loadactivityOrder(function(r) {
if (res.length + r.length == 0) { if (res.length + r.length == 0) {
that.util.toast("您需要“参观预约”或“活动预约”成功后才能进行停车位预约。"); // that.util.toast("");
that.btnDisabled = true; that.btnDisabled = true;
} else { } else {
that.btnDisabled = false; that.btnDisabled = true;
that.showSelectorder = true; that.showSelectorder = false;
} }
}) })
}); });

@ -75,28 +75,28 @@
}, { }, {
"path": "pages/visit/index", "path": "pages/visit/index",
"style": { "style": {
"navigationBarTitleText": "参观预约", "navigationBarTitleText": "参观信息",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
}, { }, {
"path": "pages/visit/book", "path": "pages/visit/book",
"style": { "style": {
"navigationBarTitleText": "个人预约", "navigationBarTitleText": "个人信息",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
}, { }, {
"path": "pages/visit/teambook", "path": "pages/visit/teambook",
"style": { "style": {
"navigationBarTitleText": "团体预约", "navigationBarTitleText": "团队信息",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
}, { }, {
"path": "pages/success/success", "path": "pages/success/success",
"style": { "style": {
"navigationBarTitleText": "预约成功", "navigationBarTitleText": "填报成功",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
@ -163,7 +163,7 @@
},{ },{
"path": "order/visitorder", "path": "order/visitorder",
"style": { "style": {
"navigationBarTitleText": "参观预约订单", "navigationBarTitleText": "参观订单",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
@ -177,7 +177,7 @@
}, { }, {
"path": "order/visitorderinfo", "path": "order/visitorderinfo",
"style": { "style": {
"navigationBarTitleText": "参观预约详情", "navigationBarTitleText": "参观信息详情",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }

@ -23,7 +23,7 @@
<view class="box-row"> <view class="box-row">
<view class="box-col" @click="handleBook(1)"> <view class="box-col" @click="handleBook(1)">
<image src="../../static/img/index_icon_1.png" class="box-body-icon"></image> <image src="../../static/img/index_icon_1.png" class="box-body-icon"></image>
<view class='box-body-title'>参观预约</view> <view class='box-body-title'>团队信息</view>
</view> </view>
<view class="box-col" @click="handleBook(2)"> <view class="box-col" @click="handleBook(2)">
<image src="../../static/img/index_icon_2.png" class="box-body-icon"></image> <image src="../../static/img/index_icon_2.png" class="box-body-icon"></image>
@ -78,7 +78,7 @@
<u-popup :show="showBook" mode="bottom" @close="closeBook" :round="10" closeable> <u-popup :show="showBook" mode="bottom" @close="closeBook" :round="10" closeable>
<view class="mpopup"> <view class="mpopup">
<view class="mpopup-title"> <view class="mpopup-title">
参观预约 <!-- 参观预约 -->
</view> </view>
<view class="mpopup-content"> <view class="mpopup-content">
<view class="book-box"> <view class="book-box">
@ -98,7 +98,7 @@
</u-icon> </u-icon>
<view v-else> <view v-else>
<text <text
v-if="item.is_open==1">{{item.remain_count==0?"不可预约":"可预约"}}</text> v-if="item.is_open==1">{{item.remain_count==0?"不可参观":"可参观"}}</text>
<text v-else></text> <text v-else></text>
</view> </view>
</view> </view>
@ -144,7 +144,7 @@
<view class="book-box-row-timeitem-txt" v-else></view> <view class="book-box-row-timeitem-txt" v-else></view>
</block> </block>
<block v-else> <block v-else>
<view class="book-box-row-timeitem-txt">不可预约</view> <view class="book-box-row-timeitem-txt">不可参观</view>
</block> </block>
</view> </view>
</view> </view>
@ -160,7 +160,7 @@
</view> </view>
<view class="mpopup-footer"> <view class="mpopup-footer">
<view style="margin-right: 0rpx;flex: 1;"> <view style="margin-right: 0rpx;flex: 1;">
<u-button style="background-color: red;" type="primary" @click="tobook('team')"></u-button> <u-button style="background-color: red;" type="primary" @click="tobook('team')"></u-button>
</view> </view>
<!-- <view style="margin-left: 14rpx;flex: 1;"> <!-- <view style="margin-left: 14rpx;flex: 1;">
<u-button type="primary" @click="tobook('user')"></u-button> <u-button type="primary" @click="tobook('user')"></u-button>
@ -345,11 +345,11 @@
if (isCanbook) { if (isCanbook) {
that.showCalendar = false; that.showCalendar = false;
} else { } else {
that.util.toast("您选择的日期不可预约") that.util.toast("您选择的日期不可参观")
} }
}); });
} else { } else {
that.util.toast("您选择的日期不可预约") that.util.toast("您选择的日期不可参观")
} }
} }
}, },
@ -368,9 +368,9 @@
if (date == m.date) { if (date == m.date) {
if (m.is_open == 1) if (m.is_open == 1)
if (m.remain_count == 0) { if (m.remain_count == 0) {
day.bottomInfo = '不可预约' day.bottomInfo = '不可参观'
} else { } else {
day.bottomInfo = '可预约' day.bottomInfo = '可参观'
} }
else { else {
day.bottomInfo = '闭馆' day.bottomInfo = '闭馆'
@ -394,7 +394,7 @@
if (cdate.remain_count === 0) { if (cdate.remain_count === 0) {
uni.showToast({ uni.showToast({
icon: "none", icon: "none",
title: "该日期已不可预约" title: "该日期已不可参观"
}) })
return; return;
} }
@ -480,11 +480,11 @@
tobook(type) { tobook(type) {
if (this.util.isNull(this.currentDate.date)) { if (this.util.isNull(this.currentDate.date)) {
this.util.toast("请选择预约的日期"); this.util.toast("请选择参观的日期");
return false; return false;
} }
if (this.util.isNull(this.currentTime.id)) { if (this.util.isNull(this.currentTime.id)) {
this.util.toast("请选择预约的时段"); this.util.toast("请选择参观的时段");
return false; return false;
} }
uni.navigateTo({ uni.navigateTo({

@ -27,7 +27,7 @@
<view class="mine-box-navlist"> <view class="mine-box-navlist">
<view class="mine-box-navitem" @click="toPage(1)"> <view class="mine-box-navitem" @click="toPage(1)">
<image src="../../static/img/index_icon_1.png" class="mine-box-navitemimg"></image> <image src="../../static/img/index_icon_1.png" class="mine-box-navitemimg"></image>
<text class="mine-box-navitemtxt">参观预约</text> <text class="mine-box-navitemtxt">参观信息</text>
</view> </view>
<view class="mine-box-navitem" @click="toPage(2)"> <view class="mine-box-navitem" @click="toPage(2)">
<image src="../../static/img/index_icon_2.png" class="mine-box-navitemimg"></image> <image src="../../static/img/index_icon_2.png" class="mine-box-navitemimg"></image>

@ -2,9 +2,9 @@
<view> <view>
<view class="content"> <view class="content">
<view class="box-card"> <view class="box-card">
<view class="box-card-title"> <!-- <view class="box-card-title">
预约详情 参观详情
</view> </view> -->
<view class="box-card-content"> <view class="box-card-content">
<view class="book-box" style="padding-top: 20rpx;"> <view class="book-box" style="padding-top: 20rpx;">
<view class="book-box-card"> <view class="book-box-card">
@ -21,7 +21,7 @@
</u-icon> </u-icon>
<view v-else> <view v-else>
<text <text
v-if="item.is_open==1">{{item.remain_count==0?"不可预约":"可预约"}}</text> v-if="item.is_open==1">{{item.remain_count==0?"不可参观":"可参观"}}</text>
<text v-else></text> <text v-else></text>
</view> </view>
</view> </view>
@ -71,7 +71,7 @@
{{(currentTime.start_time||"")+"-"+(currentTime.end_time||"")}} {{(currentTime.start_time||"")+"-"+(currentTime.end_time||"")}}
</view> </view>
<view class="book-box-selectInfo-right" @click="openNoticeInfo(0)"> <view class="book-box-selectInfo-right" @click="openNoticeInfo(0)">
<text class="book-box-selectInfo-righttxt">预约须知</text> <text class="book-box-selectInfo-righttxt">参观须知</text>
<u-icon name="arrow-right" color="#cf995a" size="20rpx"></u-icon> <u-icon name="arrow-right" color="#cf995a" size="20rpx"></u-icon>
</view> </view>
</view> </view>
@ -100,9 +100,9 @@
<view class="box-tips"> <view class="box-tips">
<text class="box-tips-txt" v-if="type=='user'">{{maxCount}}1</text> <text class="box-tips-txt" v-if="type=='user'">{{maxCount}}1</text>
<text class="box-tips-txt" <text class="box-tips-txt"
v-if="type=='team'">{{minCount}}人以上可团体预约<!-- 一个团体最多{{maxCount}} --></text> v-if="type=='team'">{{minCount}}人以上可团体参观<!-- 一个团体最多{{maxCount}} --></text>
</view> </view>
<view class="commonuser"> <!-- <view class="commonuser">
<view class="box-card-content"> <view class="box-card-content">
<view class="book-box" style="padding-top: 20rpx;"> <view class="book-box" style="padding-top: 20rpx;">
<view class="book-box-card"> <view class="book-box-card">
@ -121,7 +121,6 @@
</u-icon> </u-icon>
</view> </view>
<view>{{item.name}}</view> <view>{{item.name}}</view>
<!-- <view>{{item.datef}}</view> -->
</view> </view>
</block> </block>
</view> </view>
@ -172,7 +171,7 @@
<u-icon name="question-circle-fill" color="#cf995a" size="40rpx"></u-icon> <u-icon name="question-circle-fill" color="#cf995a" size="40rpx"></u-icon>
<text class="book-box-selectInfo-righttxt" style="margin-left: 20rpx;">批量导入说明</text> <text class="book-box-selectInfo-righttxt" style="margin-left: 20rpx;">批量导入说明</text>
</view> </view>
</view> </view> -->
</view> </view>
</view> </view>
@ -288,8 +287,8 @@
mode="center" width="600rpx" height="150rpx"> mode="center" width="600rpx" height="150rpx">
<view class=""> <view class="">
<view class="successBox"> <view class="successBox">
<view class="h3">您已经预约成功</view> <view class="h3">您已经填报成功</view>
<view class="p">即将跳转到参观预约 {{time}} s</view> <view class="p">即将跳转到参观信息 {{time}} s</view>
</view> </view>
<view class="pinkBtn" @click="goHome"></view> <view class="pinkBtn" @click="goHome"></view>
</view> </view>
@ -335,12 +334,12 @@
maxheight: "", maxheight: "",
scrollheight: "", scrollheight: "",
notice: [{ notice: [{
title: "预约须知", title: "参观须知",
content: "预约须知的内容", content: "参观须知的内容",
isTemplate:false isTemplate:false
}, { }, {
title: "批量上传帮助", title: "批量上传帮助",
content: "<p>1.批量上传EXCEL的以xlsx结尾</p><p>2.第一行为标题行 姓名 手机号 证件号 行动不便者</p><p>3.文件是从微信聊天记录中选取或者微信文件传输助手</p><img src='@host@/export.png?v=1.1' style='width:100%'/>", content: "<p>1.批量上传EXCEL的以xlsx结尾</p><p>2.第一行为标题行 姓名 手机号 行动不便者</p><p>3.文件是从微信聊天记录中选取或者微信文件传输助手</p><img src='@host@/export.png?v=1.1' style='width:100%'/>",
isTemplate:true isTemplate:true
}], }],
specialtype: false, specialtype: false,
@ -467,7 +466,7 @@
this.type = options.from; this.type = options.from;
this.load3Day(this.bcurrentDate.date); this.load3Day(this.bcurrentDate.date);
uni.setNavigationBarTitle({ uni.setNavigationBarTitle({
title: (options.from == 'user' ? "个人预约" : "团队预约") title: (options.from == 'user' ? "个人信息" : "团队信息")
}) })
//this.maxCount = (type == 'user' ? 5 : 50); //this.maxCount = (type == 'user' ? 5 : 50);
@ -891,11 +890,11 @@
that.showCalendar = false; that.showCalendar = false;
that.bcurrentTime = null; that.bcurrentTime = null;
} else { } else {
that.util.toast("您选择的日期不可预约") that.util.toast("您选择的日期不可参观")
} }
}); });
} else { } else {
that.util.toast("您选择的日期不可预约") that.util.toast("您选择的日期不可参观")
} }
} }
@ -915,9 +914,9 @@
if (date == m.date) { if (date == m.date) {
if (m.is_open == 1) { if (m.is_open == 1) {
if (m.remain_count == 0) { if (m.remain_count == 0) {
day.bottomInfo = '不可预约' day.bottomInfo = '不可参观'
} else { } else {
day.bottomInfo = '可预约' day.bottomInfo = '可参观'
} }
} else { } else {
day.bottomInfo = '闭馆' day.bottomInfo = '闭馆'
@ -944,7 +943,7 @@
if (cdate.remain_count === 0) { if (cdate.remain_count === 0) {
uni.showToast({ uni.showToast({
icon: "none", icon: "none",
title: "该日期已不可预约" title: "该日期已不可参观"
}) })
return; return;
} }
@ -966,7 +965,7 @@
return false return false
} }
if (mod.remain_count == 0) { if (mod.remain_count == 0) {
this.util.toast("该时段已不可预约"); this.util.toast("该时段已不可参观");
return false return false
} }
for (var m of this.currentDate.rules) { for (var m of this.currentDate.rules) {

@ -70,7 +70,7 @@
<view class="book-box-selectInfo" style="width:100%;padding: 0rpx 13rpx"> <view class="book-box-selectInfo" style="width:100%;padding: 0rpx 13rpx">
<view class="book-box-selectInfo-left">已选5月6日 09:00-10:00</view> <view class="book-box-selectInfo-left">已选5月6日 09:00-10:00</view>
<view class="book-box-selectInfo-right"> <view class="book-box-selectInfo-right">
<text class="book-box-selectInfo-righttxt">预约须知</text> <text class="book-box-selectInfo-righttxt">参观须知</text>
<u-icon name="arrow-right" color="#cf995a" size="20rpx"></u-icon> <u-icon name="arrow-right" color="#cf995a" size="20rpx"></u-icon>
</view> </view>
</view> </view>

Loading…
Cancel
Save