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

Compare commits

base: DMJS-IT:e3bc9276d2f722cfed1067a97848beefc3cc8ffa
Branches Tags
DMJS-IT:master
..
compare: DMJS-IT:14ad1d4cb6c8f989e4fd0cf79710385853d5c437
Branches Tags
DMJS-IT:master

No commits in common. "e3bc9276d2f722cfed1067a97848beefc3cc8ffa" and "14ad1d4cb6c8f989e4fd0cf79710385853d5c437" have entirely different histories.
e3bc9276d2 ... 14ad1d4cb6

3 changed files with 66 additions and 120 deletions
Show Stats Expand all files Collapse all files

18
src/views/modules/marketing/level/index.vue
View File

@ -74,16 +74,10 @@
> >
<template slot-scope="scope"> <template slot-scope="scope">
<div> <div>
<span>{{ scope.row.enableMemberDiscount ? "会员折扣," : "" }}</span> <span>{{scope.row.enableMemberDiscount ? '会员折扣,' :''}}</span>
<span>{{ <span>{{scope.row.enablePointsRedemption ? '积分兑换,' : ''}}</span>
scope.row.enablePointsRedemption ? "积分兑换," : "" <span>{{scope.row.enableBirthdayCoupons ? '生日优惠卷,' : ''}}</span>
}}</span> <span>{{scope.row.enableBirthdayReward ? '生日双倍积分' : ''}}</span>
<span>{{
scope.row.enableBirthdayCoupons ? "生日优惠卷," : ""
}}</span>
<span>{{
scope.row.enableBirthdayReward ? "生日双倍积分" : ""
}}</span>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
@ -108,7 +102,7 @@
<!-- </el-table-column> --> <!-- </el-table-column> -->
</el-table> </el-table>
<!-- 添加 --> <!-- 添加 -->
<addOrUpdate @getList="getList" ref="addOrUpdate"></addOrUpdate> <addOrUpdate ref="addOrUpdate"></addOrUpdate>
</div> </div>
</template> </template>
@ -133,7 +127,7 @@ export default {
this.formInline = { this.formInline = {
unitType: JSON.parse(sessionStorage.getItem("userInfo")).unitType, unitType: JSON.parse(sessionStorage.getItem("userInfo")).unitType,
marketId: this.marketId, marketId: this.marketId,
shopId: this.shopId, shopId: "",
}; };
this.getList(); this.getList();
}, },

51
src/views/modules/marketing/level/popup/add-coupon.vue
View File

