Skip to content

M
marketing
Commit 3bf50612 by chenxin
Options

fix:一些bug

parent d45fab18
Showing with 59 additions and 44 deletions
dist/index.html
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel="shortcut icon" href=./static/img/favicon.ico><title>GIC后台</title><link rel=stylesheet type=text/css href=static/css/iconfont.css><link rel=stylesheet type=text/css href=static/css/common.css><link href=/marketing/static/css/main.2cb0058e0f20f27690d6c330a5d43732.css rel=stylesheet></head><body><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.5.2/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.20.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/store.2.0.01.js></script><script src=//web-1251519181.file.myqcloud.com/components/img-preview.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/member-group.2.0.01.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-card.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/confirm-people.2.0.01.js></script><script src=//web-1251519181.file.myqcloud.com/components/people.2.0.15.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.04.js></script><script src=//web-1251519181.file.myqcloud.com/components/input.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/delete.2.0.00.js></script><script type=text/javascript src=/marketing/static/js/manifest.0a85049e489e85ac5f0a.js></script><script type=text/javascript src=/marketing/static/js/vendor.a8993e30b96d0f8d08ca.js></script><script type=text/javascript src=/marketing/static/js/main.976790420701d8bdd875.js></script></body></html>
\ No newline at end of file
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel="shortcut icon" href=./static/img/favicon.ico><title>GIC后台</title><link rel=stylesheet type=text/css href=static/css/iconfont.css><link rel=stylesheet type=text/css href=static/css/common.css><link href=/marketing/static/css/main.2cb0058e0f20f27690d6c330a5d43732.css rel=stylesheet></head><body><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.5.2/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.20.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/store.2.0.01.js></script><script src=//web-1251519181.file.myqcloud.com/components/img-preview.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/member-group.2.0.01.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-card.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/confirm-people.2.0.01.js></script><script src=//web-1251519181.file.myqcloud.com/components/people.2.0.15.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.04.js></script><script src=//web-1251519181.file.myqcloud.com/components/input.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/delete.2.0.00.js></script><script type=text/javascript src=/marketing/static/js/manifest.0a85049e489e85ac5f0a.js></script><script type=text/javascript src=/marketing/static/js/vendor.a8993e30b96d0f8d08ca.js></script><script type=text/javascript src=/marketing/static/js/main.a7ed8edab6a6ebced414.js></script></body></html>
\ No newline at end of file
src/views/card/form.js
......@@ -270,30 +270,33 @@ export default {
// isCopy则第二三层不能编辑除非第一层变动;
if ((card.cardType === 0 || card.cardType === 1) && this.form.cardApplyChannel.indexOf('WMmicroMall') !== -1) {
this.goodsList = card.coupGoodsWeimobList.map(v => {
const f2Arr = JSON.parse(v.propValues); // 第三层的数据
const f3Arr = JSON.parse(v.propValues); // 第三层的数据
let f2 = [
{
id: v.propId,
title: v.propName
// outPropertyId
}
];
const f3 =
f3Arr.map(y => {
f2[0].outPropertyId = y.relationIds.split('_')[0];
return {
id: y.valueId,
title: y.valueName,
outValueId: y.relationIds.split('_')[1]
};
}) || [];
return {
isCopy: this.isCopy,
v1: v.categoryId,
v1name: v.categoryName,
f2: [
{
id: v.propId,
title: v.propName,
outPropertyId: v.outPropertyId
}
],
f2,
v2: v.propId,
v2name: v.propName,
f3:
f2Arr.map(y => {
return {
id: y.valueId,
title: y.valueName,
outValueId: y.outValueId
};
}) || [],
v3: f2Arr.map(y1 => y1.valueId) || [],
v3name: f2Arr || []
f3,
v3: f3Arr.map(y1 => y1.valueId) || [],
v3name: f3Arr || []
};
});
this.coupGoodsWeimobList = card.coupGoodsWeimobList;
......@@ -505,6 +508,7 @@ export default {
if ((this.form.cardType === 0 || this.form.cardType === 1) && this.form.cardApplyChannel.indexOf('WMmicroMall') !== -1 && this.coupGoodsWeimobList.length !== 0) {
card.coupGoodsWeimobList = this.coupGoodsWeimobList;
}
console.log(card.coupGoodsWeimobList);
//卡券限制
if (this.cardLimitRadio === 1) {
card.cardLimit = 1;
......@@ -597,7 +601,7 @@ export default {
params.shelfIds = JSON.stringify(this.form.shelfIds);
params.card = JSON.stringify(card);
this.submitLoading = true;
console.log(params);
// console.log(params);
saveUpdateCard(params)
.then(res => {
this.submitLoading = false;
......
src/views/card/form.vue
......@@ -54,14 +54,17 @@
<!-- 微盟适用商品 -->
<div v-if="(form.cardType === 0 || form.cardType === 1) && form.cardApplyChannel.indexOf('WMmicroMall') !== -1">
<div v-for="(list, idx) in goodsList" :key="idx" class="mb10">
<span class="inline-block w100 text-right">微盟适用商品{{ idx + 1 }}</span>
<span class="inline-block w100 text-right">
微盟适用商品
<span v-show="goodsList.length !== 1">{{ idx + 1 }}</span>
</span>
<el-select :disabled="isEdit" class="w250" v-model="list.v1" filterable placeholder=" 选择商品类目" clearable :loading="loading" @change="handleF1Change($event, idx)">
<el-option v-for="item in f1" :key="item.id" :label="item.title" :value="item.id"></el-option>
</el-select>
<el-select v-show="list.f2.length > 0" :disabled="isEdit || list.isCopy" class="w250" v-model="list.v2" filterable remote reserve-keyword placeholder="选择商品参数" clearable :loading="loading" @change="handleF2Change($event, idx)">
<el-option v-for="item in list.f2" :key="item.id" :label="item.title" :value="item.id"></el-option>
</el-select>
<el-select v-show="list.f3.length > 0" :disabled="isEdit || list.isCopy" class="w250" v-model="list.v3" multiple filterable remote reserve-keyword placeholder="选择商品参数值" clearable :loading="loading">
<el-select v-if="list.f3.length > 0" :disabled="isEdit || list.isCopy" class="w250" v-model="list.v3" multiple filterable remote reserve-keyword placeholder="选择商品参数值" clearable :loading="loading">
<el-option v-for="item in list.f3" :key="item.id" :label="item.title" :value="item.id"></el-option>
</el-select>
<div v-if="isAdd || isCopy" class="inline-block">
......@@ -71,6 +74,7 @@
</div>
</div>
<!-- {{ goodsList }} -->
<!-- {{ coupGoodsWeimobList }} -->
<!-- 兑换券 -->
<div v-show="form.cardType === 2" class="mb10"><el-checkbox :disabled="isEdit || isInfo" v-model="sale_limit.flag">消费条件</el-checkbox> <span class="fz12 gray">（至少填写一项）</span></div>
<div class="mb10" v-show="form.cardType === 2">
......
src/views/card/record-send-Info.vue
......@@ -5,13 +5,12 @@
<el-option label="成功" :value="1"></el-option>
<el-option label="失败" :value="0"></el-option>
</el-select>
<div class="inline-block" v-show="listParams.putonType === 1">
<el-date-picker class="w280" v-model="receiveTime" type="daterange" range-separator="至" start-placeholder="领取开始时间" end-placeholder="领取结束时间" @change="refresh"></el-date-picker>
<el-date-picker class="w280" v-model="verifyTime" type="daterange" range-separator="至" start-placeholder="核销开始时间" end-placeholder="核销结束时间" @change="refresh"></el-date-picker>
<el-select class="vertical-middle w150" v-model="listParams.cardStatus" placeholder="投放状态" @change="search">
<el-option v-for="(v, i) in cardStatusList" :key="i" :label="v.label" :value="v.value"></el-option>
</el-select>
</div>
{{ receiveTime }}
<el-date-picker v-show="listParams.putonType === 1" class="w280" v-model="receiveTime" type="daterange" range-separator="至" start-placeholder="领取开始时间" end-placeholder="领取结束时间" @change="refresh"></el-date-picker>
<el-date-picker v-show="listParams.putonType === 1" class="w280" v-model="verifyTime" type="daterange" range-separator="至" start-placeholder="核销开始时间" end-placeholder="核销结束时间" @change="refresh"></el-date-picker>
<el-select v-show="listParams.putonType === 1" class="vertical-middle w150" v-model="listParams.cardStatus" placeholder="投放状态" @change="search">
<el-option v-for="(v, i) in cardStatusList" :key="i" :label="v.label" :value="v.value"></el-option>
</el-select>
<el-input class="w250" v-model="listParams.search" placeholder="输入会员姓名/卡号" @change="refresh"><i slot="prefix" class="el-input__icon el-icon-search"></i></el-input>
<el-button icon="iconfont icon-icon_yunxiazai fz14" class="fr" type="primary" @click="exportRecordSendInfoEvaluate"> 下载Excel</el-button>
</div>
......@@ -89,7 +88,7 @@ export default {
minWidth: '100',
align: 'left',
formatter() {
return '失败';
return '成功';
}
},
{
......@@ -196,6 +195,9 @@ export default {
let res = await getCardPutonDetail({ putonId: this.$route.params.id });
this.loading = false;
if (res.errorCode === 0) {
if (res.result.puton.putOnTime < new Date('2019-05-15')) {
this.$tips({ type: 'warning', message: '该条数据无记录' });
}
Object.assign(this.listParams, {
putonId: this.$route.params.id,
coupCardId: res.result.puton.cardId,
......@@ -212,6 +214,7 @@ export default {
this.loading = true;
this.formatterTimeFunc(); // 处理时间
const timeArr = ['beginTime', 'endTime', 'writeOffBeginTime', 'writeOffEndTime'];
console.log(this.listParams.beginTime);
let params = Object.assign({}, this.listParams);
// 时间没有填的不传该字段
for (let x in params) {
......@@ -230,19 +233,12 @@ export default {
},
// 清除筛选条件
clear() {
Object.assign(this.listParams, {
beginTime: '',
endTime: '',
writeOffBeginTime: '',
writeOffEndTime: '',
cardStatus: 0,
recordType: 0,
search: '',
currentPage: 1
});
this.receiveTime = '';
this.verifyTime = '';
this.listParams.currentPage = 1;
},
handleStatusChange() {
this.clear();
async handleStatusChange() {
await this.clear();
this.getTableList();
},
// 处理时间
......
src/views/card/record-send.vue
......@@ -30,7 +30,7 @@
<template slot-scope="scope">
<el-button type="text" v-if="scope.row.putonStatus === 2 || scope.row.putonStatus === 3" @click="$router.push('/card/groupinfo/' + scope.row.putonId)">详情</el-button>
<el-button type="text" v-if="scope.row.putonStatus !== 2 && scope.row.putonStatus !== 3" @click="$router.push('/card/groupsend/' + scope.row.putonId)">编辑</el-button>
<el-button type="text" @click="$router.push('/card/record/sendInfo/' + scope.row.putonId)">记录</el-button>
<el-button type="text" v-if="scope.row.putonTime > nowDate" @click="$router.push('/card/record/sendInfo/' + scope.row.putonId)">记录</el-button>
<dm-delete v-if="scope.row.putonStatus !== 2" @confirm="delData(scope.row)" tips="是否删除该投放记录?">
<el-button type="text">删除</el-button>
</dm-delete>
......@@ -45,6 +45,8 @@ import { cardRecordPage, deleteCardPuton } from '@/service/api/cardApi.js';
import { formatDateTimeByType } from '@/utils/index.js';
import timeCounts from '@/components/timeCount/index.vue';
import tableMethods from '@/mixins/tableMethods.js';
const nowDate = new Date('2019-05-15'); // 该日期之前无操作-记录按钮
export default {
name: 'record-send',
mixins: [tableMethods],
......@@ -53,6 +55,7 @@ export default {
},
data() {
return {
nowDate,
formatDateTimeByType,
loading: false,
recordList: [],
......@@ -94,6 +97,14 @@ export default {
};
},
created() {
this.$store.commit(
'mutations_layoutTips',
`<div class="layout--tips">
<i class="el-icon-info"></i>
历史数据限制：${formatDateTimeByType(nowDate, 'yyyy-MM-dd')}之前的卡券投放计划未保存详细投放录。
</div>
`
);
this.getTableList();
this.$store.commit('mutations_breadcrumb', [{ name: '营销管理', path: '' }, { name: '卡券营销', path: '' }, { name: '卡券记录', path: '' }, { name: '投放记录', path: '' }]);
},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment