2 Коммиты 5471bcfcc0 ... 7889c56141

Автор SHA1 Сообщение Дата
  pangqijun 7889c56141 Merge remote-tracking branch 'origin/dev' into dev 3 месяцев назад
  pangqijun 546703ba42 feat: 商家管理 3 месяцев назад
3 измененных файлов с 394 добавлено и 9 удалено
  1. 50 0
      src/api/system/usermerchant.js
  2. 29 9
      src/views/business/shop.vue
  3. 315 0
      src/views/system/usermerchant.vue

+ 50 - 0
src/api/system/usermerchant.js

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

+ 29 - 9
src/views/business/shop.vue

@@ -69,15 +69,6 @@
                 trigger: "blur"
               }]
             },
-            // {
-            //   label: "门店图片",
-            //   prop: "storeImage",
-            //   rules: [{
-            //     required: true,
-            //     message: "请输入门店图片",
-            //     trigger: "blur"
-            //   }]
-            // },
             {
               label: "门店地址",
               prop: "address",
@@ -149,6 +140,35 @@
                 trigger: "blur"
               }]
             },
+            {
+              label: "营业开始时间",
+              prop: "openingHours",
+              rules: [{
+                required: true,
+                message: "请输入营业开始时间",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "营业结束时间",
+              prop: "closingHours",
+              rules: [{
+                required: true,
+                message: "请输入营业结束时间",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "门店图片",
+              prop: "storeImage",
+              type: 'upload',
+              listType: 'picture-img',
+              rules: [{
+                required: true,
+                message: "请输入门店图片",
+                trigger: "blur"
+              }]
+            },
             // {
             //   label: "营业执照",
             //   prop: "businessLicence",

+ 315 - 0
src/views/system/usermerchant.vue

@@ -0,0 +1,315 @@
+<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.usermerchant_delete"
+                   @click="handleDelete">删 除
+        </el-button>
+      </template>
+
+      <template slot-scope="scope" slot="menu">
+        <el-button v-if="scope.row.auditStatus == 0"
+                   type="text"
+                   size="small"
+                   @click="pass(scope.row)"
+        >通过</el-button>
+        <el-button type="text"
+                   size="small"
+        >查看子账号</el-button>
+        <el-button type="text"
+                   size="small"
+        >查看门店</el-button>
+      </template>
+    </avue-crud>
+  </basic-container>
+</template>
+
+<script>
+  import {getList, getDetail, add, update, remove} from "@/api/system/usermerchant";
+  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,
+          addBtn: false,
+          selection: true,
+          dialogClickModal: false,
+          column: [
+            {
+              label: "商户名称",
+              prop: "merchantName",
+              search: true,
+              rules: [{
+                required: true,
+                message: "请输入商户名称",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "手机号",
+              prop: "phone",
+              rules: [{
+                required: true,
+                message: "请输入手机号",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "身份证号",
+              prop: "idCard",
+              rules: [{
+                required: true,
+                message: "请输入身份证号",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "地址",
+              prop: "address",
+              rules: [{
+                required: true,
+                message: "请输入地址",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "银行卡号",
+              prop: "bankCardNumber",
+              rules: [{
+                required: true,
+                message: "请输入银行卡号",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "开户行",
+              prop: "openingBank",
+              rules: [{
+                required: true,
+                message: "请输入开户行",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "审核状态",
+              prop: "auditStatus",
+              search: true,
+              type: "select",
+              dicUrl: "/api/blade-system/dict-biz/getEnumDict?enumName=AuditStatusEnum",
+              props: {
+                label: "name",
+                value: "value"
+              },
+              rules: [{
+                required: true,
+                message: "请输入审核状态",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "营业执照",
+              prop: "businessLicence",
+              hide: true,
+              span: 24,
+              type: 'upload',
+              listType: 'picture-img',
+              rules: [{
+                required: true,
+                message: "请输入营业执照",
+                trigger: "blur"
+              }]
+            },
+          ]
+        },
+        data: []
+      };
+    },
+    computed: {
+      ...mapGetters(["permission"]),
+      permissionList() {
+        return {
+          addBtn: this.vaildData(this.permission.usermerchant_add, false),
+          viewBtn: this.vaildData(this.permission.usermerchant_view, false),
+          delBtn: this.vaildData(this.permission.usermerchant_delete, false),
+          editBtn: this.vaildData(this.permission.usermerchant_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();
+        });
+      },
+      pass(row) {
+        this.$confirm("是否确定审核通过?", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          row.auditStatus = 1;
+          return update(row);
+        }).then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+        });
+      }
+    }
+  };
+</script>
+
+<style>
+</style>