Merge branch 'master' into develop

components/smallScreen/smallScreen.vue

@@ -358,6 +358,7 @@
         this.SMFlag = false;
         this.currentData = data;
         console.log(data, 'data');
+				// let ress1 = '123456'
         SM().then((ress1) => {
           uni.showLoading({
             title: "加载中",

pages/scanning_Result/scanning_Result.vue

@@ -34,7 +34,7 @@
       </view>
     </view>
 
-    <view class="Scanning_cont" v-if="
+    <view class="Scanning_cont spe" v-if="
         (res.status == 200 && type == 'specimenPlan') ||
         (res.status == 200 && type == 'specimen')
       ">
@@ -58,7 +58,7 @@
       <view class="df"><view class="width-100">住院号：</view>{{ infoDATA.residenceNo || '-' }}</view>
     </view>
 
-    <view class="Scanning_cont" v-if="
+    <view class="Scanning_cont spe" v-if="
         (res.status == 11111 && type == 'specimenPlan') ||
         (res.status == 11111 && type == 'specimen')
       ">
@@ -1327,12 +1327,16 @@
         }
       }
     }
-
+		
+		.spe{
+			height: 50vh;
+		}
+		
     .Scanning_cont {
       font-size: 32rpx;
       // text-align: center;
 			margin-top: 40rpx;
-			height: 50vh;
+			// height: 50vh;
 			overflow-y: auto;
 			
 			.df{
@@ -1382,13 +1386,16 @@
       margin-top: 40rpx;
       display: flex;
       justify-content: center;
-
+			// position: absolute;
+			// bottom: 20rpx;
+			// width: 100%;
+					
       .btn1,
       .btn2,
       .btn3 {
         height: 88rpx;
         flex: 1;
-        margin: 0 1%;
+        margin: 0 2%;
         background-image: linear-gradient(to right, #72c172, #3bb197);
         color: #fff;
         border-radius: 8rpx;
@@ -1399,7 +1406,7 @@
     }
     .foot_btn_spe {
       line-height: 88rpx;
-      height: 100rpx;
+      // height: 100rpx;
       // margin-top: 40rpx;
       text-align: center;
       display: flex;