Merge branch 'master' into dev-detail-adjust0919

src/assets/scss/common.scss

@@ -831,6 +831,23 @@ input[type="number"] {
 }
 
 // 默认输入框placeholder样式
-html .el-input.is-disabled .el-input__inner {
+html .el-input.is-disabled .el-input__inner,
+html .el-textarea.is-disabled textarea.el-textarea__inner {
   color: #333;
+  background-color: rgba(#fff, 0);
+  border: none;
+  resize: none;
+  &::placeholder {
+    color: rgba(#fff, 0);
+  }
+}
+html .el-checkbox.is-disabled.is-checked .el-checkbox__label {
+  color: #333;
+}
+html .el-form-item__label {
+  &::after {
+    content: " :";
+    display: inline;
+    color: #333;
+  }
 }