From 57bba374cb05b3c1ab55f24e52eded711b0a1b62 Mon Sep 17 00:00:00 2001
From: ZhaoTongYao <531131322@qq.com>
Date: Thu, 20 May 2021 11:17:53 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=88=E6=9C=AC=201.6.42=20=E5=BF=97?=
 =?UTF-8?q?=E6=84=BF=E8=80=85=E5=8E=BB=E5=93=AA=E5=B7=A6=E5=8F=B3=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E8=B0=83=E6=95=B4=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/heartNew/heartNew.wxml   |  6 +++---
 pages/heartNew/heartNew.wxss   | 24 ++++++++++++++++++------
 pages/toRegister/toRegister.js |  2 +-
 3 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/pages/heartNew/heartNew.wxml b/pages/heartNew/heartNew.wxml
index ca14977..a9ccf00 100644
--- a/pages/heartNew/heartNew.wxml
+++ b/pages/heartNew/heartNew.wxml
@@ -55,13 +55,13 @@
 </view>
 <view class="tab-left">
   <view class="tab" wx:for="{{tabLeftList}}" wx:key="index" data-title="{{item.remark}}" data-code="{{item.imgCode||item.categoryCode}}" bindtap="toJumpPage">
-    <image src="{{item.imgUrl}}"/>
+    <image src="{{item.imgUrl}}" class="{{item.imgCode == 'ptg' || item.imgCode == 'sds' ? 'image-big' : 'image-small'}}"/>
     <view class="tab-text"></view>
   </view>
 </view>
 <view class="tab-right">
-  <view class="tab" wx:for="{{tabRightList}}" wx:key="index" data-title="{{item.remark}}" data-code="{{item.imgCode}}" bindtap="toJumpPage">
-    <image src="{{item.imgUrl}}"/>
+  <view class="tab" wx:for="{{tabRightList}}" wx:key="index" data-title="{{item.remark}}" data-code="{{item.imgCode||item.categoryCode}}" bindtap="toJumpPage">
+    <image src="{{item.imgUrl}}" class="{{item.imgCode == 'ptg' || item.imgCode == 'sds' ? 'image-big' : 'image-small'}}"/>
     <view class="tab-text"></view>
   </view>
 </view>
diff --git a/pages/heartNew/heartNew.wxss b/pages/heartNew/heartNew.wxss
index 8d31d8e..3bff2fb 100644
--- a/pages/heartNew/heartNew.wxss
+++ b/pages/heartNew/heartNew.wxss
@@ -295,13 +295,19 @@ button:last-child {
   position: fixed;
   left: 0;
   z-index: 997;
-  margin-top: 36rpx;
   display: flex;
   flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  height: 300rpx;
+}
+.tab-left .image-small {
+  width: 186rpx;
+  height: 92rpx;
 }
-.tab-left image {
+.tab-left .image-big {
   width: 186rpx;
-  height: 102rpx;
+  height: 112rpx;
 }
 .tab-left .tab {
   position: relative;
@@ -318,13 +324,19 @@ button:last-child {
   position: fixed;
   right: 0;
   z-index: 997;
-  margin-top: 36rpx;
   display: flex;
   flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  height: 300rpx;
+}
+.tab-right .image-small {
+  width: 186rpx;
+  height: 92rpx;
 }
-.tab-right image {
+.tab-right .image-big {
   width: 186rpx;
-  height: 102rpx;
+  height: 112rpx;
 }
 .tab-right .tab {
   position: relative;
diff --git a/pages/toRegister/toRegister.js b/pages/toRegister/toRegister.js
index d3a2209..2baee7d 100644
--- a/pages/toRegister/toRegister.js
+++ b/pages/toRegister/toRegister.js
@@ -21,7 +21,7 @@ Page({
     //   }
     // })
     let that = this
-    const versionNum = "1.6.41"
+    const versionNum = "1.6.42"
     api.getScanSwitch(versionNum).then(function (res) {
       console.log(res.data)
       let state = res.data.scanFlag