Merge branch 'master' of http://106.55.241.82:3000/lzf/zhbsq-vue-web into master

src/views/QUESTION/index.vue

@@ -94,7 +94,8 @@
               {{ props.row.question }}
             </el-form-item>
             <el-form-item label="专家回答">
-             {{ props.row.expertAnswer }}
+<!--             {{ props.row.expertAnswer }}-->
+              <div class="clear_p" v-html="props.row.expertAnswer"></div>
             </el-form-item>
             <el-form-item label="提问详情">
               {{ props.row.detail }}
@@ -145,7 +146,7 @@
           {{ scope.row.responseTime }}
         </template>
       </el-table-column>
-      <el-table-column label="审核状态" align="center" prop="checkStatus">
+      <el-table-column label="审核状态" align="center" prop="checkStatus" width="100px">
         <template slot-scope="scope">
           <el-tag v-if="scope.row.checkStatus == 0">待审核</el-tag>
           <el-tag v-else-if="scope.row.checkStatus == 1" type="success"
@@ -164,9 +165,9 @@
           <el-tag v-else-if="scope.row.judge == 3" type="danger">差评</el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="回复时间" align="center" prop="replyTime">
+      <el-table-column label="回复时间" align="center" prop="responseTime">
         <template slot-scope="scope">
-          {{ scope.row.replyTime }}
+          {{ scope.row.responseTime }}
         </template>
       </el-table-column>
 
@@ -208,9 +209,8 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
-
-     
-    </el-dialog>
+<!--    </el-dialog>-->
+<!--    ↑不知道是不是没删干净，我先注释了-->
   </div>
 </template>
 
@@ -427,4 +427,9 @@ export default {
     width: 50%;
     padding-left: 90px;
   }
+
+  ::v-deep .el-form-item__content p{
+    margin: 0 !important;
+  }
+
 </style>

src/views/QUESTION/questionService.vue

@@ -18,15 +18,13 @@
             taskList.proname
           }}</el-descriptions-item>
           <el-descriptions-item label="审核状态">
-            <el-tag v-if="taskList.formobj.status == 1" type="success"
-              >已审</el-tag
-            >
-            <el-tag v-else-if="taskList.formobj.status == 2" type="danger"
-              >驳回</el-tag
-            >
+            <el-tag v-if="taskList.status == 1" type="success">已审</el-tag>
+            <el-tag v-else-if="taskList.status == 2" type="danger">驳回</el-tag>
             <!-- <el-tag v-else-if="taskList.formobj.status == 3" type="info">退回</el-tag> -->
-            <el-tag v-else-if="taskList.formobj.status == 0">待审核</el-tag>
+            <el-tag v-else-if="taskList.status == 0">待审核</el-tag>
+
           </el-descriptions-item>
+
           <el-descriptions-item label="审核意见">{{
             taskList.comments ? taskList.comments : "无"
           }}</el-descriptions-item>
@@ -150,7 +148,6 @@ export default {
     };
   },
   props: ["taskList"],
-
   methods: {
     handlePictureCardPreview(file) {
       this.taskList.formobj.picture = file.url;