Commit 4b5fae49 by zhangmeng

迭代

parent 03f7302b
......@@ -40,7 +40,7 @@ export default {
}
},
{
path: 'batchlist',
path: 'batchlist/:id/:name',
name: '批次记录',
component: batchList,
meta: {
......
import test from '@/test'
import staticCom from '@/test/example/static-com'
import marketingEvent from '@/test/example/marketing-event'
import storeNew from '@/test/example/store-new'
export default {
path: '/test',
name: '测试组件',
component: test,
children:[
{
path: 'staticcom',
name: '静态组件',
component: staticCom
},
{
path: 'storeNew',
name: '门店组件',
component: storeNew
},
{
path: 'marketingEvent',
name: '营销事件组件',
component: marketingEvent
},
]
};
......@@ -4,10 +4,7 @@ import page403 from '@/views/error/403'
import page404 from '@/views/error/404'
import page500 from '@/views/error/500'
import test from '@/test'
import staticCom from '@/test/static-com'
import test from './modules/test'
//微信营销
import wechat from './modules/wechat'
......@@ -49,7 +46,7 @@ export default [
msg,
calllog,
recharge,
evaluation,
evaluation
]
},
{
......@@ -72,15 +69,5 @@ export default [
name: '未知领域',
component: page404
},
{
path: '/test',
name: '测试组件',
component: test
},
{
path: '/staticcom',
name: '测试组件',
component: staticCom
},
test
]
......@@ -45,7 +45,7 @@ export default {
}
},
data(){
return{
return {
listParams:{
search:'',
currentPage:1,
......
<template>
<div>
<vue-gic-marketing-event :ecmPlanId="ecmPlanId" :code="code"></vue-gic-marketing-event>
</div>
</template>
<script>
import marketingEvent from '../component/marketingEvent'
export default {
components:{
'vue-gic-marketing-event':marketingEvent
},
data() {
return {
// 参数
ecmPlanId:'ff80808166817b0501669f9546db011f', // 必传,
// 页面编码——- 1001-智能引擎; 1002-微信营销; 1003-被关注回复; 1004-关键字回复
code:'1001', //默认为1001
}
}
};
</script>
<template>
<div>
<!-- <vue-gic-store-new :options="options" :uuid.sync="uuid" :isAdd="isAdd"></vue-gic-store-new>
<vue-gic-store-card :uuid.sync="uuid"></vue-gic-store-card> -->
</div>
</template>
<script>
// import vueGicStoreNew from '@gic-test/vue-gic-store-new'
// import { vueGicStoreCard } from '@gic-test/vue-gic-store-new'
export default {
components:{
// 'vue-gic-marketing-event':marketingEvent
},
data() {
return {
// 参数
uuid:'', // 新增传空,编辑必传,
// 需要的下拉 默认为全部[0,1,2,3,4,5]
// 0 全部 1 门店类型 2门店标签 3 门店区域 4 门店分组 5 部分门店
options:[0,1,2,3,4,5],
isAdd:false
}
}
};
</script>
<template>
<div style="background:#fff;">
<!-- <div>
<p>新版门店</p>
<vue-gic-store-new style="padding:20px;" :uuid="uuid" :isAdd="false"></vue-gic-store-new>
</div> -->
<!-- <div>
<p>新版卡券门店</p>
<vue-gic-store-card style="padding:20px;" :uuid="uuid"></vue-gic-store-card>
</div>
<div>
<p>老版门店</p>
<vue-gic-store-linkage style="padding:20px;" :msg="sendChildData"></vue-gic-store-linkage>
</div> -->
<div style="padding:20px;">
<p>营销事件组件</p>
<dm-marketing ecmPlanId="ff80808166817b0501669f9546db011f"></dm-marketing>
</div>
</div>
</template>
<script>
import Vue from 'vue';
import gicStoreNew from './dmStore/index.js';
import { gicStoreCard } from './dmStore/index.js';
// import gicStoreNew from '@gic-test/vue-gic-store-new';
// import { gicStoreCard } from '@gic-test/vue-gic-store-new';
Vue.use(gicStoreNew)
Vue.use(gicStoreCard)
<template>
<el-container style="height:100%;border: 1px solid #eee">
<el-aside width="200px" style="background-color: rgb(238, 241, 246);height:100%;">
<el-menu :default-openeds="['1', '3']" style="background-color: rgb(238, 241, 246);height:100%;">
<el-submenu index="1">
<template slot="title"><i class="el-icon-message"></i>GIC后台组件</template>
<el-menu-item index="1-1">营销事件</el-menu-item>
<el-menu-item index="1-2">门店组件</el-menu-item>
<!-- <el-menu-item index="1-3">选项3</el-menu-item> -->
</el-submenu>
<el-submenu index="2">
<template slot="title"><i class="el-icon-menu"></i>静态组件</template>
<el-menu-item index="2-1">静态组件</el-menu-item>
<el-menu-item index="2-2">选项3</el-menu-item>
</el-submenu>
<el-submenu index="3">
<template slot="title"><i class="el-icon-setting"></i>其他组件</template>
<el-menu-item index="3-1">选项1</el-menu-item>
<el-menu-item index="3-2">选项2</el-menu-item>
<el-menu-item index="3-3">选项3</el-menu-item>
</el-submenu>
</el-menu>
</el-aside>
<el-container style="background-color:#fff;">
<el-header style="text-align: right; font-size: 12px">
<el-dropdown>
<i class="el-icon-setting" style="margin-right: 15px"></i>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item>退出登录</el-dropdown-item>
<el-dropdown-item>重新登录</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
<span>damogic</span>
</el-header>
<el-main>
<router-view></router-view>
</el-main>
</el-container>
</el-container>
</template>
<style>
.el-header {
background-color: #B3C0D1;
color: #333;
line-height: 60px;
}
import dmMarketing from './dmMarketing';
.el-aside {
color: #333;
}
</style>
export default {
components:{
'dm-marketing':dmMarketing
},
data() {
return {
uuid:'',
sendChildData:{
storeType:0,
storeGroupIds:'',
storeIds:[],
},
}
},
created() {
setTimeout(_ => {
this.uuid = 'asdfghjkasdfghjkasdfghjkasdfghjk'
},3000)
}
}
<script>
export default {
data() {
const item = {
date: '2016-05-02',
name: '王小虎',
address: '上海市普陀区金沙江路 1518 弄'
};
return {
tableData: Array(20).fill(item)
}
}
};
</script>
<style lang="scss">
</style>
<template>
<el-dialog title="回复" :visible.sync="show" width="80%" :before-close="close">
<div class="pb22 clearfix">
<el-input v-model="listParams.memberInfo" class="w200" placeholder="输入会员昵称/名字" clearable @change="search"><i slot="prefix" class="el-input__icon el-icon-search"></i></el-input>
<el-select class="dm-select" clearable v-model="listParams.success" placeholder="所有条件" @change="search">
<el-option v-for="(v,i) in successOptions" :key="i" :label="v.label" :value="v.value"></el-option>
</el-select>
</div>
<el-table tooltipEffect="light" :data="tableList" style="width: 100%" v-loading="loading" element-loading-text="拼命加载中" >
<el-table-column type="index" width="50px" label="序号"></el-table-column>
<el-table-column v-for="(v,i) in tableHeader" :type="v.type" :fixed="v.fixed" :show-overflow-tooltip="v.tooltip" :width="v.width" :min-width="v.minWidth" :align="v.align" :key="i" :prop="v.prop" :label="v.label" :formatter="v.formatter">
<template slot-scope="scope">
<span v-if="v.formatter" v-html="v.formatter(scope.row)"></span>
<component v-else-if="v.component" :is="v.component"></component>
<span v-else>{{scope.row[v.prop]}}</span>
</template>
</el-table-column>
</el-table>
<el-pagination v-show="tableList.length" background class="dm-pagination" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="listParams.currentPage" :page-sizes="[10, 20, 30, 40]" :page-size="listParams.pageSize" layout="total, sizes, prev, pager, next" :total="total"></el-pagination>
<span slot="footer" class="dialog-footer">
<el-button @click="close">关 闭</el-button>
</span>
</el-dialog>
</template>
<script>
import {ecmBatchSendDetails} from '@/service/api/ecmApi.js';
import {formateDateTimeByType} from '@/utils/index.js'
export default {
name: 'ecm-batch-list',
props:{
show:{
type:Boolean,
default:false
},
id:{
type:String,
default:''
}
},
data () {
return {
successOptions:[{value:'',label:'所有类型'},{value:0,label:'不满足'},{value:1,label:'满足'}],
listParams:{
ecmPlanQuartzLogId:'',
success:'',
memberInfo:'',
currentPage:1,
pageSize:20
},
total:0,
loading:false,
tableHeader:[
{label:'会员信息',prop:'marketingType',minWidth:'120',align:'left'},
{label:'手机号码',prop:'phoneNumber',minWidth:'120',align:'left'},
{label:'发送条件',prop:'errCode',width:'100',align:'left',formatter(row){
return row.errCode === '0' ?'满足':'不满足';
}},
{label:'备注',prop:'errMsg',minWidth:'120',align:'left'},
],
tableList:[]
}
},
watch:{
show(val) {
if (val) {
this.ecmBatchSendDetails();
}
}
},
methods: {
search() {
this.listParams.currentPage = 1;
this.ecmBatchSendDetails();
},
handleSizeChange(val) {
this.listParams.pageSize = val;
this.ecmBatchSendDetails();
},
handleCurrentChange(val) {
this.listParams.currentPage = val;
this.ecmBatchSendDetails();
},
async ecmBatchSendDetails() {
this.loading = true;
this.listParams.ecmPlanQuartzLogId = this.id;
let res = await ecmBatchSendDetails(this.listParams);
console.log(res)
this.tableList = res.result.result || [];
this.total = res.result.totalCount;
this.loading = false;
},
close() {
this.$emit('update:show',false);
}
}
}
</script>
......@@ -124,7 +124,7 @@ export default {
},
// 记录
toRecord(row){
this.$router.push('/ecm/'+ (row.effectType ? 'batchlist' : 'currentlist'));
this.$router.push(`/ecm/${row.effectType ? 'batchlist' : 'currentlist'}/${row.ecmPlanId}/${row.ecmPlanName}`);
},
// 删除
async delData(row){
......
......@@ -115,7 +115,7 @@ import {formateDateTimeByType} from '@/utils/index.js'
import reply from './reply'
import storeGroup from '@/components/storeGroup'
export default {
name: 'sms-record',
name: 'newest',
data () {
let _vm = this;
return {
......
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