1

src/api/member/points.js

@@ -1,44 +0,0 @@
-import request from '@/utils/request'
-
-// 查询博主积分变动明细列表
-export function listPoints(query) {
-  return request({
-    url: '/member/points/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询博主积分变动明细详细
-export function getPoints(id) {
-  return request({
-    url: '/member/points/' + id,
-    method: 'get'
-  })
-}
-
-// 新增博主积分变动明细
-export function addPoints(data) {
-  return request({
-    url: '/member/points',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改博主积分变动明细
-export function updatePoints(data) {
-  return request({
-    url: '/member/points',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除博主积分变动明细
-export function delPoints(id) {
-  return request({
-    url: '/member/points/' + id,
-    method: 'delete'
-  })
-}

src/api/member/rights.js

@@ -1,44 +0,0 @@
-import request from '@/utils/request'
-
-// 查询会员权益(定时任务重置剩余值)，用户id、会员卡id、权益对应1列表
-export function listRights(query) {
-  return request({
-    url: '/rights/rights/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询会员权益(定时任务重置剩余值)，用户id、会员卡id、权益对应1详细
-export function getRights(id) {
-  return request({
-    url: '/rights/rights/' + id,
-    method: 'get'
-  })
-}
-
-// 新增会员权益(定时任务重置剩余值)，用户id、会员卡id、权益对应1
-export function addRights(data) {
-  return request({
-    url: '/rights/rights',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改会员权益(定时任务重置剩余值)，用户id、会员卡id、权益对应1
-export function updateRights(data) {
-  return request({
-    url: '/rights/rights',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除会员权益(定时任务重置剩余值)，用户id、会员卡id、权益对应1
-export function delRights(id) {
-  return request({
-    url: '/rights/rights/' + id,
-    method: 'delete'
-  })
-}

src/views/member/announcer/index.vue

@@ -0,0 +1,221 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item>
+        <el-form-item label="昵称" prop="nickName">
+          <el-input
+            v-model="queryParams.nickName"
+            placeholder="请输入通告主姓名"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="类型" prop="identityType">
+          <el-select v-model="queryParams.identityType" placeholder="请选择通告主身份类型" clearable>
+            <el-option
+              v-for="dict in dict.type.dl_identity_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </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="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" 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
+            size="mini"
+            type="text"
+            @click="update(scope.row)"
+            v-hasPermi="['member:member:remove']"
+          >冻结</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :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>
+  </div>
+</template>
+
+<script>
+import { listMember, getMember, delMember, addMember, updateMember } from "@/api/member/member";
+
+export default {
+  name: "Announcer",
+  dicts: ['dl_identity_type'],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 会员表格数据
+      memberList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        userType: '01',
+        identityType: null,
+        nickName:null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询会员列表 */
+    getList() {
+      this.loading = true;
+      listMember(this.queryParams).then(response => {
+        this.memberList = response.data.records;
+        this.total = response.data.total;
+        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;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      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 = "修改会员";
+      // });
+    },
+
+    update(){
+
+    },
+
+
+
+  }
+};
+</script>

src/views/member/apply/form/applyForm.vue

@@ -25,7 +25,7 @@
           </el-select>
         </el-form-item>
 
-        <el-form-item label="通告主" prop="nickname">
+        <el-form-item label="昵称" prop="nickname">
           <el-input
             v-model="queryParams.nickname"
             placeholder="请输入通告主昵称"
@@ -171,7 +171,7 @@ export default {
       }],
       // 查询参数
       queryParams: {
-        pageNum: 9,
+        pageNum: 1,
         pageSize: 10,
         approvalStatus:10,
         nickname: null,

src/views/member/apply/index.vue

@@ -23,7 +23,7 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="通告主" prop="nickname">
+      <el-form-item label="昵称" prop="nickname">
         <el-input
           v-model="queryParams.nickname"
           placeholder="请输入通告主昵称"
@@ -54,7 +54,7 @@
       <!--      </el-col>-->
       <el-col :span="1.5">
         <el-button
-          type="warning"
+          type="info"
           plain
           size="mini"
           @click="openHis"
@@ -216,7 +216,7 @@ export default {
       // 查询参数
       queryParams: {
         pageNum: 1,
-        pageSize: 10,
+        pageSize: 20,
         approvalStatus: 0,
         nickname: null,
         identityType: null,

src/views/member/blogger/index.vue

@@ -2,90 +2,41 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item>
+        <el-form-item label="昵称" prop="nickName">
+          <el-input
+            v-model="queryParams.nickName"
+            placeholder="请输入博主姓名"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['member:member:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['member:member:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['member:member: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="['member:member:export']"
-        >导出</el-button>
-      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
-
+    <el-table v-loading="loading" :data="memberList" >
-    <el-table v-loading="loading" :data="memberList" @selection-change="handleSelectionChange">
+      <el-table-column label="昵称" align="center" prop="nickName" />
-      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="会员" align="center" prop="cardNames" />
-      <el-table-column label="唯一主键" align="center" prop="id" />
-      <el-table-column label="用户类型" align="center" prop="userType" />
-      <el-table-column label="通告主身份类型,为null时就是未认证" align="center" prop="identityType" />
       <el-table-column label="联系方式" align="center" prop="tel" />
-      <el-table-column label="通告主-本月通告发布剩余额度" align="center" prop="tRemaining" />
+      <el-table-column label="剩余积分" align="center" prop="bPoints" />
-      <el-table-column label="通告主-个人累计已发布通告数量" align="center" prop="tTotalNum" />
-      <el-table-column label="通告主-个人粉丝数量" align="center" prop="tFansNum" />
-      <el-table-column label="通告主-是否开启报名免打扰(0否|1开启)" 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="bPoints" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-edit"
+            @click="detail(scope.row)"
-            @click="handleUpdate(scope.row)"
             v-hasPermi="['member:member:edit']"
-          >修改</el-button>
+          >查看</el-button>
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-delete"
+            @click="update(scope.row)"
-            @click="handleDelete(scope.row)"
             v-hasPermi="['member:member:remove']"
-          >删除</el-button>
+          >冻结</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -104,22 +55,22 @@
         <el-form-item label="联系方式" prop="tel">
           <el-input v-model="form.tel" placeholder="请输入联系方式" />
         </el-form-item>
-        <el-form-item label="通告主-本月通告发布剩余额度" prop="tRemaining">
+        <el-form-item label="博主-本月通告发布剩余额度" prop="tRemaining">
-          <el-input v-model="form.tRemaining" placeholder="请输入通告主-本月通告发布剩余额度" />
+          <el-input v-model="form.tRemaining" placeholder="请输入博主-本月通告发布剩余额度" />
         </el-form-item>
-        <el-form-item label="通告主-个人累计已发布通告数量" prop="tTotalNum">
+        <el-form-item label="博主-个人累计已发布通告数量" prop="tTotalNum">
-          <el-input v-model="form.tTotalNum" placeholder="请输入通告主-个人累计已发布通告数量" />
+          <el-input v-model="form.tTotalNum" placeholder="请输入博主-个人累计已发布通告数量" />
         </el-form-item>
-        <el-form-item label="通告主-个人粉丝数量" prop="tFansNum">
+        <el-form-item label="博主-个人粉丝数量" prop="tFansNum">
-          <el-input v-model="form.tFansNum" placeholder="请输入通告主-个人粉丝数量" />
+          <el-input v-model="form.tFansNum" placeholder="请输入博主-个人粉丝数量" />
         </el-form-item>
-        <el-form-item label="通告主-是否开启报名免打扰(0否|1开启)" prop="tOpenDisturb">
+        <el-form-item label="博主-是否开启报名免打扰(0否|1开启)" prop="tOpenDisturb">
-          <el-input v-model="form.tOpenDisturb" placeholder="请输入通告主-是否开启报名免打扰(0否|1开启)" />
+          <el-input v-model="form.tOpenDisturb" placeholder="请输入博主-是否开启报名免打扰(0否|1开启)" />
         </el-form-item>
-        <el-form-item label="通告主-收款码姓名" prop="tRecipientName">
+        <el-form-item label="博主-收款码姓名" prop="tRecipientName">
-          <el-input v-model="form.tRecipientName" placeholder="请输入通告主-收款码姓名" />
+          <el-input v-model="form.tRecipientName" placeholder="请输入博主-收款码姓名" />
         </el-form-item>
-        <el-form-item label="通告主-收款码图片地址" prop="tRecipientImage">
+        <el-form-item label="博主-收款码图片地址" prop="tRecipientImage">
           <image-upload v-model="form.tRecipientImage"/>
         </el-form-item>
         <el-form-item label="博主-剩余积分" prop="bPoints">
@@ -138,7 +89,8 @@
 import { listMember, getMember, delMember, addMember, updateMember } from "@/api/member/member";
 
 export default {
-  name: "Member",
+  name: "Blogger",
+  dicts: ['dl_identity_type'],
   data() {
     return {
       // 遮罩层
@@ -163,8 +115,9 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        userType: null,
+        userType: '01',
         identityType: null,
+        nickName:null
       },
       // 表单参数
       form: {},
@@ -224,64 +177,25 @@ export default {
       this.resetForm("queryForm");
       this.handleQuery();
     },
-    // 多选框选中数据
+
-    handleSelectionChange(selection) {
+
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加会员";
-    },
     /** 修改按钮操作 */
-    handleUpdate(row) {
+    detail(row) {
       this.reset();
-      const id = row.id || this.ids
+      // const id = row.id || this.ids
-      getMember(id).then(response => {
+      // getMember(id).then(response => {
-        this.form = response.data;
+      //   this.form = response.data;
-        this.open = true;
+      //   this.open = true;
-        this.title = "修改会员";
+      //   this.title = "修改会员";
-      });
+      // });
     },
-    /** 提交按钮 */
+
-    submitForm() {
+    update(){
-      this.$refs["form"].validate(valid => {
+
-        if (valid) {
-          if (this.form.id != null) {
-            updateMember(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addMember(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
     },
-    /** 删除按钮操作 */
+
-    handleDelete(row) {
+
-      const ids = row.id || this.ids;
+
-      this.$modal.confirm('是否确认删除会员编号为"' + ids + '"的数据项？').then(function() {
-        return delMember(ids);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('member/member/export', {
-        ...this.queryParams
-      }, `member_${new Date().getTime()}.xlsx`)
-    }
   }
 };
 </script>

src/views/member/points/index.vue

@@ -1,278 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="积分来源类型" prop="fromCode">
-        <el-input
-          v-model="queryParams.fromCode"
-          placeholder="请输入积分来源类型"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['member:points:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['member:points:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['member:points: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="['member:points:export']"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="pointsList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="唯一主键" align="center" prop="id" />
-      <el-table-column label="博主用户id" align="center" prop="userId" />
-      <el-table-column label="积分来源类型" align="center" prop="fromCode" />
-      <el-table-column label="类型" align="center" prop="type" />
-      <el-table-column label="标题" align="center" prop="title" />
-      <el-table-column label="积分" align="center" prop="points" />
-      <el-table-column label="剩余" align="center" prop="balance" />
-      <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['member:points:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['member:points:remove']"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :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="博主用户id" prop="userId">
-          <el-input v-model="form.userId" placeholder="请输入博主用户id" />
-        </el-form-item>
-        <el-form-item label="积分来源类型" prop="fromCode">
-          <el-input v-model="form.fromCode" placeholder="请输入积分来源类型" />
-        </el-form-item>
-        <el-form-item label="标题" prop="title">
-          <el-input v-model="form.title" placeholder="请输入标题" />
-        </el-form-item>
-        <el-form-item label="积分" prop="points">
-          <el-input v-model="form.points" placeholder="请输入积分" />
-        </el-form-item>
-        <el-form-item label="剩余" prop="balance">
-          <el-input v-model="form.balance" placeholder="请输入剩余" />
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" 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>
-  </div>
-</template>
-
-<script>
-import { listPoints, getPoints, delPoints, addPoints, updatePoints } from "@/api/member/points";
-
-export default {
-  name: "Points",
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 博主积分变动明细表格数据
-      pointsList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        fromCode: null,
-        type: null,
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询博主积分变动明细列表 */
-    getList() {
-      this.loading = true;
-      listPoints(this.queryParams).then(response => {
-        this.pointsList = response.data.records;
-        this.total = response.data.total;
-        this.loading = false;
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        userId: null,
-        fromCode: null,
-        type: null,
-        title: null,
-        points: null,
-        balance: null,
-        remark: null,
-        creator: null,
-        createTime: null,
-        updater: null,
-        updateTime: null,
-        delFlag: null
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加博主积分变动明细";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids
-      getPoints(id).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改博主积分变动明细";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id != null) {
-            updatePoints(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addPoints(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除博主积分变动明细编号为"' + ids + '"的数据项？').then(function() {
-        return delPoints(ids);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('member/points/export', {
-        ...this.queryParams
-      }, `points_${new Date().getTime()}.xlsx`)
-    }
-  }
-};
-</script>

src/views/member/right/index.vue

@@ -1,278 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="权益值(权益类型为是否时：0代表不支持，1代表支持；权益类型为数量限制时：0代表不限制，其他数字代表具体限制数量)" prop="rightsValue">
-        <el-input
-          v-model="queryParams.rightsValue"
-          placeholder="请输入权益值(权益类型为是否时：0代表不支持，1代表支持；权益类型为数量限制时：0代表不限制，其他数字代表具体限制数量)"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['rights:rights:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['rights:rights:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['rights:rights: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="['rights:rights:export']"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="rightsList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="唯一主键" align="center" prop="id" />
-      <el-table-column label="用户id" align="center" prop="userId" />
-      <el-table-column label="用户类型" align="center" prop="userType" />
-      <el-table-column label="会员卡id" align="center" prop="cardId" />
-      <el-table-column label="权益编码" align="center" prop="rightsCode" />
-      <el-table-column label="权益类型" align="center" prop="rightsType" />
-      <el-table-column label="权益限制周期(数据字典：dl_rights_cycle)" align="center" prop="rightsCycle" />
-      <el-table-column label="权益值(权益类型为是否时：0代表不支持，1代表支持；权益类型为数量限制时：0代表不限制，其他数字代表具体限制数量)" align="center" prop="rightsValue" />
-      <el-table-column label="剩余值" align="center" prop="remaining" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['rights:rights:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['rights:rights:remove']"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    <!-- 添加或修改会员权益(定时任务重置剩余值)，用户id、会员卡id、权益对应1对话框 -->
-    <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="用户id" prop="userId">
-          <el-input v-model="form.userId" placeholder="请输入用户id" />
-        </el-form-item>
-        <el-form-item label="会员卡id" prop="cardId">
-          <el-input v-model="form.cardId" placeholder="请输入会员卡id" />
-        </el-form-item>
-        <el-form-item label="权益编码" prop="rightsCode">
-          <el-input v-model="form.rightsCode" placeholder="请输入权益编码" />
-        </el-form-item>
-        <el-form-item label="权益限制周期(数据字典：dl_rights_cycle)" prop="rightsCycle">
-          <el-input v-model="form.rightsCycle" placeholder="请输入权益限制周期(数据字典：dl_rights_cycle)" />
-        </el-form-item>
-        <el-form-item label="权益值(权益类型为是否时：0代表不支持，1代表支持；权益类型为数量限制时：0代表不限制，其他数字代表具体限制数量)" prop="rightsValue">
-          <el-input v-model="form.rightsValue" placeholder="请输入权益值(权益类型为是否时：0代表不支持，1代表支持；权益类型为数量限制时：0代表不限制，其他数字代表具体限制数量)" />
-        </el-form-item>
-        <el-form-item label="剩余值" prop="remaining">
-          <el-input v-model="form.remaining" 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>
-  </div>
-</template>
-
-<script>
-import { listRights, getRights, delRights, addRights, updateRights } from "@/api/member/rights";
-
-export default {
-  name: "Rights",
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 会员权益(定时任务重置剩余值)，用户id、会员卡id、权益对应1表格数据
-      rightsList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        userType: null,
-        rightsType: null,
-        rightsValue: null,
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询会员权益(定时任务重置剩余值)，用户id、会员卡id、权益对应1列表 */
-    getList() {
-      this.loading = true;
-      listRights(this.queryParams).then(response => {
-        this.rightsList = response.data.records;
-        this.total = response.data.total;
-        this.loading = false;
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        userId: null,
-        userType: null,
-        cardId: null,
-        rightsCode: null,
-        rightsType: null,
-        rightsCycle: null,
-        rightsValue: null,
-        remaining: null,
-        createTime: null,
-        updateTime: null
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加会员权益(定时任务重置剩余值)，用户id、会员卡id、权益对应1";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids
-      getRights(id).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改会员权益(定时任务重置剩余值)，用户id、会员卡id、权益对应1";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id != null) {
-            updateRights(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addRights(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除会员权益(定时任务重置剩余值)，用户id、会员卡id、权益对应1编号为"' + ids + '"的数据项？').then(function() {
-        return delRights(ids);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('rights/rights/export', {
-        ...this.queryParams
-      }, `rights_${new Date().getTime()}.xlsx`)
-    }
-  }
-};
-</script>