1

src/api/member/member.js

@@ -10,9 +10,9 @@ export function listMember(query) {
 }
 
 // 查询会员详细
-export function getMember(id) {
+export function getAnnouncer(userId) {
   return request({
-    url: '/member/member/' + id,
+    url: '/member/member/announcerDetail/' + userId,
     method: 'get'
   })
 }

src/views/member/announcer/form/announcerDraw.vue

@@ -0,0 +1,206 @@
+<template>
+  <el-drawer title="通告主详情" :visible.sync="drawer" size="55%">
+    <!--  基本信息  -->
+    <el-card class="box-card">
+      <el-descriptions class="margin-top" :column="3" size="medium" border>
+        <el-descriptions-item>
+          <template slot="label">
+            <image-preview :src="announcerDetail.avatar" :width="50" :height="50"/>
+          </template>
+          {{ announcerDetail.nickName }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label">
+            手机号
+          </template>
+          {{ announcerDetail.phonenumber }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label">
+            身份类型
+          </template>
+          <dict-tag v-if="announcerDetail.identityType != null" :options="dict.type.dl_identity_type"
+                    :value="announcerDetail.identityType"/>
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label">
+            会员
+          </template>
+          {{ announcerDetail.memberCardName }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label">
+            剩余额度
+          </template>
+          {{ announcerDetail.tremaining }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label">
+            通告数量
+          </template>
+          {{ announcerDetail.ttotalNum }}
+        </el-descriptions-item>
+
+        <el-descriptions-item>
+          <template slot="label">
+            粉丝数量
+          </template>
+          {{ announcerDetail.tfansNum }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label">
+            收款人姓名
+          </template>
+          {{ announcerDetail.trecipientName }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label">
+            报名免打扰
+          </template>
+          <span v-if="announcerDetail.topenDisturb == 0"> 否 </span>
+          <span v-if="announcerDetail.topenDisturb == 1"> 是 </span>
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label">
+            收款码
+          </template>
+          <image-preview :src="announcerDetail.trecipientImage" :width="50" :height="50"/>
+        </el-descriptions-item>
+      </el-descriptions>
+    </el-card>
+
+    <el-card class="box-card">
+      <div slot="header" class="clearfix">
+        <span>评价</span>
+      </div>
+      <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-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','true_or_false'],
+  components: {EditForm},
+  data() {
+    return {
+      //抽屉打开框
+      drawer: false,
+      //通告主id
+      id: null,
+      //用户id
+      userId: null,
+      //通告主详情
+      announcerDetail: {},
+      //查看通告详情
+      isDetail:true,
+      title:'',
+      open:false
+
+    }
+  },
+  methods: {
+    /**初始化抽屉*/
+    initDraw(announcerId, userId) {
+      this.id = announcerId
+      this.userId = userId
+      this.drawer = true
+      this.getAnnouncerDetail(userId)
+    },
+    /**获取通告主详情*/
+    getAnnouncerDetail(userId) {
+      this.announcerDetail = {};
+      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>

src/views/member/announcer/index.vue

@@ -30,33 +30,48 @@
     </el-row>
     <el-table v-loading="loading" :data="memberList" >
       <el-table-column label="昵称" align="center" prop="nickName" />
-      <el-table-column label="身份类型" align="center" prop="identityType" />
-      <el-table-column label="会员" align="center" prop="cardNames" />
+      <el-table-column label="身份类型" align="center" prop="identityType">
+        <template slot-scope="scope">
+          <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" />
-      <el-table-column label="剩余额度" align="center" prop="tRemaining" />
-      <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="tRecipientImage" width="100">-->
-<!--        <template slot-scope="scope">-->
-<!--          <image-preview :src="scope.row.tRecipientImage" :width="50" :height="50"/>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
+      <el-table-column label="剩余额度" align="center" prop="tremaining" />
+      <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="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
             size="mini"
             type="text"
             @click="detail(scope.row)"
-            v-hasPermi="['member:member:edit']"
           >查看</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>
@@ -68,49 +83,18 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
-
-    <!-- 添加或修改会员对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="联系方式" prop="tel">
-          <el-input v-model="form.tel" placeholder="请输入联系方式" />
-        </el-form-item>
-        <el-form-item label="通告主-本月通告发布剩余额度" prop="tRemaining">
-          <el-input v-model="form.tRemaining" placeholder="请输入通告主-本月通告发布剩余额度" />
-        </el-form-item>
-        <el-form-item label="通告主-个人累计已发布通告数量" prop="tTotalNum">
-          <el-input v-model="form.tTotalNum" placeholder="请输入通告主-个人累计已发布通告数量" />
-        </el-form-item>
-        <el-form-item label="通告主-个人粉丝数量" prop="tFansNum">
-          <el-input v-model="form.tFansNum" placeholder="请输入通告主-个人粉丝数量" />
-        </el-form-item>
-        <el-form-item label="通告主-是否开启报名免打扰(0否|1开启)" prop="tOpenDisturb">
-          <el-input v-model="form.tOpenDisturb" placeholder="请输入通告主-是否开启报名免打扰(0否|1开启)" />
-        </el-form-item>
-        <el-form-item label="通告主-收款码姓名" prop="tRecipientName">
-          <el-input v-model="form.tRecipientName" placeholder="请输入通告主-收款码姓名" />
-        </el-form-item>
-        <el-form-item label="通告主-收款码图片地址" prop="tRecipientImage">
-          <image-upload v-model="form.tRecipientImage"/>
-        </el-form-item>
-        <el-form-item label="博主-剩余积分" prop="bPoints">
-          <el-input v-model="form.bPoints" placeholder="请输入博主-剩余积分" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
+    <AnnouncerDraw ref="formRef" />
   </div>
 </template>
 
 <script>
-import { listMember, getMember, delMember, addMember, updateMember } from "@/api/member/member";
-
+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",
-  dicts: ['dl_identity_type'],
+  components: {AnnouncerDraw},
+  dicts: ['dl_identity_type','dl_user_type'],
   data() {
     return {
       // 遮罩层
@@ -127,10 +111,6 @@ export default {
       total: 0,
       // 会员表格数据
       memberList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -159,34 +139,7 @@ export default {
         this.loading = false;
       });
     },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        userType: null,
-        identityType: null,
-        userId: null,
-        tel: null,
-        tRemaining: null,
-        tTotalNum: null,
-        tFansNum: null,
-        tOpenDisturb: null,
-        tRecipientName: null,
-        tRecipientImage: null,
-        bPoints: null,
-        creator: null,
-        createTime: null,
-        updater: null,
-        updateTime: null,
-        delFlag: null
-      };
-      this.resetForm("form");
-    },
+
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
@@ -198,20 +151,17 @@ export default {
       this.handleQuery();
     },
 
-
-    /** 修改按钮操作 */
+    /** 通告主查看详情 */
     detail(row) {
-      this.reset();
-      // const id = row.id || this.ids
-      // getMember(id).then(response => {
-      //   this.form = response.data;
-      //   this.open = true;
-      //   this.title = "修改会员";
-      // });
+      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();
+      });
     },
 
 

src/views/member/apply/index.vue

@@ -66,7 +66,7 @@
 
     <el-table v-loading="loading" :data="applyList">
       <el-table-column label="通告主昵称" align="center" prop="nickname"/>
-      <el-table-column label="身份类型" align="center" prop="identityType">
+      <el-table-column label="认证身份类型" align="center" prop="identityType">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.dl_identity_type" :value="scope.row.identityType"/>
         </template>