diff --git a/pages/order/activityorderinfo.vue b/pages/order/activityorderinfo.vue
index 9b40233..38d87e1 100644
--- a/pages/order/activityorderinfo.vue
+++ b/pages/order/activityorderinfo.vue
@@ -8,45 +8,67 @@
-
+
活动时间：{{timeFormat(info.activity.start_time, 'MM月DD日')}}{{getHm(info.activity.start_time)}}-{{getHm(info.activity.end_time)}}
-
- 活动人数：{{info.total}}位人员
+
+ 活动人数：{{info.total}}
-
-
- 领队：{{info.leader||""}}丨 {{info.mobile||""}}
-
-
-
- 单位名称：{{info.unit||""}}
-
-
-
- 下单时间：{{info.created_at||""}}
+
+
+
+
+ 可扫“入馆码”入馆
-
- 二维码
-
-
- {{info.code}}
-
-
-
-
-
- {{isuse?'已使用':'请前往现场核销订单二维码'}}
+
+
+ 入馆码：{{info.code}}-0
+
+
+
+ 
+
+
+
+
+
+
+
+ 入馆码：{{info.code}}-{{item.code}}
+
+
+
+
+
+
+
+ {{item.name}}
+
+
+
+
+
+
+
+ 领队人：{{info.leader||""}}丨 {{info.mobile||""}}
+
+
+
+ 单位名称：{{info.unit||""}}
+
+
+ 下单时间：{{info.created_at||""}}
+
-
+
@@ -76,18 +98,24 @@
export default {
data() {
return {
- info: {}
+ info: {},
+ detailsinfo:[]
}
},
onLoad(options) {
if (!this.util.isNull(options.id)) {
- this.loadInfo(options.id);
+ this.loadInfo(options.id);
+
}
},
methods: {
- qrFun: function(text) {
+ qrFun: function(text,qrcode) {
+ var id = "qrcode";
+ if(qrcode){
+ id = qrcode
+ }
uQRCode.make({
- canvasId: 'qrcode',
+ canvasId: id,
componentInstance: this,
text: text,
size: 140,
@@ -109,8 +137,19 @@
id: id
},
utilSuccess: function(res) {
- that.info = res;
- that.qrFun("type=activity,"+res.code);
+ that.info = res;
+ that.detailsinfo = res.details;
+ if(res.type==1){
+ that.qrFun(res.code+"-"+"0");
+ }
+ if(res.type==2){
+ for(var i=0;i
.content_box {
- background: #FFFFFF;
+ /* background: #FFFFFF; */
border-radius: 16rpx;
margin: 30rpx 27rpx;
}
@@ -159,7 +198,7 @@
.iconfont {
color: #6EAC97;
margin-right: 20rpx;
- font-size: 24rpx;
+ font-size: 35rpx;
}
.infotop {
@@ -173,7 +212,9 @@
.orderBoxList {
padding: 26rpx;
- box-sizing: border-box;
+ box-sizing: border-box;
+ background: #fff;
+ border-radius: 20rpx;
}
.orderBox {
@@ -216,7 +257,7 @@
.orderBoxInfoRowTxt {
- font-size: 24rpx;
+ font-size: 30rpx!important;
font-family: PingFang SC;
color: #828282;
}
@@ -229,34 +270,47 @@
}
.p0 {
- padding-top: 0
+ padding-top: 0;
+ border-left:32rpx solid #ef9525
}
.ewmcode {
text-align: center;
- font-size: 28rpx
+ font-size: 28rpx;
+ text-align: left;
+ font-size: 28rpx;
+ margin-left: 30rpx;
+ padding-bottom:0;
}
.imgs {
- margin: 30rpx 0 50rpx 0;
+ margin: 30rpx 0 0rpx 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 view{
+ position: relative;
+ display: inline-block;
+ }
+ .imgs image {
+ position: absolute;
+ width: 120rpx;
+ height: 120rpx;
+ z-index: 999;
+ opacity: 1;
+ right: 67rpx;
+ bottom: 39rpx;
+ }
+ .imgs canvas{
+ display: inline-block;
+ vertical-align: middle;
+ }
+ .imgs text{
+ display: inline-block;
+ }
+ .imgs .isuse canvas{
+ opacity: .4;
}
.ewminfo {
diff --git a/pages/order/visitorderinfo.vue b/pages/order/visitorderinfo.vue
index a17c87c..d81429a 100644
--- a/pages/order/visitorderinfo.vue
+++ b/pages/order/visitorderinfo.vue
@@ -8,46 +8,59 @@
-
+
参观时间：{{timeFormat(info.date, 'MM月DD日')}}{{info.time||""}}
+ class="orderBoxInfoRowTxt">参观日期：{{timeFormat(info.date, 'MM月DD日')}}
+
+
+
+ 参观时段：{{info.time||""}}
-
- 参观人数：{{info.total||0}}位观众
+
+ 参观人数：{{info.total||0}}
-
-
- 领队：{{info.leader||""}}丨 {{info.mobile||""}}
-
-
-
- 单位名称：{{info.unit||""}}
-
-
-
- 下单时间：{{info.created_at||""}}
+
+
+
+
+ 可扫“入馆码”入馆
-
-
-
- 二维码
-
-
- {{info.code}}
-
-
-
-
-
- {{isuse?'已使用':'请前往现场核销订单二维码'}}
-
-
+
+
+
+ 入馆码：{{info.code}}-0
+
+
+
+
+
+
+
+
+
+
+
+ 入馆码：{{info.code}}-{{item.code}}
+
+
+
+
+
+
+
+ {{item.name}}
+
+
+
+
+
-
+
+
+
+
+ 领队人：{{info.leader||""}}丨 {{info.mobile||""}}
+
+
+
+ 单位名称：{{info.unit||""}}
+
+
+ 下单时间：{{info.created_at||""}}
+
-
+
*
参观须知
@@ -88,7 +114,8 @@
data() {
return {
info: {},
- vinfo: {}
+ vinfo: {},
+ detailsinfo:[]
}
},
onLoad(options) {
@@ -98,21 +125,25 @@
}
},
methods: {
- qrFun: function(text) {
- uQRCode.make({
- canvasId: 'qrcode',
- componentInstance: this,
- text: text,
- size: 150,
- margin: 0,
- backgroundColor: '#ffffff',
- foregroundColor: '#000000',
- fileType: 'jpg',
- errorCorrectLevel: uQRCode.errorCorrectLevel.H,
- success: res => {
-
- }
- })
+ qrFun: function(text,qrcode) {
+ var id = "qrcode";
+ if(qrcode){
+ id = qrcode
+ }
+ uQRCode.make({
+ canvasId: id,
+ componentInstance: this,
+ text: text,
+ size: 140,
+ margin: 10,
+ backgroundColor: '#ffffff',
+ foregroundColor: '#000000',
+ fileType: 'jpg',
+ errorCorrectLevel: uQRCode.errorCorrectLevel.H,
+ success: res => {
+
+ }
+ })
},
loadIntroduce() {
var that = this;
@@ -139,7 +170,15 @@
},
utilSuccess: function(res) {
that.info = res;
- that.qrFun(res.code);
+ that.detailsinfo = res.details;
+ if(res.type==1){
+ that.qrFun(res.code+"-"+"0");
+ }
+ if(res.type==2){
+ for(var i=0;i
可预约车位
-
@@ -42,7 +42,7 @@
+ style="margin-right: 10rpx;" v-if="remain_small_park>0">
@@ -52,6 +52,17 @@
（充电桩空闲0）
+
+
+
+
+
+
+
+ 残疾人车位：{{remain_special_park}}
+
@@ -142,7 +153,8 @@
userlongitude: 120.626022
},
remain_big_park: 0,
- remain_small_park: 0
+ remain_small_park: 0,
+ remain_special_park:0
}
},
onLoad() {
@@ -273,7 +285,8 @@
that.info.latitude = parseFloat(res.detail.latitude);
that.info.longitude = parseFloat(res.detail.longitude);
that.remain_big_park = res.remain_big_park;
- that.remain_small_park = res.remain_small_park;
+ that.remain_small_park = res.remain_small_park;
+ that.remain_special_park = res.remain_special_park;
var mod = {
latitude: that.info.latitude,
longitude: that.info.longitude,
diff --git a/pages/visit/book.vue b/pages/visit/book.vue
index 1158d93..a696c52 100644
--- a/pages/visit/book.vue
+++ b/pages/visit/book.vue
@@ -438,7 +438,7 @@
}
if (this.form.card_type == 1) {
- if (!that.util.isValidCardID(that.form.idcard)) {
+ if (!this.util.isValidCardID(this.form.idcard)) {
uni.showToast({
icon: "none",
title: "请正确输入身份证号"