Merge branch 'test'
All checks were successful
continuous-integration/drone/push Build is passing

This commit is contained in:
2024-08-03 23:32:56 +08:00
2 changed files with 20 additions and 17 deletions

View File

@@ -387,13 +387,13 @@ const closed = () => {
<view class="code-box">
<view>核销码</view>
<!-- <image class="qrcode" :src="url"></image> -->
<view class="qrcode">
<canvas
ref="qrcode"
id="qrcode"
class="qrcode"
canvas-id="qrcode"></canvas>
</view>
<!-- <view class="qrcode"> -->
<canvas
ref="qrcode"
id="qrcode"
style="width: 200px; height: 200px"
canvas-id="qrcode"></canvas>
<!-- </view> -->
</view>
</nut-popup>
<pay

View File

@@ -205,13 +205,13 @@
<view class="code-box">
<view>核销码</view>
<!-- <image class="qrcode" :src="url"></image> -->
<view class="qrcode">
<canvas
ref="qrcode"
id="qrcode"
class="qrcode"
canvas-id="qrcode"></canvas>
</view>
<!-- <view class="qrcode"> -->
<canvas
ref="qrcode"
id="qrcode"
style="width: 200px; height: 200px"
canvas-id="qrcode"></canvas>
<!-- </view> -->
</view>
</nut-popup>
<pay
@@ -564,9 +564,12 @@ page {
}
.qrcode {
width: 370px;
height: 370px;
padding: 10px;
// width: 200px;
// height: 200px;
// padding: 10px;
// display: flex;
// justify-content: center;
// align-items: center;
// canvas {
// width: calc(100% - 20px);