Merge branch 'new_pad_branch' of http://git.shengws.com/zhangbj/xt_pad into new_pad_branch

src/pages/main/DetailsPage.vue

@@ -17,9 +17,7 @@
               :key="i"
               :class="index == i ? 'active' : ''"
               @click="ClickTab(i)"
-            >
-              {{ item }}
-            </li>
+            >{{ item }}</li>
           </ul>
         </div>
 
@@ -30,24 +28,14 @@
                   <span class="iconfont">2018-01-01&#xe74a;</span>
         </div>-->
         <div class="print" style="float: right; display:none">
-          <el-button
-            size="mini"
-            type="primary"
-            @click="print"
-            icon="el-icon-printer"
-            >打印</el-button
-          >
+          <el-button size="mini" type="primary" @click="print" icon="el-icon-printer">打印</el-button>
         </div>
       </div>
 
       <div class="Tab">
         <CaseHistory v-show="index == 0" title="病历"></CaseHistory>
         <!--<check-tab v-show="index==1" title="化验单"></check-tab>-->
-        <dialysis-tab
-          v-show="index == 1"
-          title="透析"
-          v-on:records="jump(val)"
-        ></dialysis-tab>
+        <dialysis-tab v-show="index == 1" title="透析" v-on:records="jump(val)"></dialysis-tab>
         <today-tab ref="today" v-show="index == 2" title="今日"></today-tab>
       </div>
     </div>
@@ -192,7 +180,7 @@ export default {
         margin-right: 3.6rem;
       }
       @media only screen and (min-width: 415px) and (max-width: 767px) {
-        margin-right: 4rem;
+        margin-right: 3.6rem;
       }
       @media only screen and (min-width: 768px) {
         margin-right: 4rem;

src/styles/style.scss

@@ -99,7 +99,7 @@ body {
           width: 4.2rem;
         }
         @media only screen and (min-width: 415px) and (max-width: 767px) {
-          width: 6rem;
+          width: 5.6rem;
           font-size: 0.4rem;
         }
         @media only screen and (min-width: 768px) {