DMJS-IT
/
merchant-web
12
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: DMJS-IT:a9741307b200a81a8bd7c5e2a366370794065d0d
Branches Tags
DMJS-IT:master
..
compare: DMJS-IT:6447aa476604014d9dc75c25e75313b546bba864
Branches Tags
DMJS-IT:master

No commits in common. "a9741307b200a81a8bd7c5e2a366370794065d0d" and "6447aa476604014d9dc75c25e75313b546bba864" have entirely different histories.
a9741307b2 ... 6447aa4766

6 changed files with 124 additions and 447 deletions
Show Stats Expand all files Collapse all files

24
src/utils/index.js
View File

@ -113,30 +113,6 @@ export function deepClone(obj) {
return result;
}
/**
* 获取时间
* @param {*} min
* @param {*} max
*/
export function getDay(day) {
let today = new Date();
let targetday_milliseconds = today.getTime() + 1000 * 60 * 60 * 24 * day;
today.setTime(targetday_milliseconds); //注意，这行是关键代码
let tYear = today.getFullYear();
let tMonth = today.getMonth();
let tDate = today.getDate();
tMonth = doHandleMonth(tMonth + 1);
tDate = doHandleMonth(tDate);
return tYear + "-" + tMonth + "-" + tDate;
}
function doHandleMonth(month) {
let m = month;
if (month.toString().length === 1) {
m = "0" + month;
}
return m;
}
export function isNumberStr(str) {
return /^[+-]?(0|([1-9]\d*))(\.\d+)?$/g.test(str);
}

8
src/views/modules/bank-card/index.vue
View File

