diff --git a/src/views/member/announcer/form/announcerDraw.vue b/src/views/member/announcer/form/announcerDraw.vue
index 7124772..f17f804 100644
--- a/src/views/member/announcer/form/announcerDraw.vue
+++ b/src/views/member/announcer/form/announcerDraw.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-drawer title="通告主详情" :visible.sync="drawer" size="50%">
+  <el-drawer title="通告主详情" :visible.sync="drawer" size="55%">
     <!--  基本信息  -->
     <el-card class="box-card">
       <el-descriptions class="margin-top" :column="3" size="medium" border>
@@ -73,32 +73,67 @@
       <div slot="header" class="clearfix">
         <span>评价</span>
       </div>
-      <el-tag style="margin-right: 10px" v-for="item in announcerDetail.evaluates" type="success">{{ item.evaluate }}</el-tag>
+      <el-tag style="margin-right: 10px" v-for="item in announcerDetail.evaluates" type="success">{{ item.evaluate }}({{item.num}})</el-tag>
+    </el-card>
+
+    <el-card class="box-card">
+      <div slot="header" class="clearfix">
+        <span>已发布通告</span>
+      </div>
+      <el-table
+        size="small"
+        :data="announcerDetail.notices"
+        height="150">
+        <el-table-column prop="title" width="150" align="center" label="标题"/>
+        <el-table-column prop="feeDown" align="center" label="稿费下限"/>
+        <el-table-column prop="feeUp" align="center" label="稿费上限"/>
+        <el-table-column label="粉丝下限" align="center" prop="fansDown" />
+        <el-table-column label="粉丝上限" align="center" prop="fansUp" />
+        <el-table-column label="截止日期" width="150" align="center" prop="endDate">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.endDate, '{y}-{m}-{d}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column fixed="right" label="操作" width="100px" align="center" class-name="small-padding fixed-width">
+          <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            @click="handleDetail(scope.row)"
+          >详情</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
     </el-card>
 
     <el-card class="box-card">
       <div slot="header" class="clearfix">
         <span>会员开卡记录</span>
       </div>
-
+      <el-table
+        size="small"
+        :data="announcerDetail.cards"
+        height="150">
+        <el-table-column align="center" prop="cardName" label="会员卡" />
+        <el-table-column align="center" prop="startDate" label="生效日期" />
+        <el-table-column align="center" prop="endDate" label="失效日期" />
+      </el-table>
     </el-card>
 
-
-    <el-card class="box-card">
-      <div slot="header" class="clearfix">
-        <span>通告主基本信息</span>
-      </div>
-
-    </el-card>
+    <el-dialog append-to-body :title="title" :visible.sync="open" width="1500px" append-to-body>
+      <EditForm ref="editForm" :is-detail="isDetail"></EditForm>
+    </el-dialog>
   </el-drawer>
 </template>
 
 <script>
 import {getAnnouncer} from "@/api/member/member";
-
+import {getNotice} from "@/api/busi/notice";
+import EditForm from "@/views/busi/notice/component/EditForm.vue"
 export default {
   name: "AnnouncerDraw",
-  dicts: ['dl_identity_type', 'dl_approval_status'],
+  dicts: ['dl_identity_type', 'dl_approval_status','true_or_false'],
+  components: {EditForm},
   data() {
     return {
       //抽屉打开框
@@ -108,7 +143,12 @@ export default {
       //用户id
       userId: null,
       //通告主详情
-      announcerDetail: {}
+      announcerDetail: {},
+      //查看通告详情
+      isDetail:true,
+      title:'',
+      open:false
+
     }
   },
   methods: {
@@ -125,12 +165,42 @@ export default {
       getAnnouncer(userId).then(response => {
         this.announcerDetail = response.data;
       });
-    }
+    },
+    /**查看通告详情*/
+    handleDetail(row){
+      const id = row.id || this.ids
+      getNotice(id).then(response => {
+        this.isDetail = true
+        this.open = true;
+        this.$nextTick(() => {
+          this.$refs.editForm.form = response.data;
+        });
+        this.title = "通告详情";
+      });
+    },
 
   }
 }
 </script>
 
 <style scoped>
-
+  /deep/.el-drawer__header {
+    -webkit-box-align: center;
+    -ms-flex-align: center;
+    align-items: center;
+    color: #72767b;
+    display: -webkit-box;
+    display: -ms-flexbox;
+    display: flex;
+    margin-bottom: 10px;
+    padding: 10px;
+    padding-bottom: 0;
+  }
+  /deep/.el-card__body {
+    padding: 5px 5px 5px 9px;
+  }
+  /deep/.el-card__header {
+    padding: 7px 5px 5px;
+    min-height: 35px;
+  }
 </style>
diff --git a/src/views/member/announcer/index.vue b/src/views/member/announcer/index.vue
index e75dd9c..c5d2460 100644
--- a/src/views/member/announcer/index.vue
+++ b/src/views/member/announcer/index.vue
@@ -35,7 +35,6 @@
           <dict-tag v-if="scope.row.identityType != null" :options="dict.type.dl_identity_type" :value="scope.row.identityType"/>
           <el-tag v-if="scope.row.identityType == null" type="info">未认证</el-tag>
         </template>
-
       </el-table-column>
       <el-table-column label="会员" align="center" prop="memberCardName" />
       <el-table-column label="联系方式" align="center" prop="tel" />
@@ -43,7 +42,15 @@
       <el-table-column label="通告数量" align="center" prop="ttotalNum" />
       <el-table-column label="粉丝数量" align="center" prop="tfansNum" />
       <el-table-column label="报名免打扰" align="center" prop="topenDisturb" />
-      <el-table-column label="收款码姓名" align="center" prop="trecipientName" />
+      <el-table-column label="状态" align="center" prop="status">
+        <template  slot-scope="scope">
+          <el-tag v-if="scope.row.status == 0" type="success">正常</el-tag>
+          <el-tag v-if="scope.row.status == 1" type="danger">冻结</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="状态" align="center" prop="status">
+
+      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -52,11 +59,19 @@
             @click="detail(scope.row)"
           >查看</el-button>
           <el-button
+            v-if="scope.row.status == 0"
             size="mini"
             type="text"
-            @click="update(scope.row)"
+            @click="update(scope.row.userId,1)"
             v-hasPermi="['member:member:remove']"
           >冻结</el-button>
+          <el-button
+            v-if="scope.row.status == 1"
+            size="mini"
+            type="text"
+            @click="update(scope.row.userId,0)"
+            v-hasPermi="['member:member:remove']"
+          >解冻</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -75,6 +90,7 @@
 <script>
 import { listMember } from "@/api/member/member";
 import AnnouncerDraw from "@/views/member/announcer/form/announcerDraw.vue"
+import { changeUserStatus } from "@/api/system/user";
 export default {
   name: "Announcer",
   components: {AnnouncerDraw},
@@ -140,8 +156,12 @@ export default {
       this.$refs['formRef'].initDraw(row.id,row.userId)
     },
 
-    update(){
-
+    update(userId,status){
+      changeUserStatus(userId,status).then(response => {
+        this.$modal.msgSuccess("处理成功");
+        this.open = false;
+        this.getList();
+      });
     },