Commit 01b734710f7bbac26b9ede0fca6d0c45c35307f3
Merge branch 'test' into 'qa'
Test See merge request !145
Showing
4 changed files
with
11 additions
and
10 deletions
components/qr_code/qr_code.wxml
| ... | ... | @@ -2,7 +2,7 @@ |
| 2 | 2 | <view class="xc-pop-up" wx:if="{{q_show}}"> |
| 3 | 3 | <!-- <scroll-view scroll-y="false" style=" height: 100%;"> --> |
| 4 | 4 | <view class="xc-obscuration" bindtap='close' catchtouchmove="ture"></view> |
| 5 | - <view> | |
| 5 | + <view> | |
| 6 | 6 | <view class="xc-qr-frame"> |
| 7 | 7 | |
| 8 | 8 | <view class="barqrcode"> |
| ... | ... | @@ -10,7 +10,7 @@ |
| 10 | 10 | <canvas canvas-id="barcode{{item.index}}" wx:for="{{barcode_canvas}}" /> |
| 11 | 11 | <view class="q_code">{{object.val}}</view> |
| 12 | 12 | </view> |
| 13 | - <view class="qrcode_rim {{is_fw==1?'mt':''}}"> | |
| 13 | + <view class="qrcode_rim {{is_fw==0?'mt':'mts'}}"> | |
| 14 | 14 | <canvas class="qrcode" canvas-id="qrcode{{item.index}}" wx:for="{{barcode_canvas}}" /> |
| 15 | 15 | <view class="r-code">{{object.content}}</view> |
| 16 | 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 | 78 | /* 二维码边框*/ |
| 79 | 79 | .qrcode_rim { |
| 80 | 80 | width: 550rpx; |
| 81 | - height:520rpx; | |
| 81 | + height:544rpx; | |
| 82 | 82 | display:flex; |
| 83 | 83 | flex-direction:column; |
| 84 | - | |
| 85 | 84 | position: absolute; |
| 86 | 85 | left: 74rpx; |
| 87 | -top: 130rpx; | |
| 88 | - | |
| 89 | 86 | |
| 90 | 87 | } |
| 91 | 88 | .qrcode{ |
| 92 | 89 | width:520rpx; |
| 93 | 90 | height:520rpx; |
| 94 | - margin-top:-20rpx | |
| 91 | + margin-top:-27rpx | |
| 95 | 92 | |
| 96 | 93 | |
| 97 | 94 | } |
| 98 | 95 | .r-code{ |
| 99 | 96 | font-size:28rpx; |
| 100 | 97 | padding-left: 25rpx; |
| 98 | +margin-top: -5.5rpx; | |
| 101 | 99 | |
| 102 | 100 | } |
| 103 | 101 | |
| ... | ... | @@ -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 | 125 | .flex{ |
| 127 | 126 | display: flex; |
| 128 | 127 | justify-content:center; | ... | ... |
pages/user/userinfo/userinfo.wxml
| ... | ... | @@ -201,11 +201,11 @@ |
| 201 | 201 | </view> |
| 202 | 202 | </view> |
| 203 | 203 | <!-- 确认修改按钮 --> |
| 204 | -<view class="flex-center confirm"> | |
| 204 | +<cover-view class="flex-center confirm"> | |
| 205 | 205 | <view class="flex-center fs30 confirmtext"bindtap="confirm_revision"> |
| 206 | 206 | <view>确认修改</view> |
| 207 | 207 | </view> |
| 208 | -</view> | |
| 208 | +</cover-view> | |
| 209 | 209 | |
| 210 | 210 | <!--弹出层内容，其中的“我知道”中绑定让弹出层消失的函数：bindtap="hide"--> |
| 211 | 211 | <view class="tc_view" hidden='{{tc_hide}}' bindtap='hide_tc'> | ... | ... |