From 01eeccaecfafad2257a4b1e18bdc56f5e9c6dd38 Mon Sep 17 00:00:00 2001
From: GaoHao <1210693421@qq.com>
Date: Fri, 25 Oct 2024 09:55:57 +0800
Subject: [PATCH 01/16] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BC=98=E6=83=A0?=
 =?UTF-8?q?=E5=88=B8=E7=9B=B8=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components copy/wine/addModal.vue         | 388 ++++++++++++++++++
 .../components copy/wine/record.vue           | 145 +++++++
 .../components copy/winestorage/addModal.vue  | 188 +++++++++
 .../winestorage/historyModal.vue              |  38 ++
 .../components copy/winestorage/record.vue    | 166 ++++++++
 .../components copy/winetotal/winetotal.vue   |  82 ++++
 .../addCoupon.vue => add_coupon.vue}          | 255 +++++++-----
 .../components/coupon_details.vue             | 204 +++++++++
 src/views/coupon_manage/couponEnum.js         |  25 +-
 src/views/coupon_manage/coupon_list.vue       |  51 +--
 10 files changed, 1413 insertions(+), 129 deletions(-)
 create mode 100644 src/views/application/components copy/wine/addModal.vue
 create mode 100644 src/views/application/components copy/wine/record.vue
 create mode 100644 src/views/application/components copy/winestorage/addModal.vue
 create mode 100644 src/views/application/components copy/winestorage/historyModal.vue
 create mode 100644 src/views/application/components copy/winestorage/record.vue
 create mode 100644 src/views/application/components copy/winetotal/winetotal.vue
 rename src/views/coupon_manage/{components/addCoupon.vue => add_coupon.vue} (53%)
 create mode 100644 src/views/coupon_manage/components/coupon_details.vue

