From bd77643e78bb462cf7f924feec8274fb9185856a Mon Sep 17 00:00:00 2001
From: cheng.xu <cheng.xu@meidd.com>
Date: Fri, 11 Oct 2019 10:28:53 +0800
Subject: [PATCH] 二维码插件修改

---
 components/qr_code/qr_code.js   |  4 +++-
 components/qr_code/qr_code.wxml | 11 ++++++++---
 components/qr_code/qr_code.wxss | 12 +++++++++---
 3 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/components/qr_code/qr_code.js b/components/qr_code/qr_code.js
index fbdf7c9..c46b356 100644
--- a/components/qr_code/qr_code.js
+++ b/components/qr_code/qr_code.js
@@ -37,7 +37,9 @@ Component({
         barcode('barcode'+this.data.index,val, 620, 160,this);
         qrcode('qrcode'+this.data.index, val, 520, 520,this);
     }  
-  }
+  },
+ 
+  
  
  
 })
\ No newline at end of file
diff --git a/components/qr_code/qr_code.wxml b/components/qr_code/qr_code.wxml
index 7db5902..216521c 100644
--- a/components/qr_code/qr_code.wxml
+++ b/components/qr_code/qr_code.wxml
@@ -1,14 +1,17 @@
+
 <view class="xc-pop-up"  wx:if="{{q_show}}">
-  <view class="xc-obscuration" bindtap='close'></view>
+<!-- <scroll-view scroll-y="false" style="	height: 100%;"> -->
+  <view class="xc-obscuration" bindtap='close' catchtouchmove="ture"></view>
   <view>
   <view class="xc-qr-frame">
+    
     <view class="barqrcode">
        <view class="barcode" wx:if="{{!is_fw}}">
-           <canvas canvas-id="barcode{{item.index}}"  wx:for="{{barcode_canvas}}" />
+           <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':''}}">
-         <canvas class="qrcode" canvas-id="qrcode{{item.index}}"  wx:for="{{barcode_canvas}}"  />
+         <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>
             <block wx:if="{{object.is_quan}}">
@@ -18,7 +21,9 @@
          <view></view>
        </view>
      </view>
+  
   </view>
   <view class="shut" bindtap="close">ⅹ</view>
 </view>
+<!-- </scroll-view> -->
 </view>
\ No newline at end of file
diff --git a/components/qr_code/qr_code.wxss b/components/qr_code/qr_code.wxss
index d659c70..e58dcd3 100644
--- a/components/qr_code/qr_code.wxss
+++ b/components/qr_code/qr_code.wxss
@@ -6,7 +6,11 @@
   display:flex;
 justify-content:center;
 align-items:center;
+
 }
+/* page{
+  overflow-y: hidden;
+} */
 
 .xc-obscuration{
   position: fixed;
@@ -33,14 +37,16 @@ align-items:center;
   height: auto;
   padding-bottom:20rpx;
   left:35rpx;
+ overflow: hidden;
  
 
+
 }
 
 /* 二维码和条形码的边框 */
 .barqrcode{
   width: 100%;
-  height: auto;
+  height: 100%;
   margin-top:30rpx;
 position: relative;
 top: 0rpx;
@@ -60,7 +66,7 @@ canvas{
   width:100%;
 height:55px;
 display:block;
-position:relative;
+
 }
 .q_code{
   font-size:28rpx;
@@ -72,7 +78,7 @@ letter-spacing:6rpx;
 /* 二维码边框*/
 .qrcode_rim {
  width: 550rpx;
-  height:580rpx;
+  height:520rpx;
 display:flex;
 flex-direction:column;
 
--
libgit2 0.21.4