Commit 07341299 authored by 潘永坪's avatar 潘永坪

页面新增

parent d65a24df
...@@ -38,8 +38,8 @@ ...@@ -38,8 +38,8 @@
</view> </view>
<view class="certificate-box" v-else-if="orderInfo.exchangeMode==1||orderInfo.exchangeMode==4||orderInfo.exchangeMode==5"> <view class="certificate-box" v-else-if="orderInfo.exchangeMode==1||orderInfo.exchangeMode==4||orderInfo.exchangeMode==5">
<view class="box-verificationCode">验证码:{{ticketCode}}</view> <view class="box-verificationCode">验证码:{{ticketCode}}</view>
<canvas class="box-QRcode" :class="showtip==false&&showUseRule==false?'':'box-QRcode2'" canvas-id="qrcode"/> <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: 180px; height: 180px;"></view> <view v-if="howtip==true||showUseRule==true" style="width: 200px; height: 200px;"></view>
<view class="progress-box" v-if="qrCodeType==true"> <view class="progress-box" v-if="qrCodeType==true">
<progress :percent="percentage" activeColor="#3688FF" stroke-width="3" /> <progress :percent="percentage" activeColor="#3688FF" stroke-width="3" />
</view> </view>
...@@ -364,7 +364,7 @@ ...@@ -364,7 +364,7 @@
</template> </template>
<script> <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' import UMask from '@/uview-ui/components/u-mask/u-mask.vue'
export default { export default {
components: { components: {
...@@ -528,6 +528,7 @@ export default { ...@@ -528,6 +528,7 @@ export default {
}, },
data() { data() {
return { return {
uqrcodeVal:'',
orderDataType:false, orderDataType:false,
openId:'',//用户信息 openId:'',//用户信息
id:'',//订单ID id:'',//订单ID
...@@ -862,17 +863,18 @@ export default { ...@@ -862,17 +863,18 @@ export default {
}else{ }else{
verifyCode=this.verifyCode verifyCode=this.verifyCode
} }
uQRCode.make({ // uQRCode.make({
canvasId: 'qrcode', // canvasId: 'qrcode',
componentInstance: this, // componentInstance: this,
text: verifyCode, // text: verifyCode,
size: 180, // size: 180,
margin: 10, // margin: 10,
backgroundColor: '#ffffff', // backgroundColor: '#ffffff',
foregroundColor: '#000000', // foregroundColor: '#000000',
fileType: 'jpg', // fileType: 'jpg',
errorCorrectLevel: uQRCode.errorCorrectLevel.H // errorCorrectLevel: uQRCode.errorCorrectLevel.H
}) // })
this.uqrcodeVal=verifyCode
} }
}, },
signOverFun(item){//过号遮罩显示 signOverFun(item){//过号遮罩显示
...@@ -913,17 +915,18 @@ export default { ...@@ -913,17 +915,18 @@ export default {
// height: 180, // height: 180,
// text:this.codeNo // text:this.codeNo
// }) // })
uQRCode.make({ // uQRCode.make({
canvasId: 'qrcode', // canvasId: 'qrcode',
componentInstance: this, // componentInstance: this,
text: this.codeNo, // text: this.codeNo,
size: 180, // size: 180,
margin: 10, // margin: 10,
backgroundColor: '#ffffff', // backgroundColor: '#ffffff',
foregroundColor: '#000000', // foregroundColor: '#000000',
fileType: 'jpg', // fileType: 'jpg',
errorCorrectLevel: uQRCode.errorCorrectLevel.H // errorCorrectLevel: uQRCode.errorCorrectLevel.H
}) // })
this.uqrcodeVal=this.codeNo
} }
this.percentage+=1 this.percentage+=1
if(this.percentage>=100){ if(this.percentage>=100){
...@@ -946,7 +949,7 @@ export default { ...@@ -946,7 +949,7 @@ export default {
this.$request('distribution/distribution/getAutoCode',data).then((res)=>{ this.$request('distribution/distribution/getAutoCode',data).then((res)=>{
if(res.code == '00'){ if(res.code == '00'){
this.codes = res.data.codes this.codes = res.data.codes
if(this.codes.length<0){ if(this.codes.length==0){
uni.showToast({ uni.showToast({
title: '网络异常,请退出重试', title: '网络异常,请退出重试',
icon: 'none' icon: 'none'
...@@ -1347,9 +1350,17 @@ export default { ...@@ -1347,9 +1350,17 @@ export default {
.order-certificate .certificate-box .box-QRcode { .order-certificate .certificate-box .box-QRcode {
display: block; display: block;
width: 180px; width: 200px;
height: 180px; height: 200px;
margin: 0 auto; 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{ .order-certificate .certificate-box .box-QRcode2{
position: fixed; position: fixed;
......
...@@ -38,8 +38,8 @@ ...@@ -38,8 +38,8 @@
</view> </view>
<view class="certificate-box" v-else-if="orderInfo.exchangeMode==1||orderInfo.exchangeMode==4||orderInfo.exchangeMode==5"> <view class="certificate-box" v-else-if="orderInfo.exchangeMode==1||orderInfo.exchangeMode==4||orderInfo.exchangeMode==5">
<view class="box-verificationCode">验证码:{{ticketCode}}</view> <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> <canvas class="box-QRcode" :class="showtip==false&&showUseRule==false?'':'box-QRcode2'" canvas-id="qrcode"/>
<view v-if="howtip==true||showUseRule==true" style="width: 200px; height: 200px;"></view> <view v-if="howtip==true||showUseRule==true" style="width: 180px; height: 180px;"></view>
<view class="progress-box" v-if="qrCodeType==true"> <view class="progress-box" v-if="qrCodeType==true">
<progress :percent="percentage" activeColor="#3688FF" stroke-width="3" /> <progress :percent="percentage" activeColor="#3688FF" stroke-width="3" />
</view> </view>
...@@ -364,7 +364,7 @@ ...@@ -364,7 +364,7 @@
</template> </template>
<script> <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' import UMask from '@/uview-ui/components/u-mask/u-mask.vue'
export default { export default {
components: { components: {
...@@ -528,7 +528,6 @@ export default { ...@@ -528,7 +528,6 @@ export default {
}, },
data() { data() {
return { return {
uqrcodeVal:'',
orderDataType:false, orderDataType:false,
openId:'',//用户信息 openId:'',//用户信息
id:'',//订单ID id:'',//订单ID
...@@ -863,18 +862,17 @@ export default { ...@@ -863,18 +862,17 @@ export default {
}else{ }else{
verifyCode=this.verifyCode verifyCode=this.verifyCode
} }
// uQRCode.make({ uQRCode.make({
// canvasId: 'qrcode', canvasId: 'qrcode',
// componentInstance: this, componentInstance: this,
// text: verifyCode, text: verifyCode,
// size: 180, size: 180,
// margin: 10, margin: 10,
// backgroundColor: '#ffffff', backgroundColor: '#ffffff',
// foregroundColor: '#000000', foregroundColor: '#000000',
// fileType: 'jpg', fileType: 'jpg',
// errorCorrectLevel: uQRCode.errorCorrectLevel.H errorCorrectLevel: uQRCode.errorCorrectLevel.H
// }) })
this.uqrcodeVal=verifyCode
} }
}, },
signOverFun(item){//过号遮罩显示 signOverFun(item){//过号遮罩显示
...@@ -915,18 +913,17 @@ export default { ...@@ -915,18 +913,17 @@ export default {
// height: 180, // height: 180,
// text:this.codeNo // text:this.codeNo
// }) // })
// uQRCode.make({ uQRCode.make({
// canvasId: 'qrcode', canvasId: 'qrcode',
// componentInstance: this, componentInstance: this,
// text: this.codeNo, text: this.codeNo,
// size: 180, size: 180,
// margin: 10, margin: 10,
// backgroundColor: '#ffffff', backgroundColor: '#ffffff',
// foregroundColor: '#000000', foregroundColor: '#000000',
// fileType: 'jpg', fileType: 'jpg',
// errorCorrectLevel: uQRCode.errorCorrectLevel.H errorCorrectLevel: uQRCode.errorCorrectLevel.H
// }) })
this.uqrcodeVal=this.codeNo
} }
this.percentage+=1 this.percentage+=1
if(this.percentage>=100){ if(this.percentage>=100){
...@@ -949,7 +946,7 @@ export default { ...@@ -949,7 +946,7 @@ export default {
this.$request('distribution/distribution/getAutoCode',data).then((res)=>{ this.$request('distribution/distribution/getAutoCode',data).then((res)=>{
if(res.code == '00'){ if(res.code == '00'){
this.codes = res.data.codes this.codes = res.data.codes
if(this.codes.length<0){ if(this.codes.length==0){
uni.showToast({ uni.showToast({
title: '网络异常,请退出重试', title: '网络异常,请退出重试',
icon: 'none' icon: 'none'
...@@ -1350,12 +1347,8 @@ export default { ...@@ -1350,12 +1347,8 @@ export default {
.order-certificate .certificate-box .box-QRcode { .order-certificate .certificate-box .box-QRcode {
display: block; display: block;
width: 200px; width: 180px;
height: 200px; height: 180px;
margin: 0 auto;
position: relative;
}
/deep/ .uqrcode-canvas-wrapper,/deep/ .uqrcode{
margin: 0 auto; margin: 0 auto;
} }
.order-certificate .certificate-box .box-QRcode2{ .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