lion 2 years ago
parent 4b1d0f7525
commit e2601d59c7

@ -67,7 +67,7 @@
<view class="box-card-content">
<view class="book-box" style="padding-top: 20rpx;">
<view class="book-box-card">
<view class="book-box-title">
<view class="book-box-title" style='font-size: 30rpx;'>
常用人
</view>
<view class="">
@ -735,11 +735,26 @@
}
}
</script>
<style lang="scss">
<style scoped>
/deep/ .u-form-item__body__left__content__required{
left:0!important
}
/deep/ .u-form-item__body__left__content__label{
margin-left:20rpx;
}
</style>
<style lang="scss" scoped>
@import url("@/static/css/bookbox.css");
@import url("@/static/css/activitybox.css");
.tag{
height:auto;
max-width:40%
}
.book-box-row-timeitem{
font-size:30rpx;
border-radius: 10rpx;
}
.box-visitor-item {
display: flex;
justify-content: space-between;

@ -330,7 +330,6 @@
page {
background-color: #f7f6f4;
}
.infoBox {
box-sizing: border-box;
padding: 40rpx 0rpx;
@ -339,6 +338,7 @@
}
.activityBox-title{
font-size: 32rpx;
font-weight:bold;
}
.activityBox-row{
font-size: 28rpx;

@ -127,7 +127,8 @@
.title {
text-align: center;
padding: 30rpx 0rpx;
font-size: 32rpx;
font-size: 36rpx;
font-weight:bold;
}
.time {

@ -289,7 +289,8 @@
.open_text {
color: #252525;
font-size: 28rpx
font-size: 28rpx;
line-height: 2.3;
}
.open_text span {
@ -337,7 +338,8 @@
font-weight: 400;
color: #828282;
line-height: 40rpx;
padding-top: 32rpx;
padding-top: 32rpx;
line-height: 2.3;
}
.u-form {

@ -160,7 +160,10 @@
}
</script>
<style>
<style>
page{
background-color: #fbf3ea;
}
.orderBoxFooter {
padding: 20rpx 0 0 0;
}
@ -198,9 +201,6 @@
box-shadow: 2rpx 3rpx 10rpx 0px rgba(107, 94, 77, 0.3);
}
page {
background-color: #f7f6f4;
}
.orderBoxList {
padding: 26rpx;
@ -208,13 +208,19 @@
}
.orderBox {
min-height: 393rpx;
/* min-height: 393rpx;
background: #FFFFFF;
border-radius: 16rpx;
box-sizing: border-box;
padding: 29rpx 18rpx;
position: relative;
margin-bottom: 17rpx;
margin-bottom: 17rpx; */
background: #FFFFFF;
border-radius: 16rpx;
box-sizing: border-box;
padding: 29rpx 18rpx;
position: relative;
margin-bottom: 30rpx;
}
.orderBoxTitle {

@ -32,8 +32,12 @@
<view class="orderBox">
<view v-if="info.type==1" class="orderBoxInfo flex-col ewmcode">
<text>入场码{{info.code}}-0</text>
<view>
<!-- <text>入场码{{info.code}}-0</text> -->
<view class='flex-row justify-between'>
<text style='color:#828282'>{{item.name}}</text>
<text style='color:#828282'>{{item.status_name}}</text>
</view>
<view style='text-align: center;'>
<view class="imgs">
<view :class="info.status!=1?'isuse':''">
<cover-image v-if="info.status==2" src="../../static/img/used.png" alt=""></cover-image>
@ -49,21 +53,27 @@
</view>
<view v-if="info.type==2" class="orderBoxInfo flex-col ewmcode" :key='index'
v-for="(item,index) in detailsinfo">
<text>入场码{{info.code}}-{{item.code}}</text>
<view>
<!-- <text>入场码{{info.code}}-{{item.code}}</text> -->
<view v-if="item.status==1" class='flex-row justify-between'>
<text >{{item.name}}</text>
<text style='color:#32950b'>{{item.status_name}}</text>
</view>
<view v-else class='flex-row justify-between'>
<text style="color:#828282">{{item.name}}</text>
<text style='color:#828282'>{{item.status_name}}</text>
</view>
<view style='text-align: center;'>
<view class="imgs">
<view :class="item.status!=1?'isuse':''">
<cover-image v-if="info.status==2" src="../../static/img/used.png" alt=""></cover-image>
<!-- <img v-if="item.status!=1" src="../../static/img/used.png" alt=""> -->
<canvas :canvas-id="'qrcode'+index" style="width: 170px;height:170px;margin: 0 auto;">
<cover-view v-if="showview">
</cover-view>
</canvas>
</view>
<view class="imgsname">
<!-- <view class="imgsname">
<text class="orderBoxTitleTxt">{{item.name}}</text>
<text class="orderBoxTitleTxt" style="font-size: 28rpx;" v-if="item.is_open==1">
可凭身份证参加活动
@ -71,7 +81,7 @@
<text style="font-size: 28rpx;" class="orderBoxTitleTxt" v-if="item.is_open==0">
可凭二维码参加活动
</text>
</view>
</view> -->
</view>
</view>
@ -326,15 +336,14 @@
}
.p0 {
padding-top: 0;
border-left: 32rpx solid #cf995a
/* padding-top: 0; */
/* border-left: 32rpx solid #cf995a */
}
.ewmcode {
text-align: center;
font-size: 28rpx;
font-size: 32rpx;
text-align: left;
font-size: 28rpx;
margin-left: 18rpx;
padding-bottom: 0;
}
@ -345,11 +354,14 @@
display: inline-block;
}
.imgs view {
position: relative;
display: inline-block;
margin-bottom: 20rpx;
.imgs view {
position: relative;
display: inline-block;
margin-bottom: 20rpx;
box-shadow: 2px 2px 8rpx gray;
padding: 10rpx;
background: #fff;
}
.imgs cover-image {

@ -30,7 +30,7 @@
</view>
<view class="orderBoxFooter flex-row flex_end">
<view class="fbtn cancel" @click.stop="tocancel(item.id)" v-if="item.status==1"></view>
<view class="fbtn cancel" @click.stop="tocancel(item.id)" style="margin-right: 23rpx;" v-if="item.status==1"></view>
<view class="fbtn" @click="toinfo(item.id)" style="margin-right: 23rpx;">查看详情</view>
</view>
</view>
@ -120,18 +120,18 @@
var list= [];
for (var mod of res) {
mod.status_name = that.statusArr[mod.status];
if (mod.visit_order) {
// if (mod.visit_order) {
mod.time = mod.visit_order.date + " " + mod.visit_order.time;
} else {
if (mod.activity_order) {
mod.time = that.$moment(mod.activity_order.activity.start_time).format(
"YYYY-MM-DD HH:mm")+""+that.$moment(mod.activity_order.activity.end_time).format(
"HH:mm");
//mod.time = mod.activity_order.date + " " + mod.activity_order.time;
}
// mod.time = mod.visit_order.date + " " + mod.visit_order.time;
// } else {
// if (mod.activity_order) {
// mod.time = that.$moment(mod.activity_order.activity.start_time).format(
// "YYYY-MM-DD HH:mm")+""+that.$moment(mod.activity_order.activity.end_time).format(
// "HH:mm");
// //mod.time = mod.activity_order.date + " " + mod.activity_order.time;
// }
}
// }
list.push(mod);
}
@ -150,7 +150,10 @@
}
</script>
<style>
<style>
page{
background-color: #fbf3ea;
}
.orderBoxFooter {
padding: 20rpx 0 0 0;
}
@ -192,23 +195,25 @@
box-shadow: 2rpx 3rpx 10rpx 0px rgba(107, 94, 77, 0.3);
}
page {
background-color: #f7f6f4;
}
.orderBoxList {
padding: 26rpx;
box-sizing: border-box;
}
.orderBox {
min-height: 393rpx;
/* min-height: 393rpx;
background: #FFFFFF;
border-radius: 16rpx;
box-sizing: border-box;
padding: 29rpx 18rpx;
position: relative;
margin-bottom: 17rpx;
margin-bottom: 17rpx; */
background: #FFFFFF;
border-radius: 16rpx;
box-sizing: border-box;
padding: 29rpx 18rpx;
position: relative;
margin-bottom: 30rpx;
}
.orderBoxTitle {

@ -11,10 +11,10 @@
<text class="iconfont icon-youkexuzhi"></text>
<text class="orderBoxInfoRowTxt">预约时间{{info.time||""}}</text>
</view>
<view class="orderBoxInfoRow flex-row" style="margin-bottom: 20rpx;">
<!-- <view class="orderBoxInfoRow flex-row" style="margin-bottom: 20rpx;">
<text class="iconfont icon-iconfontgerenzhongxin"></text>
<text class="orderBoxInfoRowTxt">车牌信息{{info.plate||""}}</text>
</view>
</view> -->
<view class="orderBoxInfoRow flex-row">
<text class="iconfont icon-iconfontgerenzhongxin"></text>
<text class="orderBoxInfoRowTxt">联系电话{{info.mobile||""}}</text>
@ -22,11 +22,42 @@
</view>
<view class="orderBoxTime">
<text>下单时间{{info.created_at||""}}</text>
</view>
</view>
<view>
<view class='flex-row justify-between' style="margin: 20rpx;margin-bottom: 0;">
<text :style="info.status==1?'':'color:#828282'">{{info.plate||''}}</text>
<text v-if="info.status==1" style='color:#32950b'>{{info.status_name}}</text>
<text v-else style='color:#828282'>{{info.status_name}}</text>
</view>
</view>
<view style='text-align: center;'>
<view class="imgs">
<view :class="info.status!=1?'isuse':''">
<cover-image v-if="info.status==2" src="../../static/img/used.png" alt=""></cover-image>
<canvas canvas-id="qrcode" style="width: 170px;height:170px;margin: 0 auto;">
<cover-view v-if="showview">
</cover-view>
</canvas>
</view>
<!-- <view class="imgsname">
<text class="orderBoxTitleTxt">{{item.name}}</text>
<text class="orderBoxTitleTxt" style="font-size: 28rpx;" v-if="item.is_open==1">
可凭身份证参加活动
</text>
<text style="font-size: 28rpx;" class="orderBoxTitleTxt" v-if="item.is_open==0">
可凭二维码参加活动
</text>
</view> -->
</view>
</view>
<view class="orderBoxTitle flex-row" style="margin-top: 20rpx;">
<text class="stars orderBoxTitleTxt">*</text>
<text class="orderBoxTitleTxt">停车须知</text>
</view>
</view>
<view class=" flex-row" style="margin-top: 20rpx;">
<rich-text :nodes="notice.value" class="orderBoxInfoRowTxt"></rich-text>
</view>
@ -42,7 +73,21 @@
data() {
return {
info: {},
notice: {}
notice: {},
showview:false,
statusList: [{
name: '已取消',
idx: 0
}, {
name: '待完成',
idx: "1"
}, {
name: '已完成',
idx: "2"
}, {
name: '已过期',
idx: "3"
}]
}
},
onLoad(options) {
@ -52,7 +97,27 @@
that.loadInfo(options.id);
}
},
methods: {
methods: {
qrFun: function(text, qrcode) {
var id = "qrcode";
if (qrcode) {
id = qrcode
}
uQRCode.make({
canvasId: id,
componentInstance: this,
text: text,
size: 170,
// margin: 10,
backgroundColor: '#ffffff',
foregroundColor: '#000000',
fileType: 'jpg',
errorCorrectLevel: uQRCode.errorCorrectLevel.H,
success: res => {
}
})
},
loadConfigInfo() {
var that = this;
this.util.request({
@ -80,23 +145,31 @@
id: id
},
utilSuccess: function(res) {
if (res.visit_order) {
// if (res.visit_order) {
res.time = res.visit_order.date + " " + res.visit_order.time;
} else {
if (res.activity_order) {
// res.time = res.visit_order.date + " " + res.visit_order.time;
// } else {
// if (res.activity_order) {
res.time = that.$moment(res.activity_order.activity.start_time).format(
"YYYY-MM-DD HH:mm")+""+that.$moment(res.activity_order.activity.end_time).format(
"HH:mm");
//res.time = res.activity_order.date + " " + res.activity_order.time;
}
// res.time = that.$moment(res.activity_order.activity.start_time).format(
// "YYYY-MM-DD HH:mm")+""+that.$moment(res.activity_order.activity.end_time).format(
// "HH:mm");
// //res.time = res.activity_order.date + " " + res.activity_order.time;
// }
}
// }
that.statusList.map(item=>{
if(item.idx==res.status){
res.status_name = item.name
}
})
that.qrFun(res.code);
setTimeout(function() {
that.showview = true
}, 500)
that.info = res;
},
utilFail: function(res) {
uni.showToast({
@ -213,29 +286,55 @@
font-size: 28rpx
}
.imgs {
width: 273rpx;
height: 273rpx;
margin: 30rpx 0 50rpx 0;
font-size: 0;
display: inline-block;
}
.imgs image {
width: 273rpx;
height: 273rpx;
}
.imgs.isuse {
background: url(../../static/img/used.png);
background-position: bottom right;
background-size: 161rpx;
background-repeat: no-repeat;
}
.imgs.isuse image {
opacity: .4;
}
.imgs {
margin: 30rpx 0 0rpx 0;
font-size: 0;
display: inline-block;
}
.imgs view {
position: relative;
display: inline-block;
margin-bottom: 20rpx;
box-shadow: 2px 2px 8rpx gray;
padding: 10rpx;
background: #fff;
}
.imgs cover-image {
position: absolute;
width: 200rpx;
height: 200rpx;
z-index: 999;
opacity: 1;
right: 0rpx;
bottom: 0rpx;
}
.imgs canvas {
display: inline-block;
vertical-align: middle;
}
.imgsname {
display: inline-block;
text-align: center;
margin-left: 15rpx;
}
.imgs text {
display: block;
/* margin-left: 40rpx; */
}
.imgs .isuse cover-view {
/* opacity: .4; */
background-color: rgba(255, 255, 255, 0.6);
width: 170px;
height: 170px;
}
.ewminfo {
color: #828282;
@ -272,5 +371,6 @@
.stars {
color: #cf995a;
margin-right: 12rpx
}
}
</style>

@ -26,7 +26,7 @@
</u--form>
<view class="box-tip box-tipgray flex-row align-center" @click="handleChange">
<u-icon :name="(form.checkUser?'checkmark-circle-fill':'checkmark-circle')" color="#cf995a">
<u-icon size='24' :name="(form.checkUser?'checkmark-circle-fill':'checkmark-circle')" color="#cf995a">
</u-icon>
<view class="box-tiptxt" style="margin-left: 10rpx;">请认真阅读知悉并遵守<text @click.stop="openNotice"
style="color: #cf995a;">本馆停车须知</text></view>

@ -51,7 +51,7 @@
style="font-size: 28rpx;"></text><text>小车{{remain_small_park}}</text>
</view>
<text style="font-size: 24rpx;color: #828282;">充电桩空闲0</text>
<text style="font-size: 24rpx;color: #828282;">可预约车位{{remain_small_park}}</text>
</view>
<view class="parkbox-item flex-row align-center"
style="margin-right: 10rpx;padding: 28rpx 20rpx;" @click="handleSelectPark(4)"
@ -113,13 +113,13 @@
</view>
<block v-for="(item,index) in listOrder" :key="index">
<view class="box-tip flex-row align-center" @click="handleSelectOrder(index,1)"
style="margin-bottom: 20rpx;">
<u-icon :name="(item.checked?'checkmark-circle-fill':'checkmark-circle')"
style="margin-bottom: 30rpx;">
<u-icon size="24" :name="(item.checked?'checkmark-circle-fill':'checkmark-circle')"
:color="(item.checked?'#cf995a':'#828282')">
</u-icon>
<view class="box-tiptxt" style="margin-left: 10rpx;">
{{$u.timeFormat(new Date(item.date), 'mm月dd日')}}
{{item.time||""}}{{item.details_count}} 位观众</text>
{{item.time||""}}{{item.total}} 位观众</text>
</view>
</view>
</block>
@ -130,12 +130,12 @@
</view>
<block v-for="(item,index) in listActivtyOrder" :key="index">
<view class="box-tip flex-row align-center" @click="handleSelectOrder(index,2)"
style="margin-bottom: 20rpx;">
<u-icon :name="(item.checked?'checkmark-circle-fill':'checkmark-circle')"
style="margin-bottom: 30rpx;">
<u-icon size="24" :name="(item.checked?'checkmark-circle-fill':'checkmark-circle')"
:color="(item.checked?'#cf995a':'#828282')">
</u-icon>
<view class="box-tiptxt" style="margin-left: 10rpx;">
活动时间{{item.activity.start_time||""}}
活动时间{{item.active_start_time||""}}
报名数量{{item.total}}</text>
</view>
</view>
@ -235,10 +235,10 @@
this.selectInfo.orderid = this.orderid = this.listOrder[index].id;
} else {
this.listActivtyOrder[index].checked = true
this.selectInfo.info = this.$moment(this.listActivtyOrder[index].activity.end_time).format(
this.selectInfo.info = this.$moment(this.listActivtyOrder[index].active_end_time).format(
"MM月DD日 HH:mm")
this.selectInfo.time = this.$moment(this.listActivtyOrder[index].activity.end_time).format(
this.selectInfo.time = this.$moment(this.listActivtyOrder[index].active_end_time).format(
"YYYY-MM-DD HH:mm:ss");
this.selectInfo.orderid = this.orderid = this.listActivtyOrder[index].id;
}
@ -282,7 +282,9 @@
},
utilSuccess: function(res) {
for (var mod of res) {
mod.checked = false;
mod.checked = false;
mod.active_start_time = mod.number[0]['start_time']
mod.active_end_time = mod.number[0]['end_time']
}
that.listActivtyOrder = res;
cb(res);
@ -379,7 +381,7 @@
color: #828282;
padding: 7rpx;
}
.
.parkbox-title {
margin-bottom: 40rpx;
margin-top: 40rpx;
@ -408,8 +410,8 @@
font-size: 26rpx;
color: #cf995a;
box-sizing: border-box;
}
}
.book-box {
height: 60%;
position: absolute;

@ -77,6 +77,8 @@
text-align: center;
padding: 30rpx 0rpx;
font-size: 32rpx;
font-size: 36rpx;
font-weight:bold;
}
.time {

@ -106,7 +106,7 @@
<view class="box-card-content">
<view class="book-box" style="padding-top: 20rpx;">
<view class="book-box-card">
<view class="book-box-title">
<view class="book-box-title" style='font-size: 30rpx;'>
常用人
</view>
<view class="">
@ -685,9 +685,7 @@
this.notice[type].content = this.notice[type].content.replace("@host@", this.util.HOST);
this.currentNotice = this.notice[type];
},
submitOrder() {
console.log(this.form)
return
submitOrder() {
this.form.date = this.currentDate.date;
this.form.rule_id = this.currentTime.id;
// if(this.specialid){
@ -1155,14 +1153,18 @@
}
</script>
<style lang="scss">
<style lang="scss" scoped>
@import url("@/static/css/bookbox.css");
.timeitem-none {
color: #ccc;
}
.commonuser .book-box-row-timeitem{
font-size:30rpx;
border-radius: 10rpx;
}
.box-visitor-item {
display: flex;
justify-content: space-between;

@ -25,14 +25,19 @@ const splitTime = (start,end)=> {
let month = parseInt(arrStart[1]) < 10 ? parseInt(arrStart[1]) : parseInt(arrStart[1])
let day = parseInt(arrStart[2]) < 10 ? parseInt(arrStart[2]) : parseInt(arrStart[2])
if (end) {
let arrEnd = end.substring(0, 10).split("-")
let yearEnd = parseInt(arrEnd[0])
let monthEnd = parseInt(arrEnd[1]) < 10 ? parseInt(arrEnd[1]) : parseInt(arrEnd[1])
let dayEnd = parseInt(arrEnd[2]) < 10 ? parseInt(arrEnd[2]) : parseInt(arrEnd[2])
if(year == yearEnd){
return year + '年' + month + '月' + day + '日' + '至' + monthEnd + '月' + dayEnd + '日'
// 判断end 是否为时间格式
if(isNaN(end)&&!isNaN(Date.parse(end))){
let arrEnd = end.substring(0, 10).split("-")
let yearEnd = parseInt(arrEnd[0])
let monthEnd = parseInt(arrEnd[1]) < 10 ? parseInt(arrEnd[1]) : parseInt(arrEnd[1])
let dayEnd = parseInt(arrEnd[2]) < 10 ? parseInt(arrEnd[2]) : parseInt(arrEnd[2])
if(year == yearEnd){
return year + '年' + month + '月' + day + '日' + '至' + monthEnd + '月' + dayEnd + '日'
}else{
return year + '年' + month + '月' + day + '日' + '至' + yearEnd + '年'+monthEnd + '月' + dayEnd + '日'
}
}else{
return year + '年' + month + '月' + day + '日' + '至' + yearEnd + '年'+monthEnd + '月' + dayEnd + '日'
return year + '年' + month + '月' + day + '日' + '至' + end
}
} else {
return year + '年' + month + '月' + day + '日' + '起'

Loading…
Cancel
Save