Merge remote-tracking branch 'origin/master'

src/App.vue

@@ -13,6 +13,7 @@
   -moz-osx-font-smoothing: grayscale;
   color: #2c3e50;
   height: 100%;
+  background: #f0f3f6;
 }
 
 #nav {

src/views/scaleResultSCl.vue

@@ -429,10 +429,11 @@ export default {
   background-size: 100% auto;
 }
 .test-mid {
-  display: inline-block;
+  //display: inline-block;
   text-align: center;
   width: 100%;
-  height: auto;
+  height: 100vh;
+  overflow: auto;
   /* height: 975px; */
   /*background: #ffffff;*/
   border-radius: 6px 6px 6px 6px;

src/views/scaleWait.vue

@@ -1,13 +1,14 @@
 <template>
-  <div>
+  <div style="background: #f0f3f6;height: 100vh">
     <van-nav-bar
       title="量表测试"
       left-text="返回"
       left-arrow
       @click-left="goBack"
     />
+    <h2 class="title">{{ scaleInfo.name }}</h2>
+
     <div class="main">
-      <h2 class="title">{{ scaleInfo.name }}</h2>
       <!--<img class="coverImg" src="../assets/1.jpg" alt="" />-->
       <img class="coverImg" src="../assets/test_records_bg.png" alt="" />
       <p class="desc">{{ scaleInfo.description }}</p>
@@ -18,10 +19,12 @@
           <span>{{ item }}</span>
         </p>
       </div>
-      <div class="btnArea">
-        <van-button block round type="info" @click="goTest">开始测试</van-button>
-      </div>
+
+    </div>
+    <div class="btnArea">
+      <van-button block round type="info" @click="goTest">开始测试</van-button>
     </div>
+
   </div>
 </template>
 
@@ -97,7 +100,9 @@ export default {
   font-size: 16px;
   color: #333333;
   text-align: center;
-  margin-top: 20px;
+  margin-top: 10px;
+
+  //background: #888888;
 }
 
 .desc {
@@ -120,10 +125,37 @@ export default {
 }
 
 .btnArea {
-  margin: 40px auto;
+  //margin: 40px auto;
+  position: absolute;
+  text-align: center;
+  bottom: 0;
+  font-size: 16px;
+  color: #FFFFFF;
+  margin: 10px 0;
+  width: 80%;
+  //background: #f0f3f6;
+  //height: 80px;
+  //line-height: 80px;
+  //background: #E0E0E0;
+  //border-radius: 5px;
+  //background-color: #1B68FD;
+  left: 50%;
+  transform: translateX(-50%);
 }
 
 .main {
-  padding: 0 15px;
+  //padding: 0 15px;
+  border-radius: 10px;
+  margin: 10px;
+  background: #ffffff;
+  overflow: auto;
+  //overflow: hidden;
+  //height: 666px;
+  height:calc(100vh - 150px);
+  //overflow: auto;
+  //position: relative;
+  //min-height: 100vh;
+  //padding-bottom: 95px;
+  //box-sizing: border-box;
 }
 </style>

src/views/user/testRecordsSCl.vue

@@ -882,10 +882,12 @@ export default {
 }
 
 .test-mid {
-  display: inline-block;
+  //display: inline-block;
   text-align: center;
   width: 100%;
-  min-height: 100vh;
+  height: 100vh;
+  overflow: auto;
+  //min-height: 100vh;
   /*height: auto;*/
   /* height: 975px; */
   /*background: #ffffff;*/