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

src/App.vue

@@ -1,12 +1,11 @@
 <template>
-  <div id="app" ref="wrapper">
+  <div id="app">
     <!-- <img src="./assets/logo.png"> -->
     <router-view v-if="isRouterAlive" />
   </div>
 </template>
 
 <script>
-import BScroll from "better-scroll";
 export default {
   name: "App",
   provide() {
@@ -32,22 +31,6 @@ export default {
       document.body.scrollTop = 0;
       document.documentElement.scrollTop = 0;
     }
-  },
-  mounted() {
-    this.$nextTick(() => {
-      //$refs绑定元素
-      if (!this.scroll) {
-        this.scroll = new BScroll(this.$refs.wrapper, {
-          //开启点击事件 默认为false
-          click: true
-        });
-        // console.log(this.scroll)
-      } else if (!this.$refs.wrapper) {
-        return;
-      } else {
-        this.scroll.refresh();
-      }
-    });
   }
 };
 </script>

src/pages/main/dialog/PrescriptionDialog.vue

@@ -1086,7 +1086,8 @@
             }else{
               this.zhiShow = true
               this.totalShow = true
-              this.huShow  = true           
+              this.huShow  = true  
+                
             }
           }
         }

src/pages/personal/ElectronicSignature.vue

@@ -430,7 +430,7 @@ export default {
       margin: 0 auto;
       text-align: center;
       padding: 10px 0;
-      height: 200px;
+      min-height: 200px;
       background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQAQMAAAAlPW0iAAAAA3NCSVQICAjb4U/gAAAABlBMVEXMzMz////TjRV2AAAACXBIWXMAAArrAAAK6wGCiw1aAAAAHHRFWHRTb2Z0d2FyZQBBZG9iZSBGaXJld29ya3MgQ1M26LyyjAAAABFJREFUCJlj+M/AgBVhF/0PAH6/D/HkDxOGAAAAAElFTkSuQmCC");
     }
     .name {

src/styles/style.scss

@@ -8,7 +8,6 @@ body {
 #app {
   width: 100%;
   height: 100%;
-  overflow-x: hidden;
 }
 
 .iconfont {
@@ -905,6 +904,6 @@ body {
     padding-top: 232px;
   }
 }
-// #app {
-//   -webkit-overflow-scrolling: touch;
-// }
+#app {
+  -webkit-overflow-scrolling: touch;
+}