wxd / MShopWeApp

Commit f9ae7fc3d9dfb90765070639b06ef90d8e4789af

Authored by yvan.ni
2 parents 7a87c3db 7c3b287f

Merge branch 'work-1.1_20191010' of http://git.vipzhuang.cn/wxd/MShopWeApp into work-1.1_20191010

Inline Side-by-side
Showing 3 changed files with 20 additions and 7 deletions
components/qr_code/qr_code.js
  View file @f9ae7fc
... ... @@ -37,7 +37,9 @@ Component({
37 37 barcode('barcode'+this.data.index,val, 620, 160,this);
38 38 qrcode('qrcode'+this.data.index, val, 520, 520,this);
39 39 }
40   - }
  40 + },
  41 +
  42 +
41 43  
42 44  
43 45 })
44 46 \ No newline at end of file
... ...
components/qr_code/qr_code.wxml
  View file @f9ae7fc
  1 +
1 2 <view class="xc-pop-up" wx:if="{{q_show}}">
2   - <view class="xc-obscuration" bindtap='close'></view>
  3 +<!-- <scroll-view scroll-y="false" style=" height: 100%;"> -->
  4 + <view class="xc-obscuration" bindtap='close' catchtouchmove="ture"></view>
3 5 <view>
4 6 <view class="xc-qr-frame">
  7 +
5 8 <view class="barqrcode">
6 9 <view class="barcode" wx:if="{{!is_fw}}">
7   - <canvas canvas-id="barcode{{item.index}}" wx:for="{{barcode_canvas}}" />
  10 + <canvas canvas-id="barcode{{item.index}}" wx:for="{{barcode_canvas}}" />
8 11 <view class="q_code">{{object.val}}</view>
9 12 </view>
10 13 <view class="qrcode_rim {{is_fw==1?'mt':''}}">
11   - <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}}" />
12 15 <view class="r-code">{{object.content}}</view>
13 16 <view class="r-code flex" wx:if="{{object.is_quan}}">有效时间：{{object.now}} 至 <view>{{object.validay}}</view></view>
14 17 <block wx:if="{{object.is_quan}}">
... ... @@ -18,7 +21,9 @@
18 21 <view></view>
19 22 </view>
20 23 </view>
  24 +
21 25 </view>
22 26 <view class="shut" bindtap="close">ⅹ</view>
23 27 </view>
  28 +<!-- </scroll-view> -->
24 29 </view>
25 30 \ No newline at end of file
... ...
components/qr_code/qr_code.wxss
  View file @f9ae7fc
... ... @@ -6,7 +6,11 @@
6 6 display:flex;
7 7 justify-content:center;
8 8 align-items:center;
  9 +
9 10 }
  11 +/* page{
  12 + overflow-y: hidden;
  13 +} */
10 14  
11 15 .xc-obscuration{
12 16 position: fixed;
... ... @@ -33,14 +37,16 @@ align-items:center;
33 37 height: auto;
34 38 padding-bottom:20rpx;
35 39 left:35rpx;
  40 + overflow: hidden;
36 41  
37 42  
  43 +
38 44 }
39 45  
40 46 /* 二维码和条形码的边框 */
41 47 .barqrcode{
42 48 width: 100%;
43   - height: auto;
  49 + height: 100%;
44 50 margin-top:30rpx;
45 51 position: relative;
46 52 top: 0rpx;
... ... @@ -60,7 +66,7 @@ canvas{
60 66 width:100%;
61 67 height:55px;
62 68 display:block;
63   -position:relative;
  69 +
64 70 }
65 71 .q_code{
66 72 font-size:28rpx;
... ... @@ -72,7 +78,7 @@ letter-spacing:6rpx;
72 78 /* 二维码边框*/
73 79 .qrcode_rim {
74 80 width: 550rpx;
75   - height:580rpx;
  81 + height:520rpx;
76 82 display:flex;
77 83 flex-direction:column;
78 84  
... ...