diff --git a/src/views/application/components copy/wine/addModal.vue b/src/views/application/components copy/wine/addModal.vue
new file mode 100644
index 0000000..a52be43
--- /dev/null
+++ b/src/views/application/components copy/wine/addModal.vue	
@@ -0,0 +1,388 @@
+<template>
+    <div>
+        <el-dialog :title="form.id ? '编辑酒品' : '添加酒品'" :visible.sync="dialogVisible" @close="reset">
+            <div class="head-container" v-if="!form.id">
+                <div class="tab_wrap">
+                    <div class="tab" :style="{ '--index': form.source }">
+                        <div class="item" v-for="(item, index) in tabs" :key="item.value"
+                            :class="{ active: index == form.source }" @click="tabChange(item)">
+                            {{ item.label }}
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <el-form ref="form" :model="form" :rules="rules" label-width="120px" label-position="left">
+                <template v-if="form.source == 0">
+                    <el-form-item label="酒品名" prop="name">
+                        <el-input v-model="form.name" placeholder="请输入酒品名" />
+                    </el-form-item>
+                    <el-form-item label="酒品图片">
+                        <uploadImg ref="uploadImg" :limit="1" @success="e => form.imgUrl = e[0]"
+                            @remove="form.imgUrl = ''" />
+                    </el-form-item>
+                </template>
+                <template v-else>
+                    <template v-if="!form.id">
+                        <el-form-item label="选择商品" prop="name">
+                            <div>
+                                <el-button type="primary" icon="el-icon-plus"
+                                    @click="$refs.shopListRef.show([...productIds])">
+                                    添加商品
+                                </el-button>
+                            </div>
+                            <div class="shop_list">
+                                <div class="item_wrap" v-for="(item, index) in productIds" :key="item.id"
+                                    @click="productIds.splice(index, 1)">
+                                    <div class="item" :data-index="index + 1">
+                                        <el-image :src="item.coverImg" style="width: 100%;height: 100%;"></el-image>
+                                    </div>
+                                    <div class="name">{{ item.name }}</div>
+                                </div>
+                            </div>
+                        </el-form-item>
+                    </template>
+                    <template v-else>
+                        <el-form-item label="商品">
+                            <div class="goods_info">
+                                <el-image :src="form.imgUrl" style="width: 50px;height: 50px;"></el-image>
+                                <div class="info">{{ form.name }}</div>
+                            </div>
+                        </el-form-item>
+                    </template>
+                </template>
+                <el-form-item label="单位">
+                    <el-input v-model="form.unit" placeholder="请输入单位" style="width: 200px;" />
+                    <!-- <el-select v-model="form.unitId" placeholder="请选择单位" style="width: 200px;" @change="selectUnitt">
+                        <el-option :label="item.name" :value="item.id" v-for="item in units" :key="item.id"></el-option>
+                    </el-select>
+                    <el-button type="primary" plain icon="el-icon-plus"
+                        @click="$refs.addUnitRef.show()">添加单位</el-button> -->
+                </el-form-item>
+                <el-form-item label="有效期(天)">
+                    <el-input-number v-model="form.period" controls-position="right" step-strictly :min="1"
+                        placeholder="请输入有效期(天)"></el-input-number>
+                </el-form-item>
+            </el-form>
+            <span slot="footer" class="dialog-footer">
+                <el-button @click="dialogVisible = false">取 消</el-button>
+                <el-button type="primary" @click="onSubmitHandle">确 定</el-button>
+            </span>
+        </el-dialog>
+        <addUnit ref="addUnitRef" @success="tbShopUnit" />
+        <shopList ref="shopListRef" @success="slectShop" />
+    </div>
+</template>
+
+<script>
+import { tbShopStorageGood } from '@/api/application'
+import { queryAllShopUser, tbShopUnit } from '@/api/shop'
+import uploadImg from '@/components/uploadImg'
+import addUnit from '@/views/product/components/addUnit'
+import shopList from '@/components/shopList'
+export default {
+    components: {
+        uploadImg,
+        addUnit,
+        shopList
+    },
+    data() {
+        const nameValidator = (rule, value, callback) => {
+            if (this.form.source == 0) {
+                if (!this.form.name) {
+                    callback(new Error('请输入酒名名'))
+                } else {
+                    callback()
+                }
+            } else {
+                if (!this.productIds.length) {
+                    callback(new Error('请选择商品'))
+                } else {
+                    callback()
+                }
+            }
+        }
+        return {
+            dialogVisible: false,
+            tabs: [
+                {
+                    value: 0,
+                    label: '手动添加'
+                },
+                {
+                    value: 1,
+                    label: '从商品添加'
+                }
+            ],
+            units: [],
+            loading: false,
+            options: [],
+            productIds: [],
+            form: {
+                name: '',
+                imgUrl: '',
+                source: 0,
+                id: '',
+                goods: [
+                    {
+                        imgUrl: '',
+                        name: '',
+                    }
+                ],
+                period: '',
+                unit: ''
+            },
+            resetForm: '',
+            rules: {
+                name: [
+                    {
+                        required: true,
+                        validator: nameValidator,
+                        trigger: 'change'
+                    }
+                ]
+            }
+        }
+    },
+    mounted() {
+        this.resetForm = { ...this.form }
+        // this.getTableData()
+        this.tbShopUnit()
+    },
+    methods: {
+        slectShop(res) {
+            if (this.productIds.length) {
+                res.map(async item => {
+                    if (!await this.checkShop(item.id)) {
+                        this.productIds.push({ ...item })
+                    }
+                })
+            } else {
+                this.productIds = res
+            }
+        },
+        selectUnitt(e) {
+            this.form.unit = this.units.find(item => item.id == e).name
+        },
+        // 获取单位
+        async tbShopUnit() {
+            try {
+                const res = await tbShopUnit({
+                    shopId: localStorage.getItem('shopId'),
+                    sort: 'id',
+                    page: 0,
+                    size: 100
+                })
+                this.units = res.content
+            } catch (error) { }
+        },
+        // 切换类型
+        tabChange(item) {
+            this.form.source = this.tabs.findIndex(i => i.value == item.value)
+        },
+        // 获取用户列表
+        async getTableData(query = '') {
+            this.loading = true
+            try {
+                const res = await queryAllShopUser({
+                    telephone: query,
+                })
+                this.loading = false
+                this.options = res.content
+            } catch (error) {
+                this.loading = false
+                console.log(error)
+            }
+        },
+        // 提交
+        onSubmitHandle() {
+            this.$refs.form.validate(async valid => {
+                if (valid) {
+                    try {
+                        if (this.form.source == 0) {
+                            //  手动大导入
+                            this.form.goods = [{
+                                name: this.form.name,
+                                imgUrl: this.form.imgUrl
+                            }]
+                        } else {
+                            this.form.goods = this.productIds.map(item => {
+                                return {
+                                    name: item.name,
+                                    imgUrl: item.coverImg
+                                }
+                            })
+                        }
+                        let res = await tbShopStorageGood(this.form, this.form.id ? 'put' : 'post')
+                        this.$emit('success', res)
+                        this.close()
+                        this.$notify({
+                            title: '成功',
+                            message: `${this.form.id ? '编辑' : '添加'}成功`,
+                            type: 'success'
+                        });
+                    } catch (error) {
+                        console.log(error)
+                    }
+                }
+            })
+        },
+        show(obj) {
+            this.dialogVisible = true
+            if (obj && obj.id) {
+                this.form = obj
+                if (obj.imgUrl && obj.source == 0) {
+                    setTimeout(() => {
+                        this.$refs.uploadImg.fileList = [
+                            {
+                                url: obj.imgUrl
+                            }
+                        ]
+                    }, 100)
+                }
+            }
+        },
+        close() {
+            this.dialogVisible = false
+        },
+        reset() {
+            if (this.form.source == 0) {
+                this.$refs.uploadImg.clearFiles()
+            }
+            this.form = { ...this.resetForm }
+            this.$refs.form.resetFields()
+
+        }
+    }
+}
+</script>
+
+<style scoped lang="scss">
+.goods_info {
+    background-color: #f9f9f9;
+    padding: 10px;
+    display: flex;
+    align-items: center;
+
+    .info {
+        flex: 1;
+        padding-left: 10px;
+    }
+}
+
+.head-container {
+    display: flex;
+    justify-content: center;
+}
+
+.tab_wrap {
+    background-color: #DCF0E8;
+    padding: 4px;
+
+    .tab {
+        --w: 120px;
+        height: 35px;
+        display: flex;
+        position: relative;
+
+
+        &::after {
+            content: "";
+            width: var(--w);
+            height: inherit;
+            background-color: #39D47A;
+            position: absolute;
+            top: 0;
+            left: calc(var(--index) * var(--w));
+            z-index: 1;
+            transition: left .3s ease-in-out;
+        }
+
+        .item {
+            width: var(--w);
+            height: inherit;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            position: relative;
+            z-index: 2;
+            color: #39D47A;
+            transition: all .1s ease-in-out .15s;
+
+            &:hover {
+                cursor: pointer;
+            }
+
+            &.active {
+                color: #fff;
+            }
+        }
+    }
+}
+
+.shop_list {
+    display: flex;
+    flex-wrap: wrap;
+
+    .item_wrap {
+        $size: 80px;
+
+        .item {
+            $radius: 4px;
+            width: $size;
+            height: $size;
+            border-radius: $radius;
+            overflow: hidden;
+            position: relative;
+            margin-right: 10px;
+            margin-top: 10px;
+
+            &:hover {
+                cursor: pointer;
+            }
+
+            &::after {
+                content: attr(data-index);
+                font-size: 12px;
+                height: 20px;
+                display: flex;
+                padding: 0 10px;
+                border-radius: 0 0 $radius 0;
+                align-items: center;
+                background-color: rgba(0, 0, 0, 0.3);
+                backdrop-filter: blur(10px);
+                color: #fff;
+                position: absolute;
+                top: 0;
+                left: 0;
+                z-index: 10;
+            }
+
+            &::before {
+                content: '删除';
+                font-size: 12px;
+                width: 100%;
+                height: 20px;
+                display: flex;
+                padding: 0 10px;
+                align-items: center;
+                justify-content: center;
+                background-color: rgba(0, 0, 0, 0.3);
+                backdrop-filter: blur(10px);
+                color: #fff;
+                position: absolute;
+                bottom: 0;
+                left: 0;
+                z-index: 10;
+                transition: all .1s ease-in-out;
+            }
+        }
+
+        .name {
+            width: $size;
+            white-space: nowrap;
+            overflow: hidden;
+            text-overflow: ellipsis;
+        }
+    }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/application/components copy/wine/record.vue b/src/views/application/components copy/wine/record.vue
new file mode 100644
index 0000000..7e4ada5
--- /dev/null
+++ b/src/views/application/components copy/wine/record.vue	
@@ -0,0 +1,145 @@
+<template>
+    <div class="head-container">
+        <div class="head-container">
+            <el-form :model="query" inline>
+                <el-form-item>
+                    <el-button type="primary" @click="$refs.addModal.show()">添加酒品</el-button>
+                </el-form-item>
+                <el-form-item label="搜索">
+                    <el-input v-model="query.name" placeholder="酒名"></el-input>
+                </el-form-item>
+                <el-form-item>
+                    <el-button type="primary" @click="getTableData">查询</el-button>
+                    <el-button @click="resetHandle">重置</el-button>
+                </el-form-item>
+            </el-form>
+        </div>
+        <div class="head-container">
+            <el-table :data="tableData.data" v-loading="tableData.loading">
+                <el-table-column label="酒名" prop="name">
+                    <template v-slot="scope">
+                        <div style="display: flex;align-items: center;">
+                            <el-image :src="scope.row.imgUrl"
+                                style="width:40px;height: 40px;border-radius: 4px;background-color: #efefef;">
+                                <div class="img_error" slot="error">
+                                    <i class="icon el-icon-document-delete"></i>
+                                </div>
+                            </el-image>
+                            <span style="margin-left: 10px;">{{ scope.row.name }}</span>
+                        </div>
+                    </template>
+                </el-table-column>
+                <el-table-column label="单位" prop="unit">
+                    <template v-slot="scope">
+                        <el-tag type="primary">{{ scope.row.unit }}</el-tag>
+                    </template>
+                </el-table-column>
+                <el-table-column label="有效期(天)" prop="period"></el-table-column>
+                <el-table-column label="来源" prop="source">
+                    <template v-slot="scope">
+                        <span v-if="scope.row.source == 0">手动导入</span>
+                        <span v-if="scope.row.source == 1">商品导入</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="操作" width="120">
+                    <template v-slot="scope">
+                        <div style="display: flex;gap: 10px;">
+                            <el-button type="text"
+                                @click="$refs.winAddModal.show({ name: scope.row.name, imgUrl: scope.row.imgUrl, expDay: scope.row.period, unit: scope.row.unit }, true)">存酒</el-button>
+                            <el-button type="text" @click="$refs.addModal.show(scope.row)">编辑</el-button>
+                            <el-popconfirm title="确定删除吗？" @confirm="delHandle(scope.row)">
+                                <el-button type="text" slot="reference">删除</el-button>
+                            </el-popconfirm>
+                        </div>
+                    </template>
+                </el-table-column>
+            </el-table>
+        </div>
+        <div class="head-container">
+            <el-pagination :total="tableData.total" :current-page="tableData.page + 1" :page-size="tableData.size"
+                @current-change="paginationChange" layout="total, sizes, prev, pager, next, jumper"></el-pagination>
+        </div>
+        <addModal ref="addModal" @success="getTableData" />
+        <winAddModal ref="winAddModal" />
+    </div>
+</template>
+
+<script>
+import { tbShopStorageGoodlist, tbShopStorageGood } from '@/api/application'
+import addModal from './addModal'
+import winAddModal from '../winestorage/addModal'
+export default {
+    components: {
+        addModal,
+        winAddModal
+    },
+    data() {
+        return {
+            statusList: [
+                {
+                    value: 0,
+                    label: '已取完'
+                },
+                {
+                    value: 1,
+                    label: '未取完'
+                }
+            ],
+            query: {
+                name: ""
+            },
+            tableData: {
+                data: [],
+                page: 0,
+                size: 10,
+                loading: false,
+                total: 0
+            }
+        }
+    },
+    mounted() {
+        this.getTableData()
+    },
+    methods: {
+        // 删除
+        async delHandle(row) {
+            try {
+                let obj = { ...row }
+                obj.isDel = 1
+                await tbShopStorageGood(obj, 'put')
+                this.$notify.success('删除成功')
+                this.getTableData()
+            } catch (error) {
+                console.log(error);
+            }
+        },
+        // 重置查询
+        resetHandle() {
+            this.tableData.page = 0;
+            this.query.name = ''
+            this.getTableData()
+        },
+        // 分页回调
+        paginationChange(e) {
+            this.tableData.page = e - 1;
+            this.getTableData()
+        },
+        // 获取商品列表
+        async getTableData() {
+            this.tableData.loading = true
+            try {
+                const res = await tbShopStorageGoodlist({
+                    name: this.query.name,
+                    page: this.tableData.page,
+                    size: this.tableData.size
+                })
+                this.tableData.loading = false
+                this.tableData.data = res.content
+                this.tableData.total = res.totalElements
+            } catch (error) {
+                console.log(error)
+            }
+        }
+    }
+}
+</script>
\ No newline at end of file
diff --git a/src/views/application/components copy/winestorage/addModal.vue b/src/views/application/components copy/winestorage/addModal.vue
new file mode 100644
index 0000000..c7c0b84
--- /dev/null
+++ b/src/views/application/components copy/winestorage/addModal.vue	
@@ -0,0 +1,188 @@
+<template>
+    <el-dialog :title="form.id ? '编辑存酒' : '添加存酒'" width="500px" :visible.sync="dialogVisible" @close="reset">
+        <el-form ref="form" :model="form" :rules="rules" label-width="120px" label-position="left">
+            <template v-if="!form.id">
+                <el-form-item label="选择用户" prop="userid">
+                    <el-select v-model="form.userid" placeholder="请输入用户昵称" filterable remote
+                        :remote-method="queryAllShopUser" :loading="loading" @change="userChange">
+                        <el-option v-for="item in options" :key="item.id" :label="`${item.nickName}-${item.telephone}`"
+                            :value="item.id">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="选择酒品">
+                    <el-select v-model="form.name" @change="wineChange" v-if="!wine">
+                        <el-option :label="item.name" :value="item.name" v-for="(item, index) in wineList"
+                            :key="index"></el-option>
+                    </el-select>
+                    <div class="goods_info" v-else>
+                        <el-image :src="form.imgUrl" style="width: 50px;height: 50px;"></el-image>
+                        <div class="info">{{ form.name }}</div>
+                    </div>
+                </el-form-item>
+                <el-form-item label="数量">
+                    <el-input-number v-model="form.num" :step="1" step-strictly :min="1"></el-input-number>
+                </el-form-item>
+            </template>
+            <el-form-item label="数量" v-else>
+                <el-input-number v-model="num" :step="1" step-strictly :min="1" :max="form.num"></el-input-number>
+            </el-form-item>
+        </el-form>
+        <span slot="footer" class="dialog-footer">
+            <el-button @click="dialogVisible = false">取 消</el-button>
+            <el-button type="primary" @click="onSubmitHandle">确 定</el-button>
+        </span>
+    </el-dialog>
+</template>
+
+<script>
+import { queryAllShopUser } from '@/api/shop'
+import { tbShopStorageGoodlist, storageWin, storagePut } from '@/api/application'
+export default {
+    data() {
+        return {
+            dialogVisible: false,
+            loading: false,
+            options: [],
+            num: '',
+            wine: false,
+            form: {
+                id: '',
+                imgUrl: '',
+                name: '',
+                nickname: '',
+                num: 1,
+                status: '',
+                telphone: '',
+                unit: '',
+                userid: '',
+                expDay: ''
+            },
+            resetForm: '',
+            rules: {
+                userid: [
+                    {
+                        required: true,
+                        message: ' ',
+                        trigger: 'blur'
+                    }
+                ]
+            },
+            wineList: []
+        }
+    },
+    mounted() {
+        this.resetForm = { ...this.form }
+        this.queryAllShopUser()
+        this.tbShopStorageGoodlist()
+    },
+    methods: {
+        // 选择用户
+        userChange(e) {
+            let user = this.options.find(item => item.id == e)
+            this.form.nickname = user.nickName
+            this.form.telphone = user.telephone
+        },
+        // 选择酒品
+        wineChange(e) {
+            let wine = this.wineList.find(item => item.name == e)
+            this.form.imgUrl = wine.imgUrl
+            this.form.expDay = wine.period
+            this.form.unit = wine.unit
+        },
+        // 获取酒品列表
+        async tbShopStorageGoodlist() {
+            try {
+                const res = await tbShopStorageGoodlist({
+                    page: 0,
+                    size: 100
+                })
+                this.wineList = res.content
+            } catch (error) {
+                console.log(error)
+            }
+        },
+        // 获取用户列表
+        async queryAllShopUser(query = '') {
+            this.loading = true
+            try {
+                const res = await queryAllShopUser({
+                    name: query,
+                })
+                this.loading = false
+                this.options = res.content
+            } catch (error) {
+                this.loading = false
+                console.log(error)
+            }
+        },
+        // 提交
+        onSubmitHandle() {
+            console.log(this.form)
+            this.$refs.form.validate(async valid => {
+                if (valid) {
+                    try {
+                        let res = ''
+                        if (this.form.id) {
+                            res = await storagePut({
+                                id: this.form.id,
+                                num: this.num,
+                                type: 0
+                            })
+                            this.$notify({
+                                title: '成功',
+                                message: `取酒成功`,
+                                type: 'success'
+                            });
+                        } else {
+                            res = await storageWin(this.form)
+                            this.$notify({
+                                title: '成功',
+                                message: `存酒成功`,
+                                type: 'success'
+                            });
+                        }
+                        this.$emit('success', res)
+                        this.close()
+                    } catch (error) {
+                        console.log(error)
+                    }
+                }
+            })
+        },
+        async show(obj = {}, wine = false) {
+            this.dialogVisible = true
+            if (obj && obj.id) {
+                this.form = { ...obj }
+            }
+            if (obj && obj.name) {
+                this.form.name = obj.name
+                this.form.imgUrl = obj.imgUrl
+                this.form.expDay = obj.expDay
+                this.form.unit = obj.unit
+            }
+            this.wine = wine
+        },
+        close() {
+            this.dialogVisible = false
+        },
+        reset() {
+            this.form = { ...this.resetForm }
+        }
+    }
+}
+</script>
+
+<style scoped lang="scss">
+.goods_info {
+    background-color: #f9f9f9;
+    padding: 10px;
+    display: flex;
+    align-items: center;
+
+    .info {
+        flex: 1;
+        padding-left: 10px;
+    }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/application/components copy/winestorage/historyModal.vue b/src/views/application/components copy/winestorage/historyModal.vue
new file mode 100644
index 0000000..41961be
--- /dev/null
+++ b/src/views/application/components copy/winestorage/historyModal.vue	
@@ -0,0 +1,38 @@
+<template>
+    <el-dialog title="记录" width="500px" :visible.sync="dialogVisible">
+        <el-steps :active="list.length" direction="vertical" :space="100">
+            <el-step :title="item.content" :description="item.time" v-for="item in list" :key="item.id"></el-step>
+        </el-steps>
+        <el-empty description="暂无记录" v-if="!list.length"></el-empty>
+    </el-dialog>
+</template>
+
+<script>
+import { recordList } from '@/api/application'
+export default {
+    data() {
+        return {
+            dialogVisible: false,
+            loading: false,
+            list: []
+        }
+    },
+    methods: {
+        // 查询存取酒记录
+        async recordList(storageId) {
+            try {
+                this.loading = true
+                const res = await recordList({ storageId: storageId })
+                this.list = res.content
+                this.loading = false
+            } catch (error) {
+                console.log(error);
+            }
+        },
+        show(id) {
+            this.dialogVisible = true
+            this.recordList(id)
+        }
+    }
+}
+</script>
\ No newline at end of file
diff --git a/src/views/application/components copy/winestorage/record.vue b/src/views/application/components copy/winestorage/record.vue
new file mode 100644
index 0000000..4837e0b
--- /dev/null
+++ b/src/views/application/components copy/winestorage/record.vue	
@@ -0,0 +1,166 @@
+<template>
+    <div class="head-container">
+        <div class="head-container">
+            <el-form :model="query" inline>
+                <el-form-item>
+                    <el-button type="primary" @click="$refs.addModal.show()">添加存酒</el-button>
+                </el-form-item>
+                <el-form-item label="搜索">
+                    <el-input v-model="query.name" placeholder="酒名/用户昵称"></el-input>
+                </el-form-item>
+                <el-form-item label="手机号">
+                    <el-input v-model="query.telphone" placeholder="手机号"></el-input>
+                </el-form-item>
+                <el-form-item label="状态">
+                    <el-select v-model="query.status">
+                        <el-option v-for="item in statusList" :key="item.value" :value="item.value"
+                            :label="item.label"></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item>
+                    <el-button type="primary" @click="getTableData">查询</el-button>
+                    <el-button @click="resetHandle">重置</el-button>
+                </el-form-item>
+            </el-form>
+        </div>
+        <div class="head-container">
+            <el-table :data="tableData.data" v-loading="tableData.loading" row-key="id">
+                <el-table-column label="用户名" prop="nickname">
+                    <template v-slot="scope">
+                        <div style="display: flex;align-items: center;">
+                            <el-image src=""
+                                style="width:40px;height: 40px;background-color: #efefef;display: flex;align-items: center;justify-content: center;">
+                                <i class="el-icon-folder-delete" slot="error" style="font-size: 20px;color: #999;"></i>
+                            </el-image>
+                            <span style="margin-left: 10px;">{{ scope.row.telphone }}</span>
+                        </div>
+                    </template>
+                </el-table-column>
+                <el-table-column label="酒品名" prop="name">
+                    <template v-slot="scope">
+                        <div style="display: flex;align-items: center;">
+                            <el-image :src="scope.row.imgUrl" style="width:40px;height: 40px;">
+                                <i class="el-icon-folder-delete" slot="error"></i>
+                            </el-image>
+                            <span style="margin-left: 10px;">{{ scope.row.name }}</span>
+                        </div>
+                    </template>
+                </el-table-column>
+                <el-table-column label="数量" prop="name">
+                    <template v-slot="scope">
+                        <span>{{ scope.row.num }}({{ scope.row.unit }})</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="存酒时间" prop="savTime"></el-table-column>
+                <el-table-column label="到期时间" prop="expTime"></el-table-column>
+                <el-table-column label="状态" prop="status">
+                    <template v-slot="scope">
+                        <el-tag :type="statusList.find(item => item.value === scope.row.status).type">{{
+                            statusList.find(item => item.value === scope.row.status).label }}</el-tag>
+                    </template>
+                </el-table-column>
+                <el-table-column label="操作" width="120">
+                    <template v-slot="scope">
+                        <div style="display: flex;gap: 10px;">
+                            <el-button type="text" @click="$refs.HistoryModal.show(scope.row.id)">查看记录</el-button>
+                            <el-button type="text" v-if="scope.row.status == 0" disabled>已取完</el-button>
+                            <el-button type="text" @click="$refs.addModal.show(scope.row)"
+                                v-if="scope.row.status == 1">取酒</el-button>
+                            <el-button type="text" v-if="scope.row.status == 2" disabled>已过期</el-button>
+                        </div>
+                    </template>
+                </el-table-column>
+            </el-table>
+        </div>
+        <div class="head-container">
+            <el-pagination :total="tableData.total" :current-page="tableData.page + 1" :page-size="tableData.size"
+                @current-change="paginationChange" layout="total, sizes, prev, pager, next, jumper"></el-pagination>
+        </div>
+        <addModal ref="addModal" @success="getTableData" />
+        <HistoryModal ref="HistoryModal" />
+    </div>
+</template>
+
+<script>
+import addModal from './addModal'
+import HistoryModal from './historyModal'
+import { storageList } from '@/api/application'
+export default {
+    components: {
+        addModal,
+        HistoryModal
+    },
+    data() {
+        return {
+            statusList: [
+                {
+                    value: '',
+                    label: '全部',
+                    type: 'warning'
+                },
+                {
+                    value: 0,
+                    label: '已取完',
+                    type: 'warning'
+                },
+                {
+                    value: 1,
+                    label: '存储中',
+                    type: 'primary'
+                },
+                {
+                    value: 2,
+                    label: '已过期',
+                    type: 'info'
+                }
+            ],
+            query: {
+                name: "",
+                telphone: "",
+                status: ''
+            },
+            tableData: {
+                data: [],
+                page: 0,
+                size: 10,
+                loading: false,
+                total: 0
+            }
+        }
+    },
+    mounted() {
+        this.getTableData()
+    },
+    methods: {
+        // 重置查询
+        resetHandle() {
+            this.tableData.page = 0
+            this.query.name = ''
+            this.query.telphone = ''
+            this.query.status = ''
+            this.getTableData()
+        },
+        // 分页回调
+        paginationChange(e) {
+            this.tableData.page = e - 1;
+            this.getTableData()
+        },
+        // 获取商品列表
+        async getTableData() {
+            try {
+                this.tableData.loading = true
+                const res = await storageList({
+                    ...this.query,
+                    page: this.tableData.page,
+                    size: this.tableData.size
+                })
+                this.tableData.loading = false
+                this.tableData.data = res.content
+                this.tableData.total = res.totalElements
+            } catch (error) {
+                console.log(error)
+            }
+        }
+    }
+}
+</script>
\ No newline at end of file
diff --git a/src/views/application/components copy/winetotal/winetotal.vue b/src/views/application/components copy/winetotal/winetotal.vue
new file mode 100644
index 0000000..5a57a65
--- /dev/null
+++ b/src/views/application/components copy/winetotal/winetotal.vue	
@@ -0,0 +1,82 @@
+<template>
+    <div class="head-container">
+        <el-table :data="tableData.data" v-loading="tableData.loading">
+            <el-table-column label="商品信息">
+                <template v-slot="scope">
+                    <div class="shop_info">
+                        <el-image :src="scope.row.imgUrl"
+                            style="width: 50px;height: 50px;border-radius: 4px;background-color: #efefef;">
+                            <div class="img_error" slot="error">
+                                <i class="icon el-icon-document-delete"></i>
+                            </div>
+                        </el-image>
+                        <div class="info">
+                            <span>{{ scope.row.name }}</span>
+                        </div>
+                    </div>
+                </template>
+            </el-table-column>
+            <el-table-column label="有效存酒" prop="savNum"></el-table-column>
+            <el-table-column label="已过期存酒" prop="expNum"></el-table-column>
+        </el-table>
+    </div>
+</template>
+
+<script>
+import { countRecord } from '@/api/application'
+export default {
+    data() {
+        return {
+            tableData: {
+                data: [],
+                page: 0,
+                size: 10,
+                loading: false,
+                total: 0
+            }
+        }
+    },
+    mounted() {
+        this.getTableData()
+    },
+    methods: {
+        // 分页回调
+        paginationChange(e) {
+            this.tableData.page = e - 1
+            this.getTableData()
+        },
+        // 获取商品列表
+        async getTableData() {
+            try {
+                this.tableData.loading = true
+                const res = await countRecord({
+                    page: this.tableData.page,
+                    size: this.tableData.size
+                })
+                this.tableData.loading = false
+                this.tableData.data = res.content
+                this.tableData.total = res.totalElements
+            } catch (error) {
+                console.log(error)
+            }
+        }
+    }
+}
+</script>
+
+<style scoped lang="scss">
+.shop_info {
+    display: flex;
+
+    .info {
+        flex: 1;
+        padding-left: 8px;
+        display: flex;
+        flex-direction: column;
+
+        .tag_wrap {
+            display: flex;
+        }
+    }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/coupon_manage/components/addCoupon.vue b/src/views/coupon_manage/add_coupon.vue
similarity index 53%
rename from src/views/coupon_manage/components/addCoupon.vue
rename to src/views/coupon_manage/add_coupon.vue
index fa12b7a..25d5dea 100644
--- a/src/views/coupon_manage/components/addCoupon.vue
+++ b/src/views/coupon_manage/add_coupon.vue
@@ -1,83 +1,111 @@
 <template>
-    <div>
-        <el-dialog title="添加优惠券" :visible.sync="dialogVisible" @close="reset">
+    <div class="app-container">
+        <div class="tab">
+            <div class="tab_item" @click="tabClick(item)" :class="{active: tabActive == item.type}" v-for="(item,index) in tabList" :key="index"> {{ item.name }} <span class="bor"></span></div>
+        </div>
+        <!-- 优惠券 -->
+        <div class="content" v-if="tabActive == 1">
             <el-form ref="form" :model="form" :rules="rules" label-width="120px" label-position="left">
-                <el-form-item label="优惠卷名称" prop="title">
-                    <el-input v-model="form.title" placeholder="请输入优惠卷名称" style="width: 200px;"></el-input>
+                <el-form-item label="优惠卷卷名" prop="title">
+                    <el-input v-model="form.title" placeholder="" style="width: 289px;"></el-input>
                 </el-form-item>
-                <el-form-item label="类型">
-                    <el-radio-group v-model="form.classType">
-                        <el-radio :label="item.value" v-for="item in couponEnum.classType" :key="item.value">
+                <el-form-item label="使用门槛" prop="title">
+                    <el-input v-model="form.title" placeholder="" style="width: 180px;margin-right: 66px;">
+                      <template slot="prepend">满</template>
+                      <template slot="append">元</template>
+                    </el-input>
+                    <el-input v-model="form.title" placeholder="" style="width: 180px;">
+                      <template slot="prepend">减</template>
+                      <template slot="append">元</template>
+                    </el-input>
+                </el-form-item>
+             
+                <el-form-item label="有效期类型">
+                    <el-radio-group v-model="form.validityType">
+                        <el-radio :label="item.value" v-for="item in couponEnum.validityType" :key="item.value">
                             {{ item.label }}
                         </el-radio>
                     </el-radio-group>
                 </el-form-item>
-                <el-form-item label="选择商品" v-if="form.classType == 'product'" prop="classType">
-                    <div>
-                        <el-button type="primary" icon="el-icon-plus" @click="$refs.shopListRef.show([...productIds])">
-                            添加商品
-                        </el-button>
-                    </div>
-                    <div class="shop_list">
-                        <div class="item_wrap" v-for="(item, index) in productIds" :key="item.id"
-                            @click="productIds.splice(index, 1)">
-                            <div class="item" :data-index="index + 1">
-                                <el-image :src="item.coverImg" style="width: 100%;height: 100%;"></el-image>
-                            </div>
-                            <div class="name">{{ item.name }}</div>
-                        </div>
-                    </div>
+                <el-form-item label="有效时间" v-if="form.validityType == 1">
+                    <el-date-picker v-model="selectTime" type="daterange" range-separator="至" start-placeholder="开始日期"
+                        end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']"
+                        value-format="yyyy-MM-dd HH:mm:ss">
+                    </el-date-picker>
                 </el-form-item>
-                <el-form-item label="优惠类型">
-                    <el-radio-group v-model="form.type">
-                        <el-radio :label="item.value" v-for="item in couponEnum.type" :key="item.value">
-                            {{ item.label }}
-                        </el-radio>
-                    </el-radio-group>
+                <el-form-item label="使用门槛" prop="title">
+                    <el-input v-model="form.title" placeholder="" style="width: 200px;">
+                      <template slot="prepend">隔</template>
+                      <template slot="append">天生效</template>
+                    </el-input>
                 </el-form-item>
-                <el-form-item label="满减限制" v-if="form.type == '0'">
-                    <el-input-number v-model="form.limitAmount" controls-position="right" :min="0"></el-input-number>
+                <el-form-item label="可用周期" prop="title">
+                  <el-checkbox-group v-model="form.checkedCycle" >
+                    <el-checkbox v-for="(city,index) in couponEnum.cycle" :label="city.label" :key="index">{{city.label}}</el-checkbox>
+                  </el-checkbox-group>
                 </el-form-item>
-                <el-form-item label="折扣" v-if="form.type == '1'">
-                    <el-input-number v-model="form.ratio" controls-position="right" :min="1"></el-input-number>
-                </el-form-item>
-                <el-form-item label="优惠券面额">
-                    <el-input-number v-model="form.amount" controls-position="right" :min="0"></el-input-number>
-                </el-form-item>
-                <el-form-item label="发放数量">
-                    <el-input-number v-model="form.number" controls-position="right" :min="1"></el-input-number>
-                </el-form-item>
-                <el-form-item label="限领数量">
-                    <el-input-number v-model="form.limitNumber" controls-position="right" :min="1"></el-input-number>
-                </el-form-item>
-                <el-form-item label="有效期">
+                <el-form-item label="指定时间段">
                     <el-radio-group v-model="form.effectType">
                         <el-radio :label="item.value" v-for="item in couponEnum.effectType" :key="item.value">
                             {{ item.label }}
                         </el-radio>
                     </el-radio-group>
                 </el-form-item>
-                <el-form-item label="有效时间" v-if="form.effectType == 1">
+                <el-form-item label="指定时间段" v-if="form.effectType == 1">
                     <el-date-picker v-model="selectTime" type="daterange" range-separator="至" start-placeholder="开始日期"
                         end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']"
                         value-format="yyyy-MM-dd HH:mm:ss">
                     </el-date-picker>
                 </el-form-item>
-                <el-form-item label="状态">
-                    <el-switch v-model="form.status" :active-value="1" :inactive-value="0"></el-switch>
+                <el-form-item label="发放数量" prop="title">
+                    <el-input v-model="form.title" placeholder="" style="width: 200px;"></el-input>
                 </el-form-item>
             </el-form>
             <span slot="footer" class="dialog-footer">
                 <el-button @click="dialogVisible = false">取 消</el-button>
                 <el-button type="primary" :loading="loading" @click="onSubmitHandle">确 定</el-button>
             </span>
-        </el-dialog>
+        </div>
+        <!-- 商品券 -->
+        <div class="content" v-if="tabActive == 2">
+            <el-form ref="form" :model="formTwo" :rules="rulesTwo" label-width="120px" label-position="left">
+                <el-form-item label="商品卷卷名" prop="title">
+                    <el-input v-model="form.title" placeholder="" style="width: 289px;"></el-input>
+                </el-form-item>
+                <el-form-item label="发放数量" >
+                    <el-input v-model="form.title" placeholder="" style="width: 289px;"></el-input>
+                </el-form-item>
+                <el-form-item label="使用门槛" >
+                    全额满<el-input v-model="form.title" placeholder="" style="width: 100px;margin: 0 23px;"><template slot="suffix">元</template></el-input>可用
+                </el-form-item>
+                <el-form-item label="赠送商品" v-if="form.classType == 'product'" prop="classType">
+                    <div>
+                        <el-button type="primary" icon="el-icon-plus" @click="$refs.shopListRef.show([...productIds])">
+                            添加 </el-button>
+                    </div>
+                    <div class="shop_list">
+                        <div class="item_wrap" v-for="(item, index) in productIds" :key="item.id"
+                            @click="productIds.splice(index, 1)">
+                            <div class="name">{{ item.name }}</div>
+                            <el-input v-model="form.title" placeholder="请填写数量" style="width: 100px;"></el-input>
+                            <div class="del">删除</div>
+                        </div>
+                    </div>
+                </el-form-item>
+          
+                
+            </el-form>
+            <span slot="footer" class="dialog-footer">
+                <el-button @click="dialogVisible = false">取 消</el-button>
+                <el-button type="primary" :loading="loading" @click="onSubmitHandle">确 定</el-button>
+            </span>
+        </div>
         <shopList ref="shopListRef" @success="slectShop" />
     </div>
 </template>
 
 <script>
-import couponEnum from './../couponEnum'
+import couponEnum from './couponEnum'
 import shopList from '@/components/shopList'
 import { tbMerchantCoupon } from '@/api/shop'
 export default {
@@ -91,15 +119,23 @@ export default {
             }
         }
         return {
+            tabList: [
+                { name: "新增优惠券", type: 1},
+                { name: "新增商品券", type: 2},
+            ],
+            tabActive: 1,
             couponEnum,
             dialogVisible: false,
             loading: false,
             selectTime: [],
             form: {
                 id: '',
+                validityType: '0',
+                checkedCycle: [],
+                type: '0',
                 title: '',
                 classType: 'product',
-                type: '0',
+               
                 limitAmount: '',
                 ratio: '1',
                 amount: '',
@@ -110,6 +146,9 @@ export default {
                 toTime: '',
                 relationIds: '',
                 status: 1
+            },
+            formTwo: {
+
             },
             rules: {
                 title: [
@@ -127,14 +166,37 @@ export default {
                     }
                 ]
             },
+            rulesTwo: {
+                title: [
+                    {
+                        required: true,
+                        message: ' ',
+                        trigger: 'blur'
+                    }
+                ],
+                classType: [
+                    {
+                        required: true,
+                        validator: validateProduct,
+                        trigger: 'change'
+                    }
+                ]
+            },
             resetForm: '',
             productIds: []
         }
     },
     mounted() {
         this.resetForm = { ...this.form }
+        console.log(this.$route.query.type)
+        this.tabActive = this.$route.query.type;
     },
     methods: {
+        tabClick (item) {
+            console.log(item)
+          this.tabActive = item.type;
+
+        },
         // 选择商品
         slectShop(res) {
             if (this.productIds.length) {
@@ -208,70 +270,59 @@ export default {
 </script>
 
 <style scoped lang="scss">
+.tab{
+  display: flex;
+  margin-bottom: 30px;
+  padding-top: 40px;
+  padding-left: 10px;
+  .tab_item{
+    margin-right: 64px;
+    font-weight: 400;
+    font-size: 16px;
+    color: #666666;
+    cursor: pointer;
+    .bor{
+      display: block;
+      width: 56px;
+      height: 6px;
+      background-color: transparent;
+      border-radius: 3px 3px 3px 3px;
+      margin: 5px auto 0;
+    }
+  }
+  .active{
+    color: #3F9EFF;
+    .bor{
+      background-color: #3F9EFF;
+    }
+  }
+  
+}
+.content{
+  font-weight: 400;
+  font-size: 16px;
+  color: #666666;
+}
 .shop_list {
     display: flex;
     flex-wrap: wrap;
-
+    margin-top: 15px;
     .item_wrap {
         $size: 80px;
-
-        .item {
-            $radius: 4px;
-            width: $size;
-            height: $size;
-            border-radius: $radius;
-            overflow: hidden;
-            position: relative;
-            margin-right: 10px;
-            margin-top: 10px;
-
-            &:hover {
-                cursor: pointer;
-            }
-
-            &::after {
-                content: attr(data-index);
-                font-size: 12px;
-                height: 20px;
-                display: flex;
-                padding: 0 10px;
-                border-radius: 0 0 $radius 0;
-                align-items: center;
-                background-color: rgba(0, 0, 0, 0.3);
-                backdrop-filter: blur(10px);
-                color: #fff;
-                position: absolute;
-                top: 0;
-                left: 0;
-                z-index: 10;
-            }
-
-            &::before {
-                content: '删除';
-                font-size: 12px;
-                width: 100%;
-                height: 20px;
-                display: flex;
-                padding: 0 10px;
-                align-items: center;
-                justify-content: center;
-                background-color: rgba(0, 0, 0, 0.3);
-                backdrop-filter: blur(10px);
-                color: #fff;
-                position: absolute;
-                bottom: 0;
-                left: 0;
-                z-index: 10;
-                transition: all .1s ease-in-out;
-            }
-        }
-
+        display: flex;
+        align-items: center;
         .name {
             width: $size;
             white-space: nowrap;
             overflow: hidden;
             text-overflow: ellipsis;
         }
+        .del{
+          font-weight: 400;
+          font-size: 14px;
+          color: #3F9EFF;
+          margin-left: 11px;
+        }
     }
 }
 </style>
\ No newline at end of file
diff --git a/src/views/coupon_manage/components/coupon_details.vue b/src/views/coupon_manage/components/coupon_details.vue
new file mode 100644
index 0000000..b0fb115
--- /dev/null
+++ b/src/views/coupon_manage/components/coupon_details.vue
@@ -0,0 +1,204 @@
+<template>
+  <div>
+    <el-dialog title="领取详情" :visible.sync="dialogVisible" width="70%" @close="reset">
+      <div class="search">
+        <el-form :model="query" inline label-position="left">
+          <el-form-item>
+            <el-input v-model="query.name" placeholder="用户ID/用户昵称/用户手机" style="width: 180px;" />
+          </el-form-item>
+          <el-form-item>
+            <el-select v-model="query.state" placeholder="选择状态" style="width: 154px;">
+              <el-option
+                v-for="item in stateList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item />
+          <el-form-item label="领取时间">
+            <el-date-picker
+              v-model="query.createdAt"
+              type="daterange"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              :default-time="['00:00:00', '23:59:59']"
+              value-format="yyyy-MM-dd HH:mm:ss"
+            />
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" @click="getTableData">查询</el-button>
+            <el-button v-loading="downloadLoading" icon="el-icon-download" @click="downloadHandle">
+              <span v-if="!downloadLoading">导出</span>
+              <span v-else>下载中...</span>
+            </el-button>
+          </el-form-item>
+        </el-form>
+      </div>
+      <div>
+        <el-table v-loading="loading" :data="tableData">
+
+          <el-table-column label="用户ID" prop="id" />
+          <el-table-column label="用户名" prop="areaName" />
+          <el-table-column label="领取时间" prop="tableName" />
+          <el-table-column label="使用时间" prop="tableName" />
+          <el-table-column label="获得来源" prop="tableName" />
+          <el-table-column label="状态" prop="tableName" />
+          <el-table-column label="使用门店" prop="tableName" />
+          <el-table-column label="订单数量" prop="orderCount">
+            <template v-slot="scope">
+              <div class="cursor-pointer" @click="toTableOrderList(scope.row)">
+                {{ scope.row.orderCount }}
+              </div>
+            </template>
+          </el-table-column>
+
+        </el-table>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      dialogVisible: true,
+      downloadLoading: false,
+      loading: false,
+      stateList: [
+        { label: '未使用', value: 1 },
+        { label: '已使用', value: 2 }
+      ],
+      query: {
+        name: '',
+        createdAt: [],
+        state: ''
+      },
+      tableData: null
+    }
+  },
+  mounted() {
+
+  },
+  methods: {
+    /**
+     * 查询
+     */
+    getTableData() {
+
+    },
+    // 导出Excel
+    async downloadHandle() {
+      try {
+        this.downloadLoading = true
+        // eslint-disable-next-line no-undef
+        const file = await summaryTableDownload({
+          startTime: this.query.createdAt[0],
+          endTime: this.query.createdAt[1]
+        })
+        // eslint-disable-next-line no-undef
+        downloadFile(file, '数据', 'xlsx')
+        this.downloadLoading = false
+      } catch (error) {
+        this.downloadLoading = false
+        console.log(error)
+      }
+    },
+    // 提交
+    onSubmitHandle() {
+
+    },
+    /**
+     * 打开详情
+     * @param obj
+     */
+    show(obj) {
+      this.dialogVisible = true
+    //   if (obj && obj.id) {
+    //     this.form = { ...obj }
+    //   }
+    },
+    /**
+     * 关闭详情
+     */
+    close() {
+      this.dialogVisible = false
+    },
+    reset() {
+      this.form = { ...this.resetForm }
+    }
+  }
+}
+</script>
+
+<style scoped lang="scss">
+.shop_list {
+    display: flex;
+    flex-wrap: wrap;
+
+    .item_wrap {
+        $size: 80px;
+
+        .item {
+            $radius: 4px;
+            width: $size;
+            height: $size;
+            border-radius: $radius;
+            overflow: hidden;
+            position: relative;
+            margin-right: 10px;
+            margin-top: 10px;
+
+            &:hover {
+                cursor: pointer;
+            }
+
+            &::after {
+                content: attr(data-index);
+                font-size: 12px;
+                height: 20px;
+                display: flex;
+                padding: 0 10px;
+                border-radius: 0 0 $radius 0;
+                align-items: center;
+                background-color: rgba(0, 0, 0, 0.3);
+                backdrop-filter: blur(10px);
+                color: #fff;
+                position: absolute;
+                top: 0;
+                left: 0;
+                z-index: 10;
+            }
+
+            &::before {
+                content: '删除';
+                font-size: 12px;
+                width: 100%;
+                height: 20px;
+                display: flex;
+                padding: 0 10px;
+                align-items: center;
+                justify-content: center;
+                background-color: rgba(0, 0, 0, 0.3);
+                backdrop-filter: blur(10px);
+                color: #fff;
+                position: absolute;
+                bottom: 0;
+                left: 0;
+                z-index: 10;
+                transition: all .1s ease-in-out;
+            }
+        }
+
+        .name {
+            width: $size;
+            white-space: nowrap;
+            overflow: hidden;
+            text-overflow: ellipsis;
+        }
+    }
+}
+</style>
diff --git a/src/views/coupon_manage/couponEnum.js b/src/views/coupon_manage/couponEnum.js
index 9bf81ab..94a6b6e 100644
--- a/src/views/coupon_manage/couponEnum.js
+++ b/src/views/coupon_manage/couponEnum.js
@@ -19,14 +19,33 @@ export default {
             label: '折扣'
         }
     ],
-    effectType: [
+    cycle: [
+        { label: '周一'},
+        { label: '周二'},
+        { label: '周三'},
+        { label: '周四'},
+        { label: '周五'},
+        { label: '周六'},
+        { label: '周七'},
+    ],
+    validityType: [
         {
             value: '0',
-            label: '一直有效'
+            label: '领券后有效期内可用'
         },
         {
             value: '1',
-            label: '时限有效'
+            label: '固定有效期范围内可用'
+        }
+    ],
+    effectType: [
+        {
+            value: '0',
+            label: '全时段可用'
+        },
+        {
+            value: '1',
+            label: '指定时间段'
         }
     ]
 }
\ No newline at end of file
diff --git a/src/views/coupon_manage/coupon_list.vue b/src/views/coupon_manage/coupon_list.vue
index 9c9b65a..ec307f0 100644
--- a/src/views/coupon_manage/coupon_list.vue
+++ b/src/views/coupon_manage/coupon_list.vue
@@ -1,42 +1,43 @@
 <template>
     <div class="app-container">
         <div class="head-container">
-            <el-button type="primary" icon="el-icon-plus" @click="$refs.addCoupon.show()">
+            <!-- <el-button type="primary" icon="el-icon-plus" @click="$refs.addCoupon.show()">
                 添加优惠券
+            </el-button> -->
+            <el-button type="primary" icon="el-icon-plus" @click="$router.push({name: 'add_coupon', query: {type:1}})">
+                添加优惠券
+            </el-button>
+            <el-button type="primary" icon="el-icon-plus" @click="$router.push({name: 'add_coupon', query: {type:2}})">
+                添加商品券
             </el-button>
         </div>
         <div class="head-container">
             <el-table :data="tableData.data" v-loading="tableData.loading">
-                <el-table-column label="优惠券名称" prop="title"></el-table-column>
-                <el-table-column label="类型" prop="classType">
-                    <template v-slot="scope">
-                        {{ scope.row.classType | classTypeFilter }}
-                    </template>
-                </el-table-column>
+                <el-table-column label="ID" prop="title"></el-table-column>
+                <el-table-column label="名称" prop="title"></el-table-column>  
                 <el-table-column label="优惠类型" prop="type">
                     <template v-slot="scope">
                         {{ scope.row.type | typeFilter }}
                     </template>
                 </el-table-column>
-                <el-table-column label="折扣" prop="ratio"></el-table-column>
-                <el-table-column label="面额" prop="amount"></el-table-column>
-                <el-table-column label="满减限制" prop="limitAmount"></el-table-column>
-                <el-table-column label="发放数量" prop="number"></el-table-column>
-                <el-table-column label="限领数量" prop="limitNumber"></el-table-column>
-                <el-table-column label="剩余数量" prop="leftNumber"></el-table-column>
+                <el-table-column label="使用门槛" prop="ratio"></el-table-column>
                 <el-table-column label="有效期" prop="effectType">
                     <template v-slot="scope">
                         {{ scope.row.effectType | effectTypeFilter }}
                     </template>
                 </el-table-column>
-                <el-table-column label="开始时间" prop="fromTime"></el-table-column>
-                <el-table-column label="到期时间" prop="toTime"></el-table-column>
-                <el-table-column label="商品列表" prop="relationIds" width="200">
+                <el-table-column label="用户领取方式" prop="ratio"></el-table-column>
+                <el-table-column label="总发放数量" prop="ratio"></el-table-column>
+                <el-table-column label="已领取" prop="ratio"></el-table-column>
+                <el-table-column label="已使用" prop="ratio"></el-table-column>
+                <el-table-column label="剩余" prop="ratio"></el-table-column>
+                <el-table-column label="操作" width="150">
                     <template v-slot="scope">
-                        <div style="display: flex;" v-if="scope.row.classType == 'product'">
-                            <el-image :src="scope.row.coverImg" style="width: 30px;height: 30px;"></el-image>
-                            <span style="margin-left: 10px;">{{ scope.row.name }}</span>
-                        </div>
+                        <el-button type="text" icon="el-icon-edit" @click="toPath( '/product/add_shop' ,scope.row )">编辑</el-button>
+                        <el-popconfirm title="确定删除吗？" @confirm="delTableHandle([scope.row.id])">
+                        <el-button type="text" icon="el-icon-delete" style="margin-left: 20px !important;"
+                            slot="reference">删除</el-button>
+                        </el-popconfirm>
                     </template>
                 </el-table-column>
             </el-table>
@@ -52,7 +53,7 @@
 
 <script>
 import couponEnum from './couponEnum'
-import addCoupon from './components/addCoupon.vue'
+import addCoupon from './components/coupon_details.vue'
 import { tbMerchantCouponGet } from '@/api/shop'
 export default {
     components: { addCoupon },
@@ -68,9 +69,7 @@ export default {
         }
     },
     filters: {
-        classTypeFilter(value) {
-            return couponEnum.classType.find(item => item.value == value).label
-        },
+       
         typeFilter(value) {
             return couponEnum.type.find(item => item.value == value).label
         },
@@ -82,6 +81,10 @@ export default {
         this.getTableData()
     },
     methods: {
+        // 是否允许修改商品
+        toPath ( path , row) {
+            this.$router.push({path: path, query: row})
+        },
         // 重置查询
         resetHandle() {
             this.page = 0

From 863630b4c20c9a6e344d89166706a9fc4c5b9917 Mon Sep 17 00:00:00 2001
From: duan <1004387497@qq.com>
Date: Fri, 25 Oct 2024 17:01:33 +0800
Subject: [PATCH 02/16] =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=9C=BA=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E5=A4=87=E6=B3=A8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/devices/details.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/devices/details.vue b/src/views/devices/details.vue
index 4cd8639..8571bba 100644
--- a/src/views/devices/details.vue
+++ b/src/views/devices/details.vue
@@ -49,7 +49,7 @@
                     <el-radio label="1">部分分类</el-radio>
                     <!-- <el-radio label="2">部分商品</el-radio> -->
                 </el-radio-group>
-                <div style="color: rgb(255, 77, 79);margin-left: 80px;">仅打印制作单[厨房]</div>
+                <div  v-if="forms.classifyPrint == 1"  style="color: rgb(255, 77, 79);margin-left: 80px;">仅打印制作单[厨房]</div>
                 <div v-if="forms.classifyPrint == 1" style="margin-left:70px">
                     <!-- <el-tree :data="partList" show-checkbox node-key="id" ref="tree" :default-checked-keys="this.forms.categoryIds"
                         :props="{ children: 'childrenList', label: 'name' }">

From 7445cfda2664d95dc52b32015d182093464730a6 Mon Sep 17 00:00:00 2001
From: gyq <875626088@qq.com>
Date: Sat, 26 Oct 2024 10:27:26 +0800
Subject: [PATCH 03/16] =?UTF-8?q?=E6=8F=90=E4=BA=A4pad=E7=82=B9=E9=A4=90?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/pad.js                               | 12 ++++
 src/utils/index.js                           | 12 ++++
 src/views/application/member_points.vue      |  3 +
 src/views/product/category.vue               |  8 +--
 src/views/product/components/addClassify.vue |  4 +-
 src/views/shop/pad_setting.vue               | 60 +++++++++++++++++---
 6 files changed, 85 insertions(+), 14 deletions(-)
 create mode 100644 src/views/application/member_points.vue

diff --git a/src/api/pad.js b/src/api/pad.js
index ebb8bd5..e2a24e6 100644
--- a/src/api/pad.js
+++ b/src/api/pad.js
@@ -69,3 +69,15 @@ export function productGroupPut(data) {
     data
   });
 }
+
+/**
+ * 拖动排序
+ * @returns
+ */
+export function productCategorySort(data) {
+  return request({
+    url: "/api/pad/productCategory/sort",
+    method: "post",
+    data
+  });
+}
diff --git a/src/utils/index.js b/src/utils/index.js
index abbf4b6..98df082 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -438,3 +438,15 @@ export function formatDecimal(num = 0, decimal = 2, isInt = false) {
     return parseFloat(num).toFixed(decimal);
   }
 }
+
+/**
+ * 传入数组，以及要交换位置的2个元素的下标
+ * @param {*} arr
+ * @param {*} i1
+ * @param {*} i2
+ * @returns
+ */
+export function swapArrayEle(arr, i1, i2) {
+  arr[i1] = arr.splice(i2, 1, arr[i1])[0];
+  return arr;
+}
diff --git a/src/views/application/member_points.vue b/src/views/application/member_points.vue
new file mode 100644
index 0000000..32aa4bb
--- /dev/null
+++ b/src/views/application/member_points.vue
@@ -0,0 +1,3 @@
+<template>
+    <div>会员积分</div>
+</template>
\ No newline at end of file
diff --git a/src/views/product/category.vue b/src/views/product/category.vue
index 650c31f..7d44ce2 100644
--- a/src/views/product/category.vue
+++ b/src/views/product/category.vue
@@ -25,18 +25,18 @@
                             @change="showChange($event, scope.row)"></el-switch>
                     </template>
                 </el-table-column>
-                <el-table-column label="颜色">
+                <!-- <el-table-column label="颜色">
                     <template v-slot="scope">
                         <div
                             :style="{ width: '20px', height: '20px', borderRadius: '50%', backgroundColor: scope.row.style || '#efefef' }">
                         </div>
                     </template>
-                </el-table-column>
+                </el-table-column> -->
                 <el-table-column label="操作" width="300">
                     <template v-slot="scope">
-                        <el-button type="text" size="mini" round icon="el-icon-plus"
+                        <!-- <el-button type="text" size="mini" round icon="el-icon-plus"
                             @click="$refs.addClassifyRef.show({ pid: scope.row.id })"
-                            v-if="!scope.row.pid">添加子分类</el-button>
+                            v-if="!scope.row.pid">添加子分类</el-button> -->
                         <el-button type="text" size="mini" round icon="el-icon-edit"
                             @click="$refs.addClassifyRef.show(scope.row)">编辑</el-button>
                         <el-popconfirm title="确定删除吗？" @confirm="delHandle([scope.row.id])">
diff --git a/src/views/product/components/addClassify.vue b/src/views/product/components/addClassify.vue
index 87232be..de599f0 100644
--- a/src/views/product/components/addClassify.vue
+++ b/src/views/product/components/addClassify.vue
@@ -14,12 +14,12 @@
             <el-form-item label="分类图片">
                 <uploadImg ref="uploadImg" @success="res => form.pic = res[0]" @remove="form.pic = ''" />
             </el-form-item>
-            <el-form-item label="颜色标识">
+            <!-- <el-form-item label="颜色标识">
                 <el-color-picker v-model="form.style"></el-color-picker>
                 <div style="color: #999;">
                     标识色用在无图模式时的商品点单按钮显示，可以更有效的从视觉.上进行商品分组。
                 </div>
-            </el-form-item>
+            </el-form-item> -->
             <el-form-item label="开关">
                 <el-switch v-model="form.isShow" :active-value="1" :inactive-value="0"></el-switch>
             </el-form-item>
diff --git a/src/views/shop/pad_setting.vue b/src/views/shop/pad_setting.vue
index df9444c..df8d0ac 100644
--- a/src/views/shop/pad_setting.vue
+++ b/src/views/shop/pad_setting.vue
@@ -2,8 +2,8 @@
     <div class="app-container">
         <div class="left_menu">
             <div class="search_wrap">
-                <el-input placeholder="名称/代码" v-model="query.name">
-                    <el-button slot="append" icon="el-icon-search"></el-button>
+                <el-input placeholder="名称/代码" v-model="query.name" @change="searchCateory">
+                    <el-button slot="append" icon="el-icon-search" @click="searchCateory"></el-button>
                 </el-input>
             </div>
             <div class="tree_wrap">
@@ -15,16 +15,18 @@
             <div class="header_wrap">
                 <el-button type="primary" @click="addHandle">新建</el-button>
             </div>
-            <div class="table">
-                <el-table :data="tableData.list" border height="100%" v-loading="tableData.loading">
+            <div class="table" id="table_drag">
+                <el-table ref="table" :data="tableData.list" border height="100%" v-loading="tableData.loading"
+                    row-key="id">
                     <el-table-column label="序号" type="index"></el-table-column>
+                    <el-table-column label="ID" prop="id" width="80"></el-table-column>
                     <el-table-column label="菜品名称" prop="productNames"></el-table-column>
                     <el-table-column label="类型" prop="padLayoutName"></el-table-column>
                     <el-table-column label="所属小类" prop="productCategoryName"></el-table-column>
                     <el-table-column label="自定义分类" prop="customName"></el-table-column>
-                    <el-table-column label="操作">
+                    <el-table-column label="操作" width="200">
                         <template v-slot="scope">
-                            <el-button type="text">拖动排序</el-button>
+                            <el-button type="text" v-if="isPcBowser">拖动排序</el-button>
                             <el-button type="text" @click="editorHandle(scope.row, 1)">编辑</el-button>
                             <el-popconfirm title="确定删除吗？" @confirm="delTableHandle(scope.row.id)">
                                 <el-button type="text" slot="reference">删除</el-button>
@@ -45,10 +47,12 @@
 </template>
 
 <script>
+import Sortable from 'sortablejs'
 import AddPadPage from './components/addPadPage.vue'
 import { tbShopCategoryGet } from '@/api/shop'
-import { productGrouppage, productCategoryDelete } from '@/api/pad.js'
-import editor from 'mavon-editor';
+import { productGrouppage, productCategoryDelete, productCategorySort } from '@/api/pad.js'
+import { swapArrayEle } from '@/utils/index.js'
+
 export default {
     components: {
         AddPadPage
@@ -59,6 +63,7 @@ export default {
                 name: ''
             },
             selectCatory: '',
+            treeDataOrgin: [],
             treeData: [],
             tableData: {
                 loading: false,
@@ -71,8 +76,46 @@ export default {
     },
     mounted() {
         this.tbShopCategoryGet()
+        if (this.isPcBowser) {
+            this.$nextTick(() => {
+                this.tableDrag()
+            })
+        }
     },
     methods: {
+        // 搜索分类
+        searchCateory() {
+            this.treeData = this.treeDataOrgin.filter(item => {
+                return item.name.includes(this.query.name)
+            })
+        },
+        //表格拖拽
+        tableDrag() {
+            const el = document.querySelector('#table_drag .el-table__body-wrapper tbody')
+            new Sortable(el, {
+                animation: 150,
+                onEnd: async e => {
+                    // console.log('拖拽结束===', e);
+                    if (e.oldIndex == e.newIndex) return
+
+                    let arr = swapArrayEle(this.tableData.list, e.oldIndex, e.newIndex)
+                    console.log(arr);
+                    let data = arr.map((item, index) => {
+                        return {
+                            id: item.id,
+                            sort: index
+                        }
+                    })
+
+                    try {
+                        await productCategorySort(data)
+                        this.getTableData()
+                    } catch (error) {
+                        console.log(error);
+                    }
+                }
+            });
+        },
         // 删除
         async delTableHandle(id) {
             try {
@@ -119,6 +162,7 @@ export default {
                     sort: 'id,desc',
                     shopId: localStorage.getItem('shopId')
                 })
+                this.treeDataOrgin = res.content
                 this.treeData = res.content
                 this.getTableData()
             } catch (error) {

From a2d21b37764835c7e119a18795c3943b6050967a Mon Sep 17 00:00:00 2001
From: gyq <875626088@qq.com>
Date: Sat, 26 Oct 2024 10:34:37 +0800
Subject: [PATCH 04/16] =?UTF-8?q?=E5=B0=86=E6=8E=A5=E5=8F=A3=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E6=B5=8B=E8=AF=95=E6=9C=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development | 4 ++--
 .env.production  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.env.development b/.env.development
index 98c3e63..fdeba2f 100644
--- a/.env.development
+++ b/.env.development
@@ -5,9 +5,9 @@ ENV = 'development'
 # VUE_APP_BASE_API  = 'http://192.168.2.42:8000'
 # VUE_APP_BASE_API  = 'http://192.168.2.133:8000'
 # 测试
-# VUE_APP_BASE_API  = 'https://admintestpapi.sxczgkj.cn'
+VUE_APP_BASE_API  = 'https://admintestpapi.sxczgkj.cn'
 #预发布
-VUE_APP_BASE_API  = 'https://pre-cashieradmin.sxczgkj.cn'
+# VUE_APP_BASE_API  = 'https://pre-cashieradmin.sxczgkj.cn'
 
 # 生产
 # VUE_APP_BASE_API  = 'https://cashieradmin.sxczgkj.cn'
diff --git a/.env.production b/.env.production
index 1db13cc..2a4f841 100644
--- a/.env.production
+++ b/.env.production
@@ -3,13 +3,13 @@ ENV = 'production'
 # 如果使用 Nginx 代理后端接口，那么此处需要改为 '/'，文件查看 Docker 部署篇，Nginx 配置
 # 接口地址，注意协议，如果你没有配置 ssl，需要将 https 改为 http
 # 测试
-# VUE_APP_BASE_API  = 'https://admintestpapi.sxczgkj.cn'
+VUE_APP_BASE_API  = 'https://admintestpapi.sxczgkj.cn'
 
 # 生产
 # VUE_APP_BASE_API  = 'https://cashieradmin.sxczgkj.cn'
 
 # 预发布接口
-VUE_APP_BASE_API  = 'https://pre-cashieradmin.sxczgkj.cn'
+# VUE_APP_BASE_API  = 'https://pre-cashieradmin.sxczgkj.cn'
 
 # VUE_APP_BASE_API  = 'http://192.168.2.98:8000'
 # 如果接口是 http 形式， wss 需要改为 ws

From 7ea49cbab8ff4fb25559f8c2e85ff84d4bf4ad35 Mon Sep 17 00:00:00 2001
From: GaoHao <1210693421@qq.com>
Date: Tue, 29 Oct 2024 10:15:04 +0800
Subject: [PATCH 05/16] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/coupon.js                             |  79 +++
 .../components copy/wine/addModal.vue         | 388 -----------
 .../components copy/wine/record.vue           | 145 -----
 .../components copy/winestorage/addModal.vue  | 188 ------
 .../winestorage/historyModal.vue              |  38 --
 .../components copy/winestorage/record.vue    | 166 -----
 .../components copy/winetotal/winetotal.vue   |  82 ---
 src/views/coupon_manage/add_coupon.vue        | 601 ++++++++++--------
 .../components/coupon_details.vue             | 145 +++--
 src/views/coupon_manage/couponEnum.js         | 100 +--
 src/views/coupon_manage/coupon_list.vue       | 262 ++++----
 11 files changed, 721 insertions(+), 1473 deletions(-)
 create mode 100644 src/api/coupon.js
 delete mode 100644 src/views/application/components copy/wine/addModal.vue
 delete mode 100644 src/views/application/components copy/wine/record.vue
 delete mode 100644 src/views/application/components copy/winestorage/addModal.vue
 delete mode 100644 src/views/application/components copy/winestorage/historyModal.vue
 delete mode 100644 src/views/application/components copy/winestorage/record.vue
 delete mode 100644 src/views/application/components copy/winetotal/winetotal.vue

diff --git a/src/api/coupon.js b/src/api/coupon.js
new file mode 100644
index 0000000..d7c4b17
--- /dev/null
+++ b/src/api/coupon.js
@@ -0,0 +1,79 @@
+import request from '@/utils/request'
+
+/**
+ * 获取优惠券列表
+ * @returns
+ */
+export function getTbShopCoupon(params) {
+  return request({
+    url: '/api/tbShopCoupon',
+    method: 'get',
+    params: {
+      ...params
+    }
+  })
+}
+
+/**
+ * 获取优惠券详情
+ * @returns
+ */
+export function getTbShopCouponInfo(id) {
+  return request({
+    url: '/api/tbShopCoupon/' + id,
+    method: 'get',
+    params: {}
+  })
+}
+
+/**
+ * 增加优惠券
+ * @returns
+ */
+export function addTbShopCoupon(params) {
+  return request({
+    url: '/api/tbShopCoupon',
+    method: 'post',
+    data: {
+      ...params
+    }
+  })
+}
+
+/**
+ * 删除优惠券
+ * @returns
+ */
+export function delTbShopCoupon(params) {
+  return request({
+    url: '/api/tbShopCoupon',
+    method: 'delete',
+    data: params
+  })
+}
+
+/**
+ * 获取领取列表
+ * @returns
+ */
+export function queryReceive(params) {
+  return request({
+    url: '/api/tbShopCoupon/queryReceive',
+    method: 'post',
+    data: {
+      ...params
+    }
+  })
+}
+
+/**
+ * 获取领取列表
+ * @returns
+ */
+export function delReceive(params) {
+  return request({
+    url: '/api/tbShopCoupon/receive',
+    method: 'delete',
+    data: params
+  })
+}
diff --git a/src/views/application/components copy/wine/addModal.vue b/src/views/application/components copy/wine/addModal.vue
deleted file mode 100644
index a52be43..0000000
--- a/src/views/application/components copy/wine/addModal.vue	
+++ /dev/null
@@ -1,388 +0,0 @@
-<template>
-    <div>
-        <el-dialog :title="form.id ? '编辑酒品' : '添加酒品'" :visible.sync="dialogVisible" @close="reset">
-            <div class="head-container" v-if="!form.id">
-                <div class="tab_wrap">
-                    <div class="tab" :style="{ '--index': form.source }">
-                        <div class="item" v-for="(item, index) in tabs" :key="item.value"
-                            :class="{ active: index == form.source }" @click="tabChange(item)">
-                            {{ item.label }}
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <el-form ref="form" :model="form" :rules="rules" label-width="120px" label-position="left">
-                <template v-if="form.source == 0">
-                    <el-form-item label="酒品名" prop="name">
-                        <el-input v-model="form.name" placeholder="请输入酒品名" />
-                    </el-form-item>
-                    <el-form-item label="酒品图片">
-                        <uploadImg ref="uploadImg" :limit="1" @success="e => form.imgUrl = e[0]"
-                            @remove="form.imgUrl = ''" />
-                    </el-form-item>
-                </template>
-                <template v-else>
-                    <template v-if="!form.id">
-                        <el-form-item label="选择商品" prop="name">
-                            <div>
-                                <el-button type="primary" icon="el-icon-plus"
-                                    @click="$refs.shopListRef.show([...productIds])">
-                                    添加商品
-                                </el-button>
-                            </div>
-                            <div class="shop_list">
-                                <div class="item_wrap" v-for="(item, index) in productIds" :key="item.id"
-                                    @click="productIds.splice(index, 1)">
-                                    <div class="item" :data-index="index + 1">
-                                        <el-image :src="item.coverImg" style="width: 100%;height: 100%;"></el-image>
-                                    </div>
-                                    <div class="name">{{ item.name }}</div>
-                                </div>
-                            </div>
-                        </el-form-item>
-                    </template>
-                    <template v-else>
-                        <el-form-item label="商品">
-                            <div class="goods_info">
-                                <el-image :src="form.imgUrl" style="width: 50px;height: 50px;"></el-image>
-                                <div class="info">{{ form.name }}</div>
-                            </div>
-                        </el-form-item>
-                    </template>
-                </template>
-                <el-form-item label="单位">
-                    <el-input v-model="form.unit" placeholder="请输入单位" style="width: 200px;" />
-                    <!-- <el-select v-model="form.unitId" placeholder="请选择单位" style="width: 200px;" @change="selectUnitt">
-                        <el-option :label="item.name" :value="item.id" v-for="item in units" :key="item.id"></el-option>
-                    </el-select>
-                    <el-button type="primary" plain icon="el-icon-plus"
-                        @click="$refs.addUnitRef.show()">添加单位</el-button> -->
-                </el-form-item>
-                <el-form-item label="有效期(天)">
-                    <el-input-number v-model="form.period" controls-position="right" step-strictly :min="1"
-                        placeholder="请输入有效期(天)"></el-input-number>
-                </el-form-item>
-            </el-form>
-            <span slot="footer" class="dialog-footer">
-                <el-button @click="dialogVisible = false">取 消</el-button>
-                <el-button type="primary" @click="onSubmitHandle">确 定</el-button>
-            </span>
-        </el-dialog>
-        <addUnit ref="addUnitRef" @success="tbShopUnit" />
-        <shopList ref="shopListRef" @success="slectShop" />
-    </div>
-</template>
-
-<script>
-import { tbShopStorageGood } from '@/api/application'
-import { queryAllShopUser, tbShopUnit } from '@/api/shop'
-import uploadImg from '@/components/uploadImg'
-import addUnit from '@/views/product/components/addUnit'
-import shopList from '@/components/shopList'
-export default {
-    components: {
-        uploadImg,
-        addUnit,
-        shopList
-    },
-    data() {
-        const nameValidator = (rule, value, callback) => {
-            if (this.form.source == 0) {
-                if (!this.form.name) {
-                    callback(new Error('请输入酒名名'))
-                } else {
-                    callback()
-                }
-            } else {
-                if (!this.productIds.length) {
-                    callback(new Error('请选择商品'))
-                } else {
-                    callback()
-                }
-            }
-        }
-        return {
-            dialogVisible: false,
-            tabs: [
-                {
-                    value: 0,
-                    label: '手动添加'
-                },
-                {
-                    value: 1,
-                    label: '从商品添加'
-                }
-            ],
-            units: [],
-            loading: false,
-            options: [],
-            productIds: [],
-            form: {
-                name: '',
-                imgUrl: '',
-                source: 0,
-                id: '',
-                goods: [
-                    {
-                        imgUrl: '',
-                        name: '',
-                    }
-                ],
-                period: '',
-                unit: ''
-            },
-            resetForm: '',
-            rules: {
-                name: [
-                    {
-                        required: true,
-                        validator: nameValidator,
-                        trigger: 'change'
-                    }
-                ]
-            }
-        }
-    },
-    mounted() {
-        this.resetForm = { ...this.form }
-        // this.getTableData()
-        this.tbShopUnit()
-    },
-    methods: {
-        slectShop(res) {
-            if (this.productIds.length) {
-                res.map(async item => {
-                    if (!await this.checkShop(item.id)) {
-                        this.productIds.push({ ...item })
-                    }
-                })
-            } else {
-                this.productIds = res
-            }
-        },
-        selectUnitt(e) {
-            this.form.unit = this.units.find(item => item.id == e).name
-        },
-        // 获取单位
-        async tbShopUnit() {
-            try {
-                const res = await tbShopUnit({
-                    shopId: localStorage.getItem('shopId'),
-                    sort: 'id',
-                    page: 0,
-                    size: 100
-                })
-                this.units = res.content
-            } catch (error) { }
-        },
-        // 切换类型
-        tabChange(item) {
-            this.form.source = this.tabs.findIndex(i => i.value == item.value)
-        },
-        // 获取用户列表
-        async getTableData(query = '') {
-            this.loading = true
-            try {
-                const res = await queryAllShopUser({
-                    telephone: query,
-                })
-                this.loading = false
-                this.options = res.content
-            } catch (error) {
-                this.loading = false
-                console.log(error)
-            }
-        },
-        // 提交
-        onSubmitHandle() {
-            this.$refs.form.validate(async valid => {
-                if (valid) {
-                    try {
-                        if (this.form.source == 0) {
-                            //  手动大导入
-                            this.form.goods = [{
-                                name: this.form.name,
-                                imgUrl: this.form.imgUrl
-                            }]
-                        } else {
-                            this.form.goods = this.productIds.map(item => {
-                                return {
-                                    name: item.name,
-                                    imgUrl: item.coverImg
-                                }
-                            })
-                        }
-                        let res = await tbShopStorageGood(this.form, this.form.id ? 'put' : 'post')
-                        this.$emit('success', res)
-                        this.close()
-                        this.$notify({
-                            title: '成功',
-                            message: `${this.form.id ? '编辑' : '添加'}成功`,
-                            type: 'success'
-                        });
-                    } catch (error) {
-                        console.log(error)
-                    }
-                }
-            })
-        },
-        show(obj) {
-            this.dialogVisible = true
-            if (obj && obj.id) {
-                this.form = obj
-                if (obj.imgUrl && obj.source == 0) {
-                    setTimeout(() => {
-                        this.$refs.uploadImg.fileList = [
-                            {
-                                url: obj.imgUrl
-                            }
-                        ]
-                    }, 100)
-                }
-            }
-        },
-        close() {
-            this.dialogVisible = false
-        },
-        reset() {
-            if (this.form.source == 0) {
-                this.$refs.uploadImg.clearFiles()
-            }
-            this.form = { ...this.resetForm }
-            this.$refs.form.resetFields()
-
-        }
-    }
-}
-</script>
-
-<style scoped lang="scss">
-.goods_info {
-    background-color: #f9f9f9;
-    padding: 10px;
-    display: flex;
-    align-items: center;
-
-    .info {
-        flex: 1;
-        padding-left: 10px;
-    }
-}
-
-.head-container {
-    display: flex;
-    justify-content: center;
-}
-
-.tab_wrap {
-    background-color: #DCF0E8;
-    padding: 4px;
-
-    .tab {
-        --w: 120px;
-        height: 35px;
-        display: flex;
-        position: relative;
-
-
-        &::after {
-            content: "";
-            width: var(--w);
-            height: inherit;
-            background-color: #39D47A;
-            position: absolute;
-            top: 0;
-            left: calc(var(--index) * var(--w));
-            z-index: 1;
-            transition: left .3s ease-in-out;
-        }
-
-        .item {
-            width: var(--w);
-            height: inherit;
-            display: flex;
-            align-items: center;
-            justify-content: center;
-            position: relative;
-            z-index: 2;
-            color: #39D47A;
-            transition: all .1s ease-in-out .15s;
-
-            &:hover {
-                cursor: pointer;
-            }
-
-            &.active {
-                color: #fff;
-            }
-        }
-    }
-}
-
-.shop_list {
-    display: flex;
-    flex-wrap: wrap;
-
-    .item_wrap {
-        $size: 80px;
-
-        .item {
-            $radius: 4px;
-            width: $size;
-            height: $size;
-            border-radius: $radius;
-            overflow: hidden;
-            position: relative;
-            margin-right: 10px;
-            margin-top: 10px;
-
-            &:hover {
-                cursor: pointer;
-            }
-
-            &::after {
-                content: attr(data-index);
-                font-size: 12px;
-                height: 20px;
-                display: flex;
-                padding: 0 10px;
-                border-radius: 0 0 $radius 0;
-                align-items: center;
-                background-color: rgba(0, 0, 0, 0.3);
-                backdrop-filter: blur(10px);
-                color: #fff;
-                position: absolute;
-                top: 0;
-                left: 0;
-                z-index: 10;
-            }
-
-            &::before {
-                content: '删除';
-                font-size: 12px;
-                width: 100%;
-                height: 20px;
-                display: flex;
-                padding: 0 10px;
-                align-items: center;
-                justify-content: center;
-                background-color: rgba(0, 0, 0, 0.3);
-                backdrop-filter: blur(10px);
-                color: #fff;
-                position: absolute;
-                bottom: 0;
-                left: 0;
-                z-index: 10;
-                transition: all .1s ease-in-out;
-            }
-        }
-
-        .name {
-            width: $size;
-            white-space: nowrap;
-            overflow: hidden;
-            text-overflow: ellipsis;
-        }
-    }
-}
-</style>
\ No newline at end of file
diff --git a/src/views/application/components copy/wine/record.vue b/src/views/application/components copy/wine/record.vue
deleted file mode 100644
index 7e4ada5..0000000
--- a/src/views/application/components copy/wine/record.vue	
+++ /dev/null
@@ -1,145 +0,0 @@
-<template>
-    <div class="head-container">
-        <div class="head-container">
-            <el-form :model="query" inline>
-                <el-form-item>
-                    <el-button type="primary" @click="$refs.addModal.show()">添加酒品</el-button>
-                </el-form-item>
-                <el-form-item label="搜索">
-                    <el-input v-model="query.name" placeholder="酒名"></el-input>
-                </el-form-item>
-                <el-form-item>
-                    <el-button type="primary" @click="getTableData">查询</el-button>
-                    <el-button @click="resetHandle">重置</el-button>
-                </el-form-item>
-            </el-form>
-        </div>
-        <div class="head-container">
-            <el-table :data="tableData.data" v-loading="tableData.loading">
-                <el-table-column label="酒名" prop="name">
-                    <template v-slot="scope">
-                        <div style="display: flex;align-items: center;">
-                            <el-image :src="scope.row.imgUrl"
-                                style="width:40px;height: 40px;border-radius: 4px;background-color: #efefef;">
-                                <div class="img_error" slot="error">
-                                    <i class="icon el-icon-document-delete"></i>
-                                </div>
-                            </el-image>
-                            <span style="margin-left: 10px;">{{ scope.row.name }}</span>
-                        </div>
-                    </template>
-                </el-table-column>
-                <el-table-column label="单位" prop="unit">
-                    <template v-slot="scope">
-                        <el-tag type="primary">{{ scope.row.unit }}</el-tag>
-                    </template>
-                </el-table-column>
-                <el-table-column label="有效期(天)" prop="period"></el-table-column>
-                <el-table-column label="来源" prop="source">
-                    <template v-slot="scope">
-                        <span v-if="scope.row.source == 0">手动导入</span>
-                        <span v-if="scope.row.source == 1">商品导入</span>
-                    </template>
-                </el-table-column>
-                <el-table-column label="操作" width="120">
-                    <template v-slot="scope">
-                        <div style="display: flex;gap: 10px;">
-                            <el-button type="text"
-                                @click="$refs.winAddModal.show({ name: scope.row.name, imgUrl: scope.row.imgUrl, expDay: scope.row.period, unit: scope.row.unit }, true)">存酒</el-button>
-                            <el-button type="text" @click="$refs.addModal.show(scope.row)">编辑</el-button>
-                            <el-popconfirm title="确定删除吗？" @confirm="delHandle(scope.row)">
-                                <el-button type="text" slot="reference">删除</el-button>
-                            </el-popconfirm>
-                        </div>
-                    </template>
-                </el-table-column>
-            </el-table>
-        </div>
-        <div class="head-container">
-            <el-pagination :total="tableData.total" :current-page="tableData.page + 1" :page-size="tableData.size"
-                @current-change="paginationChange" layout="total, sizes, prev, pager, next, jumper"></el-pagination>
-        </div>
-        <addModal ref="addModal" @success="getTableData" />
-        <winAddModal ref="winAddModal" />
-    </div>
-</template>
-
-<script>
-import { tbShopStorageGoodlist, tbShopStorageGood } from '@/api/application'
-import addModal from './addModal'
-import winAddModal from '../winestorage/addModal'
-export default {
-    components: {
-        addModal,
-        winAddModal
-    },
-    data() {
-        return {
-            statusList: [
-                {
-                    value: 0,
-                    label: '已取完'
-                },
-                {
-                    value: 1,
-                    label: '未取完'
-                }
-            ],
-            query: {
-                name: ""
-            },
-            tableData: {
-                data: [],
-                page: 0,
-                size: 10,
-                loading: false,
-                total: 0
-            }
-        }
-    },
-    mounted() {
-        this.getTableData()
-    },
-    methods: {
-        // 删除
-        async delHandle(row) {
-            try {
-                let obj = { ...row }
-                obj.isDel = 1
-                await tbShopStorageGood(obj, 'put')
-                this.$notify.success('删除成功')
-                this.getTableData()
-            } catch (error) {
-                console.log(error);
-            }
-        },
-        // 重置查询
-        resetHandle() {
-            this.tableData.page = 0;
-            this.query.name = ''
-            this.getTableData()
-        },
-        // 分页回调
-        paginationChange(e) {
-            this.tableData.page = e - 1;
-            this.getTableData()
-        },
-        // 获取商品列表
-        async getTableData() {
-            this.tableData.loading = true
-            try {
-                const res = await tbShopStorageGoodlist({
-                    name: this.query.name,
-                    page: this.tableData.page,
-                    size: this.tableData.size
-                })
-                this.tableData.loading = false
-                this.tableData.data = res.content
-                this.tableData.total = res.totalElements
-            } catch (error) {
-                console.log(error)
-            }
-        }
-    }
-}
-</script>
\ No newline at end of file
diff --git a/src/views/application/components copy/winestorage/addModal.vue b/src/views/application/components copy/winestorage/addModal.vue
deleted file mode 100644
index c7c0b84..0000000
--- a/src/views/application/components copy/winestorage/addModal.vue	
+++ /dev/null
@@ -1,188 +0,0 @@
-<template>
-    <el-dialog :title="form.id ? '编辑存酒' : '添加存酒'" width="500px" :visible.sync="dialogVisible" @close="reset">
-        <el-form ref="form" :model="form" :rules="rules" label-width="120px" label-position="left">
-            <template v-if="!form.id">
-                <el-form-item label="选择用户" prop="userid">
-                    <el-select v-model="form.userid" placeholder="请输入用户昵称" filterable remote
-                        :remote-method="queryAllShopUser" :loading="loading" @change="userChange">
-                        <el-option v-for="item in options" :key="item.id" :label="`${item.nickName}-${item.telephone}`"
-                            :value="item.id">
-                        </el-option>
-                    </el-select>
-                </el-form-item>
-                <el-form-item label="选择酒品">
-                    <el-select v-model="form.name" @change="wineChange" v-if="!wine">
-                        <el-option :label="item.name" :value="item.name" v-for="(item, index) in wineList"
-                            :key="index"></el-option>
-                    </el-select>
-                    <div class="goods_info" v-else>
-                        <el-image :src="form.imgUrl" style="width: 50px;height: 50px;"></el-image>
-                        <div class="info">{{ form.name }}</div>
-                    </div>
-                </el-form-item>
-                <el-form-item label="数量">
-                    <el-input-number v-model="form.num" :step="1" step-strictly :min="1"></el-input-number>
-                </el-form-item>
-            </template>
-            <el-form-item label="数量" v-else>
-                <el-input-number v-model="num" :step="1" step-strictly :min="1" :max="form.num"></el-input-number>
-            </el-form-item>
-        </el-form>
-        <span slot="footer" class="dialog-footer">
-            <el-button @click="dialogVisible = false">取 消</el-button>
-            <el-button type="primary" @click="onSubmitHandle">确 定</el-button>
-        </span>
-    </el-dialog>
-</template>
-
-<script>
-import { queryAllShopUser } from '@/api/shop'
-import { tbShopStorageGoodlist, storageWin, storagePut } from '@/api/application'
-export default {
-    data() {
-        return {
-            dialogVisible: false,
-            loading: false,
-            options: [],
-            num: '',
-            wine: false,
-            form: {
-                id: '',
-                imgUrl: '',
-                name: '',
-                nickname: '',
-                num: 1,
-                status: '',
-                telphone: '',
-                unit: '',
-                userid: '',
-                expDay: ''
-            },
-            resetForm: '',
-            rules: {
-                userid: [
-                    {
-                        required: true,
-                        message: ' ',
-                        trigger: 'blur'
-                    }
-                ]
-            },
-            wineList: []
-        }
-    },
-    mounted() {
-        this.resetForm = { ...this.form }
-        this.queryAllShopUser()
-        this.tbShopStorageGoodlist()
-    },
-    methods: {
-        // 选择用户
-        userChange(e) {
-            let user = this.options.find(item => item.id == e)
-            this.form.nickname = user.nickName
-            this.form.telphone = user.telephone
-        },
-        // 选择酒品
-        wineChange(e) {
-            let wine = this.wineList.find(item => item.name == e)
-            this.form.imgUrl = wine.imgUrl
-            this.form.expDay = wine.period
-            this.form.unit = wine.unit
-        },
-        // 获取酒品列表
-        async tbShopStorageGoodlist() {
-            try {
-                const res = await tbShopStorageGoodlist({
-                    page: 0,
-                    size: 100
-                })
-                this.wineList = res.content
-            } catch (error) {
-                console.log(error)
-            }
-        },
-        // 获取用户列表
-        async queryAllShopUser(query = '') {
-            this.loading = true
-            try {
-                const res = await queryAllShopUser({
-                    name: query,
-                })
-                this.loading = false
-                this.options = res.content
-            } catch (error) {
-                this.loading = false
-                console.log(error)
-            }
-        },
-        // 提交
-        onSubmitHandle() {
-            console.log(this.form)
-            this.$refs.form.validate(async valid => {
-                if (valid) {
-                    try {
-                        let res = ''
-                        if (this.form.id) {
-                            res = await storagePut({
-                                id: this.form.id,
-                                num: this.num,
-                                type: 0
-                            })
-                            this.$notify({
-                                title: '成功',
-                                message: `取酒成功`,
-                                type: 'success'
-                            });
-                        } else {
-                            res = await storageWin(this.form)
-                            this.$notify({
-                                title: '成功',
-                                message: `存酒成功`,
-                                type: 'success'
-                            });
-                        }
-                        this.$emit('success', res)
-                        this.close()
-                    } catch (error) {
-                        console.log(error)
-                    }
-                }
-            })
-        },
-        async show(obj = {}, wine = false) {
-            this.dialogVisible = true
-            if (obj && obj.id) {
-                this.form = { ...obj }
-            }
-            if (obj && obj.name) {
-                this.form.name = obj.name
-                this.form.imgUrl = obj.imgUrl
-                this.form.expDay = obj.expDay
-                this.form.unit = obj.unit
-            }
-            this.wine = wine
-        },
-        close() {
-            this.dialogVisible = false
-        },
-        reset() {
-            this.form = { ...this.resetForm }
-        }
-    }
-}
-</script>
-
-<style scoped lang="scss">
-.goods_info {
-    background-color: #f9f9f9;
-    padding: 10px;
-    display: flex;
-    align-items: center;
-
-    .info {
-        flex: 1;
-        padding-left: 10px;
-    }
-}
-</style>
\ No newline at end of file
diff --git a/src/views/application/components copy/winestorage/historyModal.vue b/src/views/application/components copy/winestorage/historyModal.vue
deleted file mode 100644
index 41961be..0000000
--- a/src/views/application/components copy/winestorage/historyModal.vue	
+++ /dev/null
@@ -1,38 +0,0 @@
-<template>
-    <el-dialog title="记录" width="500px" :visible.sync="dialogVisible">
-        <el-steps :active="list.length" direction="vertical" :space="100">
-            <el-step :title="item.content" :description="item.time" v-for="item in list" :key="item.id"></el-step>
-        </el-steps>
-        <el-empty description="暂无记录" v-if="!list.length"></el-empty>
-    </el-dialog>
-</template>
-
-<script>
-import { recordList } from '@/api/application'
-export default {
-    data() {
-        return {
-            dialogVisible: false,
-            loading: false,
-            list: []
-        }
-    },
-    methods: {
-        // 查询存取酒记录
-        async recordList(storageId) {
-            try {
-                this.loading = true
-                const res = await recordList({ storageId: storageId })
-                this.list = res.content
-                this.loading = false
-            } catch (error) {
-                console.log(error);
-            }
-        },
-        show(id) {
-            this.dialogVisible = true
-            this.recordList(id)
-        }
-    }
-}
-</script>
\ No newline at end of file
diff --git a/src/views/application/components copy/winestorage/record.vue b/src/views/application/components copy/winestorage/record.vue
deleted file mode 100644
index 4837e0b..0000000
--- a/src/views/application/components copy/winestorage/record.vue	
+++ /dev/null
@@ -1,166 +0,0 @@
-<template>
-    <div class="head-container">
-        <div class="head-container">
-            <el-form :model="query" inline>
-                <el-form-item>
-                    <el-button type="primary" @click="$refs.addModal.show()">添加存酒</el-button>
-                </el-form-item>
-                <el-form-item label="搜索">
-                    <el-input v-model="query.name" placeholder="酒名/用户昵称"></el-input>
-                </el-form-item>
-                <el-form-item label="手机号">
-                    <el-input v-model="query.telphone" placeholder="手机号"></el-input>
-                </el-form-item>
-                <el-form-item label="状态">
-                    <el-select v-model="query.status">
-                        <el-option v-for="item in statusList" :key="item.value" :value="item.value"
-                            :label="item.label"></el-option>
-                    </el-select>
-                </el-form-item>
-                <el-form-item>
-                    <el-button type="primary" @click="getTableData">查询</el-button>
-                    <el-button @click="resetHandle">重置</el-button>
-                </el-form-item>
-            </el-form>
-        </div>
-        <div class="head-container">
-            <el-table :data="tableData.data" v-loading="tableData.loading" row-key="id">
-                <el-table-column label="用户名" prop="nickname">
-                    <template v-slot="scope">
-                        <div style="display: flex;align-items: center;">
-                            <el-image src=""
-                                style="width:40px;height: 40px;background-color: #efefef;display: flex;align-items: center;justify-content: center;">
-                                <i class="el-icon-folder-delete" slot="error" style="font-size: 20px;color: #999;"></i>
-                            </el-image>
-                            <span style="margin-left: 10px;">{{ scope.row.telphone }}</span>
-                        </div>
-                    </template>
-                </el-table-column>
-                <el-table-column label="酒品名" prop="name">
-                    <template v-slot="scope">
-                        <div style="display: flex;align-items: center;">
-                            <el-image :src="scope.row.imgUrl" style="width:40px;height: 40px;">
-                                <i class="el-icon-folder-delete" slot="error"></i>
-                            </el-image>
-                            <span style="margin-left: 10px;">{{ scope.row.name }}</span>
-                        </div>
-                    </template>
-                </el-table-column>
-                <el-table-column label="数量" prop="name">
-                    <template v-slot="scope">
-                        <span>{{ scope.row.num }}({{ scope.row.unit }})</span>
-                    </template>
-                </el-table-column>
-                <el-table-column label="存酒时间" prop="savTime"></el-table-column>
-                <el-table-column label="到期时间" prop="expTime"></el-table-column>
-                <el-table-column label="状态" prop="status">
-                    <template v-slot="scope">
-                        <el-tag :type="statusList.find(item => item.value === scope.row.status).type">{{
-                            statusList.find(item => item.value === scope.row.status).label }}</el-tag>
-                    </template>
-                </el-table-column>
-                <el-table-column label="操作" width="120">
-                    <template v-slot="scope">
-                        <div style="display: flex;gap: 10px;">
-                            <el-button type="text" @click="$refs.HistoryModal.show(scope.row.id)">查看记录</el-button>
-                            <el-button type="text" v-if="scope.row.status == 0" disabled>已取完</el-button>
-                            <el-button type="text" @click="$refs.addModal.show(scope.row)"
-                                v-if="scope.row.status == 1">取酒</el-button>
-                            <el-button type="text" v-if="scope.row.status == 2" disabled>已过期</el-button>
-                        </div>
-                    </template>
-                </el-table-column>
-            </el-table>
-        </div>
-        <div class="head-container">
-            <el-pagination :total="tableData.total" :current-page="tableData.page + 1" :page-size="tableData.size"
-                @current-change="paginationChange" layout="total, sizes, prev, pager, next, jumper"></el-pagination>
-        </div>
-        <addModal ref="addModal" @success="getTableData" />
-        <HistoryModal ref="HistoryModal" />
-    </div>
-</template>
-
-<script>
-import addModal from './addModal'
-import HistoryModal from './historyModal'
-import { storageList } from '@/api/application'
-export default {
-    components: {
-        addModal,
-        HistoryModal
-    },
-    data() {
-        return {
-            statusList: [
-                {
-                    value: '',
-                    label: '全部',
-                    type: 'warning'
-                },
-                {
-                    value: 0,
-                    label: '已取完',
-                    type: 'warning'
-                },
-                {
-                    value: 1,
-                    label: '存储中',
-                    type: 'primary'
-                },
-                {
-                    value: 2,
-                    label: '已过期',
-                    type: 'info'
-                }
-            ],
-            query: {
-                name: "",
-                telphone: "",
-                status: ''
-            },
-            tableData: {
-                data: [],
-                page: 0,
-                size: 10,
-                loading: false,
-                total: 0
-            }
-        }
-    },
-    mounted() {
-        this.getTableData()
-    },
-    methods: {
-        // 重置查询
-        resetHandle() {
-            this.tableData.page = 0
-            this.query.name = ''
-            this.query.telphone = ''
-            this.query.status = ''
-            this.getTableData()
-        },
-        // 分页回调
-        paginationChange(e) {
-            this.tableData.page = e - 1;
-            this.getTableData()
-        },
-        // 获取商品列表
-        async getTableData() {
-            try {
-                this.tableData.loading = true
-                const res = await storageList({
-                    ...this.query,
-                    page: this.tableData.page,
-                    size: this.tableData.size
-                })
-                this.tableData.loading = false
-                this.tableData.data = res.content
-                this.tableData.total = res.totalElements
-            } catch (error) {
-                console.log(error)
-            }
-        }
-    }
-}
-</script>
\ No newline at end of file
diff --git a/src/views/application/components copy/winetotal/winetotal.vue b/src/views/application/components copy/winetotal/winetotal.vue
deleted file mode 100644
index 5a57a65..0000000
--- a/src/views/application/components copy/winetotal/winetotal.vue	
+++ /dev/null
@@ -1,82 +0,0 @@
-<template>
-    <div class="head-container">
-        <el-table :data="tableData.data" v-loading="tableData.loading">
-            <el-table-column label="商品信息">
-                <template v-slot="scope">
-                    <div class="shop_info">
-                        <el-image :src="scope.row.imgUrl"
-                            style="width: 50px;height: 50px;border-radius: 4px;background-color: #efefef;">
-                            <div class="img_error" slot="error">
-                                <i class="icon el-icon-document-delete"></i>
-                            </div>
-                        </el-image>
-                        <div class="info">
-                            <span>{{ scope.row.name }}</span>
-                        </div>
-                    </div>
-                </template>
-            </el-table-column>
-            <el-table-column label="有效存酒" prop="savNum"></el-table-column>
-            <el-table-column label="已过期存酒" prop="expNum"></el-table-column>
-        </el-table>
-    </div>
-</template>
-
-<script>
-import { countRecord } from '@/api/application'
-export default {
-    data() {
-        return {
-            tableData: {
-                data: [],
-                page: 0,
-                size: 10,
-                loading: false,
-                total: 0
-            }
-        }
-    },
-    mounted() {
-        this.getTableData()
-    },
-    methods: {
-        // 分页回调
-        paginationChange(e) {
-            this.tableData.page = e - 1
-            this.getTableData()
-        },
-        // 获取商品列表
-        async getTableData() {
-            try {
-                this.tableData.loading = true
-                const res = await countRecord({
-                    page: this.tableData.page,
-                    size: this.tableData.size
-                })
-                this.tableData.loading = false
-                this.tableData.data = res.content
-                this.tableData.total = res.totalElements
-            } catch (error) {
-                console.log(error)
-            }
-        }
-    }
-}
-</script>
-
-<style scoped lang="scss">
-.shop_info {
-    display: flex;
-
-    .info {
-        flex: 1;
-        padding-left: 8px;
-        display: flex;
-        flex-direction: column;
-
-        .tag_wrap {
-            display: flex;
-        }
-    }
-}
-</style>
\ No newline at end of file
diff --git a/src/views/coupon_manage/add_coupon.vue b/src/views/coupon_manage/add_coupon.vue
index 25d5dea..d253601 100644
--- a/src/views/coupon_manage/add_coupon.vue
+++ b/src/views/coupon_manage/add_coupon.vue
@@ -1,271 +1,350 @@
+<!-- eslint-disable vue/no-use-v-if-with-v-for -->
 <template>
-    <div class="app-container">
-        <div class="tab">
-            <div class="tab_item" @click="tabClick(item)" :class="{active: tabActive == item.type}" v-for="(item,index) in tabList" :key="index"> {{ item.name }} <span class="bor"></span></div>
-        </div>
-        <!-- 优惠券 -->
-        <div class="content" v-if="tabActive == 1">
-            <el-form ref="form" :model="form" :rules="rules" label-width="120px" label-position="left">
-                <el-form-item label="优惠卷卷名" prop="title">
-                    <el-input v-model="form.title" placeholder="" style="width: 289px;"></el-input>
-                </el-form-item>
-                <el-form-item label="使用门槛" prop="title">
-                    <el-input v-model="form.title" placeholder="" style="width: 180px;margin-right: 66px;">
-                      <template slot="prepend">满</template>
-                      <template slot="append">元</template>
-                    </el-input>
-                    <el-input v-model="form.title" placeholder="" style="width: 180px;">
-                      <template slot="prepend">减</template>
-                      <template slot="append">元</template>
-                    </el-input>
-                </el-form-item>
-             
-                <el-form-item label="有效期类型">
-                    <el-radio-group v-model="form.validityType">
-                        <el-radio :label="item.value" v-for="item in couponEnum.validityType" :key="item.value">
-                            {{ item.label }}
-                        </el-radio>
-                    </el-radio-group>
-                </el-form-item>
-                <el-form-item label="有效时间" v-if="form.validityType == 1">
-                    <el-date-picker v-model="selectTime" type="daterange" range-separator="至" start-placeholder="开始日期"
-                        end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']"
-                        value-format="yyyy-MM-dd HH:mm:ss">
-                    </el-date-picker>
-                </el-form-item>
-                <el-form-item label="使用门槛" prop="title">
-                    <el-input v-model="form.title" placeholder="" style="width: 200px;">
-                      <template slot="prepend">隔</template>
-                      <template slot="append">天生效</template>
-                    </el-input>
-                </el-form-item>
-                <el-form-item label="可用周期" prop="title">
-                  <el-checkbox-group v-model="form.checkedCycle" >
-                    <el-checkbox v-for="(city,index) in couponEnum.cycle" :label="city.label" :key="index">{{city.label}}</el-checkbox>
-                  </el-checkbox-group>
-                </el-form-item>
-                <el-form-item label="指定时间段">
-                    <el-radio-group v-model="form.effectType">
-                        <el-radio :label="item.value" v-for="item in couponEnum.effectType" :key="item.value">
-                            {{ item.label }}
-                        </el-radio>
-                    </el-radio-group>
-                </el-form-item>
-                <el-form-item label="指定时间段" v-if="form.effectType == 1">
-                    <el-date-picker v-model="selectTime" type="daterange" range-separator="至" start-placeholder="开始日期"
-                        end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']"
-                        value-format="yyyy-MM-dd HH:mm:ss">
-                    </el-date-picker>
-                </el-form-item>
-                <el-form-item label="发放数量" prop="title">
-                    <el-input v-model="form.title" placeholder="" style="width: 200px;"></el-input>
-                </el-form-item>
-            </el-form>
-            <span slot="footer" class="dialog-footer">
-                <el-button @click="dialogVisible = false">取 消</el-button>
-                <el-button type="primary" :loading="loading" @click="onSubmitHandle">确 定</el-button>
-            </span>
-        </div>
-        <!-- 商品券 -->
-        <div class="content" v-if="tabActive == 2">
-            <el-form ref="form" :model="formTwo" :rules="rulesTwo" label-width="120px" label-position="left">
-                <el-form-item label="商品卷卷名" prop="title">
-                    <el-input v-model="form.title" placeholder="" style="width: 289px;"></el-input>
-                </el-form-item>
-                <el-form-item label="发放数量" >
-                    <el-input v-model="form.title" placeholder="" style="width: 289px;"></el-input>
-                </el-form-item>
-                <el-form-item label="使用门槛" >
-                    全额满<el-input v-model="form.title" placeholder="" style="width: 100px;margin: 0 23px;"><template slot="suffix">元</template></el-input>可用
-                </el-form-item>
-                <el-form-item label="赠送商品" v-if="form.classType == 'product'" prop="classType">
-                    <div>
-                        <el-button type="primary" icon="el-icon-plus" @click="$refs.shopListRef.show([...productIds])">
-                            添加 </el-button>
-                    </div>
-                    <div class="shop_list">
-                        <div class="item_wrap" v-for="(item, index) in productIds" :key="item.id"
-                            @click="productIds.splice(index, 1)">
-                            <div class="name">{{ item.name }}</div>
-                            <el-input v-model="form.title" placeholder="请填写数量" style="width: 100px;"></el-input>
-                            <div class="del">删除</div>
-                        </div>
-                    </div>
-                </el-form-item>
-          
-                
-            </el-form>
-            <span slot="footer" class="dialog-footer">
-                <el-button @click="dialogVisible = false">取 消</el-button>
-                <el-button type="primary" :loading="loading" @click="onSubmitHandle">确 定</el-button>
-            </span>
-        </div>
-        <shopList ref="shopListRef" @success="slectShop" />
+  <div class="app-container">
+    <div class="tab">
+      <div v-for="(item,index) in tabList" v-if="(form.id&&form.type == item.type)||!form.id" :key="index" class="tab_item" :class="{active: form.type == item.type}" @click="tabClick(item)"> {{ item.name }} <span class="bor" /></div>
     </div>
+    <!-- 优惠券 -->
+    <div v-if="form.type == 1" class="content">
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px" label-position="left">
+        <el-form-item label="优惠卷卷名" prop="title">
+          <el-input v-model="form.title" placeholder="" style="width: 289px;" />
+        </el-form-item>
+        <el-form-item label="使用门槛">
+          <el-input v-model="form.fullAmount" type="number" placeholder="" style="width: 180px;margin-right: 66px;">
+            <template slot="prepend">满</template>
+            <template slot="append">元</template>
+          </el-input>
+          <el-input v-model="form.discountAmount" type="number" placeholder="" style="width: 180px;">
+            <template slot="prepend">减</template>
+            <template slot="append">元</template>
+          </el-input>
+        </el-form-item>
+
+        <el-form-item label="有效期类型">
+          <el-radio-group v-model="form.validityType">
+            <el-radio v-for="item in couponEnum.validityType" :key="item.value" :label="item.value">
+              {{ item.label }}
+            </el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item v-if="form.validityType == 'custom'" label="有效时间" prop="validEndTime">
+          <el-date-picker
+            v-model="validityTime"
+            type="daterange"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+            :default-time="['06:00:00', '23:59:59']"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            @change="validityChange"
+          />
+        </el-form-item>
+        <!-- <el-form-item label="使用门槛" prop="daysToTakeEffect">
+          <el-input v-model="form.daysToTakeEffect" placeholder="" style="width: 200px;">
+            <template slot="prepend">隔</template>
+            <template slot="append">天生效</template>
+          </el-input>
+        </el-form-item> -->
+        <el-form-item label="可用周期" prop="userDays">
+          <el-checkbox-group v-model="form.userDays">
+            <el-checkbox v-for="(city,index) in couponEnum.cycle" :key="index" :label="city.label" @change="userDayChagne">{{ city.label }}</el-checkbox>
+          </el-checkbox-group>
+        </el-form-item>
+        <el-form-item label="指定时间段">
+          <el-radio-group v-model="form.useTimeType">
+            <el-radio v-for="item in couponEnum.useTimeType" :key="item.value" :label="item.value">
+              {{ item.label }}
+            </el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item v-if="form.useTimeType == 'custom'" label="指定时间段" prop="useEndTime">
+          <el-time-picker
+            v-model="useTime"
+            is-range
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+            :default-time="['00:00:00', '23:59:59']"
+            value-format="HH:mm"
+            @change="useTimeChange"
+          />
+        </el-form-item>
+        <el-form-item label="发放数量" prop="number">
+          <el-input v-model="form.number" type="number" placeholder="" style="width: 200px;" />
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false">取 消</el-button>
+        <el-button type="primary" :loading="loading" @click="onSubmitHandle">确 定</el-button>
+      </span>
+    </div>
+    <!-- 商品券 -->
+    <div v-if="form.type == 2" class="content">
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px" label-position="left">
+        <el-form-item label="商品卷卷名" prop="title">
+          <el-input v-model="form.title" placeholder="" style="width: 289px;" />
+        </el-form-item>
+        <el-form-item label="发放数量" prop="number">
+          <el-input v-model="form.number" type="number" placeholder="" style="width: 289px;" />
+        </el-form-item>
+        <el-form-item label="使用门槛">
+          全额满<el-input v-model="form.fullAmount" placeholder="" style="width: 100px;margin: 0 23px;"><template slot="suffix">元</template></el-input>可用
+        </el-form-item>
+        <el-form-item label="赠送商品" prop="products">
+          <div>
+            <el-button type="primary" icon="el-icon-plus" @click="$refs.shopListRef.show([...form.products])">
+              添加 </el-button>
+          </div>
+          <div class="shop_list">
+            <div
+              v-for="(item, index) in form.products"
+              :key="item.id"
+              class="item_wrap"
+            >
+              <div class="name">{{ item.name }}</div>
+              <el-input v-model="item.num" placeholder="请填写数量" style="width: 100px;" />
+              <div class="del" @click="form.products.splice(index, 1)">删除</div>
+            </div>
+          </div>
+        </el-form-item>
+
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false">取 消</el-button>
+        <el-button type="primary" :loading="loading" @click="onSubmitHandle">确 定</el-button>
+      </span>
+    </div>
+    <shopList ref="shopListRef" @success="slectShop" />
+  </div>
 </template>
 
 <script>
 import couponEnum from './couponEnum'
 import shopList from '@/components/shopList'
-import { tbMerchantCoupon } from '@/api/shop'
+import { addTbShopCoupon, getTbShopCouponInfo } from '@/api/coupon'
 export default {
-    components: { shopList },
-    data() {
-        const validateProduct = (rule, value, callback) => {
-            if (!this.productIds.length) {
-                callback(new Error('请选择商品'))
-            } else {
-                callback()
-            }
-        }
-        return {
-            tabList: [
-                { name: "新增优惠券", type: 1},
-                { name: "新增商品券", type: 2},
-            ],
-            tabActive: 1,
-            couponEnum,
-            dialogVisible: false,
-            loading: false,
-            selectTime: [],
-            form: {
-                id: '',
-                validityType: '0',
-                checkedCycle: [],
-                type: '0',
-                title: '',
-                classType: 'product',
-               
-                limitAmount: '',
-                ratio: '1',
-                amount: '',
-                number: '1',
-                limitNumber: '1',
-                effectType: '0',
-                fromTime: '',
-                toTime: '',
-                relationIds: '',
-                status: 1
-            },
-            formTwo: {
-
-            },
-            rules: {
-                title: [
-                    {
-                        required: true,
-                        message: ' ',
-                        trigger: 'blur'
-                    }
-                ],
-                classType: [
-                    {
-                        required: true,
-                        validator: validateProduct,
-                        trigger: 'change'
-                    }
-                ]
-            },
-            rulesTwo: {
-                title: [
-                    {
-                        required: true,
-                        message: ' ',
-                        trigger: 'blur'
-                    }
-                ],
-                classType: [
-                    {
-                        required: true,
-                        validator: validateProduct,
-                        trigger: 'change'
-                    }
-                ]
-            },
-            resetForm: '',
-            productIds: []
-        }
-    },
-    mounted() {
-        this.resetForm = { ...this.form }
-        console.log(this.$route.query.type)
-        this.tabActive = this.$route.query.type;
-    },
-    methods: {
-        tabClick (item) {
-            console.log(item)
-          this.tabActive = item.type;
-
-        },
-        // 选择商品
-        slectShop(res) {
-            if (this.productIds.length) {
-                res.map(async item => {
-                    if (!await this.checkShop(item.id)) {
-                        this.productIds.push({ ...item })
-                    }
-                })
-            } else {
-                this.productIds = res
-            }
-        },
-        // 判断是否存在重复商品
-        checkShop(id) {
-            let falg = false
-            this.productIds.map(item => {
-                if (item.id == id) {
-                    falg = true
-                }
-            })
-            return falg
-        },
-        // 提交
-        onSubmitHandle() {
-            console.log(this.form)
-            this.$refs.form.validate(async valid => {
-                if (valid) {
-                    try {
-                        this.loading = true
-                        this.form.shopId = localStorage.getItem('shopId')
-                        this.form.fromTime = this.selectTime[0] || ''
-                        this.form.toTime = this.selectTime[1] || ''
-
-                        let arr = []
-                        if (this.form.classType == 'product') {
-                            arr = this.productIds.map(item => item.id)
-                        }
-
-                        this.form.relationIds = arr.join(',')
-
-                        let res = await tbMerchantCoupon(this.form, this.form.id ? 'put' : 'post')
-                        this.$emit('success', res)
-                        this.close()
-                        this.$notify({
-                            title: '成功',
-                            message: `${this.form.id ? '编辑' : '添加'}成功`,
-                            type: 'success'
-                        });
-                        this.loading = false
-                    } catch (error) {
-                        this.loading = false
-                        console.log(error)
-                    }
-                }
-            })
-        },
-        show(obj) {
-            this.dialogVisible = true
-            if (obj && obj.id) {
-                this.form = { ...obj }
-            }
-        },
-        close() {
-            this.dialogVisible = false
-        },
-        reset() {
-            this.form = { ...this.resetForm }
-        }
+  components: { shopList },
+  data() {
+    const validateProduct = (rule, value, callback) => {
+      if (!this.form.products.length) {
+        callback(new Error('请选择商品'))
+      } else {
+        callback()
+      }
     }
+    return {
+      tabList: [
+        { name: '新增优惠券', type: 1 },
+        { name: '新增商品券', type: 2 }
+      ],
+      tabActive: 1,
+      couponEnum,
+      dialogVisible: false,
+      loading: false,
+      validityTime: [],
+      useTime: ['06:00:00', '23:59:59'],
+      form: {
+        id: '',
+        shopId: '',
+        type: '1',
+        title: '',
+        fullAmount: null,
+        discountAmount: null,
+        validityType: 'fixed',
+        validStartTime: '',
+        validEndTime: '',
+        userDays: [],
+        useTimeType: 'all',
+        useStartTime: '',
+        useEndTime: '',
+        products: [],
+        number: ''
+      },
+      rules: {
+        title: [
+          {
+            required: true,
+            message: '填写券名',
+            trigger: 'blur'
+          }
+        ],
+        daysToTakeEffect: [
+          {
+            required: true,
+            message: '填写生效天数',
+            trigger: 'blur'
+          }
+        ],
+        userDays: [
+          {
+            required: true,
+            message: '选择可用周期',
+            trigger: 'change'
+          }
+        ],
+        validEndTime: [
+          {
+            required: true,
+            message: '选择有效时间段',
+            trigger: 'change'
+          }
+        ],
+        useEndTime: [
+          {
+            required: true,
+            message: '选择指定时间段',
+            trigger: 'change'
+          }
+        ],
+        products: [
+          {
+            required: true,
+            validator: validateProduct,
+            trigger: 'change'
+          }
+        ],
+        number: [
+          {
+            required: true,
+            message: '填写发放数量',
+            trigger: 'blur'
+          }
+        ]
+      },
+      resetForm: ''
+    }
+  },
+  mounted() {
+    this.resetForm = { ...this.form }
+    this.form.type = this.$route.query.type
+    this.form.useStartTime = this.useTime[0]
+    this.form.useEndTime = this.useTime[1]
+    if (this.$route.query.id) { this.form.id = this.$route.query.id; this.getCouponInfo(this.$route.query.id) }
+  },
+  methods: {
+    /**
+     * 切换类型
+     * @param item
+     */
+    tabClick(item) {
+      console.log(item)
+      this.form.type = item.type
+      this.$refs.form.resetFields()
+    },
+
+    /**
+     * 获取优惠券详情
+     */
+    async getCouponInfo(id) {
+      const resInfo = await getTbShopCouponInfo(id)
+      this.form = resInfo
+      if (resInfo.validityType === 'custom') {
+        this.validityTime = [resInfo.validStartTime, resInfo.validEndTime]
+      }
+      if (resInfo.useTimeType === 'custom') {
+        this.useTime = [resInfo.useStartTime, resInfo.useEndTime]
+      }
+      this.form.userDays = this.form.userDays.split(',')
+    },
+
+    /**
+     * 选择可用周期
+     */
+    userDayChagne(e) {
+      console.log(this.form.userDays)
+    },
+
+    /**
+     * 有效期选择
+     * @param e
+     */
+    validityChange(e) {
+      this.form.validStartTime = e[0]
+      this.form.validEndTime = e[1]
+    },
+
+    /**
+     * 指定时间段选择
+     * @param e
+     */
+    useTimeChange(e) {
+      this.form.useStartTime = e[0]
+      this.form.useEndTime = e[1]
+    },
+
+    /**
+     * 选择商品
+     * @param res
+     */
+    slectShop(res) {
+      if (res.length <= 0) {
+        return
+      }
+      this.form.products = []
+      if (this.form.products.length) {
+        res.map(async item => {
+          if (!await this.checkShop(item.id)) {
+            this.form.products.push({
+              id: item.id,
+              name: item.name,
+              num: null
+            })
+          }
+        })
+      } else {
+        this.form.products.push({
+          id: res[0].id,
+          name: res[0].name,
+          num: null
+        })
+      }
+    },
+
+    /**
+     * 判断是否存在重复商品
+     * @param id
+     */
+    checkShop(id) {
+      let falg = false
+      this.form.products.map(item => {
+        // eslint-disable-next-line eqeqeq
+        if (item.id == id) {
+          falg = true
+        }
+      })
+      return falg
+    },
+
+    /**
+     * 提交
+     */
+    onSubmitHandle() {
+      console.log(this.form)
+      this.$refs.form.validate(async valid => {
+        if (valid) {
+          try {
+            this.loading = true
+            if (!this.form.shopId) { this.form.shopId = localStorage.getItem('shopId') }
+            this.form.userDays = this.form.userDays.toString()
+            // eslint-disable-next-line no-unused-vars
+            const res = await addTbShopCoupon(this.form)
+            this.$store.dispatch('tagsView/delView', this.$route) // 关闭当前页
+            this.$router.replace({ name: 'coupon_list' }) // 要打开的页面
+            this.$notify({
+              title: '成功',
+              message: `${this.form.id ? '编辑' : '添加'}成功`,
+              type: 'success'
+            })
+            this.loading = false
+          } catch (error) {
+            this.loading = false
+            console.log(error)
+          }
+        }
+      })
+    }
+  }
 }
 </script>
 
@@ -296,7 +375,7 @@ export default {
       background-color: #3F9EFF;
     }
   }
-  
+
 }
 .content{
   font-weight: 400;
@@ -325,4 +404,4 @@ export default {
         }
     }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/coupon_manage/components/coupon_details.vue b/src/views/coupon_manage/components/coupon_details.vue
index b0fb115..1e7f88b 100644
--- a/src/views/coupon_manage/components/coupon_details.vue
+++ b/src/views/coupon_manage/components/coupon_details.vue
@@ -4,10 +4,10 @@
       <div class="search">
         <el-form :model="query" inline label-position="left">
           <el-form-item>
-            <el-input v-model="query.name" placeholder="用户ID/用户昵称/用户手机" style="width: 180px;" />
+            <el-input v-model="query.value" placeholder="用户ID/用户昵称/用户手机" style="width: 180px;" />
           </el-form-item>
           <el-form-item>
-            <el-select v-model="query.state" placeholder="选择状态" style="width: 154px;">
+            <el-select v-model="query.status" placeholder="选择状态" style="width: 154px;">
               <el-option
                 v-for="item in stateList"
                 :key="item.value"
@@ -19,21 +19,22 @@
           <el-form-item />
           <el-form-item label="领取时间">
             <el-date-picker
-              v-model="query.createdAt"
+              v-model="queryTime"
               type="daterange"
               range-separator="至"
               start-placeholder="开始日期"
               end-placeholder="结束日期"
               :default-time="['00:00:00', '23:59:59']"
               value-format="yyyy-MM-dd HH:mm:ss"
+              @change="queryTimeChange"
             />
           </el-form-item>
           <el-form-item>
             <el-button type="primary" @click="getTableData">查询</el-button>
-            <el-button v-loading="downloadLoading" icon="el-icon-download" @click="downloadHandle">
+            <!-- <el-button v-loading="downloadLoading" icon="el-icon-download" @click="downloadHandle">
               <span v-if="!downloadLoading">导出</span>
               <span v-else>下载中...</span>
-            </el-button>
+            </el-button> -->
           </el-form-item>
         </el-form>
       </div>
@@ -41,19 +42,32 @@
         <el-table v-loading="loading" :data="tableData">
 
           <el-table-column label="用户ID" prop="id" />
-          <el-table-column label="用户名" prop="areaName" />
-          <el-table-column label="领取时间" prop="tableName" />
-          <el-table-column label="使用时间" prop="tableName" />
-          <el-table-column label="获得来源" prop="tableName" />
-          <el-table-column label="状态" prop="tableName" />
-          <el-table-column label="使用门店" prop="tableName" />
-          <el-table-column label="订单数量" prop="orderCount">
+          <el-table-column label="用户名" prop="name" />
+          <el-table-column label="领取时间" prop="receiveTime" />
+          <el-table-column label="使用时间" prop="useTime" />
+          <el-table-column label="获得来源" prop="source" />
+          <el-table-column label="状态" align="status">
             <template v-slot="scope">
-              <div class="cursor-pointer" @click="toTableOrderList(scope.row)">
-                {{ scope.row.orderCount }}
+              <div style="display: flex;align-items: center;">
+                <div v-if="scope.row.overNum == scope.row.num" style="width: 30px;color: #FAAD14;">未使用</div>
+                <div v-if="scope.row.num!=0&&scope.row.overNum != scope.row.num">{{ scope.row.overNum }}/{{ scope.row.num }}</div>
+                <div v-if="scope.row.overNum == 0" style="color: #52C41A;">已使用</div>
               </div>
             </template>
           </el-table-column>
+          <el-table-column label="使用门店" prop="tableName" />
+          <el-table-column label="操作" width="150">
+            <template v-slot="scope">
+              <el-popconfirm title="确定删除吗？" @confirm="delTableHandle([scope.row.id])">
+                <el-button
+                  slot="reference"
+                  type="text"
+                  icon="el-icon-delete"
+                  style="color: #FF4D4F;"
+                >删除</el-button>
+              </el-popconfirm>
+            </template>
+          </el-table-column>
 
         </el-table>
       </div>
@@ -62,35 +76,98 @@
 </template>
 
 <script>
+import { queryReceive, delReceive } from '@/api/coupon'
+
 export default {
+  // eslint-disable-next-line vue/require-prop-types
+  props: ['couponId'],
   data() {
     return {
-      dialogVisible: true,
+      dialogVisible: false,
       downloadLoading: false,
       loading: false,
       stateList: [
-        { label: '未使用', value: 1 },
-        { label: '已使用', value: 2 }
+        { label: '未使用', value: 0 },
+        { label: '已使用', value: 1 }
       ],
+      queryTime: [],
       query: {
-        name: '',
-        createdAt: [],
-        state: ''
+        couponId: '',
+        value: '',
+        status: 0,
+        startTime: '',
+        endTime: '',
+        page: 1,
+        size: 10
       },
+      resetQuery: null,
       tableData: null
     }
   },
   mounted() {
-
+    this.resetQuery = { ...this.query }
   },
   methods: {
     /**
      * 查询
      */
-    getTableData() {
+    async getTableData() {
+      // eslint-disable-next-line no-unused-vars, prefer-const
+      console.log(this.couponId)
 
+      // eslint-disable-next-line no-unused-vars, prefer-const
+      let res = await queryReceive({
+        shopId: localStorage.getItem('shopId'),
+        couponId: this.query.couponId,
+        value: this.query.value,
+        status: this.query.status,
+        startTime: this.query.startTime,
+        endTime: this.query.endTime,
+        page: this.query.page,
+        size: this.query.size
+      })
     },
-    // 导出Excel
+
+    /**
+     * 时间选择监听
+     */
+    queryTimeChange(e) {
+      this.query.startTime = e[0]
+      this.query.endTime = e[1]
+    },
+
+    /**
+     * 删除优惠券
+     * @param id
+     */
+    async delTableHandle(id) {
+      // eslint-disable-next-line no-undef
+      const delRes = await delReceive(id)
+      console.log(delRes)
+      this.getTableData()
+    },
+
+    /**
+     * 打开详情
+     * @param obj
+     */
+    show(obj) {
+      console.log(obj)
+      this.dialogVisible = true
+      this.query.couponId = obj.id
+      this.getTableData()
+    },
+
+    /**
+     * 关闭详情
+     */
+    close() {
+      this.dialogVisible = false
+    },
+
+    /**
+     * 导出Excel
+     */
     async downloadHandle() {
       try {
         this.downloadLoading = true
@@ -107,28 +184,8 @@ export default {
         console.log(error)
       }
     },
-    // 提交
-    onSubmitHandle() {
-
-    },
-    /**
-     * 打开详情
-     * @param obj
-     */
-    show(obj) {
-      this.dialogVisible = true
-    //   if (obj && obj.id) {
-    //     this.form = { ...obj }
-    //   }
-    },
-    /**
-     * 关闭详情
-     */
-    close() {
-      this.dialogVisible = false
-    },
     reset() {
-      this.form = { ...this.resetForm }
+      this.query = { ...this.resetQuery }
     }
   }
 }
diff --git a/src/views/coupon_manage/couponEnum.js b/src/views/coupon_manage/couponEnum.js
index 94a6b6e..f4cbaf5 100644
--- a/src/views/coupon_manage/couponEnum.js
+++ b/src/views/coupon_manage/couponEnum.js
@@ -1,51 +1,51 @@
 export default {
-    classType: [
-        {
-            value: 'product',
-            label: '商品券'
-        },
-        {
-            value: 'common',
-            label: '通用券'
-        }
-    ],
-    type: [
-        {
-            value: '0',
-            label: '满减'
-        },
-        {
-            value: '1',
-            label: '折扣'
-        }
-    ],
-    cycle: [
-        { label: '周一'},
-        { label: '周二'},
-        { label: '周三'},
-        { label: '周四'},
-        { label: '周五'},
-        { label: '周六'},
-        { label: '周七'},
-    ],
-    validityType: [
-        {
-            value: '0',
-            label: '领券后有效期内可用'
-        },
-        {
-            value: '1',
-            label: '固定有效期范围内可用'
-        }
-    ],
-    effectType: [
-        {
-            value: '0',
-            label: '全时段可用'
-        },
-        {
-            value: '1',
-            label: '指定时间段'
-        }
-    ]
-}
\ No newline at end of file
+  classType: [
+    {
+      value: 'product',
+      label: '商品券'
+    },
+    {
+      value: 'common',
+      label: '通用券'
+    }
+  ],
+  type: [
+    {
+      value: '0',
+      label: '满减'
+    },
+    {
+      value: '1',
+      label: '折扣'
+    }
+  ],
+  cycle: [
+    { label: '周一' },
+    { label: '周二' },
+    { label: '周三' },
+    { label: '周四' },
+    { label: '周五' },
+    { label: '周六' },
+    { label: '周七' }
+  ],
+  validityType: [
+    {
+      value: 'fixed',
+      label: '领券后有效期内可用'
+    },
+    {
+      value: 'custom',
+      label: '固定有效期范围内可用'
+    }
+  ],
+  useTimeType: [
+    {
+      value: 'all',
+      label: '全时段可用'
+    },
+    {
+      value: 'custom',
+      label: '指定时间段'
+    }
+  ]
+}
diff --git a/src/views/coupon_manage/coupon_list.vue b/src/views/coupon_manage/coupon_list.vue
index ec307f0..7a7d802 100644
--- a/src/views/coupon_manage/coupon_list.vue
+++ b/src/views/coupon_manage/coupon_list.vue
@@ -1,121 +1,161 @@
 <template>
-    <div class="app-container">
-        <div class="head-container">
-            <!-- <el-button type="primary" icon="el-icon-plus" @click="$refs.addCoupon.show()">
-                添加优惠券
-            </el-button> -->
-            <el-button type="primary" icon="el-icon-plus" @click="$router.push({name: 'add_coupon', query: {type:1}})">
-                添加优惠券
-            </el-button>
-            <el-button type="primary" icon="el-icon-plus" @click="$router.push({name: 'add_coupon', query: {type:2}})">
-                添加商品券
-            </el-button>
-        </div>
-        <div class="head-container">
-            <el-table :data="tableData.data" v-loading="tableData.loading">
-                <el-table-column label="ID" prop="title"></el-table-column>
-                <el-table-column label="名称" prop="title"></el-table-column>  
-                <el-table-column label="优惠类型" prop="type">
-                    <template v-slot="scope">
-                        {{ scope.row.type | typeFilter }}
-                    </template>
-                </el-table-column>
-                <el-table-column label="使用门槛" prop="ratio"></el-table-column>
-                <el-table-column label="有效期" prop="effectType">
-                    <template v-slot="scope">
-                        {{ scope.row.effectType | effectTypeFilter }}
-                    </template>
-                </el-table-column>
-                <el-table-column label="用户领取方式" prop="ratio"></el-table-column>
-                <el-table-column label="总发放数量" prop="ratio"></el-table-column>
-                <el-table-column label="已领取" prop="ratio"></el-table-column>
-                <el-table-column label="已使用" prop="ratio"></el-table-column>
-                <el-table-column label="剩余" prop="ratio"></el-table-column>
-                <el-table-column label="操作" width="150">
-                    <template v-slot="scope">
-                        <el-button type="text" icon="el-icon-edit" @click="toPath( '/product/add_shop' ,scope.row )">编辑</el-button>
-                        <el-popconfirm title="确定删除吗？" @confirm="delTableHandle([scope.row.id])">
-                        <el-button type="text" icon="el-icon-delete" style="margin-left: 20px !important;"
-                            slot="reference">删除</el-button>
-                        </el-popconfirm>
-                    </template>
-                </el-table-column>
-            </el-table>
-        </div>
-        <div class="head-container">
-            <el-pagination :total="tableData.total" :current-page="tableData.page + 1" :page-size="tableData.size"
-                @current-change="paginationChange" @size-change="sizeChange"
-                layout="total, sizes, prev, pager, next, jumper"></el-pagination>
-        </div>
-        <addCoupon ref="addCoupon" @success="resetHandle" />
+  <div class="app-container">
+    <div class="head-container">
+      <!-- <el-button type="primary" icon="el-icon-plus" @click="$refs.addCoupon.show()">
+        添加优惠券
+      </el-button> -->
+      <el-button type="primary" icon="el-icon-plus" @click="$router.push({name: 'add_coupon', query: {type:1}})">
+        添加优惠券
+      </el-button>
     </div>
+    <div class="head-container">
+      <el-table v-loading="tableData.loading" :data="tableData.data">
+        <el-table-column label="ID" prop="id" />
+        <el-table-column label="名称" prop="title" />
+        <el-table-column label="使用门槛">
+          <template v-slot="scope">
+            {{ `满${scope.row.fullAmount}${scope.row.discountAmount?'减'+scope.row.discountAmount+'元':''}` }}
+          </template>
+        </el-table-column>
+        <!-- <el-table-column label="有效期">
+          <template v-slot="scope">
+            {{ `领券后${scope.row.validDays}天过期` }}
+          </template>
+        </el-table-column> -->
+        <el-table-column label="用户领取方式">
+          <template v-slot="scope">
+            {{ `无` }}
+          </template>
+        </el-table-column>
+        <el-table-column label="总发放数量" prop="number" />
+        <el-table-column label="已领取" align="center">
+          <template v-slot="scope">
+            <div style="display: flex;align-items: center;">
+              <div style="width: 30px;">{{ scope.row.number-scope.row.leftNumber }}</div>
+              <div style="margin: 0 10px;">|</div>
+              <div style="color: #3F9EFF;cursor: pointer;flex-shrink: 0;" @click="couponDetailsOpen(scope.row)">详情</div>
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="已使用" prop="useNumber" />
+        <el-table-column label="剩余" prop="leftNumber" />
+        <el-table-column label="操作" width="150">
+          <template v-slot="scope">
+            <el-button type="text" icon="el-icon-edit" @click="$router.push({name: 'add_coupon', query: {type:scope.row.type ,id: scope.row.id}} )">编辑</el-button>
+            <el-popconfirm title="确定删除吗？" @confirm="delTableHandle([scope.row.id])">
+              <el-button
+                slot="reference"
+                type="text"
+                icon="el-icon-delete"
+                style="margin-left: 20px !important;"
+              >删除</el-button>
+            </el-popconfirm>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <div class="head-container">
+      <el-pagination
+        :total="tableData.total"
+        :current-page="tableData.page + 1"
+        :page-size="tableData.size"
+        layout="total, sizes, prev, pager, next, jumper"
+        @current-change="paginationChange"
+        @size-change="sizeChange"
+      />
+    </div>
+    <couponDetails ref="couponDetails" @success="resetHandle" />
+  </div>
 </template>
 
 <script>
 import couponEnum from './couponEnum'
-import addCoupon from './components/coupon_details.vue'
-import { tbMerchantCouponGet } from '@/api/shop'
+import couponDetails from './components/coupon_details.vue'
+import { getTbShopCoupon, delTbShopCoupon } from '@/api/coupon'
 export default {
-    components: { addCoupon },
-    data() {
-        return {
-            tableData: {
-                data: [],
-                page: 0,
-                size: 10,
-                loading: false,
-                total: 0
-            }
-        }
+  // eslint-disable-next-line vue/no-unused-components
+  components: { couponDetails },
+  filters: {
+
+    typeFilter(value) {
+      // eslint-disable-next-line eqeqeq
+      return couponEnum.type.find(item => item.value == value).label
     },
-    filters: {
-       
-        typeFilter(value) {
-            return couponEnum.type.find(item => item.value == value).label
-        },
-        effectTypeFilter(value) {
-            return couponEnum.effectType.find(item => item.value == value).label
-        }
-    },
-    mounted() {
-        this.getTableData()
-    },
-    methods: {
-        // 是否允许修改商品
-        toPath ( path , row) {
-            this.$router.push({path: path, query: row})
-        },
-        // 重置查询
-        resetHandle() {
-            this.page = 0
-            this.getTableData()
-        },
-        // 分页大小改变
-        sizeChange(e) {
-            this.tableData.size = e
-            this.getTableData()
-        },
-        // 分页回调
-        paginationChange(e) {
-            this.tableData.page = e - 1
-            this.getTableData()
-        },
-        // 获取商品列表
-        async getTableData() {
-            this.tableData.loading = true
-            try {
-                const res = await tbMerchantCouponGet({
-                    page: this.tableData.page,
-                    size: this.tableData.size,
-                    shopId: localStorage.getItem('shopId')
-                })
-                this.tableData.loading = false
-                this.tableData.data = res.content
-                this.tableData.total = res.totalElements
-            } catch (error) {
-                console.log(error)
-            }
-        }
+    effectTypeFilter(value) {
+      // eslint-disable-next-line eqeqeq
+      return couponEnum.effectType.find(item => item.value == value).label
     }
+  },
+  data() {
+    return {
+      tableData: {
+        data: [],
+        page: 0,
+        size: 10,
+        loading: false,
+        total: 0
+      },
+      couponId: null
+    }
+  },
+  mounted() {
+    this.getTableData()
+  },
+  methods: {
+    // 是否允许修改商品
+    toPath(path, row) {
+      this.$router.push({ path: path, query: row })
+    },
+    // 重置查询
+    resetHandle() {
+      this.page = 0
+      this.getTableData()
+    },
+    // 分页大小改变
+    sizeChange(e) {
+      this.tableData.size = e
+      this.getTableData()
+    },
+    // 分页回调
+    paginationChange(e) {
+      this.tableData.page = e - 1
+      this.getTableData()
+    },
+    // 获取优惠券列表
+    async getTableData() {
+      this.tableData.loading = true
+      try {
+        const res = await getTbShopCoupon({
+          page: this.tableData.page,
+          size: this.tableData.size,
+          shopId: localStorage.getItem('shopId')
+        })
+        this.tableData.loading = false
+        this.tableData.data = res.content
+        this.tableData.total = res.totalElements
+        console.log(this.tableData)
+      } catch (error) {
+        console.log(error)
+      }
+    },
+
+    /**
+     * 查看领取详情
+     */
+    couponDetailsOpen(row) {
+      this.$refs.couponDetails.show(row)
+      this.couponId = row.id
+    },
+
+    /**
+     * 删除优惠券
+     * @param id
+     */
+    async delTableHandle(id) {
+      const delRes = await delTbShopCoupon(id)
+      console.log(delRes)
+      this.getTableData()
+    }
+  }
 }
-</script>
\ No newline at end of file
+</script>

From c3cd0e704ed76a9fe1ac7b88fc5b1b2b6eaf9950 Mon Sep 17 00:00:00 2001
From: duan <1004387497@qq.com>
Date: Tue, 29 Oct 2024 13:33:33 +0800
Subject: [PATCH 06/16] =?UTF-8?q?=E5=95=86=E5=93=81=E5=88=86=E7=B1=BB?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E9=9C=80=E8=A6=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/product/category.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/product/category.vue b/src/views/product/category.vue
index 650c31f..7d44ce2 100644
--- a/src/views/product/category.vue
+++ b/src/views/product/category.vue
@@ -25,18 +25,18 @@
                             @change="showChange($event, scope.row)"></el-switch>
                     </template>
                 </el-table-column>
-                <el-table-column label="颜色">
+                <!-- <el-table-column label="颜色">
                     <template v-slot="scope">
                         <div
                             :style="{ width: '20px', height: '20px', borderRadius: '50%', backgroundColor: scope.row.style || '#efefef' }">
                         </div>
                     </template>
-                </el-table-column>
+                </el-table-column> -->
                 <el-table-column label="操作" width="300">
                     <template v-slot="scope">
-                        <el-button type="text" size="mini" round icon="el-icon-plus"
+                        <!-- <el-button type="text" size="mini" round icon="el-icon-plus"
                             @click="$refs.addClassifyRef.show({ pid: scope.row.id })"
-                            v-if="!scope.row.pid">添加子分类</el-button>
+                            v-if="!scope.row.pid">添加子分类</el-button> -->
                         <el-button type="text" size="mini" round icon="el-icon-edit"
                             @click="$refs.addClassifyRef.show(scope.row)">编辑</el-button>
                         <el-popconfirm title="确定删除吗？" @confirm="delHandle([scope.row.id])">

From 4caaa3770ffe11a905d4eb4487cdb3965632e6aa Mon Sep 17 00:00:00 2001
From: duan <1004387497@qq.com>
Date: Tue, 29 Oct 2024 18:17:03 +0800
Subject: [PATCH 07/16] =?UTF-8?q?=E8=80=97=E6=9D=90=E5=8D=95=E4=BD=8D?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/invoicing.js                          |   9 +-
 .../invoicing/consumable/information.vue      | 127 +++++++++++++++++-
 src/views/invoicing/operation_in.vue          |   9 ++
 src/views/invoicing/operation_out.vue         |   9 ++
 4 files changed, 147 insertions(+), 7 deletions(-)

diff --git a/src/api/invoicing.js b/src/api/invoicing.js
index cbf2b92..2600bfa 100644
--- a/src/api/invoicing.js
+++ b/src/api/invoicing.js
@@ -173,7 +173,14 @@ export function tbProductStockOperateOutAndOn(data) {
     data
   });
 }
-
+// 副单位
+export function unittbConsInfo(params) {
+  return request({
+    url: `/api/tbConsInfo`,
+    method: "put",
+    data:params
+  });
+}
 /**
  * 库存列表
  * @returns
diff --git a/src/views/invoicing/consumable/information.vue b/src/views/invoicing/consumable/information.vue
index 0969ec0..c29c018 100644
--- a/src/views/invoicing/consumable/information.vue
+++ b/src/views/invoicing/consumable/information.vue
@@ -42,12 +42,12 @@
           <el-button @click="$router.push({ name: 'supplier_manage' })">供应商管理</el-button>
           <el-button icon="el-icon-download" :loading="downloadLoading" @click="protHandle">导出耗材</el-button>
           <el-button icon="el-icon-upload2" :loading="uploadLoading" @click="dialogVisible = true">导入耗材</el-button> -->
-           <el-select clearable v-model="query.sort" @change="getTableData" placeholder="排序">
+          <el-select clearable v-model="query.sort" @change="getTableData" placeholder="排序">
             <el-option label="创建时间" value="createTime,desc" />
             <el-option label="数量由低到高" value="balance,asc" />
           </el-select>
         </div>
-       
+
       </div>
       <div class="row_wrap" style="margin-top: 12px">
         <div class="row">
@@ -242,7 +242,7 @@
             <span>
               {{ scope.row.conUnit }}
             </span>
-            <i class="el-icon-edit" @click="editorHandle(scope.row)"></i>
+            <i class="el-icon-edit" @click="editorHandles(scope.row)"></i>
           </template>
 
         </el-table-column>
@@ -352,7 +352,6 @@
       </el-form>
     </el-dialog>
     <!-- 修改和增加 -->
-
     <el-dialog :title="dialogtitle" :visible.sync="dialogshow" width="80%">
       <template v-if="dialogtitle != '编辑'">
         <div v-for="(item, index) in ruleForms" :key="index">
@@ -482,6 +481,39 @@
         </el-form>
       </template>
     </el-dialog>
+    <!-- 单位修改 -->
+    <el-dialog :title="unitItem ? unitItem.conName : ''" :visible.sync="dialogtitleunit" width="40%">
+      <template>
+        <div class="unitStyle unitWidth">
+          <div>主单位</div>
+          <div>{{ unitItem ? unitItem.conUnit : '' }}</div>
+          <div style="display: flex;align-items: center;">
+            <div style="width: 9px;height: 9px;background-color: #D9D9D9;border-radius: 50%;margin:0 6px;"></div> 订货单位
+          </div>
+        </div>
+        <div class="unitStyleBottom unitWidth" @click="switchs = 1" v-if="switchs == 2">
+          <span style="margin-right: 10px;">+</span> 添加单位
+        </div>
+        <div class="unitStyle unitWidth " style="margin-top: 20px;" v-else>
+          <div>副单位</div>
+          <div><input style="width: 100px;" type="text" v-model="unitItem.conUnitTwo"> </div>
+          <div style="display: flex;align-items: center;">
+            <div style="width: 9px;height: 9px;background-color: #D9D9D9;border-radius: 50%;margin:0 6px;"></div> 订货单位
+            <input type="text" disabled placeholder="1">
+            <div style="width: 80px;">{{ unitItem.conUnitTwo }}</div>= <input v-model="unitItem.conUnitTwoConvert"
+              type="number">{{
+                unitItem.conUnit }}
+          </div>
+        </div>
+        <div style="display: flex; justify-content: center;margin-top: 20px;">
+          <el-button @click="dialogtitleunit = false">取 消</el-button>
+          <el-button type="primary" @click="submitUnit()">
+            确 定
+          </el-button>
+        </div>
+      </template>
+    </el-dialog>
+
 
     <el-dialog title="选择类型" :visible.sync="typedialogshow">
       <div class="head-container">
@@ -592,7 +624,7 @@ import {
   tbConsInfoFlowstock
 } from "@/api/consumable";
 import AddConsTakin from "../components/addConsTakin";
-import { tbConsInfodownload, tbConsInfoinputStock } from '@/api/invoicing'
+import { tbConsInfodownload, tbConsInfoinputStock, unittbConsInfo } from '@/api/invoicing'
 import { downloadFile } from "@/utils";
 import UploadExcel from '@/components/UploadExcel'
 import consRecordDetail from "../components/cons_record_detail";
@@ -676,6 +708,9 @@ export default {
         total: 0
       },
       ruleFormLoading: false,
+      dialogtitleunit: false,
+      unitItem: { switchs: 2 },
+      switchs: 2,
       ruleForms: [],
       ruleForm: {
         conCode: "",
@@ -768,6 +803,15 @@ export default {
         }
       })
     },
+    async submitUnit() {
+      const res = await unittbConsInfo([{
+        conUnitTwoConvert: this.unitItem.conUnitTwoConvert * 1,
+        conUnitTwo: this.unitItem.conUnitTwo,
+        id: this.unitItem.id
+      }])
+      this.unitItem = {}
+      this.dialogtitleunit = false
+    },
     //跳转订单列表
     toGoodslist(orderNo) {
       this.$router.push({
@@ -842,13 +886,18 @@ export default {
         console.log(error);
       }
     },
+    // 单位编辑
+    editorHandles(row) {
+      this.unitItem = row;
+      this.dialogtitleunit = true;
+    },
+
     // 编辑
     editorHandle(row) {
       this.dialogtitle = "编辑";
       for (let key in this.ruleForm) {
         this.ruleForm[key] = row[key];
       }
-      console.log(row, '调试1')
       this.ruleForm.id = row.id;
       this.dialogshow = true;
     },
@@ -1305,4 +1354,70 @@ export default {
     }
   }
 }
+
+.unitStyle {
+  display: flex;
+  align-items: center;
+  border-radius: 2px 2px 2px 2px;
+
+  >div:first-child {
+    width: 95px;
+    height: 42px;
+    line-height: 42px;
+    text-align: center;
+    border-right: 1px solid #DDDFE6;
+    font-family: Source Han Sans CN, Source Han Sans CN;
+    font-weight: 400;
+    font-size: 14px;
+    color: #999999;
+  }
+
+  >div:nth-child(2) {
+    width: 120px;
+    height: 42px;
+    line-height: 42px;
+    text-align: center;
+    border-right: 1px solid #DDDFE6;
+    font-family: Source Han Sans CN, Source Han Sans CN;
+    font-weight: 400;
+    font-size: 14px;
+    color: #3F9EFF;
+  }
+
+  >div:last-child {
+    font-family: Source Han Sans CN, Source Han Sans CN;
+    font-weight: 400;
+    font-size: 14px;
+    color: #999999;
+
+    >input {
+      width: 39px;
+      height: 28px;
+      background: #FFFFFF;
+      border-radius: 2px 2px 2px 2px;
+      border: 1px solid #DDDFE6;
+      margin: 0 16px;
+    }
+
+  }
+}
+
+.unitStyleBottom {
+  margin-top: 30px;
+  line-height: 42px;
+  text-align: center;
+  font-family: Source Han Sans CN, Source Han Sans CN;
+  font-weight: 400;
+  font-size: 14px;
+  color: #3F9EFF;
+
+
+}
+
+.unitWidth {
+  // width: 418px;
+  height: 42px;
+  border-radius: 2px 2px 2px 2px;
+  border: 1px solid #DDDFE6;
+}
 </style>
diff --git a/src/views/invoicing/operation_in.vue b/src/views/invoicing/operation_in.vue
index 612add2..5339e28 100644
--- a/src/views/invoicing/operation_in.vue
+++ b/src/views/invoicing/operation_in.vue
@@ -122,6 +122,15 @@
                         <div class="tips">原价￥{{ scope.row.costPrice }}/{{ scope.row.conUnit }}</div>
                     </template>
                 </el-table-column>
+                <el-table-column label="单位">
+                    <template v-slot="scope">
+                        <el-select @change="consCountTotal($event, scope.row, 'unit')" v-model="scope.row.conUnit" :placeholder="scope.row.conUnit">
+                            <el-option :label="scope.row.conUnit" :value="scope.row.conUnit"> </el-option>
+                            <el-option :label="scope.row.conUnitTwo" :value="scope.row.conUnitTwo" v-if="scope.row.conUnitTwo"> </el-option>
+                        </el-select>
+                        <div class="tips"> &nbsp;</div>
+                    </template>
+                </el-table-column>
                 <el-table-column label="数量">
                     <template v-slot="scope">
                         <el-input-number v-model="scope.row.stockNumber" :min="0" :step="1" step-strictly
diff --git a/src/views/invoicing/operation_out.vue b/src/views/invoicing/operation_out.vue
index 6bdcf59..2ffb221 100644
--- a/src/views/invoicing/operation_out.vue
+++ b/src/views/invoicing/operation_out.vue
@@ -120,6 +120,15 @@
                         <div class="tips">原价￥{{ scope.row.costPrice }}/{{ scope.row.conUnit }}</div>
                     </template>
                 </el-table-column>
+                <el-table-column label="单位">
+                    <template v-slot="scope">
+                        <el-select @change="consCountTotal($event, scope.row, 'unit')" v-model="scope.row.conUnit" :placeholder="scope.row.conUnit">
+                            <el-option :label="scope.row.conUnit" :value="scope.row.conUnit"> </el-option>
+                            <el-option :label="scope.row.conUnitTwo" :value="scope.row.conUnitTwo" v-if="scope.row.conUnitTwo"> </el-option>
+                        </el-select>
+                        <div class="tips"> &nbsp;</div>
+                    </template>
+                </el-table-column>
                 <el-table-column label="数量">
                     <template v-slot="scope">
                         <el-input-number v-model="scope.row.stockNumber" :min="0" :step="1" step-strictly

From 30d4be1560044c8c97c3342651f29461bff48975 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AD=8F=E5=95=BE?= <1144797966@qq.com>
Date: Wed, 30 Oct 2024 13:32:43 +0800
Subject: [PATCH 08/16] =?UTF-8?q?unbind=E6=9C=AA=E7=BB=91=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/table/status.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/views/table/status.js b/src/views/table/status.js
index 5dd3993..a8d2007 100644
--- a/src/views/table/status.js
+++ b/src/views/table/status.js
@@ -30,5 +30,9 @@ export default {
     cleaning: {
         label: "待清台",
         type: "#FAAD14",
+    },
+    unbind: {
+        label: "未绑定",
+        type: "rgb(221,221,221)",
     }
 }
\ No newline at end of file

From c0c3eeeb44433d5d1cc7fd7b349dae1402ff02e3 Mon Sep 17 00:00:00 2001
From: gyq <875626088@qq.com>
Date: Wed, 30 Oct 2024 13:38:34 +0800
Subject: [PATCH 09/16] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BC=9A=E5=91=98?=
 =?UTF-8?q?=E7=A7=AF=E5=88=86=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/member_points/record.vue       | 167 +++++++++++++++
 .../components/member_points/setting.vue      | 197 ++++++++++++++++++
 .../components/member_points/shop_add.vue     |  83 ++++++++
 .../components/member_points/shop_list.vue    |  42 ++++
 src/views/application/member_points.vue       |  37 +++-
 5 files changed, 524 insertions(+), 2 deletions(-)
 create mode 100644 src/views/application/components/member_points/record.vue
 create mode 100644 src/views/application/components/member_points/setting.vue
 create mode 100644 src/views/application/components/member_points/shop_add.vue
 create mode 100644 src/views/application/components/member_points/shop_list.vue

diff --git a/src/views/application/components/member_points/record.vue b/src/views/application/components/member_points/record.vue
new file mode 100644
index 0000000..25048c4
--- /dev/null
+++ b/src/views/application/components/member_points/record.vue
@@ -0,0 +1,167 @@
+<!-- 兑换记录 -->
+<template>
+    <div>
+        <div>
+            <el-form :model="query" inline label-position="left">
+                <el-form-item>
+                    <el-input placeholder="订单编号/核销码" v-model="query.name" />
+                </el-form-item>
+                <el-form-item>
+                    <el-select v-model="query.cateId" placeholder="领取方式" style="width: 140px;">
+                        <el-option label="自取" :value="1"></el-option>
+                        <el-option label="邮寄" :value="2"></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item>
+                    <el-select v-model="query.cateId" placeholder="状态" style="width: 140px;">
+                        <el-option label="自取" :value="1"></el-option>
+                        <el-option label="邮寄" :value="2"></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item>
+                    <el-date-picker v-model="query.createdAt" type="daterange" range-separator="至"
+                        start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']"
+                        value-format="yyyy-MM-dd HH:mm:ss">
+                    </el-date-picker>
+                </el-form-item>
+                <el-form-item>
+                    <el-button type="primary" @click="getTableData">查询</el-button>
+                    <el-button @click="resetHandle">重置</el-button>
+                </el-form-item>
+            </el-form>
+        </div>
+        <div class="head-container">
+            <div class="collect_wrap">
+                <div class="item">
+                    <div class="icon_wrap" style="--bg-color:#ADDBBC">
+                        <i class="icon el-icon-s-goods"></i>
+                    </div>
+                    <div class="info">
+                        <div class="m">￥1231</div>
+                        <div class="t">总订单数</div>
+                    </div>
+                </div>
+                <div class="item">
+                    <div class="icon_wrap" style="--bg-color:#8CC4FC">
+                        <i class="icon el-icon-s-goods"></i>
+                    </div>
+                    <div class="info">
+                        <div class="m">￥0.00</div>
+                        <div class="t">已支付金额</div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="head-container">
+            <el-table :data="tableData.list" v-loading="tableData.loading">
+                <el-table-column label="订单编号"></el-table-column>
+                <el-table-column label="用户名"></el-table-column>
+                <el-table-column label="商品"></el-table-column>
+                <el-table-column label="使用积分"></el-table-column>
+                <el-table-column label="支付金额"></el-table-column>
+                <el-table-column label="领取方式"></el-table-column>
+                <el-table-column label="状态"></el-table-column>
+                <el-table-column label="下单时间"></el-table-column>
+                <el-table-column label="操作"></el-table-column>
+            </el-table>
+        </div>
+    </div>
+</template>
+
+<script>
+export default {
+    data() {
+        return {
+            query: {
+                name: '',
+                cateId: '',
+                createdAt: []
+            },
+            tableData: {
+                sort: 'createdAt,desc',
+                list: [],
+                page: 0,
+                size: 30,
+                loading: false,
+                total: 0
+            },
+        }
+    },
+    methods: {
+        resetHandle() {
+
+        },
+        getTableData() {
+
+        }
+    }
+}
+</script>
+
+<style scoped lang="scss">
+.collect_wrap {
+    display: flex;
+    gap: 14px;
+
+    .item {
+        width: 200px;
+        display: flex;
+        align-items: center;
+        background-color: #f5f5f5;
+        padding: 20px;
+
+        .icon_wrap {
+            $size: 34px;
+            $border: 6px;
+            width: $size;
+            height: $size;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            background-color: var(--bg-color);
+            border-radius: 50%;
+            position: relative;
+
+            &::after {
+                content: "";
+                width: $size + $border;
+                height: $size + $border;
+                border-radius: 50%;
+                position: absolute;
+                top: 50%;
+                left: 50%;
+                transform: translate(-50%, -50%);
+                background-color: var(--bg-color);
+                opacity: 0.3;
+            }
+
+            .icon {
+                font-size: 16px;
+                color: #fff;
+            }
+
+            .img {
+                width: 20px;
+                height: 20px;
+            }
+        }
+
+        .info {
+            flex: 1;
+            display: flex;
+            flex-direction: column;
+            padding-left: 10px;
+
+            .m {
+                font-weight: bold;
+            }
+
+            .t {
+                font-size: 12px;
+                color: #999;
+                padding-top: 4px;
+            }
+        }
+    }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/application/components/member_points/setting.vue b/src/views/application/components/member_points/setting.vue
new file mode 100644
index 0000000..a201c8a
--- /dev/null
+++ b/src/views/application/components/member_points/setting.vue
@@ -0,0 +1,197 @@
+<template>
+    <div>
+        <el-form ref="form" :model="form" :rules="rules" label-width="140px" label-position="left">
+            <el-form-item label="是否消费赠送积分">
+                <el-switch v-model.trim="form.isOpenYhq" :active-value="1" :inactive-value="0"></el-switch>
+            </el-form-item>
+            <el-form-item label="费赠送积分" v-if="form.isOpenYhq">
+                <el-input v-model="form.num" style="width: 300px;">
+                    <template slot="prepend">每消费</template>
+                    <template slot="append">元赠送1积分</template>
+                </el-input>
+            </el-form-item>
+            <el-form-item label="开启下单积分抵扣" style="margin-top: 50px;">
+                <el-switch v-model.trim="form.isOpenYhq" :active-value="1" :inactive-value="0"></el-switch>
+            </el-form-item>
+            <el-form-item label="下单积分抵扣门槛">
+                <el-input v-model="form.num" style="width: 300px;">
+                    <template slot="append">积分</template>
+                </el-input>
+            </el-form-item>
+            <el-form-item label="下单最高抵扣比例">
+                <el-input v-model="form.num" style="width: 300px;">
+                    <template slot="append">%</template>
+                </el-input>
+            </el-form-item>
+            <el-form-item label="下单抵扣积分比例">
+                <el-input v-model="form.num" style="width: 300px;">
+                    <template slot="prepend">1元等于</template>
+                    <template slot="append">积分</template>
+                </el-input>
+            </el-form-item>
+            <el-form-item label="开启积分商城" style="margin-top: 50px;">
+                <el-switch v-model.trim="form.isOpenYhq" :active-value="1" :inactive-value="0"></el-switch>
+            </el-form-item>
+            <el-form-item label="显示样式">
+                <div class="style_wrap">
+                    <div class="item style1" :class="{ active: styleActive == 1 }" @click="styleActive = 1">
+                        <div class="row">
+                            <div class="cover"></div>
+                            <div class="info">
+                                <div class="line"></div>
+                                <div class="line"></div>
+                                <div class="line"></div>
+                            </div>
+                        </div>
+                        <div class="row">
+                            <div class="cover"></div>
+                            <div class="info">
+                                <div class="line"></div>
+                                <div class="line"></div>
+                                <div class="line"></div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="item style2" :class="{ active: styleActive == 2 }" @click="styleActive = 2">
+                        <div class="row">
+                            <div class="cover"></div>
+                            <div class="line"></div>
+                        </div>
+                        <div class="row">
+                            <div class="cover"></div>
+                            <div class="line"></div>
+                        </div>
+                        <div class="row">
+                            <div class="cover"></div>
+                            <div class="line"></div>
+                        </div>
+                        <div class="row">
+                            <div class="cover"></div>
+                            <div class="line"></div>
+                        </div>
+                    </div>
+                </div>
+            </el-form-item>
+            <el-form-item>
+                <el-button type="primary">保存</el-button>
+            </el-form-item>
+        </el-form>
+    </div>
+</template>
+
+<script>
+export default {
+    data() {
+        return {
+            form: {
+                isOpenYhq: 1,
+                num: ''
+            },
+            styleActive: 1,
+            rules: {}
+        }
+    }
+}
+</script>
+
+<style scoped lang="scss">
+.style_wrap {
+    display: flex;
+    width: 350px;
+    gap: 50px;
+
+    .item {
+        flex: 1;
+        padding: 10px;
+        border: 1px solid #ddd;
+        $color: #3F9EFF;
+
+        &.active {
+            border-color: $color;
+        }
+
+        .cover {
+            background-color: $color;
+        }
+
+        .line {
+            background-color: #D9D9D9;
+        }
+
+        &.style1 {
+            display: flex;
+            flex-direction: column;
+            gap: 20px;
+
+            .row {
+                flex: 1;
+                display: flex;
+
+                .cover {
+                    width: 40px;
+                    height: 40px;
+                }
+
+                .info {
+                    flex: 1;
+                    display: flex;
+                    flex-direction: column;
+                    gap: 6px;
+                    padding-left: 10px;
+
+                    .line {
+                        flex: 1;
+
+                        &:nth-child(1) {
+                            width: 80%;
+                            flex: 2;
+                        }
+
+                        &:nth-child(3) {
+                            width: 50%;
+                        }
+                    }
+                }
+            }
+        }
+
+        &.style2 {
+            display: grid;
+            grid-template-columns: repeat(2, 1fr);
+            grid-template-rows: repeat(2, 1fr);
+            grid-column-gap: 10px;
+            grid-row-gap: 10px;
+
+            .row:nth-child(1) {
+                grid-area: 1 / 1 / 2 / 2;
+            }
+
+            .row:nth-child(2) {
+                grid-area: 1 / 2 / 2 / 3;
+            }
+
+            .row:nth-child(3) {
+                grid-area: 2 / 1 / 3 / 2;
+            }
+
+            .row:nth-child(4) {
+                grid-area: 2 / 2 / 3 / 3;
+            }
+
+            .row {
+                display: flex;
+                flex-direction: column;
+
+                .cover {
+                    flex: 1;
+                }
+
+                .line {
+                    height: 4px;
+                    margin-top: 4px;
+                }
+            }
+        }
+    }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/application/components/member_points/shop_add.vue b/src/views/application/components/member_points/shop_add.vue
new file mode 100644
index 0000000..bb0b8dc
--- /dev/null
+++ b/src/views/application/components/member_points/shop_add.vue
@@ -0,0 +1,83 @@
+<!-- 添加积分商品/优惠券 -->
+<template>
+    <div>
+        <el-dialog :title="form.id ? '编辑商品' : '添加商品'" :visible.sync="dialogVisible" @close="reset">
+            <el-form ref="form" :model="form" :rules="rules" label-width="120px" label-position="left">
+                <el-form-item label="奖品类型">
+                    <el-radio-group v-model="form.registerType">
+                        <el-radio label="munchies">实物商品</el-radio>
+                        <el-radio label="restaurant">优惠券</el-radio>
+                    </el-radio-group>
+                </el-form-item>
+                <el-form-item label="商品图片">
+                    <div class="img_list">
+                        <div class="item" v-for="item in form.imgList" :key="item.id">
+                            <img class="img" :src="item.url">
+                        </div>
+                        <div class="item" @click="$refs.addImg.show()">
+                            <i class="icon el-icon-plus"></i>
+                        </div>
+                    </div>
+                </el-form-item>
+            </el-form>
+        </el-dialog>
+        <addImg ref="addImg" @successEvent="e => form.imgList.push(e[0])" />
+    </div>
+</template>
+
+<script>
+import addImg from "@/views/product/components/addImages.vue";
+export default {
+    components: {
+        addImg
+    },
+    data() {
+        return {
+            dialogVisible: false,
+            form: {
+                id: '',
+                registerType: 'munchies',
+                imgList: []
+            },
+            rules: {}
+        }
+    },
+    methods: {
+        reset() {
+
+        },
+        show() {
+            this.dialogVisible = true
+        }
+    }
+}
+</script>
+
+<style scoped lang="scss">
+.img_list {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 10px;
+
+    .item {
+        width: 100px;
+        height: 100px;
+        border: 1px dashed #ececec;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        background-color: #F7F7FA;
+
+        .img {
+            width: 100%;
+            height: 100%;
+            display: block;
+        }
+
+        .icon {
+            font-size: 20px;
+            color: #DDDFE6;
+        }
+    }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/application/components/member_points/shop_list.vue b/src/views/application/components/member_points/shop_list.vue
new file mode 100644
index 0000000..da29854
--- /dev/null
+++ b/src/views/application/components/member_points/shop_list.vue
@@ -0,0 +1,42 @@
+<template>
+    <div>
+        <div><el-button type="primary" @click="$refs.ShopAdd.show()">添加商品</el-button></div>
+        <div class="head-container">
+            <el-table :data="tableData.list" v-loading="tableData.loading">
+                <el-table-column label="商品"></el-table-column>
+                <el-table-column label="所需积分"></el-table-column>
+                <el-table-column label="额外价格「元」"></el-table-column>
+                <el-table-column label="总数"></el-table-column>
+                <el-table-column label="库存"></el-table-column>
+                <el-table-column label="操作"></el-table-column>
+            </el-table>
+        </div>
+        <!-- 添加积分商品/积分 -->
+        <ShopAdd ref="ShopAdd" />
+    </div>
+</template>
+
+<script>
+import ShopAdd from './shop_add.vue'
+export default {
+    components: { ShopAdd },
+    data() {
+        return {
+            tableData: {
+                sort: 'createdAt,desc',
+                list: [],
+                page: 0,
+                size: 30,
+                loading: false,
+                total: 0
+            },
+        }
+    }
+}
+</script>
+
+<style scoped lang="scss">
+.head-container {
+    margin-top: 20px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/application/member_points.vue b/src/views/application/member_points.vue
index 32aa4bb..ffed912 100644
--- a/src/views/application/member_points.vue
+++ b/src/views/application/member_points.vue
@@ -1,3 +1,36 @@
 <template>
-    <div>会员积分</div>
-</template>
\ No newline at end of file
+    <div class="app-container">
+        <el-tabs v-model="activeName" type="card">
+            <el-tab-pane label="基本设置" name="1"></el-tab-pane>
+            <el-tab-pane label="商品设置" name="2"></el-tab-pane>
+            <el-tab-pane label="兑换记录" name="3"></el-tab-pane>
+        </el-tabs>
+        <Setting v-if="activeName == 1" />
+        <ShopList v-if="activeName == 2" />
+        <Record v-if="activeName == 3" />
+    </div>
+</template>
+
+<script>
+import Setting from './components/member_points/setting.vue'
+import ShopList from './components/member_points/shop_list.vue'
+import Record from './components/member_points/record.vue'
+export default {
+    components: {
+        Setting,
+        ShopList,
+        Record
+    },
+    data() {
+        return {
+            activeName: '3'
+        }
+    }
+}
+</script>
+
+<style scoped lang="scss">
+:deep(.el-tabs) {
+    margin-bottom: 0;
+}
+</style>
\ No newline at end of file

From 909760e9bf6ec2b48af232c80624745623232fe2 Mon Sep 17 00:00:00 2001
From: duan <1004387497@qq.com>
Date: Wed, 30 Oct 2024 16:50:32 +0800
Subject: [PATCH 10/16] =?UTF-8?q?=E8=80=97=E6=9D=90=E5=89=AF=E5=8D=95?=
 =?UTF-8?q?=E4=BD=8D=E5=9B=9E=E6=98=BE=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/invoicing/consumable/information.vue | 4 ++++
 src/views/invoicing/operation_in.vue           | 2 +-
 src/views/invoicing/operation_out.vue          | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/views/invoicing/consumable/information.vue b/src/views/invoicing/consumable/information.vue
index c29c018..cc1b31f 100644
--- a/src/views/invoicing/consumable/information.vue
+++ b/src/views/invoicing/consumable/information.vue
@@ -889,6 +889,10 @@ export default {
     // 单位编辑
     editorHandles(row) {
       this.unitItem = row;
+      this.switchs = 2
+      if (row.conUnitTwo) {
+        this.switchs = 1
+      }
       this.dialogtitleunit = true;
     },
 
diff --git a/src/views/invoicing/operation_in.vue b/src/views/invoicing/operation_in.vue
index 5339e28..97bd84d 100644
--- a/src/views/invoicing/operation_in.vue
+++ b/src/views/invoicing/operation_in.vue
@@ -124,7 +124,7 @@
                 </el-table-column>
                 <el-table-column label="单位">
                     <template v-slot="scope">
-                        <el-select @change="consCountTotal($event, scope.row, 'unit')" v-model="scope.row.conUnit" :placeholder="scope.row.conUnit">
+                        <el-select @change="consCountTotal($event, scope.row, 'unit')" v-model="scope.row.unit" :placeholder="scope.row.conUnit">
                             <el-option :label="scope.row.conUnit" :value="scope.row.conUnit"> </el-option>
                             <el-option :label="scope.row.conUnitTwo" :value="scope.row.conUnitTwo" v-if="scope.row.conUnitTwo"> </el-option>
                         </el-select>
diff --git a/src/views/invoicing/operation_out.vue b/src/views/invoicing/operation_out.vue
index 2ffb221..a8bc706 100644
--- a/src/views/invoicing/operation_out.vue
+++ b/src/views/invoicing/operation_out.vue
@@ -122,7 +122,7 @@
                 </el-table-column>
                 <el-table-column label="单位">
                     <template v-slot="scope">
-                        <el-select @change="consCountTotal($event, scope.row, 'unit')" v-model="scope.row.conUnit" :placeholder="scope.row.conUnit">
+                        <el-select @change="consCountTotal($event, scope.row, 'unit')" v-model="scope.row.unit" :placeholder="scope.row.conUnit">
                             <el-option :label="scope.row.conUnit" :value="scope.row.conUnit"> </el-option>
                             <el-option :label="scope.row.conUnitTwo" :value="scope.row.conUnitTwo" v-if="scope.row.conUnitTwo"> </el-option>
                         </el-select>

From c103e026e5d1f6d96f1800173ca13f860c3ab412 Mon Sep 17 00:00:00 2001
From: duan <1004387497@qq.com>
Date: Thu, 31 Oct 2024 09:14:10 +0800
Subject: [PATCH 11/16] =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=87=BA=E5=BA=93null?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/invoicing/operation_in.vue  | 24 ++++++++++++++++++------
 src/views/invoicing/operation_out.vue | 16 +++++++++++++---
 2 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/src/views/invoicing/operation_in.vue b/src/views/invoicing/operation_in.vue
index 97bd84d..004bd02 100644
--- a/src/views/invoicing/operation_in.vue
+++ b/src/views/invoicing/operation_in.vue
@@ -124,9 +124,11 @@
                 </el-table-column>
                 <el-table-column label="单位">
                     <template v-slot="scope">
-                        <el-select @change="consCountTotal($event, scope.row, 'unit')" v-model="scope.row.unit" :placeholder="scope.row.conUnit">
+                        <el-select @change="consCountTotal($event, scope.row, 'unit')" v-model="scope.row.unit"
+                            :placeholder="scope.row.conUnit">
                             <el-option :label="scope.row.conUnit" :value="scope.row.conUnit"> </el-option>
-                            <el-option :label="scope.row.conUnitTwo" :value="scope.row.conUnitTwo" v-if="scope.row.conUnitTwo"> </el-option>
+                            <el-option :label="scope.row.conUnitTwo" :value="scope.row.conUnitTwo"
+                                v-if="scope.row.conUnitTwo"> </el-option>
                         </el-select>
                         <div class="tips"> &nbsp;</div>
                     </template>
@@ -142,10 +144,9 @@
                 </el-table-column>
                 <el-table-column label="小计">
                     <template v-slot="scope">
-                        <!-- <el-input-number v-model="scope.row.totalAmount" :min="0"
+                        <!-- <el-input-number v-model="scope.row.totalAmount" :min="0"  scope.row.price , scope.row.stockNumber
                             controls-position="right"></el-input-number> -->
-                        <el-input :value="formatDecimal(scope.row.price * scope.row.stockNumber)" readonly
-                            style="width: 100px;" />
+                        <el-input :value="formatDecimal(testform(scope.row))" readonly style="width: 100px;" />
                     </template>
                 </el-table-column>
                 <!-- <el-table-column label="变动后剩余库存">
@@ -350,6 +351,13 @@ export default {
                 cb(uniqueArray);
             }, 1000 * Math.random());
         },
+        testform(d) {
+            let p = 1
+            if (d.unit && d.unit == d.conUnitTwo) {
+                p = d.conUnitTwoConvert
+            }
+            return d.price * d.stockNumber * p
+        },
         handleSelect(item) {//选定后清空
             this.autocompletename = ''
             if (this.inTabValue == 'goods') {
@@ -432,7 +440,11 @@ export default {
 
                 let zong = 0
                 this.tableData.list.forEach(ele => {
-                    zong += ele.price * ele.stockNumber
+                    let p = 1
+                    if (ele.unit && ele.conUnitTwo == ele.unit) {
+                        p = ele.conUnitTwoConvert
+                    }
+                    zong += ele.price * ele.stockNumber * p
                 })
                 this.queryForm.totalAmount = formatDecimal(zong)
             }
diff --git a/src/views/invoicing/operation_out.vue b/src/views/invoicing/operation_out.vue
index a8bc706..9facbeb 100644
--- a/src/views/invoicing/operation_out.vue
+++ b/src/views/invoicing/operation_out.vue
@@ -141,8 +141,7 @@
                     <template v-slot="scope">
                         <!-- <el-input-number v-model="scope.row.totalAmount" :min="0"
                             controls-position="right"></el-input-number> -->
-                        <el-input :value="formatDecimal(scope.row.price * scope.row.stockNumber)" readonly
-                            style="width: 100px;" />
+                            <el-input :value="formatDecimal(testform(scope.row))" readonly style="width: 100px;" />
                     </template>
                 </el-table-column>
                 <!-- <el-table-column label="变动后剩余库存">
@@ -345,6 +344,13 @@ export default {
                 cb(uniqueArray);
             }, 1000 * Math.random());
         },
+        testform(d) {
+            let p = 1
+            if (d.unit && d.unit == d.conUnitTwo) {
+                p = d.conUnitTwoConvert
+            }
+            return d.price * d.stockNumber * p
+        },
         handleSelect(item) {//选定后清空
             this.autocompletename = ''
             if (this.inTabValue == 'goods') {
@@ -393,7 +399,11 @@ export default {
 
                 let zong = 0
                 this.tableData.list.forEach(ele => {
-                    zong += ele.price * ele.stockNumber
+                    let p = 1
+                    if (ele.unit && ele.conUnitTwo == ele.unit) {
+                        p = ele.conUnitTwoConvert
+                    }
+                    zong += ele.price * ele.stockNumber * p
                 })
                 this.queryForm.totalAmount = formatDecimal(zong)
             }

From f68cf9fab0e8d43479e9b33fbfb870fd315b9d0b Mon Sep 17 00:00:00 2001
From: GaoHao <1210693421@qq.com>
Date: Thu, 31 Oct 2024 09:30:18 +0800
Subject: [PATCH 12/16] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/coupon_details.vue             | 36 ++++++++++++++++---
 1 file changed, 32 insertions(+), 4 deletions(-)

diff --git a/src/views/coupon_manage/components/coupon_details.vue b/src/views/coupon_manage/components/coupon_details.vue
index 1e7f88b..e36e8ba 100644
--- a/src/views/coupon_manage/components/coupon_details.vue
+++ b/src/views/coupon_manage/components/coupon_details.vue
@@ -38,8 +38,8 @@
           </el-form-item>
         </el-form>
       </div>
-      <div>
-        <el-table v-loading="loading" :data="tableData">
+      <div class="head-container">
+        <el-table v-loading="loading" :data="tableData.data">
 
           <el-table-column label="用户ID" prop="id" />
           <el-table-column label="用户名" prop="name" />
@@ -71,6 +71,16 @@
 
         </el-table>
       </div>
+      <div class="head-container">
+        <el-pagination
+          :total="tableData.total"
+          :current-page="tableData.page + 1"
+          :page-size="tableData.size"
+          layout="total, sizes, prev, pager, next, jumper"
+          @current-change="paginationChange"
+          @size-change="sizeChange"
+        />
+      </div>
     </el-dialog>
   </div>
 </template>
@@ -101,7 +111,13 @@ export default {
         size: 10
       },
       resetQuery: null,
-      tableData: null
+      tableData: {
+        data: [],
+        page: 0,
+        size: 10,
+        loading: false,
+        total: 0
+      }
     }
   },
   mounted() {
@@ -126,6 +142,9 @@ export default {
         page: this.query.page,
         size: this.query.size
       })
+      this.tableData.loading = false
+      this.tableData.data = res.content
+      this.tableData.total = res.totalElements
     },
 
     /**
@@ -157,7 +176,16 @@ export default {
       this.query.couponId = obj.id
       this.getTableData()
     },
-
+    // 分页大小改变
+    sizeChange(e) {
+      this.tableData.size = e
+      this.getTableData()
+    },
+    // 分页回调
+    paginationChange(e) {
+      this.tableData.page = e - 1
+      this.getTableData()
+    },
     /**
      * 关闭详情
      */

From 461150f9ba5b923e24cc03c655135f4ae198d8f2 Mon Sep 17 00:00:00 2001
From: duan <1004387497@qq.com>
Date: Thu, 31 Oct 2024 10:12:39 +0800
Subject: [PATCH 13/16] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=87=BA=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E7=9A=84=E6=AC=A0=E6=AC=BE=E9=87=91=E9=A2=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/invoicing.js                           |  2 +-
 src/layout/components/TagsView/index.vue       |  1 +
 src/views/invoicing/consumable/information.vue |  6 +++---
 src/views/invoicing/operation_in.vue           |  7 +++++++
 src/views/invoicing/operation_out.vue          | 16 +++++++++++++---
 5 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/src/api/invoicing.js b/src/api/invoicing.js
index 2600bfa..e144ba4 100644
--- a/src/api/invoicing.js
+++ b/src/api/invoicing.js
@@ -71,7 +71,7 @@ export function tbProductStockDetailSum(params) {
  */
 export function tbShopPurveyorGet(params) {
   return request({
-    url: `/api/tbShopPurveyor`,
+    url: `/api/tbShopPurveyorTransact`,
     method: "get",
     params
   });
diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index b3c2ffe..40845c0 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -160,6 +160,7 @@ export default {
       }
     },
     openMenu(tag, e) {
+      console.log(11111)
       const menuMinWidth = 105
       const offsetLeft = this.$el.getBoundingClientRect().left // container margin left
       const offsetWidth = this.$el.offsetWidth // container width
diff --git a/src/views/invoicing/consumable/information.vue b/src/views/invoicing/consumable/information.vue
index cc1b31f..0d7d761 100644
--- a/src/views/invoicing/consumable/information.vue
+++ b/src/views/invoicing/consumable/information.vue
@@ -496,11 +496,11 @@
         </div>
         <div class="unitStyle unitWidth " style="margin-top: 20px;" v-else>
           <div>副单位</div>
-          <div><input style="width: 100px;" type="text" v-model="unitItem.conUnitTwo"> </div>
+          <div><input style="width: 70px;" type="text" v-model="unitItem.conUnitTwo"> </div>
           <div style="display: flex;align-items: center;">
             <div style="width: 9px;height: 9px;background-color: #D9D9D9;border-radius: 50%;margin:0 6px;"></div> 订货单位
             <input type="text" disabled placeholder="1">
-            <div style="width: 80px;">{{ unitItem.conUnitTwo }}</div>= <input v-model="unitItem.conUnitTwoConvert"
+            <div style="width: 80px;">{{ unitItem.conUnitTwo }}</div>= <input style="width: 80px;" v-model="unitItem.conUnitTwoConvert"
               type="number">{{
                 unitItem.conUnit }}
           </div>
@@ -1377,7 +1377,7 @@ export default {
   }
 
   >div:nth-child(2) {
-    width: 120px;
+    width: 80px;
     height: 42px;
     line-height: 42px;
     text-align: center;
diff --git a/src/views/invoicing/operation_in.vue b/src/views/invoicing/operation_in.vue
index 004bd02..a0870f4 100644
--- a/src/views/invoicing/operation_in.vue
+++ b/src/views/invoicing/operation_in.vue
@@ -84,6 +84,10 @@
                 </el-row>
                 <el-row>
                     <el-col :span="8">
+                        <el-form-item label="欠款金额">
+                            <el-input v-model="queryForm.waitAmount" disabled style="width: 220px;"></el-input>
+                        </el-form-item>
+                    </el-col>   <el-col :span="8">
                         <el-form-item label="备注">
                             <el-input v-model="queryForm.remark" placeholder="请输入备注" style="width: 220px;"></el-input>
                         </el-form-item>
@@ -408,6 +412,9 @@ export default {
         },
         // 切换类型
         changeTypeEnum(index) {
+            let filterd=  this.purveyorList.filter(ele=>ele.id == index)
+            this.queryForm.waitAmount = filterd[0].waitAmount
+
             this.inTabs.forEach((i) => {
                 if (i.value == this.inTabValue) {
                     this.queryForm.type = i.type
diff --git a/src/views/invoicing/operation_out.vue b/src/views/invoicing/operation_out.vue
index 9facbeb..4a6bdbe 100644
--- a/src/views/invoicing/operation_out.vue
+++ b/src/views/invoicing/operation_out.vue
@@ -83,6 +83,11 @@
                     </el-col>
                 </el-row>
                 <el-row>
+                    <el-col :span="8">
+                        <el-form-item label="欠款金额">
+                            <el-input v-model="queryForm.waitAmount" disabled style="width: 220px;"></el-input>
+                        </el-form-item>
+                    </el-col>
                     <el-col :span="8">
                         <el-form-item label="备注">
                             <el-input v-model="queryForm.remark" placeholder="请输入备注" style="width: 220px;"></el-input>
@@ -122,9 +127,11 @@
                 </el-table-column>
                 <el-table-column label="单位">
                     <template v-slot="scope">
-                        <el-select @change="consCountTotal($event, scope.row, 'unit')" v-model="scope.row.unit" :placeholder="scope.row.conUnit">
+                        <el-select @change="consCountTotal($event, scope.row, 'unit')" v-model="scope.row.unit"
+                            :placeholder="scope.row.conUnit">
                             <el-option :label="scope.row.conUnit" :value="scope.row.conUnit"> </el-option>
-                            <el-option :label="scope.row.conUnitTwo" :value="scope.row.conUnitTwo" v-if="scope.row.conUnitTwo"> </el-option>
+                            <el-option :label="scope.row.conUnitTwo" :value="scope.row.conUnitTwo"
+                                v-if="scope.row.conUnitTwo"> </el-option>
                         </el-select>
                         <div class="tips"> &nbsp;</div>
                     </template>
@@ -141,7 +148,7 @@
                     <template v-slot="scope">
                         <!-- <el-input-number v-model="scope.row.totalAmount" :min="0"
                             controls-position="right"></el-input-number> -->
-                            <el-input :value="formatDecimal(testform(scope.row))" readonly style="width: 100px;" />
+                        <el-input :value="formatDecimal(testform(scope.row))" readonly style="width: 100px;" />
                     </template>
                 </el-table-column>
                 <!-- <el-table-column label="变动后剩余库存">
@@ -526,6 +533,9 @@ export default {
         },
         // 切换类型
         changeTypeEnum(index) {
+            let filterd=  this.purveyorList.filter(ele=>ele.id == index)
+            this.queryForm.waitAmount = filterd[0].waitAmount
+
             if (this.queryForm.purveyorId) {
                 this.shopTypesActive = 0
             } else {

From 4af25b2b8042b1edcd9ca186fd08bec6ee992c47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AD=8F=E5=95=BE?= <1144797966@qq.com>
Date: Thu, 31 Oct 2024 10:17:30 +0800
Subject: [PATCH 14/16] 1

---
 src/layout/components/TagsView/index.vue       | 8 ++++++--
 src/views/invoicing/consumable/information.vue | 1 +
 src/views/invoicing/operation_in.vue           | 1 +
 src/views/invoicing/operation_out.vue          | 1 +
 src/views/product/add_shop.vue                 | 1 +
 src/views/product/index.vue                    | 1 +
 6 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index b3c2ffe..8216188 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -3,9 +3,10 @@
     <scroll-pane ref="scrollPane" class="tags-view-wrapper">
       <router-link v-for="tag in visitedViews" ref="tag" :key="tag.path" :class="isActive(tag) ? 'active' : ''"
         :to="{ path: tag.path, query: tag.query, fullPath: tag.fullPath }" tag="span" class="tags-view-item"
-        @click.middle.native="closeSelectedTag(tag)" @contextmenu.prevent.native="openMenu(tag, $event)">
+        @click.middle.native="!isAffix(tag) ? closeSelectedTag(tag) : ''"
+        @contextmenu.prevent.native="openMenu(tag, $event)">
         {{ tag.title }}
-        <span v-if="!tag.meta.affix" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
+        <span v-if="!isAffix(tag)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
       </router-link>
     </scroll-pane>
     <ul v-show="visible" :style="{ left: left + 'px', top: top + 'px' }" class="contextmenu">
@@ -58,6 +59,9 @@ export default {
     this.addTags()
   },
   methods: {
+    isAffix(tag) {
+      return tag.meta && tag.meta.affix
+    },
     isActive(route) {
       return route.path === this.$route.path
     },
diff --git a/src/views/invoicing/consumable/information.vue b/src/views/invoicing/consumable/information.vue
index 0969ec0..b7c3700 100644
--- a/src/views/invoicing/consumable/information.vue
+++ b/src/views/invoicing/consumable/information.vue
@@ -600,6 +600,7 @@ import { hasPermission } from '@/utils/limits.js'
 
 export default {
   components: { AddConsTakin, UploadExcel, consRecordDetail },
+  name:'information',
   data() {
     return {
       tongji: {},//统计
diff --git a/src/views/invoicing/operation_in.vue b/src/views/invoicing/operation_in.vue
index 612add2..4494e8b 100644
--- a/src/views/invoicing/operation_in.vue
+++ b/src/views/invoicing/operation_in.vue
@@ -226,6 +226,7 @@ import { tbConsInfoGet, tbProductlist } from "@/api/invoicing";
 import { tbShopPurveyorGet, tbProductStockOperateOutAndOn, stockInOut } from '@/api/invoicing'
 import { formatDecimal } from '@/utils'
 export default {
+  name:'operation_in',
     components: {
         shopList,
         ConsumableList
diff --git a/src/views/invoicing/operation_out.vue b/src/views/invoicing/operation_out.vue
index 6bdcf59..f8b23f5 100644
--- a/src/views/invoicing/operation_out.vue
+++ b/src/views/invoicing/operation_out.vue
@@ -221,6 +221,7 @@ import { tbShopPurveyorGet, tbProductStockOperateOutAndOn, stockInOut, tbConsInf
 
 import { formatDecimal } from '@/utils'
 export default {
+  name:'operation_out',
     components: {
         shopList,
         ConsumableList
diff --git a/src/views/product/add_shop.vue b/src/views/product/add_shop.vue
index 2a00fa7..2587310 100644
--- a/src/views/product/add_shop.vue
+++ b/src/views/product/add_shop.vue
@@ -437,6 +437,7 @@ export default {
     Editor,
     addImg,
   },
+  name:'add_shop',
   data() {
     const validatordateUsed = (rule, value, callback) => {
       if (!this.form.notices.dateUsed) {
diff --git a/src/views/product/index.vue b/src/views/product/index.vue
index 7362af3..b124684 100644
--- a/src/views/product/index.vue
+++ b/src/views/product/index.vue
@@ -244,6 +244,7 @@ import { tbProductListV2, tbShopCategoryGet, tbProductDelete, tbProductIsHot, up
 import { hasPermission } from '@/utils/limits.js'
 
 export default {
+  name:'product',
   components: {
     BindCons,
     StockHistory

From 9bf1dda6dc5dea76ce07914f691a1f8ab594735a Mon Sep 17 00:00:00 2001
From: gyq <875626088@qq.com>
Date: Fri, 1 Nov 2024 10:23:05 +0800
Subject: [PATCH 15/16] =?UTF-8?q?1.=E6=96=B0=E5=A2=9E=E5=BA=97=E9=93=BA?=
 =?UTF-8?q?=E8=A3=85=E4=BF=AE=E5=B0=8F=E7=A5=A8=E8=AE=BE=E7=BD=AE=202.?=
 =?UTF-8?q?=E5=BA=97=E9=93=BA=E8=A3=85=E4=BF=AE=E6=96=B0=E5=A2=9Epad?=
 =?UTF-8?q?=E7=82=B9=E9=A4=90=E8=AE=BE=E7=BD=AE=203.=E5=BA=94=E7=94=A8?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83=E6=96=B0=E5=A2=9E=E4=BC=9A=E5=91=98=E7=A7=AF?=
 =?UTF-8?q?=E5=88=86=204.=E5=BA=97=E9=93=BA=E8=AE=BE=E7=BD=AE=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E7=A7=AF=E5=88=86=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/points.js                             | 109 ++++++++++
 src/assets/images/1024.png                    | Bin 0 -> 1797 bytes
 .../components/member_points/record.vue       | 184 +++++++++++++---
 .../components/member_points/setting.vue      | 151 ++++++++++---
 .../components/member_points/shop_add.vue     | 200 ++++++++++++++++--
 .../components/member_points/shop_list.vue    |  99 ++++++++-
 src/views/application/member_points.vue       |   3 +-
 src/views/product/index.vue                   |  37 ++--
 src/views/shop/components/fitment.vue         |  62 +++++-
 src/views/shop/components/shopInfo.vue        |  13 +-
 10 files changed, 757 insertions(+), 101 deletions(-)
 create mode 100644 src/api/points.js
 create mode 100644 src/assets/images/1024.png

diff --git a/src/api/points.js b/src/api/points.js
new file mode 100644
index 0000000..d6d89ab
--- /dev/null
+++ b/src/api/points.js
@@ -0,0 +1,109 @@
+import request from "@/utils/request";
+// 会员积分
+
+/**
+ * 基本设置-获取店铺设置
+ * @returns
+ */
+export function basicSettingGet() {
+  let shopId = localStorage.getItem("shopId");
+  return request({
+    url: `/api/points/basic-setting/${shopId}`,
+    method: "get"
+  });
+}
+
+/**
+ * 基本设置-保存
+ * @returns
+ */
+export function basicSettingPost(data) {
+  return request({
+    url: "/api/points/basic-setting",
+    method: "post",
+    data
+  });
+}
+
+/**
+ * 商品设置-新增/编辑
+ * @returns
+ */
+export function goodsSettingAdd(data) {
+  return request({
+    url: "/api/points/goods-setting",
+    method: data.id ? "put" : "post",
+    data
+  });
+}
+
+/**
+ * 商品设置-删除
+ * @returns
+ */
+export function goodsDelete(id) {
+  return request({
+    url: `/api/points/goods-setting/${id}`,
+    method: "DELETE"
+  });
+}
+
+/**
+ * 商品设置-列表
+ * @returns
+ */
+export function goodsSettingPage(params) {
+  let shopId = localStorage.getItem("shopId");
+  return request({
+    url: `/api/points/goods-setting/page`,
+    method: "get",
+    params: {
+      ...params,
+      shopId: shopId
+    }
+  });
+}
+
+/**
+ * 兑换记录-列表
+ * @returns
+ */
+export function exchangeRecordPage(params) {
+  let shopId = localStorage.getItem("shopId");
+  return request({
+    url: `/api/points/exchange-record/page`,
+    method: "get",
+    params: {
+      ...params,
+      shopId: shopId
+    }
+  });
+}
+
+/**
+ * 兑换记录-统计
+ * @returns
+ */
+export function exchangeRecordTotal(params) {
+  let shopId = localStorage.getItem("shopId");
+  return request({
+    url: `/api/points/exchange-record/total`,
+    method: "get",
+    params: {
+      ...params,
+      shopId: shopId
+    }
+  });
+}
+
+/**
+ * 兑换记录-核销
+ * @returns
+ */
+export function recordCheckout(data) {
+  return request({
+    url: "/api/points/exchange-record/checkout",
+    method: "post",
+    data
+  });
+}
diff --git a/src/assets/images/1024.png b/src/assets/images/1024.png
new file mode 100644
index 0000000000000000000000000000000000000000..716381bea35f0257e570c507df1703578a0e8634
GIT binary patch
literal 1797
zcmeAS@N?(olHy`uVBq!ia0y~yV4MKL985qF{<{lj11Zh|kH}&M2EHR8%s5q>Pnv;&
zZM&z7V@SoEw|5--t~dy|I`;hf7oNAR!?jyzvc-Liq~2Llx2slN-GA@>cm9T^`Q`Eq
z5Ar$1CMZTYv?VY~HnFB~(13F+`<MNWb=kl6S4{c-yY|cb<@5i4sr0M=Kjr=BY~TI*
z<~j<_8ya{HG8wUOpAaB|bL{&DKi~H+bAs=$zO^mibZy<g;M?C0-66>gpj8pu+e@=<
z$DP0YZIYjDuKnrnKev)>#)<cdA8&q<yZmL}rOV$o|2V@-oDUElt&X@KQ@j4uKGFTf
zhlvgVh<4@u?Wy`JpO)CazOwCo;_b>;B)c9M0;YSXe=%8pzPM`t%P-%z*Ye*!_t_+m
z)YK4j`M3KA{cUe63rUa6xN`Xi@xJd>=l=V*<>hDp_nx`c@wdNi-Zr=Xb|uLk0!GK&
zRqvyH|Nq<ecX95r`RBLQuFfUd6p8zXSG|9qb6dUYR^7EP--G|#y?$>0w2j2fam;k@
z`YmU_)Lq#2{O6XvOP1f<rf>H5@9snrv)RX8zZw4D-u8FF<@@%w|G(U~-dq2~X1;Ci
zdy>;yPj=P%_UfzOXV=W1@B2P6xB4H+5#94X(f9pVo3q<$7v;X+{;y`ve`At!FDSzO
zZ+~l8=KJ0g6j9%|zI}gpoB8&)f0mORQ{XII_5Z~cVE6<te?I?S@~v-m{=W9}GjE@J
zPilm@)$w<qU-rFo-nRK$-~PE>S3gUd)WY!FhJ8C<)@r=_y5+A9$pQ1JI^yzg>r!A|
zT0ZaFzE|gqZ~rbLwM=+C>)!5}_n50@<^FbA?zg`^xBmT?pWEN212Yvlk<C~mO0qW)
fWgGD&dL82(6G5f#lOD1H>oo>XS3j3^P6<r_USyv<

literal 0
HcmV?d00001

diff --git a/src/views/application/components/member_points/record.vue b/src/views/application/components/member_points/record.vue
index 25048c4..2357bae 100644
--- a/src/views/application/components/member_points/record.vue
+++ b/src/views/application/components/member_points/record.vue
@@ -4,18 +4,18 @@
         <div>
             <el-form :model="query" inline label-position="left">
                 <el-form-item>
-                    <el-input placeholder="订单编号/核销码" v-model="query.name" />
+                    <el-input placeholder="订单编号/核销码" v-model="query.keywords" />
                 </el-form-item>
                 <el-form-item>
-                    <el-select v-model="query.cateId" placeholder="领取方式" style="width: 140px;">
-                        <el-option label="自取" :value="1"></el-option>
-                        <el-option label="邮寄" :value="2"></el-option>
+                    <el-select v-model="query.pickupMethod" placeholder="领取方式" style="width: 140px;">
+                        <el-option label="自取" value="self"></el-option>
+                        <el-option label="邮寄" value="post"></el-option>
                     </el-select>
                 </el-form-item>
                 <el-form-item>
-                    <el-select v-model="query.cateId" placeholder="状态" style="width: 140px;">
-                        <el-option label="自取" :value="1"></el-option>
-                        <el-option label="邮寄" :value="2"></el-option>
+                    <el-select v-model="query.status" placeholder="状态" style="width: 140px;">
+                        <el-option label="待自取" value="waiting"></el-option>
+                        <el-option label="已完成" value="done"></el-option>
                     </el-select>
                 </el-form-item>
                 <el-form-item>
@@ -25,7 +25,7 @@
                     </el-date-picker>
                 </el-form-item>
                 <el-form-item>
-                    <el-button type="primary" @click="getTableData">查询</el-button>
+                    <el-button type="primary" @click="queryHandle">查询</el-button>
                     <el-button @click="resetHandle">重置</el-button>
                 </el-form-item>
             </el-form>
@@ -37,7 +37,7 @@
                         <i class="icon el-icon-s-goods"></i>
                     </div>
                     <div class="info">
-                        <div class="m">￥1231</div>
+                        <div class="m">{{ countData.count }}</div>
                         <div class="t">总订单数</div>
                     </div>
                 </div>
@@ -46,7 +46,7 @@
                         <i class="icon el-icon-s-goods"></i>
                     </div>
                     <div class="info">
-                        <div class="m">￥0.00</div>
+                        <div class="m">￥{{ countData.totalAmount }}</div>
                         <div class="t">已支付金额</div>
                     </div>
                 </div>
@@ -54,51 +54,181 @@
         </div>
         <div class="head-container">
             <el-table :data="tableData.list" v-loading="tableData.loading">
-                <el-table-column label="订单编号"></el-table-column>
-                <el-table-column label="用户名"></el-table-column>
-                <el-table-column label="商品"></el-table-column>
-                <el-table-column label="使用积分"></el-table-column>
-                <el-table-column label="支付金额"></el-table-column>
-                <el-table-column label="领取方式"></el-table-column>
-                <el-table-column label="状态"></el-table-column>
-                <el-table-column label="下单时间"></el-table-column>
-                <el-table-column label="操作"></el-table-column>
+                <el-table-column label="订单编号" prop="orderNo"></el-table-column>
+                <el-table-column label="用户名" prop="memberName">
+                    <template v-slot="scope">
+                        <div class="goods_info">
+                            <el-image :src="scope.row.avatarUrl" style="width:40px;height:40px;flex-shrink: 0;" />
+                            <span>{{ scope.row.memberName }}</span>
+                        </div>
+                    </template>
+                </el-table-column>
+                <el-table-column label="商品" prop="pointsGoodsName">
+                    <template v-slot="scope">
+                        <div class="goods_info">
+                            <el-image :src="scope.row.goodsImageUrl" style="width:40px;height:40px;flex-shrink: 0;" />
+                            <span>{{ scope.row.pointsGoodsName }}</span>
+                        </div>
+                    </template>
+                </el-table-column>
+                <el-table-column label="使用积分" prop="spendPoints"></el-table-column>
+                <el-table-column label="支付金额" prop="extraPaymentAmount"></el-table-column>
+                <el-table-column label="领取方式" prop="pickupMethod">
+                    <template v-slot="scope">
+                        <el-tag type="success" effect="plain" disable-transitions
+                            v-if="scope.row.pickupMethod == 'self'">自取</el-tag>
+                        <el-tag type="info" effect="plain" disable-transitions
+                            v-if="scope.row.pickupMethod == 'post'">邮寄
+                        </el-tag>
+                    </template>
+                </el-table-column>
+                <el-table-column label="状态" prop="status">
+                    <template v-slot="scope">
+                        <el-tag type="warning" disable-transitions v-if="scope.row.status == 'waiting'">待自取</el-tag>
+                        <el-tag type="success" disable-transitions v-if="scope.row.status == 'done'">已完成</el-tag>
+                    </template>
+                </el-table-column>
+                <el-table-column label="下单时间" prop="createTime"></el-table-column>
+                <el-table-column label="操作">
+                    <template v-slot="scope">
+                        <el-button type="text" icon="el-icon-finished" disabled
+                            v-if="scope.row.status == 'done'">已完成</el-button>
+                        <template v-else>
+                            <el-popconfirm title="确定核销吗？" @confirm="confirmOrder(scope.row.couponCode)">
+                                <el-button type="text" icon="el-icon-finished" slot="reference">核销</el-button>
+                            </el-popconfirm>
+                        </template>
+                    </template>
+                </el-table-column>
             </el-table>
         </div>
+        <div class="head-container">
+            <el-pagination :total="tableData.total" @size-change="handleSizeChange" :current-page="tableData.page"
+                :page-size="tableData.size" @current-change="paginationChange"
+                layout="total, sizes, prev, pager, next, jumper"></el-pagination>
+        </div>
     </div>
 </template>
 
 <script>
+import { exchangeRecordPage, exchangeRecordTotal, recordCheckout } from '@/api/points.js'
 export default {
     data() {
         return {
+            countData: {
+                count: 0,
+                totalAmount: 0
+            },
             query: {
-                name: '',
-                cateId: '',
+                keywords: '',
+                beginDate: '',
+                endDate: '',
+                status: '',
+                pickupMethod: '',
                 createdAt: []
             },
+            resetQuery: '',
             tableData: {
-                sort: 'createdAt,desc',
                 list: [],
-                page: 0,
+                page: 1,
                 size: 30,
                 loading: false,
                 total: 0
             },
         }
     },
+    mounted() {
+        this.resetQuery = { ...this.query }
+        this.getTableData()
+        this.exchangeRecordTotal()
+    },
     methods: {
-        resetHandle() {
-
+        // 核销
+        async confirmOrder(couponCode) {
+            try {
+                this.tableData.loading = true
+                await recordCheckout({ couponCode: couponCode })
+                this.$notify({
+                    title: '成功',
+                    message: '核销成功',
+                    type: 'success'
+                })
+                this.getTableData()
+            } catch (error) {
+                this.tableData.loading = false
+                console.log(error);
+            }
         },
-        getTableData() {
-
+        // 统计
+        async exchangeRecordTotal() {
+            try {
+                const { count, totalAmount } = await exchangeRecordTotal({
+                    keywords: this.query.keywords,
+                    beginDate: this.query.createdAt[0] || '',
+                    endDate: this.query.createdAt[1] || '',
+                    status: this.query.status,
+                    pickupMethod: this.query.pickupMethod
+                })
+                this.countData.count = count
+                this.countData.totalAmount = totalAmount
+            } catch (error) {
+                console.log(error);
+            }
+        },
+        // 查询
+        queryHandle() {
+            this.getTableData()
+            this.exchangeRecordTotal()
+        },
+        // 重置查询
+        resetHandle() {
+            this.query = { ...this.resetQuery }
+            this.page = 1
+            this.size = 30
+            this.getTableData()
+            this.exchangeRecordTotal()
+        },
+        // 分页大小改变
+        handleSizeChange(val) {
+            this.tableData.size = val
+            this.getTableData()
+        },
+        // 分页回调
+        paginationChange(e) {
+            this.tableData.page = e
+            this.getTableData()
+        },
+        // 获取表格数据
+        async getTableData() {
+            try {
+                this.tableData.loading = true
+                const res = await exchangeRecordPage({
+                    page: this.tableData.page,
+                    size: this.tableData.size,
+                    keywords: this.query.keywords,
+                    beginDate: this.query.createdAt[0] || '',
+                    endDate: this.query.createdAt[1] || '',
+                    status: this.query.status,
+                    pickupMethod: this.query.pickupMethod
+                })
+                this.tableData.loading = false
+                this.tableData.list = res.content
+                this.tableData.total = res.totalElements
+            } catch (error) {
+                console.log(error);
+            }
         }
     }
 }
 </script>
 
 <style scoped lang="scss">
+.goods_info {
+    display: flex;
+    align-items: center;
+    gap: 10px;
+}
+
 .collect_wrap {
     display: flex;
     gap: 14px;
diff --git a/src/views/application/components/member_points/setting.vue b/src/views/application/components/member_points/setting.vue
index a201c8a..8003586 100644
--- a/src/views/application/components/member_points/setting.vue
+++ b/src/views/application/components/member_points/setting.vue
@@ -2,39 +2,46 @@
     <div>
         <el-form ref="form" :model="form" :rules="rules" label-width="140px" label-position="left">
             <el-form-item label="是否消费赠送积分">
-                <el-switch v-model.trim="form.isOpenYhq" :active-value="1" :inactive-value="0"></el-switch>
+                <el-switch v-model.trim="form.enableRewards" :active-value="1" :inactive-value="0"></el-switch>
             </el-form-item>
-            <el-form-item label="费赠送积分" v-if="form.isOpenYhq">
-                <el-input v-model="form.num" style="width: 300px;">
+            <el-form-item label="费赠送积分" prop="consumeAmount" v-if="form.enableRewards">
+                <el-input v-model="form.consumeAmount" style="width: 250px;"
+                    @input="inputFilterInt($event, 'consumeAmount')">
                     <template slot="prepend">每消费</template>
                     <template slot="append">元赠送1积分</template>
                 </el-input>
             </el-form-item>
             <el-form-item label="开启下单积分抵扣" style="margin-top: 50px;">
-                <el-switch v-model.trim="form.isOpenYhq" :active-value="1" :inactive-value="0"></el-switch>
-            </el-form-item>
-            <el-form-item label="下单积分抵扣门槛">
-                <el-input v-model="form.num" style="width: 300px;">
-                    <template slot="append">积分</template>
-                </el-input>
-            </el-form-item>
-            <el-form-item label="下单最高抵扣比例">
-                <el-input v-model="form.num" style="width: 300px;">
-                    <template slot="append">%</template>
-                </el-input>
-            </el-form-item>
-            <el-form-item label="下单抵扣积分比例">
-                <el-input v-model="form.num" style="width: 300px;">
-                    <template slot="prepend">1元等于</template>
-                    <template slot="append">积分</template>
-                </el-input>
+                <el-switch v-model.trim="form.enableDeduction" :active-value="1" :inactive-value="0"></el-switch>
             </el-form-item>
+            <template v-if="form.enableDeduction">
+                <el-form-item label="下单积分抵扣门槛" prop="minDeductionPoint">
+                    <el-input v-model="form.minDeductionPoint" style="width: 150px;"
+                        @input="inputFilterInt($event, 'minDeductionPoint')">
+                        <template slot="append">积分</template>
+                    </el-input>
+                </el-form-item>
+                <el-form-item label="下单最高抵扣比例" prop="maxDeductionRatio">
+                    <el-input v-model="form.maxDeductionRatio" style="width: 150px;"
+                        @input="inputFilterInt($event, 'maxDeductionRatio')">
+                        <template slot="append">%</template>
+                    </el-input>
+                </el-form-item>
+                <el-form-item label="下单抵扣积分比例" prop="equivalentPoints">
+                    <el-input v-model="form.equivalentPoints" style="width: 220px;"
+                        @input="inputFilterInt($event, 'equivalentPoints')">
+                        <template slot="prepend">1元等于</template>
+                        <template slot="append">积分</template>
+                    </el-input>
+                </el-form-item>
+            </template>
             <el-form-item label="开启积分商城" style="margin-top: 50px;">
-                <el-switch v-model.trim="form.isOpenYhq" :active-value="1" :inactive-value="0"></el-switch>
+                <el-switch v-model.trim="form.enablePointsMall" :active-value="1" :inactive-value="0"></el-switch>
             </el-form-item>
-            <el-form-item label="显示样式">
+            <el-form-item label="显示样式" v-if="form.enablePointsMall">
                 <div class="style_wrap">
-                    <div class="item style1" :class="{ active: styleActive == 1 }" @click="styleActive = 1">
+                    <div class="item style1" :class="{ active: form.browseMode == 'list' }"
+                        @click="form.browseMode = 'list'">
                         <div class="row">
                             <div class="cover"></div>
                             <div class="info">
@@ -52,7 +59,8 @@
                             </div>
                         </div>
                     </div>
-                    <div class="item style2" :class="{ active: styleActive == 2 }" @click="styleActive = 2">
+                    <div class="item style2" :class="{ active: form.browseMode == 'grid' }"
+                        @click="form.browseMode = 'grid'">
                         <div class="row">
                             <div class="cover"></div>
                             <div class="line"></div>
@@ -73,22 +81,103 @@
                 </div>
             </el-form-item>
             <el-form-item>
-                <el-button type="primary">保存</el-button>
+                <el-button type="primary" :loading="loading" @click="onSubmitHandle">保存</el-button>
             </el-form-item>
         </el-form>
     </div>
 </template>
 
 <script>
+import { basicSettingGet, basicSettingPost } from '@/api/points.js'
 export default {
     data() {
         return {
+            loading: false,
             form: {
-                isOpenYhq: 1,
-                num: ''
+                id: '',
+                enableRewards: 1,
+                consumeAmount: "",
+                enableDeduction: 1,
+                minDeductionPoint: "",
+                maxDeductionRatio: "",
+                equivalentPoints: "",
+                enablePointsMall: 1,
+                browseMode: 'list'
             },
-            styleActive: 1,
-            rules: {}
+            rules: {
+                consumeAmount: [
+                    {
+                        required: true,
+                        message: ' ',
+                        trigger: 'blur'
+                    }
+                ],
+                minDeductionPoint: [
+                    {
+                        required: true,
+                        message: ' ',
+                        trigger: 'blur'
+                    }
+                ],
+                maxDeductionRatio: [
+                    {
+                        required: true,
+                        message: ' ',
+                        trigger: 'blur'
+                    }
+                ],
+                equivalentPoints: [
+                    {
+                        required: true,
+                        message: ' ',
+                        trigger: 'blur'
+                    }
+                ]
+            }
+        }
+    },
+    mounted() {
+        this.basicSettingGet()
+    },
+    methods: {
+        // 过滤input只能输入整数
+        inputFilterInt(e, key) {
+            if (!e) return
+            setTimeout(() => {
+                this.form[key] = e.replace(/[^\d]/g, '')
+            }, 50)
+        },
+        // 提交
+        onSubmitHandle() {
+            this.$refs.form.validate(async valid => {
+                if (valid) {
+                    try {
+                        this.loading = true
+                        this.form.shopId = localStorage.getItem('shopId')
+                        await basicSettingPost(this.form)
+                        this.loading = false
+                        this.$notify({
+                            title: '成功',
+                            message: `保存成功`,
+                            type: 'success'
+                        });
+                    } catch (error) {
+                        this.loading = false
+                        console.log(error)
+                    }
+                }
+            })
+        },
+        // 获取店铺设置
+        async basicSettingGet() {
+            try {
+                const res = await basicSettingGet()
+                if (res.id) {
+                    this.form = res
+                }
+            } catch (error) {
+                console.log(error);
+            }
         }
     }
 }
@@ -106,6 +195,10 @@ export default {
         border: 1px solid #ddd;
         $color: #3F9EFF;
 
+        &:hover {
+            cursor: pointer;
+        }
+
         &.active {
             border-color: $color;
         }
diff --git a/src/views/application/components/member_points/shop_add.vue b/src/views/application/components/member_points/shop_add.vue
index bb0b8dc..55d5e77 100644
--- a/src/views/application/components/member_points/shop_add.vue
+++ b/src/views/application/components/member_points/shop_add.vue
@@ -4,49 +4,183 @@
         <el-dialog :title="form.id ? '编辑商品' : '添加商品'" :visible.sync="dialogVisible" @close="reset">
             <el-form ref="form" :model="form" :rules="rules" label-width="120px" label-position="left">
                 <el-form-item label="奖品类型">
-                    <el-radio-group v-model="form.registerType">
-                        <el-radio label="munchies">实物商品</el-radio>
-                        <el-radio label="restaurant">优惠券</el-radio>
+                    <el-radio-group v-model="form.goodsCategory">
+                        <el-radio label="physical">实物商品</el-radio>
+                        <!-- <el-radio label="coupon">优惠券</el-radio> -->
                     </el-radio-group>
                 </el-form-item>
-                <el-form-item label="商品图片">
+                <el-form-item label="商品图片" prop="goodsImageUrl">
                     <div class="img_list">
-                        <div class="item" v-for="item in form.imgList" :key="item.id">
-                            <img class="img" :src="item.url">
+                        <div class="item" v-if="form.goodsImageUrl" @click="form.goodsImageUrl = ''">
+                            <el-image :src="form.goodsImageUrl" style="width: 100%;height: 100%" />
+                            <div class="del">删除</div>
                         </div>
-                        <div class="item" @click="$refs.addImg.show()">
+                        <div class="item upload" @click="$refs.addImg.show()" v-else>
                             <i class="icon el-icon-plus"></i>
                         </div>
                     </div>
                 </el-form-item>
+                <el-form-item label="商品名称" prop="goodsName">
+                    <el-input v-model="form.goodsName" placeholder="请输入商品名称" style="width: 300px;"></el-input>
+                </el-form-item>
+                <el-form-item label="所需积分" prop="requiredPoints">
+                    <el-input v-model="form.requiredPoints" style="width: 130px;"
+                        @input="inputFilterInt($event, 'requiredPoints')">
+                        <template slot="append">积分</template>
+                    </el-input>
+                </el-form-item>
+                <el-form-item label="额外价格" prop="extraPrice">
+                    <el-input v-model="form.extraPrice" style="width: 130px;"
+                        @input="inputFilterFloat($event, 'extraPrice')">
+                        <template slot="append">元</template>
+                    </el-input>
+                </el-form-item>
+                <el-form-item label="数量">
+                    <el-input-number v-model="form.quantity" :min="1"></el-input-number>
+                </el-form-item>
+                <el-form-item label="排序">
+                    <el-input-number v-model="form.sort" :min="0"></el-input-number>
+                </el-form-item>
+                <el-form-item label="是否上架">
+                    <el-switch v-model.trim="form.status" :active-value="1" :inactive-value="0"></el-switch>
+                </el-form-item>
             </el-form>
+            <span slot="footer" class="dialog-footer">
+                <el-button @click="dialogVisible = false">取 消</el-button>
+                <el-button type="primary" :loading="loading" @click="onSubmitHandle">确 定</el-button>
+            </span>
         </el-dialog>
-        <addImg ref="addImg" @successEvent="e => form.imgList.push(e[0])" />
+        <addImg ref="addImg" @successEvent="e => form.goodsImageUrl = e[0].url" />
     </div>
 </template>
 
 <script>
+import { goodsSettingAdd } from '@/api/points.js'
 import addImg from "@/views/product/components/addImages.vue";
 export default {
     components: {
         addImg
     },
     data() {
+        const validateCoverImg = (rule, value, callback) => {
+            if (!this.form.goodsImageUrl) {
+                callback(new Error("请上传商品图片"));
+            } else {
+                callback()
+            }
+        }
         return {
             dialogVisible: false,
+            loading: false,
             form: {
-                id: '',
-                registerType: 'munchies',
-                imgList: []
+                goodsCategory: 'physical',
+                goodsName: '',
+                goodsImageUrl: '',
+                requiredPoints: '',
+                extraPrice: 0,
+                quantity: '',
+                status: 1,
+                sort: 0,
+                goodsDescription: ''
             },
-            rules: {}
+            resetForm: '',
+            rules: {
+                goodsName: [
+                    {
+                        required: true,
+                        message: ' ',
+                        trigger: 'blur'
+                    }
+                ],
+                goodsImageUrl: [
+                    {
+                        required: true,
+                        validator: validateCoverImg,
+                        trigger: 'change'
+                    }
+                ],
+                requiredPoints: [
+                    {
+                        required: true,
+                        message: ' ',
+                        trigger: 'blur'
+                    }
+                ],
+                extraPrice: [
+                    {
+                        required: true,
+                        message: ' ',
+                        trigger: 'blur'
+                    }
+                ]
+            }
         }
     },
+    mounted() {
+        this.resetForm = { ...this.form }
+    },
     methods: {
-        reset() {
-
+        // 过滤input只能输入整数
+        inputFilterInt(e, key) {
+            if (!e) return
+            setTimeout(() => {
+                this.form[key] = e.replace(/[^\d]/g, '')
+            }, 50)
         },
-        show() {
+        // 过滤input只能输入数字，并且最多输入两位小数
+        inputFilterFloat(value, key) {
+            if (!value) return
+            // 去除首位小数点
+            if (value.startsWith('.')) {
+                value = value.slice(1);
+            }
+            // 清除非数字和小数点（除了第一个小数点）
+            value = value.replace(/[^\d.]/g, '');
+            // 确保最多只有一个小数点
+            if (value.split('.').length > 2) {
+                value = value.split('.').slice(0, 2).join('.');
+            }
+            // 限制小数位数为两位
+            if (value.split('.')[1] && value.split('.')[1].length > 2) {
+                value = value.split('.')[0] + '.' + value.split('.')[1].slice(0, 2);
+            }
+            setTimeout(() => {
+                this.form[key] = value
+            }, 50)
+        },
+        // 提交
+        onSubmitHandle() {
+            this.$refs.form.validate(async valid => {
+                if (valid) {
+                    try {
+                        this.loading = true
+                        this.form.shopId = localStorage.getItem('shopId')
+                        await goodsSettingAdd(this.form)
+                        this.loading = false
+                        this.$notify({
+                            title: '成功',
+                            message: `${this.form.id ? '编辑' : '添加'}成功`,
+                            type: 'success'
+                        });
+                        this.$emit('success')
+                        this.close()
+                    } catch (error) {
+                        this.loading = false
+                        console.log(error)
+                    }
+                }
+            })
+        },
+        reset() {
+            this.form = { ...this.resetForm }
+        },
+        close() {
+            this.dialogVisible = false
+        },
+        show(row) {
+            if (row && row.id) {
+                this.form = { ...row }
+            }
             this.dialogVisible = true
         }
     }
@@ -62,11 +196,41 @@ export default {
     .item {
         width: 100px;
         height: 100px;
-        border: 1px dashed #ececec;
         display: flex;
         align-items: center;
         justify-content: center;
-        background-color: #F7F7FA;
+        background-color: #F5F7FA;
+        position: relative;
+        overflow: hidden;
+
+        &.upload {
+            border: 1px dashed #ddd;
+        }
+
+        &:hover {
+            cursor: pointer;
+
+            .del {
+                transform: translateY(0);
+            }
+        }
+
+        .del {
+            width: 100%;
+            height: 24px;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            position: absolute;
+            left: 0;
+            bottom: 0;
+            background-color: rgba(0, 0, 0, 0.3);
+            backdrop-filter: blur(3px);
+            color: #fff;
+            font-size: 12px;
+            transform: translateY(100%);
+            transition: all .2s ease-in-out;
+        }
 
         .img {
             width: 100%;
@@ -76,7 +240,7 @@ export default {
 
         .icon {
             font-size: 20px;
-            color: #DDDFE6;
+            color: #ddd;
         }
     }
 }
diff --git a/src/views/application/components/member_points/shop_list.vue b/src/views/application/components/member_points/shop_list.vue
index da29854..4d1f3db 100644
--- a/src/views/application/components/member_points/shop_list.vue
+++ b/src/views/application/components/member_points/shop_list.vue
@@ -3,21 +3,47 @@
         <div><el-button type="primary" @click="$refs.ShopAdd.show()">添加商品</el-button></div>
         <div class="head-container">
             <el-table :data="tableData.list" v-loading="tableData.loading">
-                <el-table-column label="商品"></el-table-column>
-                <el-table-column label="所需积分"></el-table-column>
-                <el-table-column label="额外价格「元」"></el-table-column>
-                <el-table-column label="总数"></el-table-column>
-                <el-table-column label="库存"></el-table-column>
-                <el-table-column label="操作"></el-table-column>
+                <el-table-column label="商品" prop="goodsName">
+                    <template v-slot="scope">
+                        <div class="goods_info">
+                            <el-image :src="scope.row.goodsImageUrl" style="width:40px;height:40px;flex-shrink: 0;" />
+                            <span>{{ scope.row.goodsName }}</span>
+                        </div>
+                    </template>
+                </el-table-column>
+                <el-table-column label="所需积分" prop="requiredPoints"></el-table-column>
+                <el-table-column label="额外价格「元」" prop="extraPrice"></el-table-column>
+                <el-table-column label="累计兑换次数" prop="totalExchangeCount"></el-table-column>
+                <el-table-column label="库存" prop="quantity"></el-table-column>
+                <el-table-column label="状态" prop="status">
+                    <template v-slot="scope">
+                        <el-tag type="success" disable-transitions v-if="scope.row.status == 1">上架</el-tag>
+                        <el-tag type="danger" disable-transitions v-if="scope.row.status == 0">下架</el-tag>
+                    </template>
+                </el-table-column>
+                <el-table-column label="操作">
+                    <template v-slot="scope">
+                        <el-button type="text" icon="el-icon-edit" @click="editorHandle(scope.row)">编辑</el-button>
+                        <el-popconfirm title="确定删除吗？" @confirm="delTableHandle(scope.row.id)">
+                            <el-button type="text" icon="el-icon-delete" slot="reference">删除</el-button>
+                        </el-popconfirm>
+                    </template>
+                </el-table-column>
             </el-table>
         </div>
+        <div class="head-container">
+            <el-pagination :total="tableData.total" @size-change="handleSizeChange" :current-page="tableData.page"
+                :page-size="tableData.size" @current-change="paginationChange"
+                layout="total, sizes, prev, pager, next, jumper"></el-pagination>
+        </div>
         <!-- 添加积分商品/积分 -->
-        <ShopAdd ref="ShopAdd" />
+        <ShopAdd ref="ShopAdd" @success="resetTable" />
     </div>
 </template>
 
 <script>
 import ShopAdd from './shop_add.vue'
+import { goodsSettingPage, goodsDelete } from '@/api/points.js'
 export default {
     components: { ShopAdd },
     data() {
@@ -25,12 +51,63 @@ export default {
             tableData: {
                 sort: 'createdAt,desc',
                 list: [],
-                page: 0,
+                page: 1,
                 size: 30,
                 loading: false,
                 total: 0
             },
         }
+    },
+    mounted() {
+        this.getTableData()
+    },
+    methods: {
+        // 编辑 预览
+        editorHandle(row) {
+            this.$refs.ShopAdd.show(row)
+        },
+        // 删除
+        async delTableHandle(id) {
+            try {
+                await goodsDelete(id)
+                this.$message.success('已删除')
+                this.getTableData()
+            } catch (error) {
+                console.log(error);
+            }
+        },
+        resetTable() {
+            this.tableData.page = 1
+            this.tableData.size = 30
+            this.getTableData()
+        },
+        handleSizeChange(val) {
+            this.tableData.size = val
+            this.getTableData()
+        },
+        // 分页回调
+        paginationChange(e) {
+            this.tableData.page = e
+            this.getTableData()
+        },
+        // 获取积分商品列表
+        async getTableData() {
+            try {
+                this.tableData.loading = true
+                const res = await goodsSettingPage({
+                    page: this.tableData.page,
+                    size: this.tableData.size,
+                    goodsName: '',
+                    goodsCategory: 'physical',
+                    status: ''
+                })
+                this.tableData.loading = false
+                this.tableData.list = res.content
+                this.tableData.total = res.totalElements
+            } catch (error) {
+                console.log(error);
+            }
+        }
     }
 }
 </script>
@@ -39,4 +116,10 @@ export default {
 .head-container {
     margin-top: 20px;
 }
+
+.goods_info {
+    display: flex;
+    align-items: center;
+    gap: 10px;
+}
 </style>
\ No newline at end of file
diff --git a/src/views/application/member_points.vue b/src/views/application/member_points.vue
index ffed912..3894dd0 100644
--- a/src/views/application/member_points.vue
+++ b/src/views/application/member_points.vue
@@ -16,6 +16,7 @@ import Setting from './components/member_points/setting.vue'
 import ShopList from './components/member_points/shop_list.vue'
 import Record from './components/member_points/record.vue'
 export default {
+    name: "member_points",
     components: {
         Setting,
         ShopList,
@@ -23,7 +24,7 @@ export default {
     },
     data() {
         return {
-            activeName: '3'
+            activeName: '1'
         }
     }
 }
diff --git a/src/views/product/index.vue b/src/views/product/index.vue
index 7362af3..5fbc199 100644
--- a/src/views/product/index.vue
+++ b/src/views/product/index.vue
@@ -21,7 +21,7 @@
     <div class="head-container">
       <div class="header_wrap">
         <!-- <router-link :to="{ name: 'add_shop' }" > -->
-          <el-button type="primary" icon="el-icon-plus" @click="toPath( '/product/add_shop')">添加商品</el-button>
+        <el-button type="primary" icon="el-icon-plus" @click="toPath('/product/add_shop')">添加商品</el-button>
         <!-- </router-link> -->
         <el-select v-model="tableData.sort" placeholder="排序" @change="getTableData">
           <el-option value="createdAt,desc" label="创建时间"></el-option>
@@ -139,7 +139,7 @@
             <div class="cons_wrap" v-if="scope.row.typeEnum">
               <div v-if="scope.row.conInfos && scope.row.conInfos.length">
                 <el-button type="text" @click="showBindCons(scope.row)">
-                  {{ scope.row.conInfos | conInfosFilter }}
+                  <span class="cons_span">{{ scope.row.conInfos | conInfosFilter }}</span>
                   <i class="el-icon-edit"></i>
                 </el-button>
               </div>
@@ -189,7 +189,7 @@
               style="margin-left: 20px !important;">
               <el-button type="text" icon="el-icon-edit">编辑</el-button>
             </router-link> -->
-              <el-button type="text" icon="el-icon-edit" @click="toPath( '/product/add_shop' ,scope.row )">编辑</el-button>
+            <el-button type="text" icon="el-icon-edit" @click="toPath('/product/add_shop', scope.row)">编辑</el-button>
             <el-popconfirm title="确定删除吗？" @confirm="delTableHandle([scope.row.id])">
               <el-button type="text" icon="el-icon-delete" style="margin-left: 20px !important;"
                 slot="reference">删除</el-button>
@@ -244,6 +244,7 @@ import { tbProductListV2, tbShopCategoryGet, tbProductDelete, tbProductIsHot, up
 import { hasPermission } from '@/utils/limits.js'
 
 export default {
+  name: 'product',
   components: {
     BindCons,
     StockHistory
@@ -315,14 +316,14 @@ export default {
   },
   methods: {
     // 是否允许修改商品
-    async toPath ( path , row) {
+    async toPath(path, row) {
       let res = await hasPermission('允许修改商品');
-      if ( !res) { return; }
+      if (!res) { return; }
       let query = {};
-      if ( row ) {
+      if (row) {
         query.goods_id = row.id;
       }
-      this.$router.push({path: path, query: query})
+      this.$router.push({ path: path, query: query })
     },
     // 显示修改商品警告线
     showStockWarningHandle() {
@@ -383,13 +384,13 @@ export default {
     },
     async changeGrounding(event, row, key) {
       let text;
-      if (key == 'grounding') { text = "允许上下架商品"}
-      if (key == 'pauseSale') { text = "允许售罄商品"}
+      if (key == 'grounding') { text = "允许上下架商品" }
+      if (key == 'pauseSale') { text = "允许售罄商品" }
       let res = await hasPermission(text);
-      if ( !res) { 
-        if (key == 'grounding') { row.isGrounding = (event == 0 ? 1 : 0);}
-        if (key == 'pauseSale') { row.isPauseSale = (event == 0 ? 1 : 0);}
-        return; 
+      if (!res) {
+        if (key == 'grounding') { row.isGrounding = (event == 0 ? 1 : 0); }
+        if (key == 'pauseSale') { row.isPauseSale = (event == 0 ? 1 : 0); }
+        return;
       }
       this.editorForm.key = key
       this.editorForm.id = row.id
@@ -415,7 +416,7 @@ export default {
     // 修改库存
     async changePrice(type, row) {
       let res = await hasPermission('允许修改商品库存');
-      if ( !res) { return; }
+      if (!res) { return; }
       this.editorVisable = true
       this.editorForm.key = type
       this.editorForm.id = row.id
@@ -437,7 +438,7 @@ export default {
     // 显示绑定耗材
     async showBindCons(item) {
       let res = await hasPermission('允许修改商品');
-      if ( !res) { return; }
+      if (!res) { return; }
       // console.log(item);
       this.$refs.bindCons.show(item)
     },
@@ -562,7 +563,7 @@ export default {
     // 删除商品
     async delTableHandle(ids) {
       let res = await hasPermission('允许修改商品');
-      if ( !res) { return; }
+      if (!res) { return; }
       try {
         await tbProductDelete(ids)
         this.getTableData()
@@ -575,6 +576,10 @@ export default {
 </script>
 
 <style scoped lang="scss">
+.cons_span {
+  white-space: break-spaces;
+}
+
 .header_wrap {
   display: flex;
   align-items: center;
diff --git a/src/views/shop/components/fitment.vue b/src/views/shop/components/fitment.vue
index 8885b56..fed2cad 100644
--- a/src/views/shop/components/fitment.vue
+++ b/src/views/shop/components/fitment.vue
@@ -152,6 +152,24 @@
                         <div class="shop_name">{{ shopName }}</div>
                         <img class="content" src="@/assets/images/shop_editor_bg.png" alt="">
                     </div>
+                    <div class="ticket_wrap" v-if="tableActive == 'ticket_logo'">
+                        <img class="logo" :src="selectItem.value">
+                        <img class="ewm" src="@/assets/images/1024.png">
+                        <div class="row">
+                            <span class="num">123</span>
+                            <span>座位号：#A9</span>
+                        </div>
+                        <div class="row">甜橙马黛茶</div>
+                        <div class="row">
+                            <span class="sku">加珍珠、加糖</span>
+                        </div>
+                        <div class="row">
+                            <span class="b">2020-10-24 13:14:52</span>
+                        </div>
+                        <div class="row">
+                            <span class="sku">建议尽快享用，风味更佳</span>
+                        </div>
+                    </div>
                 </div>
             </div>
             <div class="editor_wrap">
@@ -272,11 +290,11 @@ export default {
 
         .phone_wrap {
             width: 100%;
-            height: 686px;
             background-color: #fff;
             box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
 
             .index_bg {
+                padding-bottom: 50px;
                 .bg {
                     width: 100%;
                     height: 500px;
@@ -363,6 +381,7 @@ export default {
             .my_bg {
                 background-color: #f5f5f5;
                 height: 100%;
+                padding-bottom: 50px;
 
                 .bg {
                     width: 100%;
@@ -481,6 +500,7 @@ export default {
                 height: 100%;
                 background-color: #f5f5f5;
                 padding: 10px;
+                padding-bottom: 400px;
 
                 .card_wrap {
                     background-color: #fff;
@@ -616,6 +636,46 @@ export default {
                     display: block;
                 }
             }
+
+            .ticket_wrap {
+                padding: 15px;
+                position: relative;
+
+                .ewm {
+                    width: 80px;
+                    height: 80px;
+                    position: absolute;
+                    top: 10px;
+                    right: 15px;
+                }
+
+                .logo {
+                    width: 90px;
+                    height: 30px;
+                    object-fit: cover;
+                }
+
+                .row {
+                    margin-top: 5px;
+                    display: flex;
+                    align-items: center;
+
+                    .sku {
+                        font-size: 12px;
+                        color: #666;
+                    }
+
+                    .b {
+                        font-weight: bold;
+                    }
+
+                    .num {
+                        font-size: 18px;
+                        font-weight: bold;
+                        margin-right: 10px;
+                    }
+                }
+            }
         }
     }
 
diff --git a/src/views/shop/components/shopInfo.vue b/src/views/shop/components/shopInfo.vue
index e7d6ca8..2cbec62 100644
--- a/src/views/shop/components/shopInfo.vue
+++ b/src/views/shop/components/shopInfo.vue
@@ -66,6 +66,16 @@
             <el-checkbox label="take-out">允许打包</el-checkbox>
           </el-checkbox-group>
         </el-form-item>
+        <el-form-item label="是否启用会员价">
+          <el-switch v-model.trim="form.isMemberPrice" :active-value="1" ::inactive-value="0"></el-switch>
+          <!-- <div style="color: #999;">是否允许用户在小程序端支付订单</div> -->
+        </el-form-item>
+        <el-form-item label="积分群体">
+          <el-radio-group v-model="form.consumeColony">
+            <el-radio label="all">所有</el-radio>
+            <el-radio label="vip">仅针对会员</el-radio>
+          </el-radio-group>
+        </el-form-item>
         <el-form-item label="联系电话" prop="phone">
           <el-input v-model.trim="form.phone" placeholder="请输入联系电话" style="width: 500px;"></el-input>
         </el-form-item>
@@ -225,7 +235,8 @@ export default {
       formLoading: false,
       form: {
         eatModel: [],
-        paymentQrcode: ''
+        paymentQrcode: '',
+        consumeColony: 'all'
       },
       rules: {
         shopName: [

From 964877f763c221d9e6fa91919f8067a6bd0a8980 Mon Sep 17 00:00:00 2001
From: gyq <875626088@qq.com>
Date: Fri, 1 Nov 2024 10:24:16 +0800
Subject: [PATCH 16/16] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8api=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/coupon.js | 79 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 79 insertions(+)
 create mode 100644 src/api/coupon.js

diff --git a/src/api/coupon.js b/src/api/coupon.js
new file mode 100644
index 0000000..d7c4b17
--- /dev/null
+++ b/src/api/coupon.js
@@ -0,0 +1,79 @@
+import request from '@/utils/request'
+
+/**
+ * 获取优惠券列表
+ * @returns
+ */
+export function getTbShopCoupon(params) {
+  return request({
+    url: '/api/tbShopCoupon',
+    method: 'get',
+    params: {
+      ...params
+    }
+  })
+}
+
+/**
+ * 获取优惠券详情
+ * @returns
+ */
+export function getTbShopCouponInfo(id) {
+  return request({
+    url: '/api/tbShopCoupon/' + id,
+    method: 'get',
+    params: {}
+  })
+}
+
+/**
+ * 增加优惠券
+ * @returns
+ */
+export function addTbShopCoupon(params) {
+  return request({
+    url: '/api/tbShopCoupon',
+    method: 'post',
+    data: {
+      ...params
+    }
+  })
+}
+
+/**
+ * 删除优惠券
+ * @returns
+ */
+export function delTbShopCoupon(params) {
+  return request({
+    url: '/api/tbShopCoupon',
+    method: 'delete',
+    data: params
+  })
+}
+
+/**
+ * 获取领取列表
+ * @returns
+ */
+export function queryReceive(params) {
+  return request({
+    url: '/api/tbShopCoupon/queryReceive',
+    method: 'post',
+    data: {
+      ...params
+    }
+  })
+}
+
+/**
+ * 获取领取列表
+ * @returns
+ */
+export function delReceive(params) {
+  return request({
+    url: '/api/tbShopCoupon/receive',
+    method: 'delete',
+    data: params
+  })
+}