Skip to content

M
marketing
Commit e28a2974 by zhangmeng
Options

Merge branch 'dd' into dev 

* dd:
  提交测试

# Conflicts:
#	dist/index.html
parents c3c1c460 bfb0473e
Showing with 375 additions and 229 deletions
dist/static/js/app.0706de9cb889d9aba138.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.9e6b9a9d3302a889af28.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
src/components/libs/cardTemp/index.vue
......@@ -19,17 +19,17 @@
</div>
</template>
</el-table-column>
<el-table-column :show-overflow-tooltip="false" :min-width="100" align="left" prop="cardName" label="卡券名称"></el-table-column>
<el-table-column :show-overflow-tooltip="true" :min-width="100" align="left" prop="cardName" label="卡券名称"></el-table-column>
<el-table-column :show-overflow-tooltip="true" :min-width="100" align="left" prop="subName" label="备注名"></el-table-column>
<el-table-column prop="" label="有效期" :min-width="100" :show-overflow-tooltip="false">
<template slot-scope="scope">
<div v-if="scope.row.cardEffectiveMode == 0">{{scope.row.beginDate+'-'+ scope.row.endDate}}</div>
<div v-if="scope.row.cardEffectiveMode == 1">领取{{scope.row.startDay +'-'+ scope.row.limitDay}}天后,可以使用</div>
<div v-if="scope.row.cardEffectiveMode == 0">固定日期：{{formateDateTimeByType(scope.row.beginDate,'yyyy-MM-dd')+'至'+ formateDateTimeByType(scope.row.endDate,'yyyy-MM-dd')}}</div>
<div v-if="scope.row.cardEffectiveMode == 1">领取后{{(scope.row.startDay === 0 ? '当':scope.row.startDay) +'天，有效天数'+ scope.row.limitDay}}天</div>
</template>
</el-table-column>
</el-table-column>
<el-table-column prop="cardLimit" :show-overflow-tooltip="false" label="领取限制" width="90">
<template slot-scope="scope">
{{scope.row.cardLimit}}张
{{scope.row.cardLimit}}张/人
</template>
</el-table-column>
<el-table-column :show-overflow-tooltip="false" :width="90" align="left" prop="storeMode" label="适用门店">
......@@ -45,6 +45,7 @@
<script>
import {getCardList} from '@/service/api/commonApi.js';
import {formateDateTimeByType} from '@/utils/index.js';
export default {
props:{
activeId:{
......@@ -89,6 +90,7 @@ export default {
},
data(){
return{
formateDateTimeByType,
listParams:{
searchParam:'',
currentPage:1,
......
src/mixins/filterAvater.js 0 → 100644
export default {
data() {
return {
defaultAvatar:require('../assets/img/head_default.png'),
}
},
methods: {
filterAvatar(img) {
return img?img.replace(/^http(s)?/,'https'):this.defaultAvatar;
}
}
}
src/mixins/tableMethods.js 0 → 100644
/*------列表方法---------*/
// refresh
// getList
// 分页
//
export default {
methods:{
refresh() {
this.listParams.currentPage = 1;
this.getTableList();
},
handleSizeChange(val) {
this.listParams.pageSize = val;
this.getTableList();
},
handleCurrentChange(val) {
this.listParams.currentPage = val;
this.getTableList();
}
}
}
src/test/component/dm-card/index.vue
<template>
<div class="attention-textAndImg-wrap">
<el-dialog title="选择卡券" :visible.sync="dialogCard" width="800px" :before-close="handleCardClose">
<div>
<div class="text-img-search clearfix">
<span>选择卡券（共{{total}}条）</span>
<div class="fl">
<el-input
placeholder="请输入内容"
prefix-icon="el-icon-search"
class="search-input"
v-model="searchText"
@keyup.native="(value) => toSearchInput(value)" clearable @clear="clearInput">
</el-input>
<p class="limit-text">{{ cardLimit | filterCardTips }}</p>
</div>
<div class="text-img-search clearfix">
<div class="fl">
<el-input placeholder="请输入卡券名/备注名" prefix-icon="el-icon-search" class="search-input" v-model="searchText" @keyup.native="(value) => toSearchInput(value)" clearable @clear="clearInput"></el-input>
<span class="limit-text">{{limitTips}}{{total}}张。 </span>
</div>
<div class="pic-list-box">
<el-table
ref="multipleTable"
:data="cardData"
class="card-table"
tooltip-effect="dark"
style="width: 100%"
@row-click="handleCurrentChangeTable">
<el-table-column label="" width="55">
<template slot-scope="scope">
<el-radio class="radio-style" :label="scope.row.coupCardId" v-model="radio" :disabled="scope.row.disabled">
&nbsp;
</el-radio>
</template>
</el-table-column>
<div class="fr">
<el-button type="primary" @click="add">新建卡券</el-button>
<el-button @click="refresh">刷新列表</el-button>
</div>
</div>
<div class="pic-list-box">
<el-table
ref="multipleTable"
:data="cardData"
class="card-table"
tooltip-effect="dark"
style="width: 100%"
@row-click="handleCurrentChangeTable">
<el-table-column label="" width="55">
<template slot-scope="scope">
<el-radio class="radio-style" :label="scope.row.coupCardId" v-model="radio" :disabled="scope.row.disabled">
&nbsp;
</el-radio>
</template>
</el-table-column>
<el-table-column :show-overflow-tooltip="true" :min-width="100" align="left" prop="cardName" label="卡券名称"></el-table-column>
<el-table-column :show-overflow-tooltip="true" :min-width="100" align="left" prop="subName" label="备注名"></el-table-column>
<el-table-column prop="" label="有效期" :min-width="100" :show-overflow-tooltip="false">
<template slot-scope="scope">
<div v-if="scope.row.cardEffectiveMode == 0">固定日期：{{formateDateTimeByType(scope.row.beginDate,'yyyy-MM-dd')+'至'+ formateDateTimeByType(scope.row.endDate,'yyyy-MM-dd')}}</div>
<div v-if="scope.row.cardEffectiveMode == 1">领取后{{(scope.row.startDay === 0 ? '当':scope.row.startDay) +'天，有效天数'+ scope.row.limitDay}}天</div>
</template>
</el-table-column>
<el-table-column prop="cardLimit" :show-overflow-tooltip="false" label="领取限制" width="90">
<template slot-scope="scope">
{{scope.row.cardLimit}}张/人
</template>
</el-table-column>
<el-table-column :show-overflow-tooltip="false" :width="90" align="left" prop="storeMode" label="适用门店">
<template slot-scope="scope">
{{scope.row.storeMode === 0?'所有门店':(scope.row.storeMode === 1?'部分分组':'部分门店')}}
</template>
</el-table-column>
<el-table-column :show-overflow-tooltip="false" :width="100" align="left" prop="couponStock" label="库存"></el-table-column>
</el-table>
<el-table-column
label="卡券名称">
<template slot-scope="scope">{{ scope.row.cardName }}</template>
</el-table-column>
<el-table-column
prop="subName"
label="备注名">
</el-table-column>
<el-table-column
prop=""
label="有效期"
width="100">
<template slot-scope="scope">
<div v-if="scope.row.cardEffectiveMode == 0">{{scope.row.beginDate+'-'+ scope.row.endDate}}</div>
<div v-if="scope.row.cardEffectiveMode == 1">领取{{scope.row.startDay +'-'+ scope.row.limitDay}}天后,可以使用</div>
</template>
</el-table-column>
<el-table-column
prop=""
label="领取限制"
width="100">
<template slot-scope="scope">
每人限制{{scope.row.cardLimit}}张
</template>
</el-table-column>
<el-table-column
prop=""
label="适用门店"
width="100">
<template slot-scope="scope">
<div v-if="scope.row.storeMode == 0">所有门店</div>
<div v-if="scope.row.storeMode == 1">部分分组</div>
<div v-if="scope.row.storeMode == 2">部分门店</div>
</template>
</el-table-column>
<el-table-column
prop="couponStock"
label="库存"
width="130">
</el-table-column>
</el-table>
<div class="pagination" v-if="total>0">
<el-pagination
@current-change="cardCurrentChange"
:current-page="cardCurrentPage"
small
:page-size="cardPageSize"
layout="prev, pager, next"
:total="total">
</el-pagination>
</div>
<div class="pagination" v-if="total>0">
<el-pagination
@current-change="cardCurrentChange"
:current-page="cardCurrentPage"
:page-size="cardPageSize"
layout="prev, pager, next"
:total="total">
</el-pagination>
</div>
</div>
<div slot="footer" class="dialog-footer">
<el-button @click="dialogCardcancel">取 消</el-button>
<el-button @click="dialogCardcancel">关 闭</el-button>
<el-button type="primary" @click="dialogCardConfirm">确 定</el-button>
</div>
</el-dialog>
......@@ -94,13 +67,55 @@
<script>
// import { getRequest } from './api';
/**
* @param {*时间} date
* @param {*转换的格式} type
*/
const formateDateTimeByType = (date, type = 'yyyy-MM-dd-HH-mm-ss') => {
if (!date){return ''}
if (typeof date === 'number') {
date = new Date(date);
}
if (typeof date === 'string') {
return date
} else {
var year = type.indexOf('yyyy') >= 0 ? (fillZero(date.getFullYear())) : '';
var month = type.indexOf('MM') >= 0 ? ('-' + fillZero(date.getMonth() + 1)) : '';
var day = type.indexOf('dd') >= 0 ? ('-' + fillZero(date.getDate())+'') : '';
var hours = type.indexOf('HH') >= 0 ? (' ' + fillZero(date.getHours())) : '';
var min = type.indexOf('mm') >= 0 ? (':' + fillZero(date.getMinutes())) : '';
var sec = type.indexOf('ss') >= 0 ? (':' + fillZero(date.getSeconds())) : '';
// console.log(year+month+day+hours+min+sec);
return year + month + day + hours + min + sec;
}
}
/**
* 补零
* @param {String/Number} num
*/
const fillZero = (num) => {
num = num * 1;
if (num < 10) {
return '0' + num;
} else {
return num;
}
}
import qs from 'qs';
export default {
name: 'vue-gic-card',
props:{
disabledList:{
type:Array,
default:[],
default() {
return []
},
},
showCardDialog:{
type:Boolean,
......@@ -119,6 +134,17 @@
default:null,
}
},
computed:{
limitTips() {
if (this.cardLimitType === 2) {
return '领取限制领取 1~100的卡券，系统已过滤，符合条件共';
} else if (this.cardLimitType === 3) {
return '领取限制领取>=100 的卡券，系统已过滤，符合条件共';
} else {
return '领取限制>1的卡券不支持选择，系统已过滤，符合条件共';
}
}
},
data () {
return {
......@@ -136,6 +162,7 @@
// 获取 location origin
baseUrl: '',
formateDateTimeByType
}
},
beforeMount() {
......@@ -148,6 +175,13 @@
}
},
methods:{
add() {
window.open('/marketing/#/card/add');
},
refresh() {
this.cardCurrentPage = 1;
this.getCardList();
},
handleCurrentChangeTable(val) { // 当前格发生变化时触发
if (!val.disabled) {
this.radio = val.coupCardId;
......@@ -321,11 +355,14 @@
width: 180px;
}
.attention-textAndImg-wrap /deep/{
.text-img-search__wrap{
}
.text-img-search {
margin: 10px 15px;
font-size: 14px;
color: #292929;
height: 36px;
padding-bottom:22px;
line-height: 36px;
> span{
float: left;
......@@ -334,10 +371,6 @@
/deep/.search-input{
width: 180px;
.el-input__inner {
height: 36px;
line-height: 36px;
}
}
.search-btn{
margin-left: 4px;
......@@ -348,7 +381,6 @@
line-height: 1;
padding-top: 4px;
display: inline-block;
margin-left: 20px;
}
}
.pic-list-box{
......
src/test/component/dmStore/index.vue
......@@ -98,6 +98,8 @@ export default {
}
},
created() {
console.log(this.isAdd)
if (this.options instanceof Array) {
leftList.map( v => {
if (this.options.indexOf(v.value) >= 0) {
......
src/test/component/dmStore/options/option-area.vue
......@@ -107,7 +107,11 @@ export default {
},
created() {
this.getAreaTree();
if (!this.isAdd) {
this.copyStoreWidget();
}
console.log(this.uuid,this.cacheUuid);
},
methods:{
// 获取树形结构
......@@ -230,6 +234,16 @@ export default {
}).catch(err => {
console.log(err)
})
},
// 把老数据拷贝到新的临时id上
copyStoreWidget() {
this.axios.get(baseUrl + '/api-plug/copy-store-widget?requestProject=gic-web&oldKey='+this.uuid+'&newKey='+this.cacheUuid).then(res => {
if(res.data.errorCode === 0) {
console.log('拷贝成功');
}
})
}
}
}
......
src/test/component/dmStore/options/option-group.vue
......@@ -103,6 +103,9 @@ export default {
this.getLeftList().then(_ => {
this.getRightList();
});
if (!this.isAdd) {
this.copyStoreWidget();
}
console.log(this.uuid,this.cacheUuid);
},
methods:{
......@@ -206,6 +209,14 @@ export default {
handleCheckAllChange(val) {
this.leftCheckList = val ? this.leftList.map(v => v.tagId) : [];
},
// 把老数据拷贝到新的临时id上
copyStoreWidget() {
this.axios.get(baseUrl + '/api-plug/copy-store-widget?requestProject=gic-web&oldKey='+this.uuid+'&newKey='+this.cacheUuid).then(res => {
if(res.data.errorCode === 0) {
console.log('拷贝成功');
}
})
}
}
}
</script>
......
src/test/component/dmStore/options/option-part.vue
......@@ -121,6 +121,9 @@ export default {
this.initLeftList();
// 初始化右侧列表
this.initRightList();
if (!this.isAdd) {
this.copyStoreWidget();
}
console.log(this.uuid,this.cacheUuid);
},
computed:{
......@@ -302,6 +305,14 @@ export default {
// 选中所有数据
handleCheckAllChange(val) {
this.leftCheckList = val ? this.leftList.map(v => v.storeId) : [];
},
// 把老数据拷贝到新的临时id上
copyStoreWidget() {
this.axios.get(baseUrl + '/api-plug/copy-store-widget?requestProject=gic-web&oldKey='+this.uuid+'&newKey='+this.cacheUuid).then(res => {
if(res.data.errorCode === 0) {
console.log('拷贝成功');
}
})
}
}
}
......
src/test/component/dmStore/options/option-tags.vue
......@@ -119,6 +119,9 @@ export default {
created() {
this.getLeftList();
this.rightSearch();
if (!this.isAdd) {
this.copyStoreWidget();
}
console.log(this.uuid,this.cacheUuid);
},
methods:{
......@@ -142,7 +145,6 @@ export default {
getRightList() {
return new Promise((resolve,reject) => {
this.moreLoading = true;
console.log(this.isCache)
this.rightParams.key = this.isCache ? this.cacheUuid : this.uuid;
this.rightParams.search = this.rightValue;
this.axios.post(baseUrl + '/api-plug/list-right-data?requestProject=gic-web',qs.stringify(this.rightParams)).then(res => {
......@@ -251,6 +253,14 @@ export default {
})
}
})
},
// 把老数据拷贝到新的临时id上
copyStoreWidget() {
this.axios.get(baseUrl + '/api-plug/copy-store-widget?requestProject=gic-web&oldKey='+this.uuid+'&newKey='+this.cacheUuid).then(res => {
if(res.data.errorCode === 0) {
console.log('拷贝成功');
}
})
}
}
}
......
src/test/component/dmStore/options/option-type.vue
......@@ -42,6 +42,9 @@ export default {
},
created() {
this.getRightList();
if (!this.isAdd) {
this.copyStoreWidget();
}
console.log(this.uuid,this.cacheUuid);
},
data() {
......@@ -125,6 +128,14 @@ export default {
console.log(err)
})
},
// 把老数据拷贝到新的临时id上
copyStoreWidget() {
this.axios.get(baseUrl + '/api-plug/copy-store-widget?requestProject=gic-web&oldKey='+this.uuid+'&newKey='+this.cacheUuid).then(res => {
if(res.data.errorCode === 0) {
console.log('拷贝成功');
}
})
}
}
}
</script>
......
src/views/calllog/index.vue
......@@ -27,7 +27,7 @@
</el-table-column>
<el-table-column align="left" min-width="150" prop="memberId" label="被叫(会员)">
<template slot-scope="scope">
<img class="vertical-middle table__avatar--40" :src="scope.row.photeUrl || defaultAvatar" width="60" height="60" alt="">
<img class="vertical-middle table__avatar--40" :src="filterAvatar(scope.row.photeUrl)" width="60" height="60" alt="">
<div class="inline-block vertical-middle">
<p class="table-name--ellipsis">{{scope.row.name|| '--'}}</p>
<p class="fz13 gray">{{scope.row.phoneNumber || '--'}}</p>
......@@ -61,8 +61,10 @@
<script>
import {callLogList} from '@/service/api/calllogApi.js';
import {formateDateTimeByType} from '@/utils/index.js';
import filterAvatar from '@/mixins/filterAvater.js';
export default {
name: 'call-log',
mixins: [filterAvatar],
data () {
const _vm = this;
return {
......
src/views/card/cardInfo.js
......@@ -40,7 +40,7 @@ const initForm = {
verificationType:0,
cardDenomination:0,
proNoList:[],
storeMode:1
storeMode:0
}
const sale_limit = { fee:0,goods:'',flag:false,type:0}; //最低消费
const goods = {ok:'',no:'',flag:false};
......@@ -116,25 +116,13 @@ export default {
methods:{
//切换卡券类型 表单置为默认值
reset(e) {
// debugger
console.log('5'+e)
// try {
// this.$refs.form.resetFields();
// } catch (e) {
// console.log(e)
// }
this.form = JSON.parse(JSON.stringify(initForm));
this.sale_limit = JSON.parse(JSON.stringify(sale_limit));
this.goods = JSON.parse(JSON.stringify(goods));
this.form.cardType = e;
this.$nextTick(_ => {
// if (this.form.cardType === 2) {
this.$refs.storeCard.initLeftList();
// }
this.$refs.storeCard.initLeftList();
})
// console.log(this.form.storeMode,val);
},
//卡券营销--卡券库--新建/修改卡券--放入卡券展架--所有展架集合
cardGetShelfs() {
......
src/views/card/partials/shelf-add.vue
<template>
<el-dialog title="添加卡券" :visible.sync="show" width="80%" :before-close="close">
<el-dialog title="选择卡券" :visible.sync="show" width="800px" :before-close="close">
<div class="pb10 clearfix">
<div class="fl">
<el-input v-model="listParams.searchParams" class="w250" placeholder="请输入卡券名/备注名" clearable @change="cardPageList"><i slot="prefix" class="el-input__icon el-icon-search"></i></el-input>
<el-input v-model="listParams.searchParams" class="w200" placeholder="请输入卡券名/备注名" clearable @change="cardPageList"><i slot="prefix" class="el-input__icon el-icon-search"></i></el-input>
<span class="fz12 gray">领取限制>1的卡券不支持选择，系统已过滤，符合条件共{{total}}张。</span>
</div>
<div class="fr">
......@@ -12,39 +12,25 @@
</div>
<el-table tooltipEffect="light" ref="multipleTable" :data="tableList" style="width: 100%;cursor:pointer;" @row-click="rowClick" v-loading="loading" @selection-change="handleSelectionChange">
<el-table-column type="selection" align="center" label="选择"></el-table-column>
<el-table-column :show-overflow-tooltip="false" :min-width="100" align="left" prop="cardName" label="卡券名称">
<template slot-scope="scope">
<el-popover v-if="scope.row.cardName && scope.row.cardName.length > 10" placement="top-start" width="200" trigger="hover" :content="scope.row.cardName">
<div class="ellipsis" slot="reference">{{scope.row.cardName}}</div>
</el-popover>
<span v-else>{{scope.row.cardName}}</span>
</template>
</el-table-column>
<el-table-column :show-overflow-tooltip="true" :min-width="100" align="left" prop="subName" label="备注名">
<template slot-scope="scope">
<el-popover v-if="scope.row.subName && scope.row.subName.length > 10" placement="top-start" width="200" trigger="hover" :content="scope.row.subName">
<div class="ellipsis" slot="reference">{{scope.row.subName}}</div>
</el-popover>
<span v-else>{{scope.row.subName}}</span>
</template>
</el-table-column>
<el-table-column prop="" label="有效期" :min-width="100" :show-overflow-tooltip="false">
<template slot-scope="scope">
<div v-if="scope.row.cardEffectiveMode == 0">{{scope.row.beginDate+'-'+ scope.row.endDate}}</div>
<div v-if="scope.row.cardEffectiveMode == 1">领取{{scope.row.startDay +'-'+ scope.row.limitDay}}天后,可以使用</div>
</template>
</el-table-column>
<el-table-column prop="cardLimit" :show-overflow-tooltip="false" label="领取限制" :min-width="90">
<template slot-scope="scope">
{{scope.row.cardLimit}}张
</template>
</el-table-column>
<el-table-column :show-overflow-tooltip="false" :min-width="90" align="left" prop="storeMode" label="适用门店">
<template slot-scope="scope">
{{scope.row.storeMode === 0?'所有门店':(scope.row.storeMode === 1?'部分分组':'部分门店')}}
</template>
</el-table-column>
<el-table-column :show-overflow-tooltip="false" :min-width="100" align="left" prop="couponStock" label="库存"></el-table-column>
<el-table-column :show-overflow-tooltip="true" :min-width="100" align="left" prop="cardName" label="卡券名称"></el-table-column>
<el-table-column :show-overflow-tooltip="true" :min-width="100" align="left" prop="subName" label="备注名"></el-table-column>
<el-table-column prop="" label="有效期" :min-width="100" :show-overflow-tooltip="false">
<template slot-scope="scope">
<div v-if="scope.row.cardEffectiveMode == 0">固定日期：{{formateDateTimeByType(scope.row.beginDate,'yyyy-MM-dd')+'至'+ formateDateTimeByType(scope.row.endDate,'yyyy-MM-dd')}}</div>
<div v-if="scope.row.cardEffectiveMode == 1">领取后{{(scope.row.startDay === 0 ? '当':scope.row.startDay) +'天，有效天数'+ scope.row.limitDay}}天</div>
</template>
</el-table-column>
<el-table-column prop="cardLimit" :show-overflow-tooltip="false" label="领取限制" width="90">
<template slot-scope="scope">
{{scope.row.cardLimit}}张/人
</template>
</el-table-column>
<el-table-column :show-overflow-tooltip="false" :width="90" align="left" prop="storeMode" label="适用门店">
<template slot-scope="scope">
{{scope.row.storeMode === 0?'所有门店':(scope.row.storeMode === 1?'部分分组':'部分门店')}}
</template>
</el-table-column>
<el-table-column :show-overflow-tooltip="false" :width="100" align="left" prop="couponStock" label="库存"></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">
......@@ -151,7 +137,7 @@ export default {
},
refresh() {
this.listParams.currentPage = 1;
this.getCardList();
this.cardPageList();
}
},
filters:{
......
src/views/card/partials/status-render.js
......@@ -23,18 +23,39 @@ export default Vue.component('render-temp', {
const statusFaildhtml = <span>{bind6}{bind3}{bind4}</span>;
const _html = (this.item.cardEffectiveMode == 0 && (this.item.endDate < Date.now())) ? overDateHtml : statushtml;
// this.item.autingFaildMsg = '属性用于设置何时触发 Popover，支持四种触发方式：hover，click';
let failMsg = '';
if (this.item.autingFaildMsg) {
failMsg = '：' + this.item.autingFaildMsg;
if (this.item.autingFaildMsg.length > 8) {
failMsg = (<el-popover
placement="top-start"
title=""
width="200"
trigger="hover"
content={this.item.autingFaildMsg}>
<span class="danger-color" slot="reference">：{this.item.autingFaildMsg.substring(0,8)+'...'}</span>
</el-popover>);
}
};
if (this.item.auditingStatus === 0) {
return (<div class="fr"><span class="green">审核中</span></div>)
}else if (this.item.auditingStatus === -1) {
return (<div class="fr"><span class="danger-color">{this.item.autingFaildMsg || '审核失败'}</span>{statusFaildhtml}</div>)
}else if (this.item.auditingStatus === -2)
return (<div class="fr"><span class="danger-color">{this.item.autingFaildMsg || '更新失败'}</span>{_html}</div>)
else if (this.item.useCustomCode == 1 && this.item.customCodeSync == 1)
return (<div class="fr"><span class="danger-color">审核失败{failMsg}{statusFaildhtml}</span></div>)
}else if (this.item.auditingStatus === -2) {
return (<div class="fr"><span class="danger-color">更新失败{failMsg}{_html}</span></div>)
}
else if (this.item.useCustomCode == 1 && this.item.customCodeSync == 1){
return (<div class="fr"><span class="danger-color">正在上传卡券Code</span></div>)
else if (this.item.stock === 0)
}
else if (this.item.stock === 0){
return (<div class="fr">{statusNostockhtml}</div>)
else if (this.item.cardLimit && this.item.cardLimit == 1)
}
else if (this.item.cardLimit && this.item.cardLimit == 1){
return (<div class="fr">{_html}</div>)
else return (<div class="fr">{noputonStatushtml}</div>)
}
else {
return (<div class="fr">{noputonStatushtml}</div>)
}
}
});
src/views/card/record-cache.vue
......@@ -4,7 +4,7 @@
<div class="pb22">
<el-input v-model="listParams.cardName" class="w250" placeholder="请输入卡券名称" @change="search"><i slot="prefix" class="el-input__icon el-icon-search"></i></el-input>
<el-input v-model="listParams.nickName" class="w250" placeholder="请输入用户昵称" @change="search"><i slot="prefix" class="el-input__icon el-icon-search"></i></el-input>
<el-button class="fr" type="primary" icon="iconfont icon-icon_yunxiazai fz14" @click="exportTemplateReceivedExcel"> 导出订单</el-button>
<el-button class="fr" type="primary" icon="iconfont icon-icon_yunxiazai fz14" @click="exportTemplateReceivedExcel"> 导出记录</el-button>
</div>
<div class="filter--box">
<el-select class="dm-select pl10" v-model="listParams.cardType" placeholder="选择卡券类型" @change="search">
......@@ -14,7 +14,7 @@
<el-option v-for="(item,index) in statusOptions" :key="index" :label="item.label" :value="item.value"></el-option>
</el-select>
<span class="vertical-middle">领取时间：</span><el-date-picker v-model="dateTime" :clearable="false" @change="search" class="w250" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
<span class="vertical-middle">核销时间：</span><el-date-picker v-model="dateTime2" @change="search" class="w250" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
<span class="vertical-middle">关注时间：</span><el-date-picker v-model="dateTime2" @change="search" class="w250" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
</div>
<!-- 列表 -->
<el-table tooltipEffect="light" :data="recordList" style="width: 100%" v-loading="recordLoading" @sort-change="sortList">
......@@ -35,9 +35,9 @@
</el-table-column>
<el-table-column min-width="100" align="left" prop="attentionStatus" label="关注状态">
</el-table-column>
<el-table-column width="135" align="left" prop="transferDate" label="核销时间">
<el-table-column width="135" align="left" prop="transferDate" label="关注时间">
<template slot-scope="scope">
{{scope.row.useTime?formateDateTimeByType(scope.row.useTime,'yyyy-MM-dd-HH-mm'):'--'}}
{{scope.row.transferDate?formateDateTimeByType(scope.row.transferDate,'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="会员信息">
......@@ -62,7 +62,7 @@ export default {
return {
defaultAvatar:require('../../assets/img/head_default.png'),
formateDateTimeByType,
dateTime:[Date.now()-30*24*60*60*1000,Date.now()],
dateTime:[Date.now()-3*30*24*60*60*1000,Date.now()],
dateTime2:['',''],
statusOptions:[ {value:'',label:'全部关注状态'},{value:0,label:'已关注',},{ value:1,label:'未关注'}],
cardTypeOptions:[ {value:'',label:'全部卡券类型'},{value:0,label:'抵金券',},{ value:1,label:'折扣券'},{ value:2,label:'兑换券'}],
......@@ -132,8 +132,8 @@ export default {
this.listParams.attentionEndTime = '';
}
let res = await templateReceiveCardPage(this.listParams);
this.recordList = res.result.result;
this.total = res.result.totalCount;
this.recordList = (res.result && res.result.result) || [];
this.total = (res.result && res.result.totalCount) || 0;
this.recordLoading = false;
},
// 导出记录
......
src/views/card/record-send.vue
......@@ -18,7 +18,8 @@
<el-table-column v-for="(v,i) in recordHeader" :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"></el-table-column>
<el-table-column width="150" align="left" prop="cardName" label="状态">
<template slot-scope="scope">
<span :class="'dm-status--' + filterStatus(scope.row.putonStatus).type">{{filterStatus(scope.row.putonStatus).label}}</span>
<div v-if="scope.row.putonStatus === 2"><span class="dm-status--primary--flash"></span><span>正在发送</span></div>
<span v-else :class="'dm-status--' + filterStatus(scope.row.putonStatus).type">{{filterStatus(scope.row.putonStatus).label}}</span>
<div v-if="scope.row.putonStatus === 1">
<time-counts class="primary-color fz12" :defaultVal="scope.row.putonTime" :autoStart="true"></time-counts>
</div>
......
src/views/ecm/marketing-event/components/lib-card.vue
......@@ -2,16 +2,15 @@
<el-dialog title="选择卡券" :visible.sync="show" width="800px" :before-close="close">
<div class="clearfix pb22">
<div class="fl">
<span>共{{total}}条</span>
<el-input v-model="listParams.searchParam" class="w200" clearable placeholder="请输入卡券名称" @change="refresh"><i slot="prefix" class="el-input__icon el-icon-search"></i></el-input>
<span class="fz12 gray pl20">{{limitTips}} </span>
<el-input v-model="listParams.searchParam" class="w200" clearable placeholder="请输入卡券名/备注名" @change="refresh"><i slot="prefix" class="el-input__icon el-icon-search"></i></el-input>
<span class="fz12 gray">{{limitTips}}{{total}}张。 </span>
</div>
<div class="fr">
<el-button type="primary" @click="add">新建卡券</el-button>
<el-button @click="refresh">刷新列表</el-button>
</div>
</div>
<el-table tooltipEffect="light" :data="tableList" :height="360" row-class-name="cursor-pointer" style="width: 100%" v-loading="loading" @row-click="rowClick">
<el-table tooltipEffect="light" :data="tableList" row-class-name="cursor-pointer" style="width: 100%" v-loading="loading" @row-click="rowClick">
<el-table-column :show-overflow-tooltip="false" width="60" align="center" prop="coupCardId">
<template slot-scope="scope">
<div class="sms-record_left label-hidden">
......@@ -19,15 +18,25 @@
</div>
</template>
</el-table-column>
<el-table-column :show-overflow-tooltip="false" align="left" prop="cardName" label="卡券名称"></el-table-column>
<el-table-column :show-overflow-tooltip="false" :width="100" align="left" prop="cardLimit" label="领取限制"></el-table-column>
<el-table-column :show-overflow-tooltip="false" :width="120" align="left" prop="storeMode" label="适用门店">
<el-table-column :show-overflow-tooltip="true" :min-width="100" align="left" prop="cardName" label="卡券名称"></el-table-column>
<el-table-column :show-overflow-tooltip="true" :min-width="100" align="left" prop="subName" label="备注名"></el-table-column>
<el-table-column prop="" label="有效期" :min-width="100" :show-overflow-tooltip="false">
<template slot-scope="scope">
<div v-if="scope.row.cardEffectiveMode == 0">固定日期：{{formateDateTimeByType(scope.row.beginDate,'yyyy-MM-dd')+'至'+ formateDateTimeByType(scope.row.endDate,'yyyy-MM-dd')}}</div>
<div v-if="scope.row.cardEffectiveMode == 1">领取后{{(scope.row.startDay === 0 ? '当':scope.row.startDay) +'天，有效天数'+ scope.row.limitDay}}天</div>
</template>
</el-table-column>
<el-table-column prop="cardLimit" :show-overflow-tooltip="false" label="领取限制" width="90">
<template slot-scope="scope">
{{scope.row.cardLimit}}张/人
</template>
</el-table-column>
<el-table-column :show-overflow-tooltip="false" :width="90" align="left" prop="storeMode" label="适用门店">
<template slot-scope="scope">
{{scope.row.storeMode === 0?'所有门店':(scope.row.storeMode === 1?'部分分组':'部分门店')}}
</template>
</el-table-column>
<el-table-column :show-overflow-tooltip="false" :width="100" align="left" prop="couponStock" label="库存"></el-table-column>
<el-table-column :show-overflow-tooltip="true" align="left" prop="subName" label="描述"></el-table-column>
</el-table>
<el-pagination v-show="tableList.length" class="dm-pagination" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="listParams.currentPage" :page-sizes="[10, 20, 30, 40]" :page-size="listParams.pageSize" layout="prev, pager, next" :total="total"></el-pagination>
<span slot="footer" class="dialog-footer">
......@@ -39,6 +48,7 @@
<script>
import {getCardList} from '../assets/api.js';
import {formateDateTimeByType} from '../assets/utils.js';
export default {
name:'lib-card',
props:{
......@@ -54,20 +64,21 @@ export default {
computed:{
limitTips() {
if (this.cardLimitType === 2) {
return '领取限制领取 1~100的卡券，系统已过滤。';
return '领取限制领取 1~100的卡券，系统已过滤，符合条件共';
} else if (this.cardLimitType === 3) {
return '领取限制领取>=100 的卡券，系统已过滤。';
return '领取限制领取>=100 的卡券，系统已过滤，符合条件共';
} else {
return '领取限制>1的卡券不支持选择，系统已过滤。';
return '领取限制>1的卡券不支持选择，系统已过滤，符合条件共';
}
}
},
data(){
return{
formateDateTimeByType,
listParams:{
searchParam:'',
currentPage:1,
pageSize:10,
pageSize:5,
requestProject:'gic-web',
cardLimitType:this.cardLimitType,
cardType:''
......
src/views/ecm/marketing-event/components/lib-image.vue
......@@ -145,6 +145,14 @@ export default {
this.$emit('update:show',false);
},
rowClick(row) {
// 可以取消
if (row.imageId === this.selectedId[0]) {
row.comName = '';
row.title = '';
this.selectedId = [];
this.selectedData = {};
return;
}
row.comName = 'image';
row.title = row.imageTitle;
this.selectedId = [row.imageId];
......
src/views/evaluation/newest.vue
......@@ -2,19 +2,19 @@
<section class="eval-newest dm-wrap">
<div class="clearfix pb22">
<vue-gic-store-group width="240" class="pr5" :model="storeGroupData" @commit-store="getStoreGroup"></vue-gic-store-group>
<el-date-picker v-if="$route.meta.type !== 'bad'" class="w250" v-model="dateTime" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" @change="latestEvaluationList"></el-date-picker>
<el-input v-model="listParams.searchName" class="w300" placeholder="订单号/门店名称/会员姓名/卡号" clearable @change="latestEvaluationList"><i slot="prefix" class="el-input__icon el-icon-search"></i></el-input>
<el-date-picker v-if="$route.meta.type !== 'bad'" class="w250" v-model="dateTime" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" @change="refresh"></el-date-picker>
<el-input v-model="listParams.searchName" class="w300" placeholder="订单号/门店名称/会员姓名/卡号" clearable @change="refresh"><i slot="prefix" class="el-input__icon el-icon-search"></i></el-input>
<el-button icon="iconfont icon-icon_yunxiazai fz14" v-if="$route.meta.type !== 'bad'" class="fr" type="primary" @click="exportLatestEvaluate"> 下载Excel</el-button>
</div>
<div class="filter--box">
<el-select size="small" v-if="$route.meta.type === 'bad'" class="vertical-middle pl10 w150" v-model="badStatus" placeholder="选择差评类型" @change="$router.push('/evaluation/bad/'+badStatus)">
<el-option v-for="item in badOptions" :key="item.msg" :label="item.msg" :value="item.msg"></el-option>
</el-select>
<el-select size="small" class="vertical-middle pl10 w150" v-model="listParams.visiteStatus" placeholder="选择发送状态" @change="latestEvaluationList">
<el-select size="small" class="vertical-middle pl10 w150" v-model="listParams.visiteStatus" placeholder="选择发送状态" @change="refresh">
<el-option v-for="item in visiteStatusOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
</el-select>
<el-checkbox class="vertical-middle" size="small" border v-if="$route.meta.type !== 'bad'" :true-label="1" :false-label="0" v-model="listParams.isBad" @change="latestEvaluationList">不良评价</el-checkbox>
<el-checkbox class="vertical-middle" size="small" border v-if="$route.meta.type !== 'bad'" :true-label="1" :false-label="0" v-model="listParams.isContent" @change="latestEvaluationList">有评语</el-checkbox>
<el-checkbox class="vertical-middle" size="small" border v-if="$route.meta.type !== 'bad'" :true-label="1" :false-label="0" v-model="listParams.isBad" @change="refresh">不良评价</el-checkbox>
<el-checkbox class="vertical-middle" size="small" border v-if="$route.meta.type !== 'bad'" :true-label="1" :false-label="0" v-model="listParams.isContent" @change="refresh">有评语</el-checkbox>
</div>
<el-table tooltipEffect="light" :data="tableList" style="width: 100%" v-loading="loading" element-loading-text="拼命加载中">
<el-table-column :show-overflow-tooltip="false" width="90" align="left" prop="showStatus" fixed="left" label="服务号显示">
......@@ -106,16 +106,18 @@
</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>
<reply :show.sync="replyShow" :id="replyId" @refresh="latestEvaluationList"></reply>
<reply :show.sync="replyShow" :id="replyId" @refresh="getTableList"></reply>
</section>
</template>
<script>
import {latestEvaluationList,evaluateBad,evaluationStoreExists,allocateEvaluation,changeShowStatus,exportLatestEvaluate} from '@/service/api/evaluationApi.js';
import {formateDateTimeByType,filterAvatar} from '@/utils/index.js'
import reply from './reply'
import storeGroup from '@/components/storeGroup'
import {formateDateTimeByType,filterAvatar} from '@/utils/index.js';
import reply from './reply';
import storeGroup from '@/components/storeGroup';
import tableMethods from '@/mixins/tableMethods.js';
export default {
name: 'newest',
mixins:[tableMethods],
data () {
let _vm = this;
return {
......@@ -136,7 +138,7 @@ export default {
}
},
created() {
this.latestEvaluationList();
this.getTableList();
if (this.$route.params.type) {
this.$store.commit('mutations_breadcrumb',[{name:'企业管理',path:''},{name:'服务监督',path:'/evaluation'},{name:'评价概览',path:'/evaluation/index/charts'},{name:'差评详情',path:''}])
} else {
......@@ -145,7 +147,7 @@ export default {
},
watch:{
$route(val){
this.latestEvaluationList();
this.getTableList();
}
},
components:{
......@@ -155,7 +157,7 @@ export default {
methods: {
getStoreGroup(val) {
this.listParams.currentStoreGroupId = val.storeGroupId || '';
this.latestEvaluationList();
this.getTableList();
},
//回复
replyData(row){
......@@ -188,7 +190,7 @@ export default {
})
if(res.errorCode === 0) {
this.$tips({type: 'warning',message: '分配成功'});
this.latestEvaluationList();
this.getTableList();
}
} else {
this.$tips({type: 'warning',message: '门店不存在，不能执行分配操作'});
......@@ -207,7 +209,7 @@ export default {
}).then(res => {
if(res.errorCode === 0) {
this.$tips({type: 'warning',message: '操作成功'});
this.latestEvaluationList();
this.getTableList();
}
})
}).catch(() => {
......@@ -217,18 +219,9 @@ export default {
//服务号显示隐藏
async changeShow(row) {
let res = await changeShowStatus({evaluateId:row.evaluateId,showStatus:row.showStatus});
this.latestEvaluationList();
this.getTableList();
},
handleSizeChange(val) {
this.listParams.pageSize = val;
this.latestEvaluationList();
},
handleCurrentChange(val) {
this.listParams.currentPage = val;
this.latestEvaluationList();
},
async latestEvaluationList(val) {
async getTableList(val) {
if (this.$route.meta.type === 'bad') {
try {
this.loading = true;
......
src/views/game/dzp/record.vue
......@@ -15,7 +15,7 @@
<template slot-scope="scope">
<div v-if="scope.row.memberDTO">
<a :href="'/member/#/wechatmemberDetail?memberId='+scope.row.memberDTO.memberId" target="_blank">
<img class="vertical-middle table__avatar--40" :src="scope.row.memberDTO.thirdImgUrl" width="60" height="60" alt="" srcset="">
<img class="vertical-middle table__avatar--40" :src="filterAvatar(scope.row.memberDTO.thirdImgUrl)" width="60" height="60" alt="" srcset="">
<div class="inline-block vertical-middle">
<p class="table-name--ellipsis">{{scope.row.memberDTO.memberName || '--'}}</p>
</div>
......@@ -57,28 +57,30 @@
</template>
<script>
import {loadLotteryRecordList,exportLotteryExcel,url} from '@/service/api/gameApi.js';
import {formateDateTimeByType} from '@/utils/index.js'
import {formateDateTimeByType} from '@/utils/index.js';
import filterAvatar from '@/mixins/filterAvater.js';
export default {
mixins: [filterAvatar],
data() {
return {
prizeTypeOptions:[{value:'',label:'所有类型'},{value:1,label:'积分'} ,{value:2,label:'卡券'}],
loading:false,
listParams:{
gameId:this.$route.params.id,
gameType:1,
prizeType:'',
searchParam:'',
gameStatus:'',
freeFlag:0,
startDate:'',
endDate:'',
currentPage:1, //是 Number 当前页面
pageSize:20 //是 Number 每页显示条数
},
total:0,
recordList:[],
recordHeader:[],
dateTime:['','']
prizeTypeOptions:[{value:'',label:'所有类型'},{value:1,label:'积分'} ,{value:2,label:'卡券'}],
loading:false,
listParams:{
gameId:this.$route.params.id,
gameType:1,
prizeType:'',
searchParam:'',
gameStatus:'',
freeFlag:0,
startDate:'',
endDate:'',
currentPage:1, //是 Number 当前页面
pageSize:20 //是 Number 每页显示条数
},
total:0,
recordList:[],
recordHeader:[],
dateTime:['','']
};
},
created(){
......@@ -122,7 +124,7 @@ import {formateDateTimeByType} from '@/utils/index.js'
},
formatterTime(row){
return formateDateTimeByType(row.winDate,'yyyy-MM-dd-HH-mm-ss');
}
},
}
};
</script>
......
src/views/game/ggk/record.vue
......@@ -15,7 +15,7 @@
<template slot-scope="scope">
<div v-if="scope.row.memberDTO">
<a :href="'/member/#/wechatmemberDetail?memberId='+scope.row.memberDTO.memberId" target="_blank">
<img class="vertical-middle table__avatar--40" :src="scope.row.memberDTO.thirdImgUrl" width="60" height="60" alt="" srcset="">
<img class="vertical-middle table__avatar--40" :src="filterAvatar(scope.row.memberDTO.thirdImgUrl)" width="60" height="60" alt="" srcset="">
<div class="inline-block vertical-middle">
<p class="table-name--ellipsis">{{scope.row.memberDTO.memberName || '--'}}</p>
</div>
......@@ -58,7 +58,9 @@
<script>
import {loadLotteryRecordList,exportLotteryExcel,url} from '@/service/api/gameApi.js';
import {formateDateTimeByType} from '@/utils/index.js'
import filterAvatar from '@/mixins/filterAvater.js';
export default {
mixins: [filterAvatar],
data() {
return {
prizeTypeOptions:[{value:'',label:'所有类型'},{value:1,label:'积分'} ,{value:2,label:'卡券'}],
......
src/views/game/klfl/record.vue
......@@ -15,7 +15,7 @@
<el-table-column :min-width="150" align="left" label="会员信息">
<template slot-scope="scope">
<a :href="'/member/#/wechatmemberDetail?memberId='+scope.row.memberId" target="_blank">
<img class="vertical-middle table__avatar--40" width="60" height="60" :src="scope.row.imgUrl" alt="" srcset="">
<img class="vertical-middle table__avatar--40" width="60" height="60" :src="filterAvatar(scope.row.imgUrl)" alt="" srcset="">
<div class="inline-block vertical-middle">
<p class="table-name--ellipsis">{{scope.row.memberName || '--'}}</p>
</div>
......@@ -30,7 +30,9 @@
<script>
import {klflReportList,url,klflRecordExcel} from '@/service/api/gameApi.js';
import {formateDateTimeByType} from '@/utils/index.js'
import filterAvatar from '@/mixins/filterAvater.js';
export default {
mixins: [filterAvatar],
created() {
this.klflReportList();
this.$store.commit('mutations_breadcrumb',[{name:'营销管理',path:''},{name:'游戏营销',path:'/game'},{name:'口令福利',path:'/game/klfl'},{name:'口令福利中奖记录',path:''}])
......
src/views/game/ptyx/record.vue
......@@ -14,8 +14,8 @@
<el-table-column width="60" align="left" label="名次" prop="ranking"></el-table-column>
<el-table-column min-width="150" header-align="left" align="left" label="会员信息">
<template slot-scope="scope">
<a :href="'/member/#/wechatmemberDetail?memberId='+scope.row.memberId" target="_blank" class="sms-table_info">
<img class="vertical-middle table__avatar--40" :src="scope.row.memberPhotoUrl" alt="" srcset="">
<a :href="'/member/#/wechatmemberDetail?memberId='+scope.row.memberId" target="_blank">
<img class="vertical-middle table__avatar--40" :src="filterAvatar(scope.row.memberPhotoUrl)" alt="" srcset="">
<p class="inline-block vertical-middle">{{scope.row.memberName || '--'}}</p>
</a>
</template>
......@@ -34,8 +34,8 @@
<el-table tooltipEffect="light" :data="recordList" style="width:100%" v-loading="loading">
<el-table-column min-width="150" header-align="left" align="left" label="会员信息">
<template slot-scope="scope">
<a :href="'/member/#/wechatmemberDetail?memberId='+scope.row.memberId" target="_blank" class="sms-table_info">
<img class="vertical-middle" :src="scope.row.memberImage" alt="" srcset="">
<a :href="'/member/#/wechatmemberDetail?memberId='+scope.row.memberId" target="_blank">
<img class="vertical-middle table__avatar--40" :src="filterAvatar(scope.row.memberImage)" alt="" srcset="">
<p class="fz12 inline-block vertical-middle">{{scope.row.memberName}}</p>
</a>
</template>
......@@ -50,7 +50,9 @@
<script>
import {LoadPtyxRecordList,exportPtyxExcel,ptyxCalcTitle,url} from '@/service/api/gameApi.js';
import {formateDateTimeByType} from '@/utils/index.js'
import filterAvatar from '@/mixins/filterAvater.js';
export default {
mixins: [filterAvatar],
data() {
return {
gameStatusOptions:[{value:-1,label:'所有状态'},{value:2,label:'成功'} ,{value:1,label:'失败'}],
......
src/views/game/znm/record.vue
......@@ -13,8 +13,8 @@
<el-table-column width="60" align="left" label="名次" prop="ranking"></el-table-column>
<el-table-column align="left" label="会员信息">
<template slot-scope="scope">
<a :href="'/member/#/wechatmemberDetail?memberId='+scope.row.memberId" target="_blank" class="sms-table_info">
<img class="vertical-middle table__avatar--40" :src="scope.row.memberPhotoUrl" alt="" srcset="">
<a :href="'/member/#/wechatmemberDetail?memberId='+scope.row.memberId" target="_blank">
<img class="vertical-middle table__avatar--40" :src="filterAvatar(scope.row.memberPhotoUrl)" alt="" srcset="">
<div class="inline-block vertical-middle">
<p class="table-name--ellipsis">{{scope.row.memberName || '--'}}</p>
<p class="gray fz13">{{scope.row.memberNickName || '--'}}</p>
......@@ -37,8 +37,8 @@
<el-table tooltipEffect="light" :data="recordList" style="width:100%" v-loading="loading">
<el-table-column align="left" label="会员信息">
<template slot-scope="scope">
<a :href="'/member/#/wechatmemberDetail?memberId='+scope.row.memberId" target="_blank" class="sms-table_info">
<img class="vertical-middle table__avatar--40" :src="scope.row.memberImage" alt="" srcset="">
<a :href="'/member/#/wechatmemberDetail?memberId='+scope.row.memberId" target="_blank">
<img class="vertical-middle table__avatar--40" :src="filterAvatar(scope.row.memberImage)" alt="" srcset="">
<div class="inline-block vertical-middle">
<p class="table-name--ellipsis">{{scope.row.memberName || '--'}}</p>
<p class="gray fz13">{{scope.row.memberNickName || '--'}}</p>
......@@ -56,7 +56,9 @@
<script>
import {znmReportList,znmRankExcel,url,znmRecordExcel} from '@/service/api/gameApi.js';
import {formateDateTimeByType} from '@/utils/index.js'
import filterAvatar from '@/mixins/filterAvater.js';
export default {
mixins: [filterAvatar],
created() {
this.znmReportList();
this.znmReportList1();
......
src/views/wechat/editor.vue
......@@ -57,7 +57,7 @@
</el-form>
<!-- 图片弹窗 -->
<el-dialog title="提示" :visible.sync="imgShow" width="60%" :before-close="close">
<dm-img-box :activeId.sync="mediaId" :scrollStyle="{'maxHeight':'300px','overflowY':'auto','overflowX':'hidden'}"></dm-img-box>
<dm-img-box :activeId.sync="mediaId" :scrollStyle="{'maxHeight':'500px','overflowY':'auto','overflowX':'hidden'}"></dm-img-box>
<span slot="footer" class="dialog-footer"><el-button @click="close">关 闭</el-button></span>
</el-dialog>
<!-- 视频 -->
......@@ -82,7 +82,7 @@
<span slot="footer" class="dialog-footer"><el-button @click="close">取 消</el-button><el-button type="primary" @click="videoSubmit">确 定</el-button></span>
</el-dialog>
<!-- 卡券弹窗 -->
<el-dialog title="选择卡券" :visible.sync="cardShow" width="80%" :before-close="close">
<el-dialog title="选择卡券" :visible.sync="cardShow" width="800px" :before-close="close">
<cardTemp :activeId.sync="mediaId" :pageSize="5"></cardTemp>
<span slot="footer" class="dialog-footer"><el-button @click="close">取 消</el-button></span>
</el-dialog>
......
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