Merge remote-tracking branch 'origin/master'

src/views/service-management/medical-record-management/check-detail.vue

@@ -278,7 +278,10 @@
             class="fourWordsBtn"
             :disabled="currentUser.userType === '2' && currentUser.name !== checkDetail.doctorName"
             @click="bookNow"
-          >立即预约</el-button>
+          >
+            <svg-icon icon-class="liebiao_icon_xiangqing" />
+            立即预约
+          </el-button>
         </div>
       </div>
       <!-- 预约信息 -->
@@ -324,10 +327,10 @@
         </el-col>
       </el-row>
       <el-row v-show="checkDetail.checkSchedule < 2">
-        <el-col :span="8">
-          <el-form-item label="暂未预约">
-            <span />
-          </el-form-item>
+        <el-col :span="24">
+          <div class="unallocated">
+            <el-form-item label="暂未预约" label-width="50.5rem" />
+          </div>
         </el-col>
       </el-row>
       <div v-show="checkDetail.checkSchedule >= 2">
@@ -783,4 +786,10 @@ export default {
 .schedule-info.progress-base {
   padding-bottom: 10px !important;
 }
+.unallocated {
+  border: 1px dashed #E5E5E5;
+  display: flex;
+  padding: 20px 0 0 0;
+  margin: 0 3.25rem 26px 28px;
+}
 </style>

src/views/service-management/treatment-management/treatment-detail.vue

@@ -1220,6 +1220,6 @@ export default {
   border: 1px dashed #E5E5E5;
   display: flex;
   padding: 20px 0 0 0;
-  margin: 0 20px 0 28px;
+  margin: 0 20px 26px 28px;
 }
 </style>