@ -181,15 +181,11 @@ export default {
render: ({ row }) => {
let defaultBank = () => {
if (row.default) {
this.$confirm(
"此操作将设置该银行卡为默认银行卡, 是否继续?",
"提示",
{
this.$confirm("此操作将永久删除该文件, 是否继续?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
}
)
})
.then(() => {
this.$api.mer_admin
.defaultBank({

18
src/views/modules/coupon/index.vue
View File

@ -123,7 +123,7 @@ export default {
formInline: {
marketId: "",
shopId: "",
queryStatus: "q",
queryStatus: "",
name: "",
},
tableProp: {
@ -140,7 +140,7 @@ export default {
created() {
this.formInline = {
name: "",
queryStatus: "1",
queryStatus: "",
marketId: this.marketId,
shopId: this.shopId,
};
@ -185,7 +185,7 @@ export default {
Reset() {
this.formInline = {
name: "",
queryStatus: "1",
queryStatus: "",
marketId: this.marketId,
shopId: this.shopId,
};
@ -294,11 +294,11 @@ export default {
align: "center",
field: "money",
},
// {
// title: "折扣",
// align: "center",
// field: "discount",
// },
{
title: "折扣",
align: "center",
field: "discount",
},
{
title: "最低消费",
align: "center",
@ -386,7 +386,6 @@ export default {
});
}
};
if (row.status == 1) {
return (
<el-switch
onchange={changeState}
@ -397,7 +396,6 @@ export default {
inactive-value={0}
></el-switch>
);
}
},
},
{

122
src/views/modules/coupon/popup/add-or-update.vue
View File

@ -8,7 +8,7 @@
:modalHandles="modalHandles"
>
<template slot="dialog__content">
<el-form :model="modalData" :rules="rules" ref="modalForm">
<el-form :model="modalData" ref="modalForm">
<el-form-item label-width="150px" label="优惠券名称" prop="name">
<el-input
style="width: 350px"
@ -17,11 +17,7 @@
>
</el-input>
</el-form-item>
<el-form-item
label-width="150px"
label="使用日期"
prop="useStartTime"
>
<el-form-item label-width="150px" label="使用日期" prop="name">
<el-date-picker
@change="usageDateChange"
v-model="usageDate"
@ -30,15 +26,10 @@
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
:picker-options="pickerOptions"
>
</el-date-picker>
</el-form-item>
<el-form-item
label-width="150px"
label="开放领取日期"
prop="receiveStartTime"
>
<el-form-item label-width="150px" label="开放领取日期" prop="name">
<el-date-picker
@change="collectionDateChange"
v-model="collectionDate"
@ -47,11 +38,10 @@
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
:picker-options="pickerOptions"
>
</el-date-picker>
</el-form-item>
<!-- <el-form-item label-width="150px" label="选择商品" prop="targetIds">
<el-form-item label-width="150px" label="选择商品" prop="targetIds">
<el-input
style="width: 350px"
placeholder="请选择选择商品"
@ -81,30 +71,23 @@
</div>
</div>
</div>
</el-form-item> -->
<el-form-item label-width="150px" label="优惠金额" prop="money">
</el-form-item>
<el-form-item label-width="150px" label="优惠金额" prop="targetIds">
<el-input-number
placeholder="请输入"
controls-position="right"
:precision="2"
v-model="modalData.money"
:min="0"
:max="99999"
label="请输入"
></el-input-number>
</el-form-item>
<el-form-item label-width="150px" label="发放数量" prop="total">
<el-form-item label-width="150px" label="发放数量" prop="targetIds">
<el-input-number
placeholder="请输入"
controls-position="right"
:precision="0"
v-model="modalData.total"
:min="0"
:max="99999"
label="请输入"
></el-input-number>
</el-form-item>
<el-form-item label-width="150px" label="每人限领" prop="limitedNum">
<el-form-item label-width="150px" label="每人限领" prop="targetIds">
<el-select v-model="modalData.limitedNum" placeholder="请选择">
<el-option
v-for="item in [
@ -148,9 +131,10 @@
</div>
</template>
<script>
import { getDay } from "@/utils/index";
import commodity from "./commodity.vue";
import { debounce, cloneDeep } from "lodash";
import { Divider } from "element-ui";
import loginVue from "../../../common/login.vue";
export default {
components: { commodity },
data() {
@ -170,66 +154,8 @@ export default {
usageDate: [], //使用时间
collectionDate: [], //领取日期
product: {}, //商品
pickerOptions: {
disabledDate: (time) => {
return time.getTime() < Date.now() - 8.64e7;
},
},
rules: {
name: [
{
required: true,
message: "请输入优惠券名称",
trigger: ["blur", "change"],
},
],
useStartTime: [
{
required: true,
message: "请选择使用日期",
trigger: ["blur", "change"],
},
],
receiveStartTime: [
{
required: true,
message: "请选择领取日期",
trigger: ["blur", "change"],
},
],
money: [
{
required: true,
message: "请输入优惠金额",
trigger: ["blur", "change"],
},
],
total: [
{
required: true,
message: "请输入发放数量",
trigger: ["blur", "change"],
},
],
limitedNum: [
{
required: true,
message: "请选择每人限领",
trigger: ["blur", "change"],
},
],
},
};
},
watch: {
"modalConfig.show"(newVal) {
if (!newVal) {
//关闭弹窗清空校验
this.$refs.modalForm.resetFields();
this.collectionDate = [];
}
},
},
methods: {
queryTableData(pageNo, pageSize) {},
toggle(e) {
@ -243,11 +169,6 @@ export default {
}
return {
add: (row) => {
this.usageDate = [getDay(0), getDay(14)];
let month = getDay(0).slice(5, 7);
let day = getDay(0).slice(8, 10);
console.log(month, day);
this.formInline = {
marketId: row.marketId,
shopId: row.shopId,
@ -259,18 +180,16 @@ export default {
receiveType: "MANUAL",
couponType: "MONEY",
isTimeReceive: 1, //0-不限时，1-限时
name: `无门槛优惠卷${month}${day}`,
useStartTime: getDay(0),
useEndTime: getDay(14),
name: "",
useStartTime: "",
useEndTime: "",
receiveStartTime: "",
receiveEndTime: "",
money: "",
total: 10000,
limitedNum: 1,
limitedNum: 0,
minPrice: 0,
usableRange: "ALL", //部分商品-PARTIAL_GOODS 所有商品-ALL_GOODS 部分摊位-PARTIAL_SHOP
targetIds: [],
status: 1,
usableRange: "PARTIAL_GOODS", //部分商品-PARTIAL_GOODS 所有商品-ALL_GOODS 部分摊位-PARTIAL_SHOP
};
// this.$refs.modal.resetFields();
});
@ -283,7 +202,6 @@ export default {
},
init(row) {},
usageDateChange(e) {
console.log(e);
if (e) {
this.modalData.useStartTime = e[0];
this.modalData.useEndTime = e[1];
@ -327,18 +245,16 @@ export default {
type: "primary",
handle: () => {
console.log(this.modalData);
this.$refs.modalForm.validate((valid) => {
console.log(valid);
if (valid) {
let data = { ...this.modalData };
data.targetIds = [data.targetIds];
console.log(this.modalData, data);
this.$api.coupon
.addCoupon({ ...this.modalData, ...this.formInline })
.addCoupon({ ...data, ...this.formInline })
.then((res) => {
console.log(res);
this.$emit("queryList");
this.toggle();
});
}
});
},
},
];

160
src/views/modules/coupon/popup/full-reduction.vue
View File

@ -8,8 +8,8 @@
:modalHandles="modalHandles"
>
<template slot="dialog__content">
<el-form :model="modalData" :rules="rules" ref="modalForm">
<!-- <el-form-item label-width="150px" label="可用范围" prop="name">
<el-form :model="modalData" ref="modalForm">
<el-form-item label-width="150px" label="可用范围" prop="name">
<div>
<el-radio
v-model="modalData.usableRange"
@ -33,7 +33,7 @@
>部分摊位</el-radio
>
</div>
</el-form-item> -->
</el-form-item>
<el-form-item label-width="150px" label="优惠卷名称" prop="name">
<el-input
style="width: 350px"
@ -42,11 +42,7 @@
>
</el-input>
</el-form-item>
<el-form-item
label-width="150px"
label="使用日期"
prop="useStartTime"
>
<el-form-item label-width="150px" label="使用日期" prop="name">
<el-date-picker
@change="usageDateChange"
v-model="usageDate"
@ -55,15 +51,10 @@
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
:picker-options="pickerOptions"
>
</el-date-picker>
</el-form-item>
<el-form-item
label-width="150px"
label="开放领取日期"
prop="receiveStartTime"
>
<el-form-item label-width="150px" label="开放领取日期" prop="name">
<el-date-picker
@change="collectionDateChange"
v-model="collectionDate"
@ -72,42 +63,25 @@
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
:picker-options="pickerOptions"
>
</el-date-picker>
</el-form-item>
<el-form-item label-width="150px" label="优惠设置(单位：元)" required>
<el-form-item label-width="150px" label="优惠设置" prop="name">
<el-col class="line" :span="1">满</el-col>
<el-col :span="7">
<el-form-item prop="minPrice">
<el-input-number
placeholder="请输入"
controls-position="right"
:precision="0"
v-model="modalData.minPrice"
:min="0"
:max="99999"
label="请输入"
></el-input-number>
</el-form-item>
<el-input placeholder="请输入" v-model="modalData.minPrice">
<template slot="append">元</template>
</el-input>
</el-col>
<el-col class="line" :span="1"></el-col>
<el-col class="line" :span="1">减</el-col>
<el-col :span="7">
<el-form-item prop="money">
<el-input-number
placeholder="请输入"
controls-position="right"
:precision="0"
v-model="modalData.money"
:min="0"
:max="99999"
label="请输入"
></el-input-number>
</el-form-item>
<el-input placeholder="请输入" v-model="modalData.money">
<template slot="append">元</template>
</el-input>
</el-col>
</el-form-item>
<!-- <el-form-item
<el-form-item
v-if="modalData.usableRange === 'ALL_GOODS'"
label-width="150px"
label="选择商品"
@ -121,8 +95,8 @@
<template slot="append">
<el-button @click="selectProduct">请选择</el-button>
</template>
</el-input> -->
<!-- <div v-if="product.name" class="product">
</el-input>
<div v-if="product.name" class="product">
<div>
<el-image
style="width: 80px; height: 80px; margin-right: 10px"
@ -141,20 +115,17 @@
￥{{ product.minSalePrice }}
</div>
</div>
</div> -->
<!-- </el-form-item> -->
<el-form-item label-width="150px" label="发放数量" prop="total">
</div>
</el-form-item>
<el-form-item label-width="150px" label="发放数量" prop="targetIds">
<el-input-number
placeholder="请输入"
controls-position="right"
:precision="0"
v-model="modalData.total"
:min="0"
:max="99999"
label="请输入"
></el-input-number>
</el-form-item>
<el-form-item label-width="150px" label="每人限领" prop="limitedNum">
<el-form-item label-width="150px" label="每人限领" prop="targetIds">
<el-select v-model="modalData.limitedNum" placeholder="请选择">
<el-option
v-for="item in [
@ -198,9 +169,10 @@
</div>
</template>
<script>
import { getDay } from "@/utils/index";
import commodity from "./commodity.vue";
import { debounce, cloneDeep } from "lodash";
import { Divider } from "element-ui";
import loginVue from "../../../common/login.vue";
export default {
components: { commodity },
data() {
@ -220,73 +192,8 @@ export default {
usageDate: [], //使用时间
collectionDate: [], //领取日期
product: {}, //商品
pickerOptions: {
disabledDate: (time) => {
return time.getTime() < Date.now() - 8.64e7;
},
},
rules: {
name: [
{
required: true,
message: "请输入优惠券名称",
trigger: ["blur", "change"],
},
],
useStartTime: [
{
required: true,
message: "请选择使用日期",
trigger: ["blur", "change"],
},
],
receiveStartTime: [
{
required: true,
message: "请选择领取日期",
trigger: ["blur", "change"],
},
],
minPrice: [
{
required: true,
message: "请输入满减条件",
trigger: ["blur", "change"],
},
],
money: [
{
required: true,
message: "请输入优惠金额",
trigger: ["blur", "change"],
},
],
total: [
{
required: true,
message: "请输入发放数量",
trigger: ["blur", "change"],
},
],
limitedNum: [
{
required: true,
message: "请选择每人限领",
trigger: ["blur", "change"],
},
],
},
};
},
watch: {
"modalConfig.show"(newVal) {
if (!newVal) {
//关闭弹窗清空校验
this.$refs.modalForm.resetFields();
this.collectionDate = [];
}
},
},
methods: {
queryTableData(pageNo, pageSize) {},
toggle(e) {
@ -300,9 +207,6 @@ export default {
}
return {
add: (row) => {
this.usageDate = [getDay(0), getDay(14)];
let month = getDay(0).slice(5, 7);
let day = getDay(0).slice(8, 10);
this.formInline = {
marketId: row.marketId,
shopId: row.shopId,
@ -310,22 +214,20 @@ export default {
this.modalConfig.title = `添加${row.label}`;
this.$nextTick(() => {
this.modalData = {
category: "MAX_OUT",
category: "NO_THRESHOLD",
receiveType: "MANUAL",
couponType: "MONEY",
isTimeReceive: 1, //0-不限时，1-限时
name: `满减卷${month}${day}`,
useStartTime: getDay(0),
useEndTime: getDay(14),
name: "",
useStartTime: "",
useEndTime: "",
receiveStartTime: "",
receiveEndTime: "",
money: "",
total: 10000,
limitedNum: 0,
minPrice: 0,
usableRange: "ALL", //部分商品-PARTIAL_GOODS 所有商品-ALL_GOODS 部分摊位-PARTIAL_SHOP
status: 1,
targetIds: [],
usableRange: "PARTIAL_GOODS", //部分商品-PARTIAL_GOODS 所有商品-ALL_GOODS 部分摊位-PARTIAL_SHOP
};
// this.$refs.modal.resetFields();
});
@ -381,18 +283,16 @@ export default {
type: "primary",
handle: () => {
console.log(this.modalData);
this.$refs.modalForm.validate((valid) => {
if (valid) {
let data = { ...this.modalData };
data.targetIds = [data.targetIds];
console.log(this.modalData, data);
this.$api.coupon
.addCoupon({ ...this.modalData, ...this.formInline })
.addCoupon({ ...data, ...this.formInline })
.then((res) => {
console.log(res);
this.$emit("queryList");
this.toggle();
});
}
});
},
},
];

141
src/views/modules/coupon/popup/new-powder.vue
View File

@ -17,7 +17,7 @@
>
</el-input>
</el-form-item>
<!-- <el-form-item label-width="150px" label="使用时间：" prop="day">
<el-form-item label-width="150px" label="使用时间：" prop="day">
<el-col class="line" :span="2">领取后</el-col>
<el-col :span="7">
<el-input-number
@ -33,40 +33,6 @@
<el-col style="margin-left: 8px" :span="5"
>(单位：天) 内可使用</el-col
>
</el-form-item> -->
<el-form-item
label-width="150px"
label="使用日期:"
prop="useStartTime"
>
<el-date-picker
@change="usageDateChange"
v-model="usageDate"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
:picker-options="pickerOptions"
>
</el-date-picker>
</el-form-item>
<el-form-item
label-width="150px"
label="开放领取日期:"
prop="receiveStartTime"
>
<el-date-picker
@change="collectionDateChange"
v-model="collectionDate"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
:picker-options="pickerOptions"
>
</el-date-picker>
</el-form-item>
<el-form-item label-width="150px" label="可用范围：" prop="name">
<div>
@ -89,7 +55,7 @@
</div>
</el-form-item>
<el-form-item
v-show="!threshold"
v-if="!threshold"
label-width="150px"
label="优惠金额："
prop="money"
@ -108,14 +74,13 @@
<span>（单位：元）</span>
</el-form-item>
<el-form-item
v-show="threshold"
v-if="threshold"
label-width="150px"
label="优惠设置(单位：元)"
required
label="优惠设置："
prop="money"
>
<el-col class="line" :span="1">满</el-col>
<el-col :span="7">
<el-form-item prop="minPrice">
<el-input-number
placeholder="请输入"
controls-position="right"
@ -125,23 +90,21 @@
:max="99999"
label="请输入"
></el-input-number>
</el-form-item>
</el-col>
<el-col class="line" :span="1"></el-col>
<el-col class="line" :span="1">减</el-col>
<el-col :span="7">
<el-form-item prop="money">
<el-input-number
placeholder="请输入"
controls-position="right"
:precision="0"
v-model="modalData.money"
:min="0"
:max="99999"
:max="modalData.minPrice"
label="请输入"
></el-input-number>
</el-form-item>
</el-col>
<span>（单位：元）</span>
</el-form-item>
<el-form-item label-width="150px" label="发放数量：" prop="total">
<el-input-number
@ -158,11 +121,7 @@
label="每人限领："
prop="limitedNum"
>
<el-select
disabled
v-model="modalData.limitedNum"
placeholder="请选择"
>
<el-select v-model="modalData.limitedNum" placeholder="请选择">
<el-option
v-for="item in [
{
@ -203,7 +162,6 @@
</div>
</template>
<script>
import { getDay } from "@/utils/index";
import { debounce, cloneDeep } from "lodash";
export default {
components: {},
@ -224,11 +182,6 @@ export default {
modalData: {},
usageDate: [], //使用时间
collectionDate: [], //领取日期
pickerOptions: {
disabledDate: (time) => {
return time.getTime() < Date.now() - 8.64e7;
},
},
rules: {
name: [
{
@ -238,32 +191,11 @@ export default {
},
{ min: 1, max: 10, message: "长度10字符以内", trigger: "blur" },
],
useStartTime: [
day: [
{
required: true,
message: "请选择使用日期",
trigger: ["blur", "change"],
},
],
receiveStartTime: [
{
required: true,
message: "请选择领取日期",
trigger: ["blur", "change"],
},
],
// day: [
// {
// required: true,
// message: "请输入领取后有效天数",
// trigger: "blur",
// },
// ],
minPrice: [
{
required: true,
message: "请输入满减条件",
trigger: ["blur", "change"],
message: "请输入领取后有效天数",
trigger: "blur",
},
],
money: [
@ -290,16 +222,6 @@ export default {
},
};
},
watch: {
"modalConfig.show"(newVal) {
if (!newVal) {
//关闭弹窗清空校验
this.$refs.modalForm.resetFields();
this.collectionDate = [];
this.threshold = false;
}
},
},
methods: {
queryTableData(pageNo, pageSize) {},
toggle(e) {
@ -313,9 +235,6 @@ export default {
}
return {
add: (row) => {
this.usageDate = [getDay(0), getDay(14)];
let month = getDay(0).slice(5, 7);
let day = getDay(0).slice(8, 10);
this.formInline = {
marketId: row.marketId,
shopId: row.shopId,
@ -326,20 +245,14 @@ export default {
category: "FIRST_ATTENTION",
receiveType: "MANUAL",
couponType: "MONEY",
isTimeReceive: 1, //0-不限时，1-限时
name: `新粉优惠卷${month}${day}`,
// day: "7",
useStartTime: getDay(0),
useEndTime: getDay(14),
receiveStartTime: "",
receiveEndTime: "",
isTimeReceive: 0, //0-不限时，1-限时
name: "",
day: "7",
money: "",
total: 10000,
limitedNum: 1,
limitedNum: 0,
minPrice: 0,
usableRange: "ALL", //部分商品-PARTIAL_GOODS 所有商品-ALL_GOODS 部分摊位-PARTIAL_SHOP
status: 1,
targetIds: [],
usableRange: "ALL_GOODS", //部分商品-PARTIAL_GOODS 所有商品-ALL_GOODS 部分摊位-PARTIAL_SHOP
};
// this.$refs.modal.resetFields();
});
@ -351,24 +264,6 @@ export default {
};
},
init(row) {},
usageDateChange(e) {
if (e) {
this.modalData.useStartTime = e[0];
this.modalData.useEndTime = e[1];
} else {
this.modalData.useStartTime = "";
this.modalData.useEndTime = "";
}
},
collectionDateChange(e) {
if (e) {
this.modalData.receiveStartTime = e[0];
this.modalData.receiveEndTime = e[1];
} else {
this.modalData.receiveStartTime = "";
this.modalData.receiveEndTime = "";
}
},
changeThreshold(e) {
if (e) {
this.modalData.minPrice = 0;
@ -393,8 +288,6 @@ export default {
type: "primary",
handle: () => {
console.log(this.modalData);
this.$refs.modalForm.validate((valid) => {
if (valid) {
this.$api.coupon
.addCoupon({ ...this.modalData, ...this.formInline })
.then((res) => {
@ -402,8 +295,6 @@ export default {
this.$emit("queryList");
this.toggle();
});
}
});
},
},
];