crm功能开发

.env.development

@@ -1,11 +1,11 @@
 # 页面标题
-VUE_APP_TITLE = 若依管理系统
+VUE_APP_TITLE = 通告快接管理后台
 
 # 开发环境配置
 ENV = 'development'
 
-# 若依管理系统/开发环境
+# 通告快接管理后台/开发环境
-VUE_APP_BASE_API = '/dev-api'
+VUE_APP_BASE_API = 'http://localhost:8088'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

.env.staging

@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = 若依管理系统
+VUE_APP_TITLE = 通告快接管理后台
 
 BABEL_ENV = production
 
@@ -8,5 +8,5 @@ NODE_ENV = production
 # 测试环境配置
 ENV = 'staging'
 
-# 若依管理系统/测试环境
+# 通告快接管理后台/测试环境
 VUE_APP_BASE_API = '/stage-api'

src/api/busi/tcinfo.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询提成记录列表
+export function listTcinfo(query) {
+  return request({
+    url: '/busi/tcinfo/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询提成记录详细
+export function getTcinfo(id) {
+  return request({
+    url: '/busi/tcinfo/' + id,
+    method: 'get'
+  })
+}
+
+// 新增提成记录
+export function addTcinfo(data) {
+  return request({
+    url: '/busi/tcinfo',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改提成记录
+export function updateTcinfo(data) {
+  return request({
+    url: '/busi/tcinfo',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除提成记录
+export function delTcinfo(id) {
+  return request({
+    url: '/busi/tcinfo/' + id,
+    method: 'delete'
+  })
+}

src/api/member/points.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询博主积分变动明细列表
+export function listPoints(query) {
+  return request({
+    url: '/member/points/adminList',
+    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/views/busi/notice/index.vue

@@ -1,6 +1,14 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="120px">
+      <el-form-item label="通告id" prop="id">
+        <el-input
+          v-model="queryParams.id"
+          placeholder="通告id"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="标题" prop="title">
         <el-input
           v-model="queryParams.title"
@@ -9,9 +17,33 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="发布者" prop="userId">
+
+      <el-form-item label="第三方链接" prop="thirdUrl">
+        <el-select v-model="queryParams.thirdUrl" placeholder="第三方链接" clearable>
+          <el-option
+            key="01"
+            label="存在"
+            value="01"
+          />
+          <el-option
+            key="02"
+            label="不存在"
+            value="02"
+          />
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="查询第三方链接" prop="thirdUrl">
         <el-input
-          v-model="queryParams.userId"
+          v-model="queryParams.params.thirdUrl"
+          placeholder="请输入第三方链接"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="发布者" prop="userNickName">
+        <el-input
+          v-model="queryParams.userNickName"
           placeholder="请输入发布者"
           clearable
           @keyup.enter.native="handleQuery"
@@ -127,6 +159,20 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item label="进行状态" prop="isRuning">
+        <el-select v-model="queryParams.params.isRuning" placeholder="请选择进行状态" clearable>
+          <el-option
+            key="01"
+            label="进行中"
+            value="01"
+          />
+          <el-option
+            key="02"
+            label="已结束"
+            value="02"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item label="创建时间">
         <el-date-picker
           v-model="daterangeCreateTime"
@@ -184,9 +230,14 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="平台" width="100" align="center" prop="platformName" />
       <el-table-column label="标题" width="100" align="center" prop="title" />
+      <el-table-column label="报名人数" width="100" align="center" prop="signNum" />
       <el-table-column label="发布者" width="100" align="center" prop="userNickName" />
-      <el-table-column label="浏览量" width="100" align="center" prop="viewNum" />
 
+      <el-table-column label="身份类型" width="100" align="center" prop="identityType">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.dl_identity_type" :value="scope.row.identityType"/>
+        </template>
+      </el-table-column>
       <el-table-column label="平台名称" width="100" align="center" prop="platformName" />
 
       <el-table-column label="是否需自报价" width="100" align="center" prop="isSelfPrice">
@@ -215,6 +266,7 @@
           <dict-tag :options="dict.type.true_or_false" :value="scope.row.isUrgent"/>
         </template>
       </el-table-column>
+      <el-table-column label="相似通告id" width="100" align="center" prop="similarityIds"/>
       <el-table-column fixed="right" label="审核状态" width="100" align="center" prop="approvalStatus">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.dl_approval_status" :value="scope.row.approvalStatus"/>
@@ -331,7 +383,7 @@ import  EditForm from "./component/EditForm.vue"
 
 export default {
   name: "Notice",
-  dicts: ['notice_type', 'notice_collect', 'dl_approval_status', 'true_or_false'],
+  dicts: ['notice_type', 'notice_collect', 'dl_approval_status', 'true_or_false','dl_identity_type'],
   components: {EditForm},
   data() {
     return {
@@ -390,6 +442,9 @@ export default {
         approvalTime: null,
         approvalRemark: null,
         createTime: null,
+        params:{
+          thirdUrl:''
+        }
       },
       // 表单参数
       form: {},
@@ -459,7 +514,6 @@ export default {
     /** 查询通告列表 */
     getList() {
       this.loading = true;
-      this.queryParams.params = {};
       if (null != this.daterangeCreateTime && '' != this.daterangeCreateTime) {
         this.queryParams.params["beginCreateTime"] = this.daterangeCreateTime[0];
         this.queryParams.params["endCreateTime"] = this.daterangeCreateTime[1];

src/views/crm/newUser/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
       <el-form-item>
         <el-form-item label="昵称" prop="nickName">
           <el-input
@@ -18,6 +18,42 @@
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
+        <el-form-item label="会员等级" prop="isVip">
+          <el-select v-model="queryParams.params.isVip" placeholder="会员等级" clearable>
+            <el-option
+              key="普通博主会员"
+              label="普通博主会员"
+              value="普通博主会员"
+            />
+            <el-option
+              key="VIP会员"
+              label="VIP会员"
+              value="VIP会员"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="邀请人" prop="xsName">
+          <el-input
+            v-model="queryParams.xsName"
+            placeholder="请输入邀请人"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="是否消费过" prop="isXf">
+          <el-select v-model="queryParams.params.isXf" placeholder="是否消费过" clearable>
+            <el-option
+              key="01"
+              label="是"
+              value="01"
+            />
+            <el-option
+              key="02"
+              label="否"
+              value="02"
+            />
+          </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>
@@ -26,14 +62,14 @@
     <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   @sort-change="sortChange" v-loading="loading" :data="memberList" >
       <el-table-column label="昵称" align="center" prop="nickName" />
       <el-table-column label="会员" align="center" prop="memberCardName" />
       <el-table-column label="联系方式" align="center" prop="tel" />
       <el-table-column label="邀请人" align="center" prop="inviteName" />
       <el-table-column label="剩余积分" align="center" prop="bpoints" />
-      <el-table-column label="本月消费金额" align="center" prop="monthMoney" />
+      <el-table-column  sortable="custom" label="本月消费金额" align="center" prop="monthMoney" />
-      <el-table-column label="总消费金额" align="center" prop="allMoney" />
+      <el-table-column  sortable="custom" label="总消费金额" align="center" prop="allMoney" />
       <el-table-column label="注册时间" align="center" prop="createTime" />
       <el-table-column label="状态" align="center" prop="status">
         <template  slot-scope="scope">
@@ -102,7 +138,8 @@ export default {
         userType: '02',
         identityType: null,
         nickName:null,
-        tel:null
+        tel:null,
+        params:{}
       },
       // 表单参数
       form: {},
@@ -115,6 +152,23 @@ export default {
     this.getList();
   },
   methods: {
+    sortChange(e){
+      console.log(e,137)
+      if (e.prop=='monthMoney'){
+        if(e.order=='ascending'){
+          this.queryParams.params.orderBy = 'monthMoney asc'
+        }else{
+          this.queryParams.params.orderBy = 'monthMoney desc'
+        }
+      }else if (e.prop=='allMoney'){
+        if(e.order=='ascending'){
+          this.queryParams.params.orderBy = 'allMoney asc'
+        }else{
+          this.queryParams.params.orderBy = 'allMoney desc'
+        }
+      }
+      this.getList()
+    },
     /** 查询会员列表 */
     getList() {
       this.loading = true;
@@ -141,6 +195,15 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
+      this.queryParams={
+        pageNum: 1,
+        pageSize: 10,
+        userType: '02',
+        identityType: null,
+        nickName:null,
+        tel:null,
+        params:{}
+      },
       this.handleQuery();
     },
 

src/views/crm/tcInfo/index.vue

@@ -0,0 +1,246 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="95px">
+      <el-form-item label="姓名" prop="tcUserName">
+        <el-input
+          v-model="queryParams.tcUserName"
+          placeholder="提成销售名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+       <el-form-item label="提成金额" prop="money">
+        <el-input-number
+          v-model="queryParams.params.beginMoney"
+          placeholder="最小值"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+         <el-input-number
+           style="margin-left: 5px"
+           v-model="queryParams.params.endMoney"
+           placeholder="最大值"
+           clearable
+           @keyup.enter.native="handleQuery"
+         />
+      </el-form-item>
+      <el-form-item label="创建时间">
+        <el-date-picker
+          v-model="daterangeCreateTime"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </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-table v-loading="loading" :data="tcinfoList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="姓名" align="center" prop="tcUserName" />
+      <el-table-column label="提成信息" align="center" prop="info" />
+      <el-table-column label="提成金额" align="center" prop="money" />
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
+        </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="formUserId">
+          <el-input v-model="form.formUserId" placeholder="请输入来源用户id" />
+        </el-form-item>
+        <el-form-item label="部门主键" prop="deptId">
+          <el-input v-model="form.deptId" placeholder="请输入部门主键" />
+        </el-form-item>
+        <el-form-item label="提成信息" prop="info">
+          <el-input v-model="form.info" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="提成金额" prop="money">
+          <el-input v-model="form.money" 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 { listTcinfo, getTcinfo, delTcinfo, addTcinfo, updateTcinfo } from "@/api/busi/tcinfo";
+
+export default {
+  name: "Tcinfo",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 提成记录表格数据
+      tcinfoList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 提成金额时间范围
+      daterangeCreateTime: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        userId: null,
+        formUserId: null,
+        deptId: null,
+        info: null,
+        money: null,
+        createTime: null,
+        params:{}
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询提成记录列表 */
+    getList() {
+      this.loading = true;
+      this.queryParams.params = {};
+      if (null != this.daterangeCreateTime && '' != this.daterangeCreateTime) {
+        this.queryParams.params["beginCreateTime"] = this.daterangeCreateTime[0];
+        this.queryParams.params["endCreateTime"] = this.daterangeCreateTime[1];
+      }
+      listTcinfo(this.queryParams).then(response => {
+        this.tcinfoList = response.data.records;
+        this.total = response.data.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        userId: null,
+        formUserId: null,
+        deptId: null,
+        info: null,
+        money: null,
+        isJs: null,
+        creator: null,
+        createTime: null,
+        updater: null,
+        updateTime: null,
+        delFlag: null,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.daterangeCreateTime = [];
+      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
+      getTcinfo(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) {
+            updateTcinfo(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addTcinfo(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 delTcinfo(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('busi/tcinfo/export', {
+        ...this.queryParams
+      }, `tcinfo_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

src/views/cwMan/point/index.vue

@@ -0,0 +1,257 @@
+<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="nickName">
+        <el-input
+          v-model="queryParams.nickName"
+          placeholder="请输入博主用户"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="创建时间">
+        <el-date-picker
+          v-model="daterangeCreateTime"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item label="类型" prop="type">
+        <el-select v-model="queryParams.type" placeholder="类型" clearable>
+          <el-option
+            key="1"
+            label="积分获取"
+            value="1"
+          />
+          <el-option
+            key="2"
+            label="提现扣除"
+            value="2"
+          />
+        </el-select>
+      </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-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="nickName" />
+      <el-table-column label="类型" align="center" prop="type" >
+        <template slot-scope="scope">
+        <span v-if="scope.row.type ==1" style="color: red">积分获取</span>
+          <span v-if="scope.row.type ==2" style="color: green">提现扣除</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="标题" align="center" prop="title" />
+      <el-table-column label="积分" align="center" prop="points" />
+      <el-table-column label="对应金额(元)" align="center" prop="points">
+        <template slot-scope="scope">
+          <span >{{scope.row.points/10}}</span>
+
+        </template>
+      </el-table-column>
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
+        </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"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+          >删除</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="balance">
+          <el-input v-model="form.balance" 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,
+      // 剩余时间范围
+      daterangeCreateTime: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        userId: null,
+        type: null,
+        createTime: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询博主积分变动明细列表 */
+    getList() {
+      this.loading = true;
+      this.queryParams.params = {};
+      if (null != this.daterangeCreateTime && '' != this.daterangeCreateTime) {
+        this.queryParams.params["beginCreateTime"] = this.daterangeCreateTime[0];
+        this.queryParams.params["endCreateTime"] = this.daterangeCreateTime[1];
+      }
+      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.daterangeCreateTime = [];
+      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/cwMan/tcInfo/index.vue

@@ -0,0 +1,255 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="95px">
+      <el-form-item label="姓名" prop="tcUserName">
+        <el-input
+          v-model="queryParams.tcUserName"
+          placeholder="提成销售名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="提成金额" prop="money">
+        <el-input-number
+          v-model="queryParams.params.beginMoney"
+          placeholder="最小值"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+        <el-input-number
+          style="margin-left: 5px"
+          v-model="queryParams.params.endMoney"
+          placeholder="最大值"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="创建时间">
+        <el-date-picker
+          v-model="daterangeCreateTime"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </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-table v-loading="loading" :data="tcinfoList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="姓名" align="center" prop="tcUserName" />
+      <el-table-column label="提成信息" align="center" prop="info" />
+      <el-table-column label="提成金额" align="center" prop="money" />
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
+        </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="handleUpdate(scope.row)"-->
+<!--          >查看</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="formUserId">
+          <el-input v-model="form.formUserId" placeholder="请输入来源用户id" />
+        </el-form-item>
+        <el-form-item label="部门主键" prop="deptId">
+          <el-input v-model="form.deptId" placeholder="请输入部门主键" />
+        </el-form-item>
+        <el-form-item label="提成信息" prop="info">
+          <el-input v-model="form.info" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="提成金额" prop="money">
+          <el-input v-model="form.money" 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 { listTcinfo, getTcinfo, delTcinfo, addTcinfo, updateTcinfo } from "@/api/busi/tcinfo";
+
+export default {
+  name: "Tcinfo",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 提成记录表格数据
+      tcinfoList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 提成金额时间范围
+      daterangeCreateTime: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        userId: null,
+        formUserId: null,
+        deptId: null,
+        info: null,
+        money: null,
+        createTime: null,
+        params:{}
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询提成记录列表 */
+    getList() {
+      this.loading = true;
+      this.queryParams.params = {};
+      if (null != this.daterangeCreateTime && '' != this.daterangeCreateTime) {
+        this.queryParams.params["beginCreateTime"] = this.daterangeCreateTime[0];
+        this.queryParams.params["endCreateTime"] = this.daterangeCreateTime[1];
+      }
+      listTcinfo(this.queryParams).then(response => {
+        this.tcinfoList = response.data.records;
+        this.total = response.data.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        userId: null,
+        formUserId: null,
+        deptId: null,
+        info: null,
+        money: null,
+        isJs: null,
+        creator: null,
+        createTime: null,
+        updater: null,
+        updateTime: null,
+        delFlag: null,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.daterangeCreateTime = [];
+      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
+      getTcinfo(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) {
+            updateTcinfo(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addTcinfo(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 delTcinfo(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('busi/tcinfo/export', {
+        ...this.queryParams
+      }, `tcinfo_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

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

@@ -34,7 +34,14 @@
           />
         </el-form-item>
 
-
+        <el-form-item label="手机号" prop="tel">
+          <el-input
+            v-model="queryParams.tel"
+            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>
@@ -43,6 +50,7 @@
 
       <el-table v-loading="loading" :data="applyList" >
         <el-table-column label="通告主昵称" align="center" prop="nickname"/>
+        <el-table-column label="手机号" align="center" prop="tel" />
         <el-table-column label="身份类型" align="center" prop="identityType">
           <template slot-scope="scope">
             <dict-tag :options="dict.type.dl_identity_type" :value="scope.row.identityType"/>
@@ -295,6 +303,7 @@ export default {
         approvalStatus:10,
         nickname: null,
         identityType: null,
+        tel: null,
       },
       //创建时间段
       startEndTime: [],

src/views/member/busiCard/form/cardCheckHis.vue

@@ -11,6 +11,14 @@
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
+        <el-form-item label="手机号" prop="tel">
+          <el-input
+            v-model="queryParams.tel"
+            placeholder="请输入手机号"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
 
         <el-form-item label="平台名称" prop="platformName">
           <el-input

src/views/member/order/index.vue

@@ -94,6 +94,7 @@
         </template>
       </el-table-column>
       <el-table-column label="用户昵称" align="center" prop="nickname"/>
+      <el-table-column label="用户手机号" align="center" prop="userPhone"/>
       <el-table-column width="160" label="订单编号" align="center" prop="orderNo"/>
       <el-table-column label="订单类型" align="center" prop="orderType">
         <template slot-scope="scope">