czg_team/cashier-web
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化修复问题

Browse Source
This commit is contained in:
gyq
2025-11-25 14:37:03 +08:00
parent 980f0357c1
commit 748c20362f
15 changed files with 446 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/api/coupon/index.js
View File

@@ -756,6 +756,15 @@ export function distributionUserResetLevel(data) {
});
}
// 会员购买订单记录 分页
export function memberOrder(params) {
return request({
url: `${Market_BaseUrl}/admin/member/order`,
method: 'get',
params
});
}

BIN
src/assets/applocation/ddje.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.5 KiB

BIN
src/assets/applocation/dds.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.1 KiB

BIN
src/assets/applocation/glyzs.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.6 KiB

BIN
src/assets/applocation/tgff.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
src/assets/applocation/xtff.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
src/assets/applocation/yhlq.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.1 KiB

128
src/views/data/index.vue
View File

@@ -78,9 +78,9 @@
<div class="top">
<div class="item earnings">
<div class="num_wrap">
<div class="num">{{ formatDecimal(yingyeShiShou || 0) }}</div>
<div class="num">{{ formatDecimal(trade.payAmount + trade.rechargeAmount || 0) }}</div>
<div class="tips">
营业实收（元）
营业额(元)
<el-tooltip popper-class="popper" effect="light" placement="bottom">
<template #content>
<div class="tips_row">
@@ -89,42 +89,49 @@
<img class="icon" src="@/assets/images/data/wx.png" />
<span>微信小程序</span>
</div>
<span class="num">{{ trade.wechatPayAmount }}</span>
<span class="num">{{ trade.wechatPayAmount || 0 }}</span>
</div>
<div class="item">
<div class="left">
<img class="icon" src="@/assets/images/data/ali.png" />
<span>支付宝小程序</span>
</div>
<span class="num">{{ trade.aliPayAmount }}</span>
<span class="num">{{ trade.aliPayAmount || 0 }}</span>
</div>
<div class="item">
<div class="left">
<img class="icon" src="@/assets/images/data/scan.png" />
<span>主扫收款</span>
</div>
<span class="num">{{ trade.scanPayAmount }}</span>
<span class="num">{{ trade.backScanPayAmount || 0 }}</span>
</div>
<div class="item">
<div class="left">
<img class="icon" src="@/assets/images/data/cash.png" />
<span>现金</span>
</div>
<span class="num">{{ trade.cashPayAmount }}</span>
<span class="num">{{ trade.cashPayAmount || 0 }}</span>
</div>
<div class="item">
<div class="left">
<img class="icon" src="@/assets/images/data/cash.png" />
<span>充值</span>
</div>
<span class="num">{{ trade.rechargeAmount }}</span>
<span class="num">{{ trade.rechargeAmount || 0 }}</span>
</div>
<div class="item">
<div class="left">
<img class="icon" src="@/assets/images/data/cash.png" />
<span>挂账</span>
</div>
<span class="num">{{ trade.creditPayAmount }}</span>
<span class="num">{{ trade.creditPayAmount || 0 }}</span>
</div>
<div class="item">
<div class="left">
<img class="icon" src="@/assets/images/data/cash.png" />
<span>会员支付</span>
</div>
<span class="num">{{ trade.memberPayAmount || 0 }}</span>
</div>
</div>
</template>
@@ -138,19 +145,19 @@
<div class="line_item">
<div class="line_item_top">
<div>销售金额（元）</div>
<!-- <div class="t">{{ formatDecimal(tradeSale.totalSaleAmount || 0) }}</div> -->
<!-- <div class="t">{{ formatDecimal(tradeSale.totalpayAmount || 0) }}</div> -->
</div>
<div class="line_gropress">
<div class="gropress l" :style="{
width: `${trade.saleAmount
? (trade.saleAmount / (trade.saleAmount * 1 + trade.refundAmount * 1)) *
width: `${trade.payAmount
? (trade.payAmount / (trade.payAmount * 1 + trade.refundAmount * 1)) *
100
: 0
}%`,
}" />
<div class="gropress r" :style="{
width: `${trade.refundAmount
? (trade.refundAmount / (trade.saleAmount * 1 + trade.refundAmount * 1)) *
? (trade.refundAmount / (trade.payAmount * 1 + trade.refundAmount * 1)) *
100
: 0
}%`,
@@ -159,7 +166,7 @@
<div class="line_btm">
<el-icon class="icon el-icon-caret-right" />
<div class="info">
<span class="l_t">收：{{ formatDecimal(trade.saleAmount || 0) }}</span>
<span class="l_t">收：{{ formatDecimal(trade.payAmount || 0) }}</span>
<span class="l_r">退：{{ formatDecimal(trade.refundAmount || 0) }}</span>
</div>
</div>
@@ -200,7 +207,21 @@
</div>
</div>
<div class="item data">
<div class="data_item">
<div class="right_data_wrap">
<div class="item">
<div class="num">{{ formatDecimal(trade.memberPayAmount || 0) }}</div>
<div class="tips">余额支付金额（元）</div>
</div>
<div class="item">
<div class="num">{{ trade.memberPayCount || 0 }}</div>
<div class="tips">余额支付（笔）</div>
</div>
<div class="item">
<div class="num">{{ trade.newMemberCount || 0 }}</div>
<div class="tips">新增会员数（人）</div>
</div>
</div>
<!-- <div class="data_item">
<div class="num_wrap">
<div class="num">{{ formatDecimal(trade.memberPayAmount || 0) }}</div>
<div class="tips">会员消费（元）</div>
@@ -215,7 +236,7 @@
<span>会员消费笔数</span>
<span class="n">{{ trade.memberPayCount || 0 }}</span>
</div>
</div>
</div> -->
</div>
</div>
<div class="btm">
@@ -223,7 +244,7 @@
<div class="title">客单价</div>
<div class="icon_wrap">
<img class="img" src="@/assets/images/data_home_item1_icon.png" />
<div class="t">{{ formatDecimal(trade.customerUnitPrice || 0) }}</div>
<div class="t">{{ formatDecimal(trade.avgPayAmount || 0) }}</div>
</div>
</div>
<div class="item item2">
@@ -237,7 +258,7 @@
</div>
<div class="icon_wrap">
<img class="img" src="@/assets/images/data_home_item2_icon.png" />
<div class="t">{{ trade.tableTurnoverRate }}</div>
<div class="t">{{ trade.turnoverRate || 0 }}%</div>
</div>
</div>
<div class="item item3">
@@ -254,6 +275,38 @@
<div class="t">{{ trade.discountCount || 0 }}</div>
</div>
</div>
<div class="item item1">
<div class="row_wrap">
<div class="row">
<div class="title">毛利润</div>
<div class="icon_wrap">
<div class="t">{{ trade.profitAmount || 0 }}</div>
</div>
</div>
<div class="row">
<div class="title">毛利率</div>
<div class="icon_wrap">
<div class="t">{{ trade.profitRate || 0 }}%</div>
</div>
</div>
</div>
</div>
<div class="item item4">
<div class="row_wrap">
<div class="row">
<div class="title">净利润</div>
<div class="icon_wrap">
<div class="t">{{ trade.netProfitAmount || 0 }}</div>
</div>
</div>
<div class="row">
<div class="title">净利率</div>
<div class="icon_wrap">
<div class="t">{{ trade.netProfitRate || 0 }}%</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
@@ -1323,6 +1376,23 @@ export default {
background-image: url("../../assets/images/data_home_item4.png");
}
.row_wrap {
display: flex;
width: 100%;
height: 100%;
.row {
flex: 1;
display: flex;
flex-direction: column;
justify-content: center;
.t {
margin-left: 0;
}
}
}
.title {
display: flex;
align-items: center;
@@ -1501,4 +1571,28 @@ export default {
}
}
}
.right_data_wrap {
width: 100%;
height: 100%;
display: flex;
align-items: center;
.item {
flex: 1;
display: flex;
flex-direction: column;
align-items: center;
.num {
font-size: 32px;
color: #3F9EFF;
}
.tips {
font-size: 14px;
color: #666666;
}
}
}
</style>

146
src/views/marketing_center/components/getDetailDialog.vue
View File

@@ -4,48 +4,21 @@
<div>
<el-form :model="querForm" inline>
<el-form-item label="搜索">
<el-select
v-model="querForm.userId"
placeholder="用户昵称/用户ID/用户手机"
filterable
remote
reserve-keyword
:remote-method="remoteMethod"
:loading="loading"
>
<el-option
v-for="item in options"
:key="item.id"
:label="item.nickName"
:value="item.id"
/>
<el-select v-model="querForm.userId" placeholder="用户昵称/用户ID/用户手机" filterable remote reserve-keyword
:remote-method="remoteMethod" :loading="loading">
<el-option v-for="item in options" :key="item.id" :label="item.nickName" :value="item.id" />
</el-select>
</el-form-item>
<el-form-item label="状态">
<el-select
v-model="querForm.status"
placeholder="请选择"
style="width: 200px"
>
<el-option
:label="item.label"
:value="item.value"
v-for="item in statusList"
:key="item.value"
></el-option>
<el-select v-model="querForm.status" placeholder="请选择" style="width: 200px">
<el-option :label="item.label" :value="item.value" v-for="item in statusList"
:key="item.value"></el-option>
</el-select>
</el-form-item>
<el-form-item label="领取时间">
<el-date-picker
v-model="querForm.time"
type="datetimerange"
value-format="YYYY-MM-DD HH:mm:ss"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
@clear="querForm.time = []"
@change="datePickerChange"
/>
<el-date-picker v-model="querForm.time" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" @clear="querForm.time = []"
@change="datePickerChange" />
</el-form-item>
<el-form-item label-width="0">
<el-button type="primary" @click="searchHandle">搜索</el-button>
@@ -53,14 +26,38 @@
</el-form-item>
</el-form>
</div>
<div class="total_info_wrap">
<div class="item">
<img class="icon" src="@/assets/applocation/yhlq.png" />
<div class="info">
<el-text>用户领取</el-text>
<el-text>{{ tableData.toatalInfo['用户领取'] || 0 }}张</el-text>
</div>
</div>
<div class="item">
<img class="icon" src="@/assets/applocation/tgff.png" />
<div class="info">
<el-text>推广发放</el-text>
<el-text>{{ tableData.toatalInfo['推广发放'] || 0 }}张</el-text>
</div>
</div>
<div class="item">
<img class="icon" src="@/assets/applocation/glyzs.png" />
<div class="info">
<el-text>管理员赠送</el-text>
<el-text>{{ tableData.toatalInfo['管理员赠送'] || 0 }}张</el-text>
</div>
</div>
<div class="item">
<img class="icon" src="@/assets/applocation/xtff.png" />
<div class="info">
<el-text>系统发放</el-text>
<el-text>{{ tableData.toatalInfo['系统发送'] || 0 }}张</el-text>
</div>
</div>
</div>
<div>
<el-table
:data="tableData.list"
border
stripe
v-loading="tableData.loading"
height="64vh"
>
<el-table :data="tableData.list" border stripe v-loading="tableData.loading" height="64vh">
<el-table-column label="用户ID" prop="userId" width="80"></el-table-column>
<el-table-column label="用户名称" prop="name" width="200">
<template #default="scope">
@@ -70,21 +67,13 @@
</div>
</template>
</el-table-column>
<el-table-column
label="领取时间"
prop="createTime"
width="200"
></el-table-column>
<el-table-column label="领取时间" prop="createTime" width="200"></el-table-column>
<el-table-column label="使用时间" prop="useTime"></el-table-column>
<el-table-column label="获得来源" prop="source"></el-table-column>
<el-table-column label="状态" prop="status">
<template #default="scope">
<el-tag
disable-transitions
:type="
statusList.find((item) => item.value == scope.row.status).type
"
>
<el-tag disable-transitions :type="statusList.find((item) => item.value == scope.row.status).type
">
{{
statusList.find((item) => item.value == scope.row.status).label
}}
@@ -94,10 +83,7 @@
<el-table-column label="操作">
<template #default="scope">
<template v-if="scope.row.status == 0">
<el-popconfirm
title="确认要失效吗？"
@confirm="deleteHandle(scope.row)"
>
<el-popconfirm title="确认要失效吗？" @confirm="deleteHandle(scope.row)">
<template #reference>
<el-button type="danger" link icon="EditPen">
失效
@@ -115,16 +101,9 @@
</el-table>
</div>
<div class="row">
<el-pagination
v-model:current-page="tableData.page"
v-model:page-size="tableData.pageSize"
:page-sizes="[10, 100, 200, 300, 400]"
background
layout="total, sizes, prev, pager, next, jumper"
:total="tableData.total"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
/>
<el-pagination v-model:current-page="tableData.page" v-model:page-size="tableData.pageSize"
:page-sizes="[10, 100, 200, 300, 400]" background layout="total, sizes, prev, pager, next, jumper"
:total="tableData.total" @size-change="handleSizeChange" @current-change="handleCurrentChange" />
</div>
</el-dialog>
</div>
@@ -206,6 +185,7 @@ const tableData = reactive({
pageSize: 10,
total: 0,
list: [],
toatalInfo: {}
});
// 分页大小发生变化
@@ -244,6 +224,8 @@ async function couponRecordAjax() {
});
tableData.total = res.totalRow;
tableData.list = res.records;
tableData.toatalInfo = res.resultCountMap
} catch (error) {
console.log(error);
}
@@ -278,9 +260,37 @@ defineExpose({
.row {
padding-top: 14px;
}
.user_info {
display: flex;
align-items: center;
gap: 10px;
}
.total_info_wrap {
display: flex;
justify-content: space-between;
padding-bottom: 20px;
.item {
width: 158px;
display: flex;
padding: 14px;
border: 1px solid #D9D9D9;
border-radius: 8px;
background-color: #fff;
.icon {
width: 44px;
height: 44px;
}
.info {
display: flex;
flex-direction: column;
padding-left: 10px;
align-items: center;
}
}
}
</style>

182
src/views/marketing_center/super_vip/components/buyVipOrder.vue Normal file
View File

@@ -0,0 +1,182 @@
<!-- 购买会员订单 -->
<template>
<div>
<el-form inline :model="queryForm">
<el-form-item>
<el-date-picker style="width: 300px" v-model="times" type="daterange" range-separator="至"
start-placeholder="开始日期" end-placeholder="结束日期" value-format="YYYY-MM-DD"
@change="selectTimeChange"></el-date-picker>
</el-form-item>
<el-form-item>
<selectUser v-model="queryForm.key" placeholder="选择用户"></selectUser>
</el-form-item>
<el-form-item>
<el-button type="primary" :loading="tableData.loading" icon="Search" @click="searchHandle">搜索</el-button>
<el-button icon="Refresh" :loading="tableData.loading" @click="resetHandle">重置</el-button>
</el-form-item>
</el-form>
<div class="total_info_wrap">
<div class="item">
<img class="icon" src="@/assets/applocation/dds.png" />
<div class="info">
<el-text>订单数</el-text>
<el-text>{{ tableData.total }}</el-text>
</div>
</div>
<div class="item">
<img class="icon" src="@/assets/applocation/ddje.png" />
<div class="info">
<el-text>订单金额（元）</el-text>
<el-text>{{ tableData.amount }}</el-text>
</div>
</div>
</div>
<div>
<el-table :data="tableData.list" border stripe v-loading="tableData.loading">
<el-table-column label="订单号" prop="orderNo"></el-table-column>
<el-table-column label="用户" prop="name">
<template v-slot="scope">
<div class="column">
<div>{{ scope.row.nickName }}</div>
<div style="color: #999;">{{ scope.row.phone }}</div>
</div>
</template>
</el-table-column>
<el-table-column label="订单金额" prop="amount">
<template v-slot="scope">
<span>{{ multiplyAndFormat(scope.row.amount || 0) }}</span>
</template>
</el-table-column>
<el-table-column label="购买时长" prop="circleTime">
<template v-slot="scope">
<span>{{ scope.row.circleTime }}个{{ scope.row.circleUnit }}</span>
</template>
</el-table-column>
<el-table-column label="创建时间" prop="createTime"></el-table-column>
</el-table>
</div>
<div style="margin-top: 14px;">
<el-pagination v-model:current-page="tableData.page" v-model:page-size="tableData.pageSize"
:page-sizes="[10, 100, 200, 300, 400]" background layout="total, sizes, prev, pager, next, jumper"
:total="tableData.total" @size-change="handleSizeChange" @current-change="handleCurrentChange" />
</div>
</div>
</template>
<script setup>
import dayjs from 'dayjs';
import { reactive, ref, onMounted } from 'vue';
import selectUser from '../../components/selectUser.vue';
import { memberOrder } from '@/api/coupon/index.js';
import { multiplyAndFormat } from '@/utils/index'
const times = ref([]);
const queryForm = reactive({
startTime: '',
endTime: '',
key: '',
});
const selectTimeChange = (value) => {
if (value && value.length === 2) {
queryForm.startTime = dayjs(value[0]).format('YYYY-MM-DD 00:00:00');
queryForm.endTime = dayjs(value[1]).format('YYYY-MM-DD 23:59:59');
} else {
queryForm.startTime = '';
queryForm.endTime = '';
}
};
function searchHandle() {
tableData.page = 1;
getTableData();
}
function resetHandle() {
times.value = [];
queryForm.startTime = '';
queryForm.endTime = '';
queryForm.key = '';
tableData.page = 1;
getTableData();
}
const tableData = reactive({
loading: false,
page: 1,
pageSize: 10,
amount: 0,
total: 0,
list: [],
toatalInfo: {}
});
// 分页大小发生变化
function handleSizeChange(e) {
tableData.pageSize = e;
getTableData();
}
// 分页发生变化
function handleCurrentChange(e) {
tableData.page = e;
getTableData();
}
// 已领取详情
async function getTableData() {
try {
tableData.loading = true;
const res = await memberOrder({
page: tableData.page,
size: tableData.pageSize,
...queryForm
});
tableData.total = res.totalRow;
tableData.list = res.records;
tableData.amount = res.totalAmount;
} catch (error) {
console.log(error);
}
setTimeout(() => {
tableData.loading = false;
}, 500);
}
onMounted(() => {
getTableData()
})
</script>
<style scoped lang="scss">
.total_info_wrap {
display: flex;
gap: 24px;
padding-bottom: 20px;
.item {
display: flex;
padding: 14px;
border: 1px solid #D9D9D9;
border-radius: 8px;
background-color: #fff;
.icon {
width: 44px;
height: 44px;
}
.info {
display: flex;
flex-direction: column;
padding-left: 10px;
align-items: center;
}
}
}
.column {
display: flex;
flex-direction: column;
}
</style>

30
src/views/marketing_center/super_vip/components/coup-lists.vue
View File

@@ -1,28 +1,14 @@
<template>
<div>
<div v-for="(item, index) in modelValue" :key="index" class="flex gap-4 mb-2">
<el-select
v-model="item.coupon.id"
placeholder="请选择优惠券"
@change="changeCoupon($event, index)"
>
<el-option
v-for="coupon in couponList"
:key="coupon.id"
:label="coupon.title"
:value="coupon.id"
/>
<el-select v-model="item.coupon.id" placeholder="请选择优惠券">
<el-option v-for="coupon in couponList" :key="coupon.id" :label="coupon.title" :value="coupon.id" />
</el-select>
<el-input v-model="item.num" placeholder="请输入数量">
<template #append>数量</template>
</el-input>
<div>
<el-link
:underline="false"
type="danger"
class="no-wrap"
@click="modelValue.splice(index, 1)"
>
<el-link :underline="false" type="danger" class="no-wrap" @click="modelValue.splice(index, 1)">
删除
</el-link>
</div>
@@ -77,9 +63,9 @@ onMounted(() => {
});
});
function changeCoupon(e, index) {
const coupon = couponList.value.find((item) => item.id === e);
console.log(coupon);
modelValue.value[index].coupon = coupon;
}
// function changeCoupon(e, index) {
// const coupon = couponList.value.find((item) => item.id === e);
// console.log(coupon);
// modelValue.value[index].coupon = coupon;
// }
</script>

13
src/views/marketing_center/super_vip/components/dialog-plans.vue
View File

@@ -16,12 +16,7 @@
</el-form-item>
<el-form-item label="周期时间" required>
<div class="flex">
<el-input-number
style="width: 300px"
v-model="form.circleTime"
placeholder="周期时间"
type="number"
/>
<el-input-number style="width: 300px" v-model="form.circleTime" placeholder="周期时间" type="number" />
<el-select class="ml-2" v-model="form.circleUnit" placeholder="">
<el-option label="年" value="年" />
<el-option label="月" value="月" />
@@ -134,18 +129,16 @@ function submit() {
let isedit = ref(false);
let dataIndex = null;
function open(data, index) {
data = toRaw(data);
console.log("data", data);
console.log("index", index);
if (data) {
form.value = data;
if (data && data.name) {
form.value = { ...data };
isedit.value = true;
dataIndex = index;
} else {
isedit.value = false;
dataIndex = null;
}
console.log(data);
show.value = true;
}
function close() {

6
src/views/marketing_center/super_vip/index.vue
View File

@@ -46,7 +46,7 @@
{{ scope.row.circleTime }} {{ scope.row.circleUnit }}
</template>
</el-table-column>
<el-table-column label="操作" align="center">
<el-table-column label="操作" align="center" width="120">
<template #default="scope">
<el-button type="text" @click="
refDialogPlans.open(scope.row, scope.$index)
@@ -245,6 +245,9 @@
</el-tab-pane>
</el-tabs>
</template>
<template v-if="activeTab == 'order'">
<buyVipOrder />
</template>
</el-tab-pane>
</el-tabs>
</div>
@@ -259,6 +262,7 @@ import memberApi from "@/api/market/member";
import HeaderCard from "../components/headerCard.vue";
import DialogPlans from "./components/dialog-plans.vue";
import CouponLists from "./components/coup-lists.vue";
import buyVipOrder from "./components/buyVipOrder.vue";
import { ref, reactive, watch, toRaw, getCurrentInstance, onMounted } from "vue";
import { ElMessage } from "element-plus";
import { useRouter } from "vue-router";

33
src/views/shop/config/components/shopInfo.vue
View File

@@ -154,6 +154,21 @@
<el-input type="textarea" v-model.trim="form.bookingSms" placeholder="请输入台桌预订短信"
style="width: 500px"></el-input>
</el-form-item>
<el-form-item label="电子围栏" prop="isOrderFence">
<div class="column">
<div class="center" style="display: flex;align-items: center;gap: 14px;">
<el-switch v-model="form.isOrderFence" :active-value="1" :inactive-value="0"></el-switch>
<div class="tips" style="font-size: 14px;color: #999;">开启后，用户只能在店铺附近xx公里内点餐</div>
</div>
<div class="center">
<el-input v-model="form.orderFenceDistance" placeholder="请输入"
@input="e => form.orderFenceDistance = filterNumberInput(e)" style="width: 250px;" :cus>
<template #prepend>限制：</template>
<template #append>公里</template>
</el-input>
</div>
</div>
</el-form-item>
<el-form-item label="状态">
<el-radio-group v-model="form.status">
<el-radio :value="1">营业中</el-radio>
@@ -193,11 +208,13 @@ import { ElMessage } from "element-plus";
import QRCode from "qrcode";
import img_download_error from "@/assets/images/img_download_error.png";
import ShopApi from "@/api/account/shop";
import { filterNumberInput } from '@/utils/index'
// import { tbShopInfo, tbShopInfoPut } from "@/api/user";
// import { geocode } from "@/api/shop";
export default {
data() {
return {
filterNumberInput,
img_download_error,
showUpload: false,
uploadIndex: 1,
@@ -238,6 +255,18 @@ export default {
trigger: "blur",
},
],
isOrderFence: [
{
trigger: "blur",
validator: (rule, value, callback) => {
if (this.form.isOrderFence === 1 && (!this.form.orderFenceDistance || this.form.orderFenceDistance <= 0)) {
callback(new Error("请输入限制米数"));
} else {
callback();
}
},
}
]
},
fileList: [],
files: [],
@@ -341,6 +370,7 @@ export default {
const shopId = localStorage.getItem("shopId");
const res = await ShopApi.get();
this.form = { ...res, eatModel: res.eatModel ? res.eatModel.split(",") : [] };
this.form.orderFenceDistance = res.orderFenceDistance / 1000
if (res.businessTime) {
const businessTime = res.businessTime.split("-");
this.startTime = businessTime[0];
@@ -368,6 +398,9 @@ export default {
if (this.startTime && this.endTime) {
this.form.businessTime = `${this.startTime}-${this.endTime}`;
}
if (this.form.isOrderFence == 1) {
this.form.orderFenceDistance = this.form.orderFenceDistance * 1000
}
const res = await ShopApi.edit({
...this.form,
eatModel: this.form.eatModel.join(","),

20
src/views/user/list/components/user-coupon-dialog.vue
View File

@@ -1,6 +1,6 @@
<template>
<div>
<el-dialog title="优惠券" v-model="visible" width="1200px">
<el-dialog title="优惠券" v-model="visible" width="1200px" @closed="resetHandle">
<el-form :inline="true" :model="form">
<el-form-item label="券名称">
<el-input v-model="form.name" placeholder="请输入券名称"></el-input>
@@ -54,28 +54,32 @@
<script setup>
import couponApi from "@/api/market/coupon";
import { ref, reactive } from "vue";
const status = reactive([
{ label: "全部", value: "", type: 'info' },
{ label: "未使用", value: 0, type: 'warning' },
{ label: "已使用", value: 1, type: 'info' },
{ label: "已过期", value: 2, type: 'info' },
]);
const visible = ref(false);
const form = reactive({
status: 0,
status: '',
name: "",
date: "",
shopUserId: "",
page: 1,
});
const tableData = ref([]);
const pagination = reactive({
total: 0,
size: 10,
page: 1,
});
function open(data) {
console.log(data);
form.shopUserId = data.id;
@@ -83,6 +87,16 @@ function open(data) {
visible.value = true;
getList();
}
function resetHandle() {
form.status = '';
form.name = "";
form.date = "";
form.shopUserId = "";
pagination.page = 1;
tableData.value = [];
}
function close() {
visible.value = false;
}