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

src/views/FRIENDLYLINKS/index.vue

@@ -43,16 +43,16 @@
           v-hasPermi="['business:FRIENDLYLINKS:remove']"
         >删除</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['business:FRIENDLYLINKS:export']"
-        >导出</el-button>
-      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="warning"-->
+<!--          plain-->
+<!--          icon="el-icon-download"-->
+<!--          size="mini"-->
+<!--          @click="handleExport"-->
+<!--          v-hasPermi="['business:FRIENDLYLINKS:export']"-->
+<!--        >导出</el-button>-->
+<!--      </el-col>-->
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 

src/views/LEAVEMESSAGE/index.vue

@@ -62,7 +62,8 @@
       <el-table-column label="留言详情" align="center" prop="questionDetail" :show-overflow-tooltip="true" />
       <el-table-column label="状态" align="center" prop="type" >
         <template slot-scope="scope">
-          <span>{{ scope.row.type == 1 ? '未回复' : '已回复' }}</span>
+          <span v-if="scope.row.type == 1"><el-tag type="danger">未回复</el-tag></span>
+          <span v-if="scope.row.type == 0"><el-tag>已回复</el-tag></span>
         </template>
       </el-table-column>
       <el-table-column label="留言时间" align="center" prop="questionTime" >
@@ -336,7 +337,7 @@ export default {
           if (this.form.id != null) {
             this.form.type = 0;
             updateLEAVEMESSAGE(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
+              this.$modal.msgSuccess("回复成功");
               this.open = false;
               this.getList();
             });