Merge branch 'test' into 'qa'

Test See merge request !145

Merge branch 'test' into 'qa'
Test See merge request !145
后端研发-苏明海
2 parents 5b19ce2c 3467ae1a
Showing 4 changed files with 11 additions and 10 deletions
components/qr_code/qr_code.wxml
components/qr_code/qr_code.wxss
pages/user/userinfo/userinfo.wxml
pages/user/userinfo/userinfo.wxss
@@ -2,7 +2,7 @@
 <view class="xc-pop-up"  wx:if="{{q_show}}">
 <!-- <scroll-view scroll-y="false" style="	height: 100%;"> -->
   <view class="xc-obscuration" bindtap='close' catchtouchmove="ture"></view>
-  <view>
+  <view>  
   <view class="xc-qr-frame">
     <view class="barqrcode">
@@ -10,7 +10,7 @@
            <canvas  canvas-id="barcode{{item.index}}"  wx:for="{{barcode_canvas}}" />
            <view class="q_code">{{object.val}}</view>
        </view>
-       <view class="qrcode_rim {{is_fw==1?'mt':''}}">
+       <view class="qrcode_rim {{is_fw==0?'mt':'mts'}}">
          <canvas  class="qrcode" canvas-id="qrcode{{item.index}}"  wx:for="{{barcode_canvas}}"  />
          <view class="r-code">{{object.content}}</view>
             <view class="r-code flex" wx:if="{{object.is_quan}}">有效时间：{{object.now}} 至 <view>{{object.validay}}</view></view>
@@ -78,26 +78,24 @@ letter-spacing:6rpx;
 /* 二维码边框*/
 .qrcode_rim {
  width: 550rpx;
-  height:520rpx;
+  height:544rpx;
 display:flex;
 flex-direction:column;
-
 position: absolute;
 left: 74rpx;
-top: 130rpx;
-
 }
 .qrcode{
  width:520rpx;
  height:520rpx;
- margin-top:-20rpx 
+ margin-top:-27rpx 
 }
 .r-code{
   font-size:28rpx;
   padding-left: 25rpx;
+margin-top: -5.5rpx;
 }
@@ -122,7 +120,8 @@ top: 130rpx;
 }
-.mt{ margin-top: 70rpx}
+.mt{ margin-top:130rpx}
+.mts{ margin-top:70rpx}
 .flex{
   display: flex;
   justify-content:center;
@@ -201,11 +201,11 @@
   </view>
 </view>
 <!-- 确认修改按钮 -->
-<view class="flex-center confirm">
+<cover-view class="flex-center confirm">
   <view class="flex-center fs30 confirmtext"bindtap="confirm_revision">
     <view>确认修改</view>
   </view>
-</view>
+</cover-view>
 <!--弹出层内容，其中的“我知道”中绑定让弹出层消失的函数：bindtap="hide"-->
 <view class="tc_view" hidden='{{tc_hide}}' bindtap='hide_tc'>
@@ -109,6 +109,8 @@ padding-right: 14rpx;
   bottom: 0rpx;
   height: 130rpx;
   background-color: rgb(255,255,255);
+  z-index: 999;
+  border-top:1rpx solid #ddd 
 }
 .confirmtext {