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

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

@@ -449,7 +449,7 @@ export default {
       @media only screen and (max-width: 767px) {
         padding: 0.34rem 0 !important;
         padding-left: 5px !important;
-        font-size: 0.45rem !important;
+        font-size: 0.42rem !important;
       }
     }
     .el-input__inner {

src/pages/main/dialog/new_order/order_form.vue

@@ -494,7 +494,7 @@ export default {
       @media only screen and (max-width: 767px) {
         padding: 0.38rem 0 !important;
         padding-left: 5px !important;
-        font-size: 0.45rem !important;
+        font-size: 0.42rem !important;
       }
     }
     .el-input__inner {