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

src/pages/main/dialog/TwoMenu.vue

@@ -150,6 +150,9 @@ export default {
   @media only screen and (max-width: 812px) {
     min-height: 8rem !important;
   }
+  @media only screen and (min-width: 415px) and (max-width: 737px) {
+    max-height: 12.6rem !important;
+  }
   ul {
     li {
       height: 1.2rem;

src/pages/main/dialog/modify_order/modify_order_form.vue

@@ -397,7 +397,6 @@ export default {
     float: left;
     width: 4.5rem;
     margin: 0.35rem 0.3rem 0.1rem 0.4rem;
-    overflow: hidden;
     label {
       display: block;
       height: 0.9rem;