wangyifang
/
wx-dangyuanjiaoyujidi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改

Browse Source
master
lion 3 years ago
parent 7acea354f3
commit 970ba422e5
5 changed files with 272 additions and 142 deletions
Show Stats Download Patch File Download Diff File

162
pages/order/activityorderinfo.vue
Unescape View File

@ -8,45 +8,67 @@
<view class="orderBoxInfo flex-col">
<view class="orderBoxInfoRow flex-row">
<text class="iconfont icon-youkexuzhi"></text>
<text class="iconfont icon-shijian"></text>
<text
class="orderBoxInfoRowTxt">活动时间：{{timeFormat(info.activity.start_time, 'MM月DD日')}}{{getHm(info.activity.start_time)}}-{{getHm(info.activity.end_time)}}</text>
</view>
<view class="orderBoxInfoRow flex-row" style="margin-top: 20rpx;">
<text class="iconfont icon-youkexuzhi"></text>
<text class="orderBoxInfoRowTxt">活动人数：{{info.total}}位人员</text>
<text class="iconfont icon-renshu"></text>
<text class="orderBoxInfoRowTxt">活动人数：{{info.total}}</text>
</view>
<view class="orderBoxInfoRow flex-row" v-if="info.type==1" style="margin-top: 20rpx;">
<text class="iconfont icon-iconfontgerenzhongxin"></text>
<text class="orderBoxInfoRowTxt">领队：{{info.leader||""}}丨 {{info.mobile||""}}</text>
</view>
<view class="orderBoxInfoRow flex-row" v-if="info.type==1" style="margin-top: 20rpx;">
<text class="iconfont icon-danwei"></text>
<text class="orderBoxInfoRowTxt">单位名称：{{info.unit||""}}</text>
</view>
</view>
<view class="orderBoxTime">
<text>下单时间：{{info.created_at||""}}</text>
</view>
</view>
</view>
<view class="orderBoxTitle flex-row">
<text style="padding-top:25rpx" class="orderBoxTitleTxt">可扫“入馆码”入馆</text>
</view>
<view class="orderBoxList p0">
<view class="orderBox">
<view class="orderBoxTitle flex-row">
<text class="orderBoxTitleTxt">二维码</text>
</view>
<view class="orderBoxInfo flex-col ewmcode">
<text>{{info.code}}</text>
<view>
<view :class="isuse?'imgs isuse':'imgs'">
<canvas canvas-id="qrcode" style="width: 300rpx;margin: 0 auto;" />
</view>
</view>
<text class="ewminfo">{{isuse?'已使用':'请前往现场核销订单二维码'}}</text>
<view v-if="info.type==1" class="orderBoxInfo flex-col ewmcode">
<text>入馆码：{{info.code}}-0</text>
<view>
<view class="imgs" >
<view :class="info.status!=1?'isuse':''">
<img v-if="info.status!=1" src="../../static/img/used.png" alt="">
<canvas canvas-id="qrcode" style="width: 300rpx;margin: 0 auto;" />
</view>
</view>
</view>
<!-- <text class="ewminfo">{{isuse?'已使用':'请前往现场核销订单二维码'}}</text> -->
</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>
<view class="imgs" >
<view :class="item.status!=1?'isuse':''">
<img v-if="item.status!=1" src="../../static/img/used.png" alt="">
<canvas :canvas-id="'qrcode'+index" style="width: 300rpx;margin: 0 auto;" />
</view>
<text class="orderBoxTitleTxt">{{item.name}}</text>
</view>
</view>
<!-- <text class="ewminfo">{{isuse?'已使用':'请前往现场核销订单二维码'}}</text> -->
</view>
</view>
</view>
<view style="padding-bottom:25rpx">
<view class="orderBoxInfoRow flex-row" v-if="info.type==1" style="margin-top: 25rpx;">
<!-- <text class="iconfont icon-iconfontgerenzhongxin"></text> -->
<text class="orderBoxInfoRowTxt">领队人：{{info.leader||""}}丨 {{info.mobile||""}}</text>
</view>
<view class="orderBoxInfoRow flex-row" v-if="info.type==1" style="margin-top: 20rpx;">
<!-- <text class="iconfont icon-danwei"></text> -->
<text class="orderBoxInfoRowTxt">单位名称：{{info.unit||""}}</text>
</view>
<view class="orderBoxInfoRow flex-row" style="margin-top: 20rpx;margin-bottom: 20rpx;">
<text class="orderBoxInfoRowTxt">下单时间：{{info.created_at||""}}</text>
</view>
</view>
<view class="orderBoxList p0">
<!-- <view class="orderBoxList p0">
<view class="orderBox">
<view class="orderBoxTitle flex-row" style="justify-content: space-between;">
<text class="orderBoxTitleTxt">参与人员信息</text>
@ -67,7 +89,7 @@
</view>
</view>
</view>
</view>
</view> -->
</view>
</template>
@ -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<res.details.length;i++){
that.qrFun(res.code+"-"+res.details[i].code,'qrcode'+i);
}
}
},
utilFail: function(res) {
uni.showToast({
@ -134,7 +173,7 @@
<style>
.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 {

224
pages/order/visitorderinfo.vue
Unescape View File

@ -8,46 +8,59 @@
<view class="orderBoxInfo flex-col">
<view class="orderBoxInfoRow flex-row">
<text class="iconfont icon-youkexuzhi"></text>
<text class="iconfont icon-shijian"></text>
<text
class="orderBoxInfoRowTxt">参观时间：{{timeFormat(info.date, 'MM月DD日')}}{{info.time||""}}</text>
class="orderBoxInfoRowTxt">参观日期：{{timeFormat(info.date, 'MM月DD日')}}</text>
</view>
<view class="orderBoxInfoRow flex-row">
<text class="iconfont icon-shijian"></text>
<text
class="orderBoxInfoRowTxt">参观时段：{{info.time||""}}</text>
</view>
<view class="orderBoxInfoRow flex-row">
<text class="iconfont icon-youkexuzhi"></text>
<text class="orderBoxInfoRowTxt">参观人数：{{info.total||0}}位观众</text></text>
<text class="iconfont icon-renshu"></text>
<text class="orderBoxInfoRowTxt">参观人数：{{info.total||0}}</text></text>
</view>
<view class="orderBoxInfoRow flex-row" v-if="info.type==1" style="margin-top: 20rpx;">
<text class="iconfont icon-iconfontgerenzhongxin"></text>
<text class="orderBoxInfoRowTxt">领队：{{info.leader||""}}丨 {{info.mobile||""}}</text>
</view>
<view class="orderBoxInfoRow flex-row" v-if="info.type==1" style="margin-top: 20rpx;">
<text class="iconfont icon-danwei"></text>
<text class="orderBoxInfoRowTxt">单位名称：{{info.unit||""}}</text>
</view>
</view>
<view class="orderBoxTime">
<text>下单时间：{{info.created_at||""}}</text>
</view>
</view>
</view>
<view class="orderBoxTitle flex-row">
<text style="padding-top:25rpx" class="orderBoxTitleTxt">可扫“入馆码”入馆</text>
</view>
<view class="orderBoxList p0" v-if="false">
<view class="orderBox">
<view class="orderBoxTitle flex-row">
<text class="orderBoxTitleTxt">二维码</text>
</view>
<view class="orderBoxInfo flex-col ewmcode">
<text>{{info.code}}</text>
<view>
<view :class="item.status!=1?'imgs isuse':'imgs'">
<canvas canvas-id="qrcode" style="width: 300rpx;margin: 0 auto;" />
</view>
</view>
<text class="ewminfo">{{isuse?'已使用':'请前往现场核销订单二维码'}}</text>
</view>
</view>
<view class="orderBoxList p0">
<view class="orderBox">
<view v-if="info.type==1" class="orderBoxInfo flex-col ewmcode">
<text>入馆码：{{info.code}}-0</text>
<view>
<view class="imgs" >
<view :class="info.status!=1?'isuse':''">
<img v-if="info.status!=1" src="../../static/img/used.png" alt="">
<canvas canvas-id="qrcode" style="width: 300rpx;margin: 0 auto;" />
</view>
</view>
</view>
<!-- <text class="ewminfo">{{isuse?'已使用':'请前往现场核销订单二维码'}}</text> -->
</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>
<view class="imgs" >
<view :class="item.status!=1?'isuse':''">
<img v-if="item.status!=1" src="../../static/img/used.png" alt="">
<canvas :canvas-id="'qrcode'+index" style="width: 300rpx;margin: 0 auto;" />
</view>
<text class="orderBoxTitleTxt">{{item.name}}</text>
</view>
</view>
<!-- <text class="ewminfo">{{isuse?'已使用':'请前往现场核销订单二维码'}}</text> -->
</view>
</view>
</view>
<view class="orderBoxList p0">
<!-- <view class="orderBoxList p0">
<view class="orderBox">
<view class="orderBoxTitle flex-row" style="justify-content: space-between;">
<text class="orderBoxTitleTxt">观众信息</text>
@ -69,8 +82,21 @@
</view>
</view>
</view>
</view> -->
<view>
<view class="orderBoxInfoRow flex-row" v-if="info.type==1" style="margin-top: 25rpx;">
<!-- <text class="iconfont icon-iconfontgerenzhongxin"></text> -->
<text class="orderBoxInfoRowTxt">领队人：{{info.leader||""}}丨 {{info.mobile||""}}</text>
</view>
<view class="orderBoxInfoRow flex-row" v-if="info.type==1" style="margin-top: 20rpx;">
<!-- <text class="iconfont icon-danwei"></text> -->
<text class="orderBoxInfoRowTxt">单位名称：{{info.unit||""}}</text>
</view>
<view class="orderBoxInfoRow flex-row" style="margin-top: 20rpx">
<text class="orderBoxInfoRowTxt">下单时间：{{info.created_at||""}}</text>
</view>
</view>
<view class="orderBoxList p0">
<view class="orderBoxList orderBoxListTip">
<view class="orderBoxTitle flex-row">
<text class="stars orderBoxTitleTxt">*</text>
<text class="orderBoxTitleTxt">参观须知</text>
@ -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<res.details.length;i++){
that.qrFun(res.code+"-"+res.details[i].code,'qrcode'+i);
}
}
},
utilFail: function(res) {
uni.showToast({
@ -174,7 +213,7 @@
.iconfont {
color: #6EAC97;
margin-right: 20rpx;
font-size: 24rpx;
font-size: 35rpx;
}
.infotop {
@ -187,12 +226,22 @@
}
.orderBoxList {
padding: 26rpx;
box-sizing: border-box;
padding: 26rpx;
box-sizing: border-box;
background: #fff;
border-radius: 20rpx;
}
.orderBoxListTip{
background: none;
border-radius: 0rpx;
padding: 26rpx 10rpx;
}
.orderBoxListTip .orderBoxTitle{
padding-bottom:10rpx
}
.content_box {
background: #FFFFFF;
/* background: #FFFFFF; */
border-radius: 16rpx;
margin: 30rpx 27rpx;
}
@ -207,7 +256,8 @@
}
.orderBoxInfoRow {
align-items: center;
align-items: center;
margin:10rpx
}
.orderBoxTitleTxt {
@ -228,13 +278,13 @@
}
.orderBoxInfo {
padding: 29rpx 0rpx;
/* padding: 29rpx 0rpx; */
border-bottom: 2rpx solid #F7F6F4;
}
.orderBoxInfoRowTxt {
font-size: 24rpx;
font-size: 30rpx!important;
font-family: PingFang SC;
color: #828282;
}
@ -246,38 +296,50 @@
font-size: 24rpx;
}
.p0 {
padding-top: 0
}
.ewmcode {
text-align: center;
font-size: 28rpx
.p0 {
padding-top: 0;
border-left:32rpx solid #ef9525
}
.ewmcode {
text-align: center;
font-size: 28rpx;
text-align: left;
font-size: 28rpx;
margin-left: 30rpx;
padding-bottom:0;
padding-top: 30rpx;
}
.imgs {
width: 273rpx;
height: 273rpx;
margin: 30rpx 0 50rpx 0;
.imgs {
margin: 30rpx 0 0rpx 0;
font-size: 0;
display: inline-block;
}
.imgs view{
position: relative;
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;
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 image {
.imgs .isuse canvas{
opacity: .4;
}
}
.ewminfo {
color: #828282;

5
pages/park/book.vue
Unescape View File

@ -143,9 +143,10 @@
if (!that.util.isNull(options.bookinfo)) {
let bookinfo = JSON.parse(unescape(options.bookinfo));
this.bookinfo = bookinfo;
this.form.time = bookinfo.time;
this.form.time = bookinfo.time;
this.orderType = bookinfo.orderType;
this.selectInfo = bookinfo.info;
console.log(bookinfo)
if (this.orderType == 2)
this.form.activity_order_id = bookinfo.orderid
else

21
pages/park/index.vue
Unescape View File

@ -29,7 +29,7 @@
<view class="parkbox">
<view class="parkbox-title">可预约车位</view>
<view class="parkbox-content flex-row justify-around">
<view class="parkbox-item flex-row align-center" style="margin-right: 15rpx;"
<view class="parkbox-item flex-row align-center" style="margin-right: 10rpx;"
@click="handleSelectPark(2)" :class="(currentPark==2?'parkbox-item-on':'')"
v-if="remain_big_park>0">
<view class="parkbox-item-status" v-if="currentPark==2">
@ -42,7 +42,7 @@
</view>
<view class="parkbox-item flex-col align-center"
:class="(currentPark==1?'parkbox-item-on':'')" @click="handleSelectPark(1)"
style="margin-left: 15rpx;" v-if="remain_small_park>0">
style="margin-right: 10rpx;" v-if="remain_small_park>0">
<view class="parkbox-item-status" v-if="currentPark==1">
<u-icon name="checkmark" color="#fff" size="20rpx"></u-icon>
</view>
@ -52,6 +52,17 @@
</view>
<text style="font-size: 24rpx;color: #828282;">（充电桩空闲0）</text>
</view>
<view class="parkbox-item flex-row align-center" style=""
@click="handleSelectPark(3)" :class="(currentPark==3?'parkbox-item-on':'')"
v-if="remain_special_park>0">
<view class="parkbox-item-status" v-if="currentPark==3">
<u-icon name="checkmark" color="#fff" size="20rpx"></u-icon>
</view>
<text class="iconfont icon-tingchechang1" style="font-size: 28rpx;"></text>
<view>
<text>残疾人车位：{{remain_special_park}}</text>
</view>
</view>
</view>
</view>
@ -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,

2
pages/visit/book.vue
Unescape View File

@ -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: "请正确输入身份证号"

Write Preview
Loading…
Cancel
Save