Merge branch 'master' of http://1.71.9.215:3000/feiyi/cbjsxt-front-master

src/views/personal/notice/index.vue

@@ -47,7 +47,7 @@
           show-overflow-tooltip
         >
           <template slot-scope="scope">
-            {{ scope.row.status == '0' ? '正常' : '关闭' }}
+            {{ scope.row.status == '0' ? '未读' : '已读' }}
           </template>
         </el-table-column>
         <el-table-column
@@ -131,7 +131,7 @@
           <el-row :gutter="20">
             <el-col :span="12">
               <el-form-item label="状态：">
-                {{ form.status == '0' ? '正常' : '关闭' }}
+                {{ form.status == '0' ? '未读' : '已读' }}
               </el-form-item>
             </el-col>
             <el-col :span="12">