Merge branch 'dev'

src/views/saasManage/indexPage.vue

@@ -389,10 +389,12 @@
         </el-form-item>
         </el-form-item>
         <el-form-item label="备注" prop="remark">
         <el-form-item label="备注" prop="remark">
           <el-input
           <el-input
+            class="remark_input"
             style="width: 200px"
             style="width: 200px"
             v-model="giftOrderForm.remark"
             v-model="giftOrderForm.remark"
             size="small"
             size="small"
             type="textarea"
             type="textarea"
+            rows="4"
             maxlength="100"
             maxlength="100"
             show-word-limit
             show-word-limit
             placeholder="请输入备注" />
             placeholder="请输入备注" />
@@ -782,7 +784,11 @@ export default {
   overflow: hidden;
   overflow: hidden;
   display: flex;
   display: flex;
   flex-direction: column;
   flex-direction: column;
-
+  .remark_input {
+    ::v-deep(.el-input__count) {
+      background: transparent;
+    }
+  }
   &::v-deep {
   &::v-deep {
     .el-table .el-table__cell {
     .el-table .el-table__cell {
       padding: 6px 0;
       padding: 6px 0;