Merge branch 'oil' of 39.97.239.116:gyfl/minixyz into oil

pages/components/showImage/showImage.wxml

@@ -1,10 +1,6 @@
 <!--pages/components/showImage/showImage.wxml-->
-<view  class="sharePopup"  bindtap="closeMiniDialog">
-	<view class="shareDialog">
-    <!-- <image src="../../../image/close_icon.png" class="close_icon" ></image> -->
-    <view>
-        <image src="{{imageUrl}}" mode="heightFix"></image>
-    </view>
-    </view>
+<view  class="sharePopup">
+	<view class="shareDialog" catchtap="closeMiniDialog"></view>
+    <image class="qrcode" src="{{imageUrl}}" mode="widthFix"></image>
 </view>
 

pages/components/showImage/showImage.wxss

@@ -12,12 +12,11 @@
   z-index: 100;
 }
 .shareDialog {
-  position: relative;
-  width: 600rpx;
-  height: 600rpx;
-  display: flex;
-  justify-content: center;
-  padding-top: 0rpx;
+  position: absolute;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
 }
 .close_icon {
   position: absolute;
@@ -25,4 +24,13 @@
   top: -25rpx;
   width: 100rpx;
   height: 100rpx;
+}
+
+.qrcode {
+  position: absolute;
+  left: 50%;
+  top: 50%;
+  width: 600rpx;
+  height: 600rpx;
+  transform: translate(-50%,-50%);
 }