From 69e7d5efd4cfb965672ab04fa49ae00319c14976 Mon Sep 17 00:00:00 2001
From: cheng.xu <cheng.xu@meidd.com>
Date: Tue, 12 Nov 2019 16:29:00 +0800
Subject: [PATCH] 二维码组件修改

---
 components/qr_code/qr_code.wxml |  4 ++--
 components/qr_code/qr_code.wxss | 11 +++++------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/components/qr_code/qr_code.wxml b/components/qr_code/qr_code.wxml
index 216521c..b6da6b4 100644
--- a/components/qr_code/qr_code.wxml
+++ b/components/qr_code/qr_code.wxml
@@ -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>
diff --git a/components/qr_code/qr_code.wxss b/components/qr_code/qr_code.wxss
index e58dcd3..c4eb9e2 100644
--- a/components/qr_code/qr_code.wxss
+++ b/components/qr_code/qr_code.wxss
@@ -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;
--
libgit2 0.21.4