积分明细，用户礼品

src/api/goodsrecord/goodsrecord.js

@@ -2,7 +2,7 @@ import request from '@/router/axios';
 
 export const getList = (current, size, params) => {
   return request({
-    url: '/api/cyzh-goodsRecord/goodsrecord/page',
+    url: '/api/cyzh-goodsRecord/goodsrecord/list',
     method: 'get',
     params: {
       ...params,

src/api/hotdetail/hotdetail.js

@@ -0,0 +1,50 @@
+import request from '@/router/axios';
+
+export const getList = (current, size, params) => {
+  return request({
+    url: '/api/cyzh-hotDetail/hotdetail/list',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    }
+  })
+}
+
+export const getDetail = (id) => {
+  return request({
+    url: '/api/cyzh-hotDetail/hotdetail/detail',
+    method: 'get',
+    params: {
+      id
+    }
+  })
+}
+
+export const remove = (ids) => {
+  return request({
+    url: '/api/cyzh-hotDetail/hotdetail/remove',
+    method: 'post',
+    params: {
+      ids,
+    }
+  })
+}
+
+export const add = (row) => {
+  return request({
+    url: '/api/cyzh-hotDetail/hotdetail/submit',
+    method: 'post',
+    data: row
+  })
+}
+
+export const update = (row) => {
+  return request({
+    url: '/api/cyzh-hotDetail/hotdetail/submit',
+    method: 'post',
+    data: row
+  })
+}
+

src/api/loginuser/loginuser.js

@@ -43,7 +43,7 @@ export const add = (row) => {
 
 export const update = (row) => {
   return request({
-    url: '/api/cyzh-loginUser/loginuser/submit',
+    url: '/api/cyzh-loginUser/loginuser/update',
     method: 'post',
     data: row
   })

src/api/usergoods/usergoods.js

@@ -0,0 +1,50 @@
+import request from '@/router/axios';
+
+export const getList = (current, size, params) => {
+  return request({
+    url: '/api/cyzh-userGoods/usergoods/list',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    }
+  })
+}
+
+export const getDetail = (id) => {
+  return request({
+    url: '/api/cyzh-userGoods/usergoods/detail',
+    method: 'get',
+    params: {
+      id
+    }
+  })
+}
+
+export const remove = (ids) => {
+  return request({
+    url: '/api/cyzh-userGoods/usergoods/remove',
+    method: 'post',
+    params: {
+      ids,
+    }
+  })
+}
+
+export const add = (row) => {
+  return request({
+    url: '/api/cyzh-userGoods/usergoods/submit',
+    method: 'post',
+    data: row
+  })
+}
+
+export const update = (row) => {
+  return request({
+    url: '/api/cyzh-userGoods/usergoods/submit',
+    method: 'post',
+    data: row
+  })
+}
+

src/components/goodsrecord-comps/goodsrecord.vue

@@ -0,0 +1,309 @@
+<template>
+  <basic-container>
+    <avue-crud :option="option"
+               :table-loading="loading"
+               :data="data"
+               :page.sync="page"
+               :permission="permissionList"
+               :before-open="beforeOpen"
+               v-model="form"
+               ref="crud"
+               @row-update="rowUpdate"
+               @row-save="rowSave"
+               @row-del="rowDel"
+               @search-change="searchChange"
+               @search-reset="searchReset"
+               @selection-change="selectionChange"
+               @current-change="currentChange"
+               @size-change="sizeChange"
+               @refresh-change="refreshChange"
+               @on-load="onLoad">
+      <template slot="menuLeft">
+        <el-button type="danger"
+                   size="small"
+                   icon="el-icon-delete"
+                   plain
+                   v-if="permission.goodsrecord_delete"
+                   @click="handleDelete">删 除
+        </el-button>
+      </template>
+    </avue-crud>
+  </basic-container>
+</template>
+
+<script>
+  import {getList, getDetail, add, update, remove} from "@/api/goodsrecord/goodsrecord";
+  import {mapGetters} from "vuex";
+
+  export default {
+	  props:{
+		  distributionStatus:Number
+	  },
+    watch:{
+      distributionStatus(newVal,oldVal){
+        if (newVal!=oldVal) {
+          this.refreshChange()
+        }
+      }
+    },
+    data() {
+      return {
+        form: {},
+        query: {},
+        loading: true,
+        page: {
+          pageSize: 10,
+          currentPage: 1,
+          total: 0
+        },
+        selectionList: [],
+        option: {
+          height:'auto',
+          calcHeight: 30,
+          tip: false,
+          searchShow: true,
+          searchMenuSpan: 6,
+          border: true,
+          index: true,
+          viewBtn: true,
+          selection: true,
+          dialogClickModal: false,
+          column: [
+            {
+              label: "用户id",
+              prop: "userId",
+              rules: [{
+                required: true,
+                message: "请输入用户id",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "实物id",
+              prop: "goodsId",
+              rules: [{
+                required: true,
+                message: "请输入实物id",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "实物名称",
+              prop: "goodsName",
+              rules: [{
+                required: true,
+                message: "请输入实物名称",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "实物图片",
+              prop: "goodsPic",
+              rules: [{
+                required: true,
+                message: "请输入实物图片",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "领取数量",
+              prop: "count",
+              rules: [{
+                required: true,
+                message: "请输入领取数量",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "实物包邮的数量",
+              prop: "goodsPostAmount",
+              rules: [{
+                required: true,
+                message: "请输入实物包邮的数量",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "配送方式",
+              hide:true,
+              prop: "distributionId",
+              rules: [{
+                required: true,
+                message: "请输入配送方式id,包邮则传-1",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "配送状态",
+              prop: "distributionStatus",
+              dicData:[
+                {
+                  label:"配送中",
+                  value:0
+                },
+                {
+                  label:"已完成",
+                  value:1
+                }
+              ]
+            },
+            {
+              label: "完成时间",
+              prop: "doneTime",
+              rules: [{
+                required: true,
+                message: "请输入完成时间",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "配送地址",
+              prop: "addressId",
+              rules: [{
+                required: true,
+                message: "请输入关联的地址",
+                trigger: "blur"
+              }]
+            },
+          ]
+        },
+        data: []
+      };
+    },
+    computed: {
+      ...mapGetters(["permission"]),
+      permissionList() {
+        return {
+          addBtn: this.vaildData(this.permission.goodsrecord_add, false),
+          viewBtn: this.vaildData(this.permission.goodsrecord_view, false),
+          delBtn: this.vaildData(this.permission.goodsrecord_delete, false),
+          editBtn: this.vaildData(this.permission.goodsrecord_edit, false)
+        };
+      },
+      ids() {
+        let ids = [];
+        this.selectionList.forEach(ele => {
+          ids.push(ele.id);
+        });
+        return ids.join(",");
+      }
+    },
+    methods: {
+      rowSave(row, done, loading) {
+        add(row).then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+          done();
+        }, error => {
+          loading();
+          window.console.log(error);
+        });
+      },
+      rowUpdate(row, index, done, loading) {
+        update(row).then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+          done();
+        }, error => {
+          loading();
+          console.log(error);
+        });
+      },
+      rowDel(row) {
+        this.$confirm("确定将选择数据删除?", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            return remove(row.id);
+          })
+          .then(() => {
+            this.onLoad(this.page);
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
+          });
+      },
+      handleDelete() {
+        if (this.selectionList.length === 0) {
+          this.$message.warning("请选择至少一条数据");
+          return;
+        }
+        this.$confirm("确定将选择数据删除?", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            return remove(this.ids);
+          })
+          .then(() => {
+            this.onLoad(this.page);
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
+            this.$refs.crud.toggleSelection();
+          });
+      },
+      beforeOpen(done, type) {
+        if (["edit", "view"].includes(type)) {
+          getDetail(this.form.id).then(res => {
+            this.form = res.data.data;
+          });
+        }
+        done();
+      },
+      searchReset() {
+        this.query = {};
+        this.onLoad(this.page);
+      },
+      searchChange(params, done) {
+        this.query = params;
+        this.page.currentPage = 1;
+        this.onLoad(this.page, params);
+        done();
+      },
+      selectionChange(list) {
+        this.selectionList = list;
+      },
+      selectionClear() {
+        this.selectionList = [];
+        this.$refs.crud.toggleSelection();
+      },
+      currentChange(currentPage){
+        this.page.currentPage = currentPage;
+      },
+      sizeChange(pageSize){
+        this.page.pageSize = pageSize;
+      },
+      refreshChange() {
+        this.onLoad(this.page, this.query);
+      },
+      onLoad(page, params = {}) {
+        this.loading = true;
+        if (this.distributionStatus != undefined) {
+          this.query.distributionStatus=this.distributionStatus
+        }
+        getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+          const data = res.data.data;
+          this.page.total = data.total;
+          this.data = data.records;
+          this.loading = false;
+          this.selectionClear();
+        });
+      }
+    }
+  };
+</script>
+
+<style>
+</style>

src/components/usergoods-comps/usergoods-comps.vue

@@ -0,0 +1,236 @@
+<template>
+  <basic-container>
+    <avue-crud :option="option"
+               :table-loading="loading"
+               :data="data"
+               :page.sync="page"
+               :permission="permissionList"
+               :before-open="beforeOpen"
+               v-model="form"
+               ref="crud"
+               @row-update="rowUpdate"
+               @row-save="rowSave"
+               @row-del="rowDel"
+               @search-change="searchChange"
+               @search-reset="searchReset"
+               @selection-change="selectionChange"
+               @current-change="currentChange"
+               @size-change="sizeChange"
+               @refresh-change="refreshChange"
+               @on-load="onLoad">
+      <template slot="menuLeft">
+        <el-button type="danger"
+                   size="small"
+                   icon="el-icon-delete"
+                   plain
+                   v-if="permission.usergoods_delete"
+                   @click="handleDelete">删 除
+        </el-button>
+      </template>
+    </avue-crud>
+  </basic-container>
+</template>
+
+<script>
+  import {getList, getDetail, add, update, remove} from "@/api/usergoods/usergoods";
+  import {mapGetters} from "vuex";
+
+  export default {
+    data() {
+      return {
+        form: {},
+        query: {},
+        loading: true,
+        page: {
+          pageSize: 10,
+          currentPage: 1,
+          total: 0
+        },
+        selectionList: [],
+        option: {
+          height:'auto',
+          calcHeight: 30,
+          tip: false,
+          searchShow: true,
+          searchMenuSpan: 6,
+          border: true,
+          index: true,
+          viewBtn: true,
+          selection: true,
+          dialogClickModal: false,
+          column: [
+            {
+              label: "用户id",
+              prop: "userId",
+              rules: [{
+                required: true,
+                message: "请输入用户id",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "实物id",
+              prop: "goodsId",
+              rules: [{
+                required: true,
+                message: "请输入实物id",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "活动ids",
+              prop: "activityIds",
+              rules: [{
+                required: true,
+                message: "请输入活动ids",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "礼物数量",
+              prop: "count",
+              rules: [{
+                required: true,
+                message: "请输入礼物数量",
+                trigger: "blur"
+              }]
+            },
+          ]
+        },
+        data: []
+      };
+    },
+    computed: {
+      ...mapGetters(["permission"]),
+      permissionList() {
+        return {
+          addBtn: this.vaildData(this.permission.usergoods_add, false),
+          viewBtn: this.vaildData(this.permission.usergoods_view, false),
+          delBtn: this.vaildData(this.permission.usergoods_delete, false),
+          editBtn: this.vaildData(this.permission.usergoods_edit, false)
+        };
+      },
+      ids() {
+        let ids = [];
+        this.selectionList.forEach(ele => {
+          ids.push(ele.id);
+        });
+        return ids.join(",");
+      }
+    },
+    methods: {
+      rowSave(row, done, loading) {
+        add(row).then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+          done();
+        }, error => {
+          loading();
+          window.console.log(error);
+        });
+      },
+      rowUpdate(row, index, done, loading) {
+        update(row).then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+          done();
+        }, error => {
+          loading();
+          console.log(error);
+        });
+      },
+      rowDel(row) {
+        this.$confirm("确定将选择数据删除?", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            return remove(row.id);
+          })
+          .then(() => {
+            this.onLoad(this.page);
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
+          });
+      },
+      handleDelete() {
+        if (this.selectionList.length === 0) {
+          this.$message.warning("请选择至少一条数据");
+          return;
+        }
+        this.$confirm("确定将选择数据删除?", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            return remove(this.ids);
+          })
+          .then(() => {
+            this.onLoad(this.page);
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
+            this.$refs.crud.toggleSelection();
+          });
+      },
+      beforeOpen(done, type) {
+        if (["edit", "view"].includes(type)) {
+          getDetail(this.form.id).then(res => {
+            this.form = res.data.data;
+          });
+        }
+        done();
+      },
+      searchReset() {
+        this.query = {};
+        this.onLoad(this.page);
+      },
+      searchChange(params, done) {
+        this.query = params;
+        this.page.currentPage = 1;
+        this.onLoad(this.page, params);
+        done();
+      },
+      selectionChange(list) {
+        this.selectionList = list;
+      },
+      selectionClear() {
+        this.selectionList = [];
+        this.$refs.crud.toggleSelection();
+      },
+      currentChange(currentPage){
+        this.page.currentPage = currentPage;
+      },
+      sizeChange(pageSize){
+        this.page.pageSize = pageSize;
+      },
+      refreshChange() {
+        this.onLoad(this.page, this.query);
+      },
+      onLoad(page, params = {}) {
+        this.loading = true;
+        getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+          const data = res.data.data;
+          this.page.total = data.total;
+          this.data = data.records;
+          this.loading = false;
+          this.selectionClear();
+        });
+      }
+    }
+  };
+</script>
+
+<style>
+</style>

src/views/hotdetail/hotdetail.vue

@@ -0,0 +1,286 @@
+<template>
+  <basic-container>
+    <avue-crud :option="option"
+               :table-loading="loading"
+               :data="data"
+               :page.sync="page"
+               :permission="permissionList"
+               :before-open="beforeOpen"
+               v-model="form"
+               ref="crud"
+               @row-update="rowUpdate"
+               @row-save="rowSave"
+               @row-del="rowDel"
+               @search-change="searchChange"
+               @search-reset="searchReset"
+               @selection-change="selectionChange"
+               @current-change="currentChange"
+               @size-change="sizeChange"
+               @refresh-change="refreshChange"
+               @on-load="onLoad">
+      <template slot="menuLeft">
+        <el-button type="danger"
+                   size="small"
+                   icon="el-icon-delete"
+                   plain
+                   v-if="permission.hotdetail_delete"
+                   @click="handleDelete">删 除
+        </el-button>
+      </template>
+
+      <template slot="userInfo" slot-scope="scope">
+        <div style="display: flex;"  v-if="scope.row.loginWebVO.id">
+          <div style="display: flex;justify-content: center;align-items: center;">
+            <el-avatar size="large" :src="scope.row.loginWebVO.avatar"></el-avatar>
+          </div>
+           <div style="padding: 10px;">
+             <div >昵称：{{scope.row.loginWebVO.nickName}}</div>
+             <div>手机：{{scope.row.loginWebVO.phone}}</div>
+           </div>
+        </div>
+        <div style="display: flex;" v-else>
+          <div style="display: flex;justify-content: center;align-items: center;">
+            <el-avatar size="large" src="https://music.nanyue6688.com/obsfile/0ad6d53ecf5448bfb9694fdaed27eadc-avatar.png"></el-avatar>
+          </div>
+           <div style="padding: 10px;">
+             <div style="color: #DD6161;">用户已注销</div>
+           </div>
+        </div>
+      </template>
+
+    </avue-crud>
+  </basic-container>
+</template>
+
+<script>
+  import {getList, getDetail, add, update, remove} from "@/api/hotdetail/hotdetail";
+  import {mapGetters} from "vuex";
+
+  export default {
+    data() {
+      return {
+        form: {},
+        query: {},
+        loading: true,
+        page: {
+          pageSize: 10,
+          currentPage: 1,
+          total: 0
+        },
+        selectionList: [],
+        option: {
+          height:'auto',
+          calcHeight: 30,
+          tip: false,
+          searchShow: true,
+          searchMenuSpan: 6,
+          border: true,
+          index: true,
+          viewBtn: true,
+          selection: true,
+          dialogClickModal: false,
+          column: [
+            {
+              label: "用户id",
+              hide:true,
+              prop: "userId",
+              rules: [{
+                required: true,
+                message: "请输入用户id",
+                trigger: "blur"
+              }]
+            },
+            {
+              label:"用户信息",
+              prop:"userInfo",
+              slot:true
+            },
+            {
+              label: "热力值",
+              prop: "hotValue",
+              rules: [{
+                required: true,
+                message: "请输入热力值",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "备注",
+              prop: "note",
+              rules: [{
+                required: true,
+                message: "请输入备注",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "类型",
+              prop: "type",
+              dicData: [{
+                  label: '助力',
+                  value: 1
+                },
+                {
+                  label: '积分商城兑换',
+                  value: 2
+                },
+                {
+                  label: '可用热力提现',
+                  value: 3
+                }
+              ],
+              rules: [{
+                required: true,
+                message: "请输入类型1：助力 2：积分商城兑换 3：可用热力提现",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "关联的id",
+              hide:true,
+              prop: "relationId",
+              rules: [{
+                required: true,
+                message: "请输入关联的id",
+                trigger: "blur"
+              }]
+            },
+          ]
+        },
+        data: []
+      };
+    },
+    computed: {
+      ...mapGetters(["permission"]),
+      permissionList() {
+        return {
+          addBtn: this.vaildData(this.permission.hotdetail_add, false),
+          viewBtn: this.vaildData(this.permission.hotdetail_view, false),
+          delBtn: this.vaildData(this.permission.hotdetail_delete, false),
+          editBtn: this.vaildData(this.permission.hotdetail_edit, false)
+        };
+      },
+      ids() {
+        let ids = [];
+        this.selectionList.forEach(ele => {
+          ids.push(ele.id);
+        });
+        return ids.join(",");
+      }
+    },
+    methods: {
+      rowSave(row, done, loading) {
+        add(row).then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+          done();
+        }, error => {
+          loading();
+          window.console.log(error);
+        });
+      },
+      rowUpdate(row, index, done, loading) {
+        update(row).then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+          done();
+        }, error => {
+          loading();
+          console.log(error);
+        });
+      },
+      rowDel(row) {
+        this.$confirm("确定将选择数据删除?", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            return remove(row.id);
+          })
+          .then(() => {
+            this.onLoad(this.page);
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
+          });
+      },
+      handleDelete() {
+        if (this.selectionList.length === 0) {
+          this.$message.warning("请选择至少一条数据");
+          return;
+        }
+        this.$confirm("确定将选择数据删除?", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            return remove(this.ids);
+          })
+          .then(() => {
+            this.onLoad(this.page);
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
+            this.$refs.crud.toggleSelection();
+          });
+      },
+      beforeOpen(done, type) {
+        if (["edit", "view"].includes(type)) {
+          getDetail(this.form.id).then(res => {
+            this.form = res.data.data;
+          });
+        }
+        done();
+      },
+      searchReset() {
+        this.query = {};
+        this.onLoad(this.page);
+      },
+      searchChange(params, done) {
+        this.query = params;
+        this.page.currentPage = 1;
+        this.onLoad(this.page, params);
+        done();
+      },
+      selectionChange(list) {
+        this.selectionList = list;
+      },
+      selectionClear() {
+        this.selectionList = [];
+        this.$refs.crud.toggleSelection();
+      },
+      currentChange(currentPage){
+        this.page.currentPage = currentPage;
+      },
+      sizeChange(pageSize){
+        this.page.pageSize = pageSize;
+      },
+      refreshChange() {
+        this.onLoad(this.page, this.query);
+      },
+      onLoad(page, params = {}) {
+        this.loading = true;
+        getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+          const data = res.data.data;
+          this.page.total = data.total;
+          this.data = data.records;
+          this.loading = false;
+          this.selectionClear();
+        });
+      }
+    }
+  };
+</script>
+
+<style>
+</style>

src/views/loginuser/loginuser.vue

@@ -106,11 +106,6 @@
               prop: "phone",
               width: 100,
               search: true,
-              rules: [{
-                required: true,
-                message: "请输入手机号",
-                trigger: "blur"
-              }]
             },
             {
               label: "性别",

src/views/usergoods/usergoods.vue

@@ -0,0 +1,41 @@
+<template>
+  <basic-container>
+    <el-menu :default-active="activeIndex" class="el-menu-demo" mode="horizontal" @select="handleSelect">
+      <el-menu-item index="1">待领取</el-menu-item>
+      <el-menu-item index="2">配送中</el-menu-item>
+      <el-menu-item index="3">已完成</el-menu-item>
+    </el-menu>
+    <user-goods-comps v-if="activeIndex==1"></user-goods-comps>
+    <goods-record v-else ref="goodsRecordRef" :distributionStatus="distributionStatus"></goods-record>
+  </basic-container>
+</template>
+
+<script>
+  import userGoodsComps from "@/components/usergoods-comps/usergoods-comps.vue"
+  import goodsRecord from "@/components/goodsrecord-comps/goodsrecord.vue"
+  export default {
+    components:{
+      userGoodsComps,goodsRecord
+    },
+    data() {
+      return {
+        activeIndex: '1',
+        //配送状态 0配送中 1 已完成
+        distributionStatus:0
+      };
+    },
+    methods: {
+      handleSelect(key, keyPath) {
+        this.activeIndex=key
+        if (key==2) {
+          this.distributionStatus=0
+        }else if (key==3) {
+          this.distributionStatus=1
+        }
+      }
+    }
+  };
+</script>
+
+<style>
+</style>