Skip to content

U
uni-pdtravel
Commit 07341299 authored by 潘永坪's avatar 潘永坪
Browse files
Options

页面新增

parent d65a24df
Hide whitespace changes
Inline Side-by-side
Showing with 67 additions and 63 deletions
pages/my/order/electronicTicket/electronicTicket - 副本.vue → pages/my/order/electronicTicket/electronicTicket-副本.vue
View file @ 07341299
......@@ -38,8 +38,8 @@
</view>
<view class="certificate-box" v-else-if="orderInfo.exchangeMode==1||orderInfo.exchangeMode==4||orderInfo.exchangeMode==5">
<view class="box-verificationCode">验证码：{{ticketCode}}</view>
<canvas class="box-QRcode" :class="showtip==false&&showUseRule==false?'':'box-QRcode2'" canvas-id="qrcode"/>
<view v-if="howtip==true||showUseRule==true" style="width: 180px; height: 180px;"></view>
<uqrcode ref="uqrcode" canvas-id="qrcode" class="box-QRcode" :class="showtip==false&&showUseRule==false?'':'box-QRcode2'" :value="uqrcodeVal" :options="{ margin: 10 }" ></uqrcode>
<view v-if="howtip==true||showUseRule==true" style="width: 200px; height: 200px;"></view>
<view class="progress-box" v-if="qrCodeType==true">
<progress :percent="percentage" activeColor="#3688FF" stroke-width="3" />
</view>
......@@ -364,7 +364,7 @@
</template>
<script>
import uQRCode from '@/common/js/uqrcode.js'
import uQRCode from '@/common/uqrcode.js'
import UMask from '@/uview-ui/components/u-mask/u-mask.vue'
export default {
components: {
......@@ -528,6 +528,7 @@ export default {
},
data() {
return {
uqrcodeVal:'',
orderDataType:false,
openId:'',//用户信息
id:'',//订单ID
......@@ -862,17 +863,18 @@ export default {
}else{
verifyCode=this.verifyCode
}
uQRCode.make({
canvasId: 'qrcode',
componentInstance: this,
text: verifyCode,
size: 180,
margin: 10,
backgroundColor: '#ffffff',
foregroundColor: '#000000',
fileType: 'jpg',
errorCorrectLevel: uQRCode.errorCorrectLevel.H
})
// uQRCode.make({
// canvasId: 'qrcode',
// componentInstance: this,
// text: verifyCode,
// size: 180,
// margin: 10,
// backgroundColor: '#ffffff',
// foregroundColor: '#000000',
// fileType: 'jpg',
// errorCorrectLevel: uQRCode.errorCorrectLevel.H
// })
this.uqrcodeVal=verifyCode
}
},
signOverFun(item){//过号遮罩显示
......@@ -913,17 +915,18 @@ export default {
// height: 180,
// text:this.codeNo
// })
uQRCode.make({
canvasId: 'qrcode',
componentInstance: this,
text: this.codeNo,
size: 180,
margin: 10,
backgroundColor: '#ffffff',
foregroundColor: '#000000',
fileType: 'jpg',
errorCorrectLevel: uQRCode.errorCorrectLevel.H
})
// uQRCode.make({
// canvasId: 'qrcode',
// componentInstance: this,
// text: this.codeNo,
// size: 180,
// margin: 10,
// backgroundColor: '#ffffff',
// foregroundColor: '#000000',
// fileType: 'jpg',
// errorCorrectLevel: uQRCode.errorCorrectLevel.H
// })
this.uqrcodeVal=this.codeNo
}
this.percentage+=1
if(this.percentage>=100){
......@@ -946,7 +949,7 @@ export default {
this.$request('distribution/distribution/getAutoCode',data).then((res)=>{
if(res.code == '00'){
this.codes = res.data.codes
if(this.codes.length<0){
if(this.codes.length==0){
uni.showToast({
title: '网络异常，请退出重试',
icon: 'none'
......@@ -1347,9 +1350,17 @@ export default {
.order-certificate .certificate-box .box-QRcode {
display: block;
width: 180px;
height: 180px;
width: 200px;
height: 200px;
margin: 0 auto;
position: relative;
}
/deep/ .uqrcode-canvas-wrapper,/deep/ .uqrcode{
margin: 0 auto;
position: relative;
}
/deep/ .uqrcode-canvas{
transform:(1,1)
}
.order-certificate .certificate-box .box-QRcode2{
position: fixed;
......
pages/my/order/electronicTicket/electronicTicket.vue
View file @ 07341299
......@@ -38,8 +38,8 @@
</view>
<view class="certificate-box" v-else-if="orderInfo.exchangeMode==1||orderInfo.exchangeMode==4||orderInfo.exchangeMode==5">
<view class="box-verificationCode">验证码：{{ticketCode}}</view>
<uqrcode ref="uqrcode" canvas-id="qrcode" class="box-QRcode" :class="showtip==false&&showUseRule==false?'':'box-QRcode2'" :value="uqrcodeVal" :options="{ margin: 10 }" ></uqrcode>
<view v-if="howtip==true||showUseRule==true" style="width: 200px; height: 200px;"></view>
<canvas class="box-QRcode" :class="showtip==false&&showUseRule==false?'':'box-QRcode2'" canvas-id="qrcode"/>
<view v-if="howtip==true||showUseRule==true" style="width: 180px; height: 180px;"></view>
<view class="progress-box" v-if="qrCodeType==true">
<progress :percent="percentage" activeColor="#3688FF" stroke-width="3" />
</view>
......@@ -364,7 +364,7 @@
</template>
<script>
import uQRCode from '@/common/uqrcode.js'
import uQRCode from '@/common/js/uqrcode.js'
import UMask from '@/uview-ui/components/u-mask/u-mask.vue'
export default {
components: {
......@@ -528,7 +528,6 @@ export default {
},
data() {
return {
uqrcodeVal:'',
orderDataType:false,
openId:'',//用户信息
id:'',//订单ID
......@@ -863,18 +862,17 @@ export default {
}else{
verifyCode=this.verifyCode
}
// uQRCode.make({
// canvasId: 'qrcode',
// componentInstance: this,
// text: verifyCode,
// size: 180,
// margin: 10,
// backgroundColor: '#ffffff',
// foregroundColor: '#000000',
// fileType: 'jpg',
// errorCorrectLevel: uQRCode.errorCorrectLevel.H
// })
this.uqrcodeVal=verifyCode
uQRCode.make({
canvasId: 'qrcode',
componentInstance: this,
text: verifyCode,
size: 180,
margin: 10,
backgroundColor: '#ffffff',
foregroundColor: '#000000',
fileType: 'jpg',
errorCorrectLevel: uQRCode.errorCorrectLevel.H
})
}
},
signOverFun(item){//过号遮罩显示
......@@ -915,18 +913,17 @@ export default {
// height: 180,
// text:this.codeNo
// })
// uQRCode.make({
// canvasId: 'qrcode',
// componentInstance: this,
// text: this.codeNo,
// size: 180,
// margin: 10,
// backgroundColor: '#ffffff',
// foregroundColor: '#000000',
// fileType: 'jpg',
// errorCorrectLevel: uQRCode.errorCorrectLevel.H
// })
this.uqrcodeVal=this.codeNo
uQRCode.make({
canvasId: 'qrcode',
componentInstance: this,
text: this.codeNo,
size: 180,
margin: 10,
backgroundColor: '#ffffff',
foregroundColor: '#000000',
fileType: 'jpg',
errorCorrectLevel: uQRCode.errorCorrectLevel.H
})
}
this.percentage+=1
if(this.percentage>=100){
......@@ -949,7 +946,7 @@ export default {
this.$request('distribution/distribution/getAutoCode',data).then((res)=>{
if(res.code == '00'){
this.codes = res.data.codes
if(this.codes.length<0){
if(this.codes.length==0){
uni.showToast({
title: '网络异常，请退出重试',
icon: 'none'
......@@ -1350,12 +1347,8 @@ export default {
.order-certificate .certificate-box .box-QRcode {
display: block;
width: 200px;
height: 200px;
margin: 0 auto;
position: relative;
}
/deep/ .uqrcode-canvas-wrapper,/deep/ .uqrcode{
width: 180px;
height: 180px;
margin: 0 auto;
}
.order-certificate .certificate-box .box-QRcode2{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment