Commit 69e7d5efd4cfb965672ab04fa49ae00319c14976
1 parent
968580e8
二维码组件修改
Showing
2 changed files
with
7 additions
and
8 deletions
components/qr_code/qr_code.wxml
@@ -2,7 +2,7 @@ | @@ -2,7 +2,7 @@ | ||
2 | <view class="xc-pop-up" wx:if="{{q_show}}"> | 2 | <view class="xc-pop-up" wx:if="{{q_show}}"> |
3 | <!-- <scroll-view scroll-y="false" style=" height: 100%;"> --> | 3 | <!-- <scroll-view scroll-y="false" style=" height: 100%;"> --> |
4 | <view class="xc-obscuration" bindtap='close' catchtouchmove="ture"></view> | 4 | <view class="xc-obscuration" bindtap='close' catchtouchmove="ture"></view> |
5 | - <view> | 5 | + <view> |
6 | <view class="xc-qr-frame"> | 6 | <view class="xc-qr-frame"> |
7 | 7 | ||
8 | <view class="barqrcode"> | 8 | <view class="barqrcode"> |
@@ -10,7 +10,7 @@ | @@ -10,7 +10,7 @@ | ||
10 | <canvas canvas-id="barcode{{item.index}}" wx:for="{{barcode_canvas}}" /> | 10 | <canvas canvas-id="barcode{{item.index}}" wx:for="{{barcode_canvas}}" /> |
11 | <view class="q_code">{{object.val}}</view> | 11 | <view class="q_code">{{object.val}}</view> |
12 | </view> | 12 | </view> |
13 | - <view class="qrcode_rim {{is_fw==1?'mt':''}}"> | 13 | + <view class="qrcode_rim {{is_fw==0?'mt':'mts'}}"> |
14 | <canvas class="qrcode" canvas-id="qrcode{{item.index}}" wx:for="{{barcode_canvas}}" /> | 14 | <canvas class="qrcode" canvas-id="qrcode{{item.index}}" wx:for="{{barcode_canvas}}" /> |
15 | <view class="r-code">{{object.content}}</view> | 15 | <view class="r-code">{{object.content}}</view> |
16 | <view class="r-code flex" wx:if="{{object.is_quan}}">有效时间:{{object.now}} 至 <view>{{object.validay}}</view></view> | 16 | <view class="r-code flex" wx:if="{{object.is_quan}}">有效时间:{{object.now}} 至 <view>{{object.validay}}</view></view> |
components/qr_code/qr_code.wxss
@@ -78,26 +78,24 @@ letter-spacing:6rpx; | @@ -78,26 +78,24 @@ letter-spacing:6rpx; | ||
78 | /* 二维码边框*/ | 78 | /* 二维码边框*/ |
79 | .qrcode_rim { | 79 | .qrcode_rim { |
80 | width: 550rpx; | 80 | width: 550rpx; |
81 | - height:520rpx; | 81 | + height:544rpx; |
82 | display:flex; | 82 | display:flex; |
83 | flex-direction:column; | 83 | flex-direction:column; |
84 | - | ||
85 | position: absolute; | 84 | position: absolute; |
86 | left: 74rpx; | 85 | left: 74rpx; |
87 | -top: 130rpx; | ||
88 | - | ||
89 | 86 | ||
90 | } | 87 | } |
91 | .qrcode{ | 88 | .qrcode{ |
92 | width:520rpx; | 89 | width:520rpx; |
93 | height:520rpx; | 90 | height:520rpx; |
94 | - margin-top:-20rpx | 91 | + margin-top:-27rpx |
95 | 92 | ||
96 | 93 | ||
97 | } | 94 | } |
98 | .r-code{ | 95 | .r-code{ |
99 | font-size:28rpx; | 96 | font-size:28rpx; |
100 | padding-left: 25rpx; | 97 | padding-left: 25rpx; |
98 | +margin-top: -5.5rpx; | ||
101 | 99 | ||
102 | } | 100 | } |
103 | 101 | ||
@@ -122,7 +120,8 @@ top: 130rpx; | @@ -122,7 +120,8 @@ top: 130rpx; | ||
122 | 120 | ||
123 | } | 121 | } |
124 | 122 | ||
125 | -.mt{ margin-top: 70rpx} | 123 | +.mt{ margin-top:130rpx} |
124 | +.mts{ margin-top:70rpx} | ||
126 | .flex{ | 125 | .flex{ |
127 | display: flex; | 126 | display: flex; |
128 | justify-content:center; | 127 | justify-content:center; |