Skip to content

M
marketing
Commit 5a1f4fa9 by zhangmeng
Options

营销模块迭代

parent 2a1ad1fb
Showing with 95 additions and 73 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/app.a8ec267984c86423e2812342cbe1cf85.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/marketing/static/js/manifest.0a85049e489e85ac5f0a.js></script><script type=text/javascript src=/marketing/static/js/vendor.77d497571413c653cb91.js></script><script type=text/javascript src=/marketing/static/js/app.ab9070a4f573c8eea145.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/app.684bd9cfda34e664deed9ed15bfaeb21.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/marketing/static/js/manifest.0a85049e489e85ac5f0a.js></script><script type=text/javascript src=/marketing/static/js/vendor.77d497571413c653cb91.js></script><script type=text/javascript src=/marketing/static/js/app.1e2c9ded8d72efea1572.js></script></body></html>
\ No newline at end of file
dist/static/js/app.1e2c9ded8d72efea1572.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/app.ab9070a4f573c8eea145.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
src/assets/style/components/index.scss
......@@ -136,7 +136,7 @@
left: 200px;
}
.el-button+.el-button {
margin-left: 5px;
margin-left: 4px;
}
}
.dm-tabs-wrap{
......@@ -145,7 +145,7 @@
}
}
.el-select,.el-input,.el-checkbox.is-bordered,.el-date-editor{
margin-right: 5px;
margin-right: 4px;
}
.el-form-item__margin-top14 {
......
src/assets/theme/index.css
......@@ -41626,7 +41626,7 @@
.el-textarea__inner {
display: block;
resize: vertical;
padding: 5px 15px;
padding: 5px 12px;
line-height: 1.5;
-webkit-box-sizing: border-box;
box-sizing: border-box;
src/components/libs/audioTemp/audioItem.vue
......@@ -12,9 +12,9 @@
</div>
<div class="audio-item_bottom">
<i class="el-icon-edit" @click="edit"></i>
<dm-confirm @confirm="del" tips="确认删除该语音?">
<dm-delete @confirm="del" tips="确认删除该语音?">
<i class="el-icon-delete"></i>
</dm-confirm>
</dm-delete>
</div>
</div>
</el-col>
......
src/components/libs/imgTemp/index-box.vue
......@@ -140,10 +140,10 @@ export default {
this.addGroupService(value);
}).catch(err => {
console.log(err)
this.$tips({
type: 'info',
message: '取消新增'
});
// this.$tips({
// type: 'info',
// message: '取消新增'
// });
});
},
async addGroupService(val) {
......
src/components/libs/imgTemp/index.vue
<template>
<section class="dm-wrap dm-ilib clearfix">
<nav>
<h4 class="text-right">
<h4 class="text-left pl10">
<el-button style="font-weight: 500;" size="small" type="text" icon="el-icon-plus" @click.stop="addGroup">新建分组</el-button>
</h4>
<ul class="dm-ilib-category" :style="scrollStyle">
......@@ -217,10 +217,10 @@ export default {
}).then(({ value }) => {
this.addGroupService(value);
}).catch(() => {
this.$tips({
type: 'info',
message: '取消新增'
});
// this.$tips({
// type: 'info',
// message: '取消新增'
// });
});
},
async addGroupService(val) {
......@@ -277,9 +277,16 @@ export default {
line-height: 50px;
font-size: 16px;
i{
font-size: 20px;
font-size: 16px;
padding-left:10px;
cursor: pointer;
color:#909399;
&.el-icon-edit:hover{
color:#1890ff;
}
&.el-icon-delete:hover{
color:#f5222d;
}
}
}
}
......
src/components/libs/imgTextTemp/index.vue
......@@ -37,9 +37,9 @@
<el-table-column label="操作" align="left" width="200px" v-if="auto">
<template slot-scope="scope" >
<el-button type="text" @click="editData(scope.row)">编辑</el-button>
<dm-confirm @confirm="delData(scope.row)" tips="确认删除该图文?">
<dm-delete @confirm="delData(scope.row)" tips="确认删除该图文?">
<el-button type="text">删除</el-button>
</dm-confirm>
</dm-delete>
<el-button type="text" @click="$router.push('/wechat/record/add/'+scope.row.imageTextId)">使用</el-button>
</template>
</el-table-column>
......
src/components/libs/videoTemp/index.vue
......@@ -92,7 +92,7 @@ export default {
</script>
<style lang="scss" scoped>
.dm-vlib{
margin:20px;
margin: 20px 0 20px 20px;
}
.lib-video__list{
width:100%;
......
src/components/libs/videoTemp/videoItem.vue
......@@ -15,9 +15,9 @@
</div>
<div class="video-item_bottom" v-if="!chooseFlag">
<i class="el-icon-edit" @click="edit"></i>
<dm-confirm @confirm="del" tips="确认删除该视频?">
<dm-delete @confirm="del" tips="确认删除该视频?">
<i class="el-icon-delete"></i>
</dm-confirm>
</dm-delete>
</div>
</div>
</el-col>
......@@ -65,6 +65,7 @@ export default {
border: 1px solid #e4e7ed;
// width: 290px;
margin-bottom: 20px;
// margin:0 10px;
overflow: hidden;
cursor: pointer;
vertical-align:middle;
......
src/main.js
......@@ -25,10 +25,10 @@ import preview from 'vue-photo-preview/src/lib/index.js'
import 'vue-photo-preview/dist/skin.css'
import dmConfirm from './components/dm-confirm'
import dmDelete from './components/dm-delete'
//删除组件 这个组件常用，放到这不用在组件里引入
Vue.component(dmConfirm.name,dmConfirm)
Vue.component(dmDelete.name,dmDelete)
Vue.config.productionTip = false
Vue.use(preview)
......
src/views/card/cardInfo.js
......@@ -184,11 +184,23 @@ export default {
}
this.form.useCustomCode = card.useCustomCode;
if (this.isCopy && this.form.useCustomCode === 1) {
this.form.customCodeBegin = '';
this.form.customCodeEnd = '';
this.form.customCodePrefix = '';
this.form.customCodeSuffix = '';
this.form.useCodePrefix = 0;
this.form.useCodeSuffix = 0;
} else {
this.form.customCodeBegin = card.customCodeBegin;
this.form.customCodeEnd = card.customCodeEnd;
this.form.customCodePrefix = card.customCodePrefix;
this.form.customCodeSuffix = card.customCodeSuffix;
this.form.useCodePrefix = card.useCodePrefix || 0;
this.form.useCodeSuffix = card.useCodeSuffix || 0;
}
this.form.cardCodeCount = card.cardCodeCount;
this.form.customCodeBegin = card.customCodeBegin;
this.form.customCodeEnd = card.customCodeEnd;
this.form.customCodePrefix = card.customCodePrefix;
this.form.customCodeSuffix = card.customCodeSuffix;
this.form.cardEffectiveMode = card.cardEffectiveMode;
this.form.dateTime = [card.beginDate || '',card.endDate || ''];
this.form.costValue = card.costValue || 0;
......@@ -197,9 +209,6 @@ export default {
this.form.cardExplain = card.cardExplain || '';
this.form.useDescript = card.useDescript || '';
this.form.coverDescript = card.coverDescript || '';
this.form.useCodePrefix = card.useCodePrefix || 0;
this.form.useCodeSuffix = card.useCodeSuffix || 0;
this.sendChildData = {
storeType:card.storeMode || 0,
......
src/views/card/list.vue
......@@ -9,6 +9,9 @@
<el-button @click="sortList('col4')">核销率<i class="el-icon--right" :class="listParams.sortBy === 'col4'?'el-icon-caret-top':(listParams.sortBy === 'col4 desc'?'el-icon-caret-bottom':'el-icon-d-caret')"></i></el-button>
<el-button @click="sortList('col5')">核销额<i class="el-icon--right" :class="listParams.sortBy === 'col5'?'el-icon-caret-top':(listParams.sortBy === 'col5 desc'?'el-icon-caret-bottom':'el-icon-d-caret')"></i></el-button>
</el-button-group>
<el-select class="dm-select" v-model="listParams.cardType" placeholder="选择卡券类型" @change="cardPageList">
<el-option v-for="(item,index) in cardTypeOptions" :key="index" :label="item.label" :value="item.value"></el-option>
</el-select>
<el-input v-model="listParams.searchParam" class="w200 vertical-middle" placeholder="输入卡券名称/备注" clearable @change="cardPageList"><i slot="prefix" class="el-input__icon el-icon-search"></i></el-input>
<el-button class="fr" type="primary" @click="$router.push('/card/add')">新增卡券</el-button>
</div>
......@@ -36,11 +39,13 @@ export default {
sortBy:'',
searchParam:'',
currentPage:1,
pageSize:20
pageSize:20,
cardType:''
},
total:0,
loading:false,
tableList:[],
cardTypeOptions:[ {value:'',label:'全部卡券类型'},{value:0,label:'抵金券',},{ value:1,label:'折扣券'},{ value:2,label:'兑换券'}],
sortFlag:false,
adjustStock:false,
currentCard:{}
......
src/views/card/record-get.vue
......@@ -14,14 +14,14 @@
</div>
<!-- 列表 -->
<el-table tooltipEffect="light" :data="recordList" style="width: 100%" v-loading="recordLoading" @sort-change="sortList">
<el-table-column width="135" align="left" prop="receiveTime" label="领取时间" fixed="left">
<el-table-column width="135" align="left" prop="receiveTime" label="领取时间" fixed="left" sortable="custom">
<template slot-scope="scope">
{{formateDateTimeByType(scope.row.receiveTime,'yyyy-MM-dd-HH-mm')}}
</template>
</el-table-column>
<el-table-column width="135" align="left" prop="writeOffTime" label="核销时间" fixed="left">
<el-table-column width="135" align="left" prop="writeOffTime" label="核销时间" fixed="left" sortable="custom">
<template slot-scope="scope">
{{formateDateTimeByType(scope.row.useTime,'yyyy-MM-dd-HH-mm')}}
{{scope.row.useTime?formateDateTimeByType(scope.row.useTime,'yyyy-MM-dd-HH-mm'):'--'}}
</template>
</el-table-column>
<el-table-column :show-overflow-tooltip="true" min-width="140" header-align="left" align="left" :key="Math.random()" prop="clerkId" label="会员信息">
......@@ -118,8 +118,8 @@ export default {
methods: {
// 列表方法
sortList(val) {
this.listParams.sortBy = (obj.order === 'descending') ? (obj.prop +' desc') : obj.prop;
this.cardPageList();
this.listParams.sortBy = (val.order === 'descending') ? (val.prop +' desc') : val.prop;
this.cardRecordPage();
},
search() {
this.listParams.currentPage = 1;
......@@ -133,7 +133,7 @@ export default {
this.listParams.currentPage = val;
this.cardRecordPage();
},
// 发送记录列表
// 领取列表
async cardRecordPage() {
this.recordLoading = true;
if (this.dateTime) {
......
src/views/card/record-send.vue
......@@ -28,9 +28,9 @@
<template slot-scope="scope" >
<el-button type="text" v-if="scope.row.putonStatus === 2 || scope.row.putonStatus === 3" @click="queryData(scope.row)">详情</el-button>
<el-button type="text" v-if="scope.row.putonStatus !== 2 && scope.row.putonStatus !== 3" @click="editData(scope.row)">编辑</el-button>
<dm-confirm v-if="scope.row.putonStatus !== 2" @confirm="delData(scope.row)" tips="是否删除该投放记录?">
<dm-delete v-if="scope.row.putonStatus !== 2" @confirm="delData(scope.row)" tips="是否删除该投放记录?">
<el-button type="text">删除</el-button>
</dm-confirm>
</dm-delete>
</template>
</el-table-column>
</el-table>
......
src/views/ecm/list.vue
......@@ -23,9 +23,9 @@
<el-table-column label="操作" align="left" width="120px" fixed="right">
<template slot-scope="scope" >
<el-button type="text" @click="editData(scope.row)">编辑</el-button>
<dm-confirm v-if="scope.row.putonStatus !== 2" @confirm="delData(scope.row)" tips="是否删除该计划?">
<dm-delete v-if="scope.row.putonStatus !== 2" @confirm="delData(scope.row)" tips="是否删除该计划?">
<el-button type="text">删除</el-button>
</dm-confirm>
</dm-delete>
</template>
</el-table-column>
......
src/views/game/dzp/index.vue
......@@ -20,9 +20,9 @@
<el-button type="text" @click="recordData(scope.row)">记录</el-button>
<el-button type="text" @click="editData(scope.row)" v-if="scope.row.gameStatus != '3'">编辑</el-button>
<el-button type="text" @click="detailData(scope.row)" v-if="scope.row.gameStatus == '3'">详情</el-button>
<dm-confirm @confirm="delData(scope.row)" tips="是否删除该游戏?">
<dm-delete @confirm="delData(scope.row)" tips="是否删除该游戏?">
<el-button type="text">删除</el-button>
</dm-confirm>
</dm-delete>
</template>
</el-table-column>
</el-table>
......
src/views/game/ggk/index.vue
......@@ -20,9 +20,9 @@
<el-button type="text" @click="recordData(scope.row)">记录</el-button>
<el-button type="text" @click="editData(scope.row)" v-if="scope.row.gameStatus != '3'">编辑</el-button>
<el-button type="text" @click="detailData(scope.row)" v-if="scope.row.gameStatus == '3'">详情</el-button>
<dm-confirm @confirm="delData(scope.row)" tips="是否删除该游戏?">
<dm-delete @confirm="delData(scope.row)" tips="是否删除该游戏?">
<el-button type="text">删除</el-button>
</dm-confirm>
</dm-delete>
</template>
</el-table-column>
</el-table>
......
src/views/game/klfl/addEdit.vue
......@@ -106,9 +106,9 @@
<el-table-column label="操作" align="left" width="120">
<template slot-scope="scope">
<el-button type="text" @click="editStrategy(scope.row.gamePrizeStrategyId)">编辑</el-button>
<dm-confirm @confirm="delItem(scope.row)" tips="是否删除该策略?">
<dm-delete @confirm="delItem(scope.row)" tips="是否删除该策略?">
<el-button type="text">删除</el-button>
</dm-confirm>
</dm-delete>
</template>
</el-table-column>
</el-table>
......
src/views/game/klfl/index.vue
......@@ -21,9 +21,9 @@
<el-button type="text" v-clipboard:text="scope.row.gameUrl">复制</el-button>
<el-button type="text" v-if="scope.row.sendStatus!==0" @click="$router.push('/game/klfl/record/'+scope.row.gameActivityId)">记录</el-button>
<el-button type="text" @click="$router.push('/game/klfl/edit/'+scope.row.gameActivityId)">编辑</el-button>
<dm-confirm @confirm="delData(scope.row)" tips="是否删除该游戏?">
<dm-delete @confirm="delData(scope.row)" tips="是否删除该游戏?">
<el-button type="text">删除</el-button>
</dm-confirm>
</dm-delete>
</template>
</el-table-column>
</el-table>
......
src/views/game/ptyx/index.vue
......@@ -21,9 +21,9 @@
<el-button type="text" v-if="scope.row.activityStatus !== 0" @click="$router.push('/game/ptyx/record/'+scope.row.gameActivityId)">记录</el-button>
<el-button type="text" v-if="scope.row.activityStatus === 0" @click="$router.push('/game/ptyx/edit/'+scope.row.gameActivityId)">编辑</el-button>
<el-button type="text" v-if="scope.row.activityStatus !== 0" @click="$router.push('/game/ptyx/query/'+scope.row.gameActivityId)">详情</el-button>
<dm-confirm @confirm="delData(scope.row)" tips="是否删除该游戏?">
<dm-delete @confirm="delData(scope.row)" tips="是否删除该游戏?">
<el-button type="text">删除</el-button>
</dm-confirm>
</dm-delete>
</template>
</el-table-column>
</el-table>
......
src/views/game/znm/addEdit.vue
......@@ -41,9 +41,9 @@
<el-table-column label="操作" align="left" width="120">
<template slot-scope="scope">
<el-button type="text" @click="editStrategy(scope.row.gamePrizeStrategyId)">编辑</el-button>
<dm-confirm @confirm="delItem(scope.row)" tips="是否删除该策略?">
<dm-delete @confirm="delItem(scope.row)" tips="是否删除该策略?">
<el-button type="text">删除</el-button>
</dm-confirm>
</dm-delete>
</template>
</el-table-column>
</el-table>
......
src/views/game/znm/index.vue
......@@ -19,9 +19,9 @@
<el-button type="text" v-clipboard:text="scope.row.gameUrl">复制</el-button>
<el-button type="text" v-if="scope.row.activityStatus!==0" @click="$router.push('/game/znm/record/'+scope.row.gameActivityId)">记录</el-button>
<el-button type="text" @click="$router.push('/game/znm/edit/'+scope.row.gameActivityId)">编辑</el-button>
<dm-confirm @confirm="delData(scope.row)" tips="是否删除该游戏?">
<dm-delete @confirm="delData(scope.row)" tips="是否删除该游戏?">
<el-button type="text">删除</el-button>
</dm-confirm>
</dm-delete>
</template>
</el-table-column>
</el-table>
......
src/views/mall/coupon/list.vue
......@@ -51,9 +51,9 @@
<el-table-column label="操作" align="left" width="140px">
<template slot-scope="scope">
<el-button type="text" @click="$router.push('/mall/coupon/info/'+scope.row.integralMallProId)">编辑</el-button>
<dm-confirm @confirm="delData(scope.row)" tips="是否删除该优惠券?">
<dm-delete @confirm="delData(scope.row)" tips="是否删除该优惠券?">
<el-button type="text">删除</el-button>
</dm-confirm>
</dm-delete>
</template>
</el-table-column>
</el-table>
......
src/views/mall/gift/list.vue
......@@ -82,9 +82,9 @@
<el-table-column label="操作" align="left" width="140px" fixed="right">
<template slot-scope="scope">
<el-button type="text" @click="$router.push('/mall/gift/info/'+scope.row.integralMallProId)">编辑</el-button>
<dm-confirm @confirm="delData(scope.row)" tips="是否删除该优惠券?">
<dm-delete @confirm="delData(scope.row)" tips="是否删除该优惠券?">
<el-button type="text">删除</el-button>
</dm-confirm>
</dm-delete>
</template>
</el-table-column>
</el-table>
......
src/views/message/addRecord.vue
......@@ -199,7 +199,7 @@ export default {
saveSendSmsService(params).then(res => {
if (res.errorCode === 0) {
this.$router.go(-1);
this.$tips({type:'warning',message:'提交成功'})
this.$tips({type:'success',message:'提交成功'})
} else {
this.$tips({type:'error',message:'提交失败'})
}
......
src/views/message/addTemp.vue
......@@ -121,7 +121,7 @@ export default {
try {
this.loading = true;
let res = await saveTempService(this.form);
this.$tips({type:'warning',message:'操作成功'});
this.$tips({type:'success',message:'操作成功'});
this.$router.push('/message/temp');
this.loading = false;
} catch (err) {
......
src/views/message/record.vue
......@@ -25,9 +25,9 @@
<el-table-column label="操作" align="left" width="140px" fixed="right">
<template slot-scope="scope" >
<el-button type="text" @click="$router.push('/message/record/detail/'+scope.row.smsId)">详情</el-button>
<dm-confirm v-if="scope.row.sendStatus == 4 || scope.row.sendStatus == 0" @confirm="invalidData(scope.row)" tips="是否禁用该发送记录?">
<dm-delete v-if="scope.row.sendStatus == 4 || scope.row.sendStatus == 0" @confirm="invalidData(scope.row)" tips="是否禁用该发送记录?">
<el-button type="text">禁用</el-button>
</dm-confirm>
</dm-delete>
</template>
</el-table-column>
</el-table>
......
src/views/message/temp.vue
......@@ -22,9 +22,9 @@
</div>
<div class="fr">
<el-button type="text" v-if="v.status === 2" @click="$router.push('/message/temp/edit/'+v.smsTemplateId)">修改</el-button>
<dm-confirm @confirm="delData(v)" tips="是否删除该短信模板?">
<dm-delete @confirm="delData(v)" tips="是否删除该短信模板?">
<el-button type="text">删除</el-button>
</dm-confirm>
</dm-delete>
</div>
</div>
<span class="sms-lib-item-tips_right danger-color-bg" v-if="v.status === 2">未通过</span>
......
src/views/msg/list.vue
......@@ -27,9 +27,9 @@
<el-table-column label="操作" align="left" width="140px" fixed="right">
<template slot-scope="scope" >
<el-button v-if="scope.row.bindStatusDesc !== '未绑定'" type="text" @click="$router.push('/msg/edit/'+scope.row.templateId)">编辑</el-button>
<dm-confirm v-if="scope.row.bindStatusDesc !== '未绑定'" @confirm="delData(scope.row)" tips="将同步删除公众号后台对应模板，一旦删除无法恢复。您确认吗?">
<dm-delete v-if="scope.row.bindStatusDesc !== '未绑定'" @confirm="delData(scope.row)" tips="将同步删除公众号后台对应模板，一旦删除无法恢复。您确认吗?">
<el-button type="text">删除</el-button>
</dm-confirm>
</dm-delete>
</template>
</el-table-column>
</el-table>
......
src/views/wechat/addRecord.vue
......@@ -76,7 +76,7 @@
</section>
<div class="btn-wrap_fixed" :class="{'on':asideShow}">
<el-button type="primary" @click="submit" v-if="!isInfo">提 交</el-button>
<el-button @click="$router.go(-1)">返回</el-button>
<el-button @click="$router.go(-1)">返 回</el-button>
</div>
</div>
</template>
......
src/views/wechat/record.vue
......@@ -36,12 +36,12 @@
<el-table-column label="操作" align="left" width="160px" fixed="right">
<template slot-scope="scope" >
<el-button type="text" v-if="scope.row.contentType === 0 && scope.row.sendStatus === 1 && scope.row.couponType === 1" @click="queryData(scope.row)">数据</el-button>
<dm-confirm @confirm="delData(scope.row)" tips="是否删除该发送记录?">
<dm-delete @confirm="delData(scope.row)" tips="是否删除该发送记录?">
<el-button type="text">删除</el-button>
</dm-confirm>
<dm-confirm @confirm="invalidData(scope.row)" v-if="scope.row.contentType===0 && scope.row.sendType !==2 && scope.row.sendStatus==1" tips="是否禁用该发送记录?">
</dm-delete>
<dm-delete @confirm="invalidData(scope.row)" v-if="scope.row.contentType===0 && scope.row.sendType !==2 && scope.row.sendStatus==1" tips="是否禁用该发送记录?">
<el-button type="text">禁用</el-button>
</dm-confirm>
</dm-delete>
<el-button type="text" v-if="scope.row.sendStatus===0" @click="$router.push('/wechat/record/edit/'+scope.row.wechatTeletextId)">编辑</el-button>
<el-button type="text" v-if="scope.row.sendStatus!==0" @click="$router.push('/wechat/record/info/'+scope.row.wechatTeletextId)">详情</el-button>
......
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