Merge branch 'develop-3.18.0' into 'release'

Develop 3.18.0

See merge request com.pica.cloud.education.frontend/pica.cloud.web-education-admin!332

src/style/global.scss

@@ -236,4 +236,21 @@
 .el-input__inner:focus, .el-textarea__inner:focus {
   border-color: #449284 !important;
 }
+.el-table {
+    th.el-table__cell>.cell.highlight {
+        color: #449284 !important;
+    }
+}
+.el-table-filter {
+    .el-table-filter__content {
+        .el-checkbox__input.is-checked+.el-checkbox__label {
+            color: #449284 !important;
+        }
+        .el-checkbox__input.is-checked .el-checkbox__inner, .el-checkbox__input.is-indeterminate .el-checkbox__inner {
+            background-color: #449284 !important;
+            border-color: #449284 !important;
+
+        }
+    }
+}
 

src/views/goods/order-detail.vue

@@ -593,7 +593,6 @@
   }
 </script>
 <style lang="scss">
-
   .order-detail-wrapper{
      .el-dialog__wrapper {
       .el-dialog {
@@ -788,7 +787,6 @@
     .el-step__title {
       font-size: 14px;
     }
-
     .el-step:last-of-type .el-step__line {
       display: block !important;
       height: 30%;
@@ -800,7 +798,8 @@
       border: 1px solid #999999;
       background-color: #b8b8b8;
     }
-   
-    
+    .el-steps--vertical {
+      height: auto;
+    }
   }
 </style>

src/views/goods/order-manage.vue

@@ -155,7 +155,7 @@
         <el-tab-pane label="已发货" name="third"></el-tab-pane>
         <el-tab-pane label="已完成" name="fourth"></el-tab-pane>
         <el-tab-pane label="已取消" name="six"></el-tab-pane>
-        <el-tab-pane label="退款/关闭" name="five"></el-tab-pane>
+        <el-tab-pane label="退款/售后" name="five"></el-tab-pane>
     </el-tabs>
       <el-table
         :data="tableData"