@ -26,24 +26,10 @@ export default {
show: false, show: false,
width: "60%", width: "60%",
}, },
modalData: { modalData: {},
couponsName: "", value1: [],
couponsThreshold: 0,
couponsMinus: 0,
couponsEffectiveTimeType: "1",
},
}; };
}, },
watch: {
"modalConfig.show"(newVal) {
if (newVal) {
//关闭弹窗清空校验
setTimeout(() => {
this.$refs.modal.resetFields();
});
}
},
},
methods: { methods: {
queryTableData(pageNo, pageSize) {}, queryTableData(pageNo, pageSize) {},
toggle(e) { toggle(e) {
@ -51,33 +37,43 @@ export default {
this.modalConfig.show = true; this.modalConfig.show = true;
} else { } else {
this.modalConfig.show = false; this.modalConfig.show = false;
this.$refs.modal.resetFields();
} }
if (e) { if (e) {
this.init(cloneDeep(e)); this.init(cloneDeep(e));
} }
return { return {
add: (row) => { add: (row) => {
console.log(row); this.modalConfig.title = "添加优惠卷";
if (row.length > 0) { this.$nextTick(() => {
this.$refs.modal?.resetFields();
});
this.isAdd = true;
if (row) {
this.modalData = row[0]; this.modalData = row[0];
} else {
console.log("111"); console.log("111");
return;
}
this.modalData = { this.modalData = {
couponsName: "", couponsName: "",
couponsThreshold: 0, couponsThreshold: 0,
couponsMinus: 0, couponsMinus: 0,
couponsEffectiveTimeType: "1", couponsEffectiveTimeType: "1",
}; };
} console.log("qqw");
this.modalConfig.title = "添加优惠卷";
this.isAdd = true;
}, },
update: () => { update: () => {
this.isAdd = false; this.isAdd = false;
}, },
}; };
}, },
init(row) {}, init(row) {
if (row) {
this.modalData = row;
return;
}
console.log("123");
},
}, },
computed: { computed: {
modalCols() { modalCols() {
@ -150,7 +146,7 @@ export default {
}, },
{ {
label: "当月", label: "当月",
value: "3", value: "2",
}, },
].map((item) => { ].map((item) => {
return ( return (
@ -180,11 +176,8 @@ export default {
loading: this.isLoading, loading: this.isLoading,
submit: true, submit: true,
handle: () => { handle: () => {
console.log(JSON.parse(JSON.stringify(this.modalData))); console.log(this.modalData);
this.$emit( this.$emit("addCouponData", this.modalData);
"addCouponData",
JSON.parse(JSON.stringify(this.modalData))
);
this.toggle(); this.toggle();
}, },
}, },

79
src/views/modules/marketing/level/popup/add-or-update.vue
View File

@ -13,7 +13,7 @@
<obj-table-plus <obj-table-plus
style="height: 70vh" style="height: 70vh"
ref="oTableThree" ref="oTableThree"
v-model="modalData.levelList" v-model="modalData.tableData"
:tableCols="tableCols" :tableCols="tableCols"
:tableProp="tableProp" :tableProp="tableProp"
:toolbarProp="toolbarProp" :toolbarProp="toolbarProp"
@ -28,7 +28,6 @@
</div> </div>
</template> </template>
<script> <script>
import { mapState } from "vuex";
import addCoupon from "./add-coupon.vue"; import addCoupon from "./add-coupon.vue";
import { debounce, cloneDeep } from "lodash"; import { debounce, cloneDeep } from "lodash";
export default { export default {
@ -42,7 +41,6 @@ export default {
tableProp: { tableProp: {
height: "auto", height: "auto",
border: true, border: true,
"show-overflow": false,
"auto-resize": false, "auto-resize": false,
"print-config": {}, "print-config": {},
}, },
@ -60,7 +58,7 @@ export default {
marketId: "", marketId: "",
shopId: "", shopId: "",
unitType: "", unitType: "",
levelList: [ tableData: [
{ {
levelName: "", levelName: "",
requiredGrowthValue: 0, requiredGrowthValue: 0,
@ -92,7 +90,7 @@ export default {
enableBirthdayReward: false, enableBirthdayReward: false,
discountRate: "", discountRate: "",
rewardEffectiveTimeType: "", rewardEffectiveTimeType: "",
memberLevelCouponsList: [], memberLevelCouponsList: "",
}, },
]); ]);
}); });
@ -127,8 +125,7 @@ export default {
addCouponData(data) { addCouponData(data) {
console.log(data); console.log(data);
let row = JSON.parse(JSON.stringify(data)); let row = JSON.parse(JSON.stringify(data));
this.modalData.levelList[this.couponIndex].memberLevelCouponsList = [row]; this.modalData.tableData[this.couponIndex].memberLevelCouponsList = [row];
this.$refs.modalForm.validate();
}, },
}, },
computed: { computed: {
@ -150,7 +147,7 @@ export default {
let row = e.row; let row = e.row;
return ( return (
<el-form-item <el-form-item
prop={`levelList.${e.$rowIndex}.levelName`} prop={`tableData.${e.$rowIndex}.levelName`}
rules={{ rules={{
required: true, required: true,
message: "请输入等级名称", message: "请输入等级名称",
@ -171,26 +168,15 @@ export default {
width: "170px", width: "170px",
type: "jsx", type: "jsx",
render: (e) => { render: (e) => {
let changUpperLimit = () => {
console.log(
e.$rowIndex,
e,
e.data[e.$rowIndex - 1].growthValueUpperLimit,
e.data[e.$rowIndex].requiredGrowthValue
);
e.data[e.$rowIndex - 1].growthValueUpperLimit =
e.data[e.$rowIndex].requiredGrowthValue - 1;
};
return ( return (
<el-form-item <el-form-item
prop={`levelList.${e.$rowIndex}.requiredGrowthValue`} prop={`tableData.${e.$rowIndex}.requiredGrowthValue`}
rules={{ rules={{
required: true, required: true,
message: "请输入所需成长值", message: "请输入所需成长值",
}} }}
> >
<el-input-number <el-input-number
onChange={changUpperLimit}
disabled={e.$rowIndex == 0} disabled={e.$rowIndex == 0}
style="width:150px" style="width:150px"
controls-position="right" controls-position="right"
@ -213,14 +199,14 @@ export default {
render: (e) => { render: (e) => {
return ( return (
<el-form-item <el-form-item
prop={`levelList.${e.$rowIndex}.requiredGrowthValue`} prop={`tableData.${e.$rowIndex}.requiredGrowthValue`}
rules={{ rules={{
required: true, required: true,
message: "请输入所需成长值", message: "请输入所需成长值",
}} }}
> >
<el-input-number <el-input-number
disabled={this.modalData.levelList.length == e.$rowIndex + 1} disabled={this.modalData.tableData.length == e.$rowIndex + 1}
style="width:150px" style="width:150px"
controls-position="right" controls-position="right"
precision={0} precision={0}
@ -246,12 +232,10 @@ export default {
} }
}; };
return ( return (
<el-form-item>
<el-switch <el-switch
onchange={changeDiscountRate} onchange={changeDiscountRate}
v-model={row.enableMemberDiscount} v-model={row.enableMemberDiscount}
></el-switch> ></el-switch>
</el-form-item>
); );
}, },
}, },
@ -265,7 +249,7 @@ export default {
if (e.row.enableMemberDiscount) { if (e.row.enableMemberDiscount) {
return ( return (
<el-form-item <el-form-item
prop={`levelList.${e.$rowIndex}.discountRate`} prop={`tableData.${e.$rowIndex}.discountRate`}
rules={{ rules={{
required: true, required: true,
message: "请输入所需成长值", message: "请输入所需成长值",
@ -294,14 +278,7 @@ export default {
width: "120px", width: "120px",
type: "jsx", type: "jsx",
render: ({ row }) => { render: ({ row }) => {
return ( return <el-switch v-model={row.enablePointsRedemption}></el-switch>;
<el-form-item>
{" "}
<el-switch
v-model={row.enablePointsRedemption}
></el-switch>{" "}
</el-form-item>
);
}, },
}, },
{ {
@ -313,16 +290,14 @@ export default {
render: ({ row }) => { render: ({ row }) => {
let changeCouponsList = () => { let changeCouponsList = () => {
if (!row.enableBirthdayCoupons) { if (!row.enableBirthdayCoupons) {
row.memberLevelCouponsList = []; row.memberLevelCouponsList = "";
} }
}; };
return ( return (
<el-form-item>
<el-switch <el-switch
onchange={changeCouponsList} onchange={changeCouponsList}
v-model={row.enableBirthdayCoupons} v-model={row.enableBirthdayCoupons}
></el-switch> ></el-switch>
</el-form-item>
); );
}, },
}, },
@ -341,7 +316,7 @@ export default {
if (e.row.enableBirthdayCoupons) { if (e.row.enableBirthdayCoupons) {
return ( return (
<el-form-item <el-form-item
prop={`levelList.${e.$rowIndex}.memberLevelCouponsList`} prop={`tableData.${e.$rowIndex}.memberLevelCouponsList`}
rules={{ rules={{
required: true, required: true,
message: "请添加优惠卷", message: "请添加优惠卷",
@ -374,12 +349,10 @@ export default {
} }
}; };
return ( return (
<el-form-item>
<el-switch <el-switch
onchange={changeReward} onchange={changeReward}
v-model={row.enableBirthdayReward} v-model={row.enableBirthdayReward}
></el-switch> ></el-switch>
</el-form-item>
); );
}, },
}, },
@ -393,7 +366,7 @@ export default {
if (e.row.enableBirthdayReward) { if (e.row.enableBirthdayReward) {
return ( return (
<el-form-item <el-form-item
prop={`levelList.${e.$rowIndex}.rewardEffectiveTimeType`} prop={`tableData.${e.$rowIndex}.rewardEffectiveTimeType`}
rules={{ rules={{
required: true, required: true,
message: "请输入所需成长值", message: "请输入所需成长值",
@ -435,7 +408,7 @@ export default {
render: (e) => { render: (e) => {
let add = () => { let add = () => {
console.log(e); console.log(e);
this.modalData.levelList.splice(e.$rowIndex + 1, 0, { this.modalData.tableData.splice(e.$rowIndex + 1, 0, {
levelName: "", levelName: "",
requiredGrowthValue: "0", requiredGrowthValue: "0",
growthValueUpperLimit: "999999999", growthValueUpperLimit: "999999999",
@ -445,16 +418,16 @@ export default {
enableBirthdayReward: false, enableBirthdayReward: false,
discountRate: "", discountRate: "",
rewardEffectiveTimeType: "", rewardEffectiveTimeType: "",
memberLevelCouponsList: [], memberLevelCouponsList: "",
}); });
}; };
let remove = () => { let remove = () => {
this.modalData.levelList.splice(e.$rowIndex, 1); this.modalData.tableData.splice(e.$rowIndex, 1);
}; };
return ( return (
<div> <div>
<el-button <el-button
v-show={this.modalData.levelList.length == e.$rowIndex + 1} v-show={this.modalData.tableData.length == e.$rowIndex + 1}
style="margin-right: 10px" style="margin-right: 10px"
type="primary" type="primary"
size="mini" size="mini"
@ -463,7 +436,7 @@ export default {
> >
添加 添加
</el-button> </el-button>
{this.modalData.levelList.length > 1 && e.$rowIndex != 0 ? ( {this.modalData.tableData.length > 1 && e.$rowIndex != 0 ? (
<el-popconfirm title="确认要删除吗？" onConfirm={remove}> <el-popconfirm title="确认要删除吗？" onConfirm={remove}>
<el-button <el-button
class="ml-1" class="ml-1"
@ -500,26 +473,12 @@ export default {
).unitType; ).unitType;
console.log(this.modalData); console.log(this.modalData);
this.$refs.modalForm.validate((valid) => { this.$refs.modalForm.validate((valid) => {
if (valid) { console.log(valid);
this.$api.marketing
.addMarketingLevel(this.modalData)
.then((res) => {
this.$emit("getList");
this.toggle();
});
}
}); });
}, 300), }, 300),
}, },
]; ];
}, },
...mapState("userData", [
"isMerchant",
"marketList",
"storeList",
"marketId",
"shopId",
]),
}, },
asyncComputed: {}, asyncComputed: {},
}; };