Merge branch 'develop/3.1.1' into test

src/common/main.scss

@@ -81,4 +81,8 @@
 input::-webkit-outer-spin-button,
 input::-webkit-inner-spin-button {
   -webkit-appearance: none;
+}
+
+.el-tooltip__popper {
+  width: 500px;
 }

src/views/operation/feedbacklist/detail.vue

@@ -1,6 +1,6 @@
 <template>
   <div class='app-container'>
-    <el-form :model="form" ref="form" :rules="rules" label-width="100px" :disabled="disabled">
+    <el-form :model="form" ref="form" :rules="rules" label-width="100px">
       <el-form-item label="用户Id：">
         <span>{{ form.uid }}</span>
       </el-form-item>
@@ -18,8 +18,8 @@
       <el-form-item label="反馈内容：">
         <span>{{ form.content }}</span>
       </el-form-item>
-      <el-form-item label="回复：" prop="reply" style="width: 500px;">
-        <el-input v-model="form.reply" type="textarea" :autosize="{ minRows: 5, maxRows: 20 }" placeholder="请输入回复" />
+      <el-form-item v-if="form.reply" label="回复：" prop="reply" style="width: 500px;">
+        <el-input v-model="form.reply" type="textarea" :readonly="disabled" :autosize="{ minRows: 5, maxRows: 20 }" placeholder="请输入回复" />
       </el-form-item>
     </el-form>
     <div class="form-btn">

src/views/operation/feedbacklist/index.vue

@@ -3,13 +3,13 @@
     <!-- 搜索 -->
     <el-form inline size="mini">
       <el-form-item label="用户Id：">
-        <el-input v-model="form.uid" placeholder="请输入用户Id" />
+        <el-input v-model="form.uid" placeholder="请输入用户Id" clearable />
       </el-form-item>
       <el-form-item label="手机号：">
-        <el-input v-model="form.phone" placeholder="请输入用户手机号" />
+        <el-input v-model="form.phone" placeholder="请输入用户手机号" clearable />
       </el-form-item>
       <el-form-item label="反馈类型：">
-        <el-select v-model="form.type" placeholder="请选择反馈类型">
+        <el-select v-model="form.type" placeholder="请选择反馈类型" clearable>
           <el-option v-for="item in typeOptions" :key="item.value" :value="item.value" :label="item.label" />
         </el-select>
       </el-form-item>