Browse Source

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

xiaoming_global 5 years ago
parent
commit
641637d109

+ 3 - 3
src/pages/main/dialog/AcceptsDialog.vue View File

474
 .acceptsForm {
474
 .acceptsForm {
475
   .el-radio {
475
   .el-radio {
476
     margin-right: 14px;
476
     margin-right: 14px;
477
-    width: 2.4rem;
477
+    width: 2.2rem;
478
   }
478
   }
479
 }
479
 }
480
 
480
 
481
 .el-radio__inner {
481
 .el-radio__inner {
482
-  width: 20px;
483
-  height: 20px;
482
+  width: 16px;
483
+  height: 16px;
484
   @media only screen and (min-width: 768px) {
484
   @media only screen and (min-width: 768px) {
485
     width: 26px;
485
     width: 26px;
486
     height: 26px;
486
     height: 26px;

+ 5 - 1
src/pages/main/dialog/modify_order/modify_order_form.vue View File

10
       </div>
10
       </div>
11
       <div class="DialogContent choose advice-top">
11
       <div class="DialogContent choose advice-top">
12
         <div class="content clearfix">
12
         <div class="content clearfix">
13
-          <div>
13
+          <div class="newContent">
14
             <div class="cell" v-show="order.parent_id == 0">
14
             <div class="cell" v-show="order.parent_id == 0">
15
               <label>开始时间</label>
15
               <label>开始时间</label>
16
               <el-input
16
               <el-input
397
     float: left;
397
     float: left;
398
     width: 4.5rem;
398
     width: 4.5rem;
399
     margin: 0.35rem 0.3rem 0.2rem 0.4rem;
399
     margin: 0.35rem 0.3rem 0.2rem 0.4rem;
400
+    overflow: hidden;
400
     label {
401
     label {
401
       display: block;
402
       display: block;
402
       height: 0.9rem;
403
       height: 0.9rem;
443
 </style>
444
 </style>
444
 <style lang="scss">
445
 <style lang="scss">
445
 .content {
446
 .content {
447
+  .newContent {
448
+    overflow: hidden;
449
+  }
446
   .cell {
450
   .cell {
447
     .inputBox {
451
     .inputBox {
448
       @media only screen and (max-width: 767px) {
452
       @media only screen and (max-width: 767px) {