Commit e3b43aff by chenxin

fix:分页页码统一为[20,40,60,80];所有表格最后一页删除判断current-1;数据暂无图标css;

parent a45f51e4
'use strict' 'use strict';
const path = require('path') const path = require('path');
const config = require('../config') const config = require('../config');
const ExtractTextPlugin = require('extract-text-webpack-plugin') const ExtractTextPlugin = require('extract-text-webpack-plugin');
const packageConfig = require('../package.json') const packageConfig = require('../package.json');
exports.assetsPath = function (_path) { exports.assetsPath = function(_path) {
const assetsSubDirectory = process.env.NODE_ENV === 'production' const assetsSubDirectory = process.env.NODE_ENV === 'production' ? config.build.assetsSubDirectory : config.dev.assetsSubDirectory;
? config.build.assetsSubDirectory
: config.dev.assetsSubDirectory
return path.posix.join(assetsSubDirectory, _path) return path.posix.join(assetsSubDirectory, _path);
} };
exports.cssLoaders = function (options) { exports.cssLoaders = function(options) {
options = options || {} options = options || {};
const cssLoader = { const cssLoader = {
loader: 'css-loader', loader: 'css-loader',
options: { options: {
sourceMap: options.sourceMap sourceMap: options.sourceMap
} }
} };
const postcssLoader = { const postcssLoader = {
loader: 'postcss-loader', loader: 'postcss-loader',
options: { options: {
sourceMap: options.sourceMap sourceMap: options.sourceMap
} }
} };
// generate loader string to be used with extract text plugin // generate loader string to be used with extract text plugin
function generateLoaders (loader, loaderOptions) { function generateLoaders(loader, loaderOptions) {
const loaders = options.usePostCSS ? [cssLoader, postcssLoader] : [cssLoader] const loaders = options.usePostCSS ? [cssLoader, postcssLoader] : [cssLoader];
if (loader) { if (loader) {
loaders.push({ loaders.push({
...@@ -39,7 +37,7 @@ exports.cssLoaders = function (options) { ...@@ -39,7 +37,7 @@ exports.cssLoaders = function (options) {
options: Object.assign({}, loaderOptions, { options: Object.assign({}, loaderOptions, {
sourceMap: options.sourceMap sourceMap: options.sourceMap
}) })
}) });
} }
// Extract CSS when that option is specified // Extract CSS when that option is specified
...@@ -47,10 +45,11 @@ exports.cssLoaders = function (options) { ...@@ -47,10 +45,11 @@ exports.cssLoaders = function (options) {
if (options.extract) { if (options.extract) {
return ExtractTextPlugin.extract({ return ExtractTextPlugin.extract({
use: loaders, use: loaders,
// publicPath: '../../', //注意: 此处根据路径, 自动更改 解决css background img 找不到文件
fallback: 'vue-style-loader' fallback: 'vue-style-loader'
}) });
} else { } else {
return ['vue-style-loader'].concat(loaders) return ['vue-style-loader'].concat(loaders);
} }
} }
...@@ -63,39 +62,39 @@ exports.cssLoaders = function (options) { ...@@ -63,39 +62,39 @@ exports.cssLoaders = function (options) {
scss: generateLoaders('sass'), scss: generateLoaders('sass'),
stylus: generateLoaders('stylus'), stylus: generateLoaders('stylus'),
styl: generateLoaders('stylus') styl: generateLoaders('stylus')
} };
} };
// Generate loaders for standalone style files (outside of .vue) // Generate loaders for standalone style files (outside of .vue)
exports.styleLoaders = function (options) { exports.styleLoaders = function(options) {
const output = [] const output = [];
const loaders = exports.cssLoaders(options) const loaders = exports.cssLoaders(options);
for (const extension in loaders) { for (const extension in loaders) {
const loader = loaders[extension] const loader = loaders[extension];
output.push({ output.push({
test: new RegExp('\\.' + extension + '$'), test: new RegExp('\\.' + extension + '$'),
use: loader use: loader
}) });
} }
return output return output;
} };
exports.createNotifierCallback = () => { exports.createNotifierCallback = () => {
const notifier = require('node-notifier') const notifier = require('node-notifier');
return (severity, errors) => { return (severity, errors) => {
if (severity !== 'error') return if (severity !== 'error') return;
const error = errors[0] const error = errors[0];
const filename = error.file && error.file.split('!').pop() const filename = error.file && error.file.split('!').pop();
notifier.notify({ notifier.notify({
title: packageConfig.name, title: packageConfig.name,
message: severity + ': ' + error.name, message: severity + ': ' + error.name,
subtitle: filename || '', subtitle: filename || '',
icon: path.join(__dirname, 'logo.png') icon: path.join(__dirname, 'logo.png')
}) });
} };
} };
<!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.713444cdaef9806a882f97b885f25ac1.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.25.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.37634a54dc3492968d49.js></script></body></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.be62cf2c05933f1b21c25b9969e53fb9.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.25.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.2d7efdea45a945164b40.js></script></body></html>
\ No newline at end of file \ No newline at end of file
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -114,16 +114,16 @@ ...@@ -114,16 +114,16 @@
display: block; display: block;
width: 200px; width: 200px;
height: 200px; height: 200px;
background: url(/marketing/static/img/chart-no-data.png) no-repeat center; background: url(/static/img/chart-no-data.png) no-repeat center;
background-size: cover; background-size: cover;
margin: 20px auto 10px auto; margin: 20px auto 10px auto;
} }
&::after { &::after {
content: '暂无数据'; content: "\6682\65E0\6570\636E";
color: #808995; color: #c0c4cc;
margin: 0 auto; margin: 0 auto;
text-align:center; text-align: center;
font-size:13px; font-size: 13px;
display: block; display: block;
margin-bottom: 60px; margin-bottom: 60px;
} }
...@@ -312,3 +312,19 @@ ...@@ -312,3 +312,19 @@
white-space: pre; white-space: pre;
} }
} }
.el-table__empty-text:before {
content: " ";
display: block;
width: 60px;
height: 60px;
background: url('/static/img/no-data_icon.png') no-repeat 50%;
margin: 80px auto 22px;
}
.el-table__empty-text {
width: auto;
margin-bottom: 80px;
}
.el-table__empty-block{
min-height: 240px;
}
\ No newline at end of file
...@@ -131,6 +131,9 @@ a:hover { ...@@ -131,6 +131,9 @@ a:hover {
.mt30{ .mt30{
margin-top: 30px!important; margin-top: 30px!important;
} }
.mt100{
margin-top: 100px!important;
}
.ml5{ .ml5{
margin-left: 5px!important; margin-left: 5px!important;
} }
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
</el-table-column> </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="false" :width="100" align="left" prop="couponStock" label="库存"></el-table-column>
</el-table> </el-table>
<el-pagination v-show="tableList.length && showPagination" 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, prev, pager, next" :total="total"></el-pagination> <el-pagination v-show="tableList.length && showPagination" background class="dm-pagination" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="listParams.currentPage" :page-sizes="[20, 40, 60, 80]" :page-size="listParams.pageSize" layout="total, prev, pager, next" :total="total"></el-pagination>
</section> </section>
</template> </template>
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
<el-checkbox-group v-loading="loading" v-model="newMediaId" :max="1" class="clearfix img-item__wrap" :style="scrollStyle"> <el-checkbox-group v-loading="loading" v-model="newMediaId" :max="1" class="clearfix img-item__wrap" :style="scrollStyle">
<img-item-radio v-for="(v, i) in imgList" :key="i" :imgData="v" @click.native.stop.prevent="selectImg(v)"></img-item-radio> <img-item-radio v-for="(v, i) in imgList" :key="i" :imgData="v" @click.native.stop.prevent="selectImg(v)"></img-item-radio>
</el-checkbox-group> </el-checkbox-group>
<el-pagination v-show="imgList.length" background class="dm-pagination imglib-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> <el-pagination v-show="imgList.length" background class="dm-pagination imglib-pagination" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="listParams.currentPage" :page-sizes="[20, 40, 60, 80]" :page-size="listParams.pageSize" layout="total, sizes, prev, pager, next" :total="total"></el-pagination>
</article> </article>
</section> </section>
</template> </template>
...@@ -53,7 +53,7 @@ export default { ...@@ -53,7 +53,7 @@ export default {
imgList: [], imgList: [],
listParams: { listParams: {
currentPage: 1, currentPage: 1,
pageSize: 10, pageSize: 20,
wechatImageGroupId: '' wechatImageGroupId: ''
}, },
total: 0, total: 0,
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
<el-checkbox-group v-loading="loading" :isIndeterminate="isIndeterminate" v-model="checkedList" @change="handlecheckedListChange" class="clearfix img-item__wrap" :style="scrollStyle"> <el-checkbox-group v-loading="loading" :isIndeterminate="isIndeterminate" v-model="checkedList" @change="handlecheckedListChange" class="clearfix img-item__wrap" :style="scrollStyle">
<img-item v-for="(v, i) in imgList" :key="i" :imgData="v" @refresh="loadImgList" @delSingleImg="delImg" @moveSingleImg="moveImgGroup"></img-item> <img-item v-for="(v, i) in imgList" :key="i" :imgData="v" @refresh="loadImgList" @delSingleImg="delImg" @moveSingleImg="moveImgGroup"></img-item>
</el-checkbox-group> </el-checkbox-group>
<el-pagination v-show="imgList.length" background class="dm-pagination pb20 pr20" @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> <el-pagination v-show="imgList.length" background class="dm-pagination pb20 pr20" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="listParams.currentPage" :page-sizes="[20, 40, 60, 80]" :page-size="listParams.pageSize" layout="total, sizes, prev, pager, next" :total="total"></el-pagination>
</article> </article>
<dm-move-dialog :show.sync="moveDialogShow" :dataList="groupsMoveList" @moveFinish="moveFinish"></dm-move-dialog> <dm-move-dialog :show.sync="moveDialogShow" :dataList="groupsMoveList" @moveFinish="moveFinish"></dm-move-dialog>
</section> </section>
...@@ -62,7 +62,7 @@ export default { ...@@ -62,7 +62,7 @@ export default {
imgList: [], imgList: [],
listParams: { listParams: {
currentPage: 1, currentPage: 1,
pageSize: 10, pageSize: 20,
wechatImageGroupId: '' wechatImageGroupId: ''
}, },
total: 0, total: 0,
...@@ -182,7 +182,12 @@ export default { ...@@ -182,7 +182,12 @@ export default {
async deleteImageService(val) { async deleteImageService(val) {
try { try {
await deleteImageService({ imageIds: val }); await deleteImageService({ imageIds: val });
this.checkAll = false;
this.$tips({ type: 'success', message: '删除图片成功' }); this.$tips({ type: 'success', message: '删除图片成功' });
if (this.imgList.length === val.split(',').length) {
this.listParams.currentPage--;
}
this.checkedList = []; // 移除存在的项
this.loadImgList(); this.loadImgList();
} catch (err) { } catch (err) {
this.$tips({ type: 'error', message: '删除图片失败' }); this.$tips({ type: 'error', message: '删除图片失败' });
......
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
</el-radio-group> </el-radio-group>
<el-pagination v-show="textImgList.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> <el-pagination v-show="textImgList.length" background class="dm-pagination" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="listParams.currentPage" :page-sizes="[20, 40, 60, 80]" :page-size="listParams.pageSize" layout="total, sizes, prev, pager, next" :total="total"></el-pagination>
<sync-imgtext :show.sync="syncImgTextShow"></sync-imgtext> <sync-imgtext :show.sync="syncImgTextShow"></sync-imgtext>
</section> </section>
</template> </template>
...@@ -147,6 +147,9 @@ export default { ...@@ -147,6 +147,9 @@ export default {
deleteImageText({ imageTextId: row.imageTextId }) deleteImageText({ imageTextId: row.imageTextId })
.then(res => { .then(res => {
this.$tips({ type: 'success', message: '删除成功!' }); this.$tips({ type: 'success', message: '删除成功!' });
if (this.textImgList.length === 1 && this.listParams.currentPage !== 1) {
this.listParams.currentPage--;
}
this.loadImgTextList(); this.loadImgTextList();
}) })
.catch(err => { .catch(err => {
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-pagination v-show="smsTempList.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> <el-pagination v-show="smsTempList.length" background class="dm-pagination" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="listParams.currentPage" :page-sizes="[20, 40, 60, 80]" :page-size="listParams.pageSize" layout="total, sizes, prev, pager, next" :total="total"></el-pagination>
</section> </section>
</template> </template>
......
...@@ -4,8 +4,15 @@ import router from './router'; ...@@ -4,8 +4,15 @@ import router from './router';
import store from './store'; import store from './store';
import { axios } from './service/api/index'; import { axios } from './service/api/index';
import directives from './directives'; import directives from './directives';
Vue.config.productionTip = false; Vue.config.productionTip = false;
// Vue.config.devtools = true;
if (process.env.NODE_ENV == 'development') { // eslint-disable-line
Vue.config.devtools = true;
} else {
Vue.config.devtools = false;
}
Vue.prototype.axios = axios; Vue.prototype.axios = axios;
Vue.prototype.axios.withCredentials = true; Vue.prototype.axios.withCredentials = true;
Object.keys(directives).map(item => Vue.directive(item, directives[item])); Object.keys(directives).map(item => Vue.directive(item, directives[item]));
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<el-button type="primary" class="fr" @click="$router.push('/calllog/record')">录音设置</el-button> <el-button type="primary" class="fr" @click="$router.push('/calllog/record')">录音设置</el-button>
</div> </div>
<el-table tooltipEffect="light" :data="tableList" style="width:100%" v-loading="loading"> <el-table tooltipEffect="light" :data="tableList" style="width:100%" v-loading="loading">
<el-table-column align="left" width="120" prop="callBeginTime" label="呼叫时间"> <el-table-column align="left" width="150" prop="callBeginTime" label="呼叫时间">
<template slot-scope="scope"> <template slot-scope="scope">
<p class="cell-time"> <p class="cell-time">
{{ formatDateTimeByType(scope.row.callBeginTime, 'yyyy-MM-dd-HH-mm-ss', true).y }}<br /> {{ formatDateTimeByType(scope.row.callBeginTime, 'yyyy-MM-dd-HH-mm-ss', true).y }}<br />
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </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> <el-pagination v-show="tableList.length" background class="dm-pagination" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="listParams.currentPage" :page-sizes="[20, 40, 60, 80]" :page-size="listParams.pageSize" layout="total, sizes, prev, pager, next" :total="total"></el-pagination>
</section> </section>
</template> </template>
<script> <script>
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<el-table-column :show-overflow-tooltip="false" align="left" prop="storeCode" label="消费门店"></el-table-column> <el-table-column :show-overflow-tooltip="false" align="left" prop="storeCode" label="消费门店"></el-table-column>
<el-table-column :show-overflow-tooltip="false" align="left" prop="orderNumber" label="订单流水号"></el-table-column> <el-table-column :show-overflow-tooltip="false" align="left" prop="orderNumber" label="订单流水号"></el-table-column>
</el-table> </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> <el-pagination v-show="tableList.length" background class="dm-pagination" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="listParams.currentPage" :page-sizes="[20, 40, 60, 80]" :page-size="listParams.pageSize" layout="total, sizes, prev, pager, next" :total="total"></el-pagination>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button @click="close">取 消</el-button> <el-button @click="close">取 消</el-button>
<el-button type="primary" @click="submit">确 定</el-button> <el-button type="primary" @click="submit">确 定</el-button>
......
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </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> <el-pagination v-show="tableList.length" background class="dm-pagination" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="listParams.currentPage" :page-sizes="[20, 40, 60, 80]" :page-size="listParams.pageSize" layout="total, sizes, prev, pager, next" :total="total"></el-pagination>
<vue-gic-export-excel :dialogVisible.sync="dialogVisible" :dataArr="tableList" :type="2" :excelUrl="excelUrl" :params="params" :projectName="projectName"></vue-gic-export-excel> <vue-gic-export-excel :dialogVisible.sync="dialogVisible" :dataArr="tableList" :type="2" :excelUrl="excelUrl" :params="params" :projectName="projectName"></vue-gic-export-excel>
</section> </section>
</template> </template>
......
...@@ -116,7 +116,7 @@ ...@@ -116,7 +116,7 @@
</el-radio> </el-radio>
</div> </div>
<div> <div>
<el-checkbox v-model="only" :disabled="isEdit || isInfo">不与其优惠共享</el-checkbox> <el-checkbox v-model="only" :disabled="isEdit || isInfo">不与其优惠共享</el-checkbox>
</div> </div>
</el-form-item> </el-form-item>
<el-form-item prop="cardLimit" label="领券限制"> <el-form-item prop="cardLimit" label="领券限制">
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
<el-button class="block block-center mt10" type="text" @click="$router.push('/card/add')">新增卡券</el-button> <el-button class="block block-center mt10" type="text" @click="$router.push('/card/add')">新增卡券</el-button>
</div> </div>
<adjust-stock :show.sync="adjustStock" :totalCount="currentCard.couponStock" :coupCardId="currentCard.coupCardId" @refresh="delayRefresh"></adjust-stock> <adjust-stock :show.sync="adjustStock" :totalCount="currentCard.couponStock" :coupCardId="currentCard.coupCardId" @refresh="delayRefresh"></adjust-stock>
<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> <el-pagination v-show="tableList.length" background class="dm-pagination" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="listParams.currentPage" :page-sizes="[20, 40, 60, 80]" :page-size="listParams.pageSize" layout="total, sizes, prev, pager, next" :total="total"></el-pagination>
</section> </section>
</template> </template>
<script> <script>
...@@ -104,6 +104,9 @@ export default { ...@@ -104,6 +104,9 @@ export default {
async deleteCard(coupCardId) { async deleteCard(coupCardId) {
await deleteCard({ coupCardId }); await deleteCard({ coupCardId });
this.$tips({ type: 'success', message: '删除成功!' }); this.$tips({ type: 'success', message: '删除成功!' });
if (this.tableList.length === 1 && this.listParams.currentPage !== 1) {
this.listParams.currentPage--;
}
this.getTableList(); this.getTableList();
} }
} }
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<img class="block block-center pt100" width="60" height="60" src="../../assets/img/no-data_icon.png" alt="" /> <img class="block block-center pt100" width="60" height="60" src="../../assets/img/no-data_icon.png" alt="" />
<el-button class="block block-center mt10" type="text" @click="shelfAddShow = true">添加卡券</el-button> <el-button class="block block-center mt10" type="text" @click="shelfAddShow = true">添加卡券</el-button>
</div> </div>
<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> <el-pagination v-show="tableList.length" background class="dm-pagination" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="listParams.currentPage" :page-sizes="[20, 40, 60, 80]" :page-size="listParams.pageSize" layout="total, sizes, prev, pager, next" :total="total"></el-pagination>
<shelf-add :show.sync="shelfAddShow" @refresh="cardPageList"></shelf-add> <shelf-add :show.sync="shelfAddShow" @refresh="cardPageList"></shelf-add>
</section> </section>
</template> </template>
......
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-pagination v-show="recordList.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> <el-pagination v-show="recordList.length" background class="dm-pagination" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="listParams.currentPage" :page-sizes="[20, 40, 60, 80]" :page-size="listParams.pageSize" layout="total, sizes, prev, pager, next" :total="total"></el-pagination>
<vue-gic-export-excel :dialogVisible.sync="dialogVisible" :dataArr="recordList" :type="2" :excelUrl="excelUrl" :params="params" :projectName="projectName"></vue-gic-export-excel> <vue-gic-export-excel :dialogVisible.sync="dialogVisible" :dataArr="recordList" :type="2" :excelUrl="excelUrl" :params="params" :projectName="projectName"></vue-gic-export-excel>
</section> </section>
</template> </template>
......
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-pagination v-show="recordList.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> <el-pagination v-show="recordList.length" background class="dm-pagination" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="listParams.currentPage" :page-sizes="[20, 40, 60, 80]" :page-size="listParams.pageSize" layout="total, sizes, prev, pager, next" :total="total"></el-pagination>
<!-- 核销组件dialog --> <!-- 核销组件dialog -->
<card-order :show.sync="cardOrderShow" :obj="currentObj"></card-order> <card-order :show.sync="cardOrderShow" :obj="currentObj"></card-order>
<vue-gic-export-excel :dialogVisible.sync="dialogVisible" :dataArr="recordList" :type="2" :excelUrl="excelUrl" :params="params" :projectName="projectName"></vue-gic-export-excel> <vue-gic-export-excel :dialogVisible.sync="dialogVisible" :dataArr="recordList" :type="2" :excelUrl="excelUrl" :params="params" :projectName="projectName"></vue-gic-export-excel>
......
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
</el-table-column> </el-table-column>
<el-table-column v-for="(v, i) in failHeader" :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 v-for="(v, i) in failHeader" :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> </el-table>
<el-pagination v-show="recordList.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> <el-pagination v-show="recordList.length" background class="dm-pagination" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="listParams.currentPage" :page-sizes="[20, 40, 60, 80]" :page-size="listParams.pageSize" layout="total, sizes, prev, pager, next" :total="total"></el-pagination>
<vue-gic-export-excel :dialogVisible.sync="dialogVisible" :dataArr="recordList" :type="2" :excelUrl="excelUrl" :params="params" :projectName="projectName"></vue-gic-export-excel> <vue-gic-export-excel :dialogVisible.sync="dialogVisible" :dataArr="recordList" :type="2" :excelUrl="excelUrl" :params="params" :projectName="projectName"></vue-gic-export-excel>
</section> </section>
</template> </template>
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-pagination v-show="recordList.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> <el-pagination v-show="recordList.length" background class="dm-pagination" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="listParams.currentPage" :page-sizes="[20, 40, 60, 80]" :page-size="listParams.pageSize" layout="total, sizes, prev, pager, next" :total="total"></el-pagination>
</section> </section>
</template> </template>
<script> <script>
...@@ -131,6 +131,9 @@ export default { ...@@ -131,6 +131,9 @@ export default {
.then(res => { .then(res => {
if (res.errorCode === 0) { if (res.errorCode === 0) {
this.$tips({ type: 'success', message: '删除成功!' }); this.$tips({ type: 'success', message: '删除成功!' });
if (this.recordList.length === 1 && this.listParams.currentPage !== 1) {
this.listParams.currentPage--;
}
this.getTableList(); this.getTableList();
} else { } else {
this.$tips({ type: 'error', message: '删除失败!' }); this.$tips({ type: 'error', message: '删除失败!' });
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </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> <el-pagination v-show="tableList.length" background class="dm-pagination" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="listParams.currentPage" :page-sizes="[20, 40, 60, 80]" :page-size="listParams.pageSize" layout="total, sizes, prev, pager, next" :total="total"></el-pagination>
</section> </section>
</template> </template>
<script> <script>
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </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> <el-pagination v-show="tableList.length" background class="dm-pagination" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="listParams.currentPage" :page-sizes="[20, 40, 60, 80]" :page-size="listParams.pageSize" layout="total, sizes, prev, pager, next" :total="total"></el-pagination>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button @click="close">关 闭</el-button> <el-button @click="close">关 闭</el-button>
</span> </span>
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </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> <el-pagination v-show="tableList.length" background class="dm-pagination" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="listParams.currentPage" :page-sizes="[20, 40, 60, 80]" :page-size="listParams.pageSize" layout="total, sizes, prev, pager, next" :total="total"></el-pagination>
<batch-dialog :show.sync="dialogShow" :id="dialogId" :execTime="dialogExecTime" :ecmPlanName="dialogEcmPlanName"></batch-dialog> <batch-dialog :show.sync="dialogShow" :id="dialogId" :execTime="dialogExecTime" :ecmPlanName="dialogEcmPlanName"></batch-dialog>
</section> </section>
</template> </template>
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-pagination v-show="infoList.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> <el-pagination v-show="infoList.length" background class="dm-pagination" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="listParams.currentPage" :page-sizes="[20, 40, 60, 80]" :page-size="listParams.pageSize" layout="total, sizes, prev, pager, next" :total="total"></el-pagination>
</div> </div>
<vue-gic-export-excel :dialogVisible.sync="dialogVisible" :dataArr="tableList" :type="2" :excelUrl="excelUrl" :params="params" :projectName="projectName"></vue-gic-export-excel> <vue-gic-export-excel :dialogVisible.sync="dialogVisible" :dataArr="tableList" :type="2" :excelUrl="excelUrl" :params="params" :projectName="projectName"></vue-gic-export-excel>
</section> </section>
......
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </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> <el-pagination v-show="tableList.length" background class="dm-pagination" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="listParams.currentPage" :page-sizes="[20, 40, 60, 80]" :page-size="listParams.pageSize" layout="total, sizes, prev, pager, next" :total="total"></el-pagination>
</section> </section>
</template> </template>
<script> <script>
...@@ -143,6 +143,9 @@ export default { ...@@ -143,6 +143,9 @@ export default {
let res = await deleteEcm({ ecmPlanId: row.ecmPlanId }); let res = await deleteEcm({ ecmPlanId: row.ecmPlanId });
if (res.errorCode === 0) { if (res.errorCode === 0) {
this.$tips({ type: 'success', message: '删除成功!' }); this.$tips({ type: 'success', message: '删除成功!' });
if (this.tableList.length === 1 && this.listParams.currentPage !== 1) {
this.listParams.currentPage--;
}
this.loadEcmList(); this.loadEcmList();
} else { } else {
this.$tips({ type: 'error', message: res.message || '删除失败!' }); this.$tips({ type: 'error', message: res.message || '删除失败!' });
......
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
</el-table-column> </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="false" :width="100" align="left" prop="couponStock" label="库存"></el-table-column>
</el-table> </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> <el-pagination v-show="tableList.length" class="dm-pagination" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="listParams.currentPage" :page-sizes="[20, 40, 60, 80]" :page-size="listParams.pageSize" layout="prev, pager, next" :total="total"></el-pagination>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button @click="close">关 闭</el-button> <el-button @click="close">关 闭</el-button>
<el-button type="primary" @click="addItem">确 定</el-button> <el-button type="primary" @click="addItem">确 定</el-button>
......
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
</div> </div>
</label> </label>
</div> </div>
<el-pagination v-show="imgList.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> <el-pagination v-show="imgList.length" class="dm-pagination" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="listParams.currentPage" :page-sizes="[20, 40, 60, 80]" :page-size="listParams.pageSize" layout="prev, pager, next" :total="total"></el-pagination>
</article> </article>
</div> </div>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-pagination v-show="smsTempList.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> <el-pagination v-show="smsTempList.length" class="dm-pagination" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="listParams.currentPage" :page-sizes="[20, 40, 60, 80]" :page-size="listParams.pageSize" layout="prev, pager, next" :total="total"></el-pagination>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button @click="close">关 闭</el-button> <el-button @click="close">关 闭</el-button>
<el-button type="primary" @click="addItem">确 定</el-button> <el-button type="primary" @click="addItem">确 定</el-button>
......
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
</el-radio-group> </el-radio-group>
<el-pagination v-show="textImgList.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> <el-pagination v-show="textImgList.length" class="dm-pagination" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="listParams.currentPage" :page-sizes="[20, 40, 60, 80]" :page-size="listParams.pageSize" layout="prev, pager, next" :total="total"></el-pagination>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button @click="close">关 闭</el-button> <el-button @click="close">关 闭</el-button>
<el-button type="primary" @click="addItem">确 定</el-button> <el-button type="primary" @click="addItem">确 定</el-button>
......
...@@ -40,12 +40,12 @@ ...@@ -40,12 +40,12 @@
<div class="charts-half"> <div class="charts-half">
<h3 class="dm-title__label--outer">正面快评使用统计</h3> <h3 class="dm-title__label--outer">正面快评使用统计</h3>
<div id="mountNodePieGood" ref="mountNodePieGood" v-show="goodList.length"></div> <div id="mountNodePieGood" ref="mountNodePieGood" v-show="goodList.length"></div>
<div class="chart--nodata" v-show="!goodList.length"></div> <div class="chart--nodata mt100" v-show="!goodList.length"></div>
</div> </div>
<div class="charts-half"> <div class="charts-half">
<h3 class="dm-title__label--outer">负面快评使用统计</h3> <h3 class="dm-title__label--outer">负面快评使用统计</h3>
<div id="mountNodePieBad" ref="mountNodePieBad" v-show="badList.length"></div> <div id="mountNodePieBad" ref="mountNodePieBad" v-show="badList.length"></div>
<div class="chart--nodata" v-show="!badList.length"></div> <div class="chart--nodata mt100" v-show="!badList.length"></div>
</div> </div>
</div> </div>
<detail :show.sync="detailShow" :id="groupId"></detail> <detail :show.sync="detailShow" :id="groupId"></detail>
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
</el-table-column> </el-table-column>
<el-table-column v-for="(v, i) in tableHeader" :sortable="v.sortable" :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 v-for="(v, i) in tableHeader" :sortable="v.sortable" :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> </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> <el-pagination v-show="tableList.length" background class="dm-pagination" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="listParams.currentPage" :page-sizes="[20, 40, 60, 80]" :page-size="listParams.pageSize" layout="total, sizes, prev, pager, next" :total="total"></el-pagination>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button @click="close">关 闭</el-button> <el-button @click="close">关 闭</el-button>
</span> </span>
......
...@@ -101,7 +101,7 @@ ...@@ -101,7 +101,7 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </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> <el-pagination v-show="tableList.length" background class="dm-pagination" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="listParams.currentPage" :page-sizes="[20, 40, 60, 80]" :page-size="listParams.pageSize" layout="total, sizes, prev, pager, next" :total="total"></el-pagination>
<reply :show.sync="replyShow" :id="replyId" @refresh="getTableList"></reply> <reply :show.sync="replyShow" :id="replyId" @refresh="getTableList"></reply>
<vue-gic-export-excel :dialogVisible.sync="dialogVisible" :dataArr="tableList" :type="2" :excelUrl="excelUrl" :params="params" :projectName="projectName"></vue-gic-export-excel> <vue-gic-export-excel :dialogVisible.sync="dialogVisible" :dataArr="tableList" :type="2" :excelUrl="excelUrl" :params="params" :projectName="projectName"></vue-gic-export-excel>
</section> </section>
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </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> <el-pagination v-show="tableList.length" background class="dm-pagination" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="listParams.currentPage" :page-sizes="[20, 40, 60, 80]" :page-size="listParams.pageSize" layout="total, sizes, prev, pager, next" :total="total"></el-pagination>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button @click="close">关 闭</el-button> <el-button @click="close">关 闭</el-button>
</span> </span>
......
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </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> <el-pagination v-show="tableList.length" background class="dm-pagination" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="listParams.currentPage" :page-sizes="[20, 40, 60, 80]" :page-size="listParams.pageSize" layout="total, sizes, prev, pager, next" :total="total"></el-pagination>
<vue-gic-export-excel :dialogVisible.sync="dialogVisible" :dataArr="tableList" :type="2" :excelUrl="excelUrl" :params="params" :projectName="projectName"></vue-gic-export-excel> <vue-gic-export-excel :dialogVisible.sync="dialogVisible" :dataArr="tableList" :type="2" :excelUrl="excelUrl" :params="params" :projectName="projectName"></vue-gic-export-excel>
</section> </section>
</template> </template>
......
<template> <template>
<section class="dm-form__wrap"> <section class="dm-form__wrap">
<!-- TODO: 1接口没有这个参数 -->
<h3 class="dm-title__label">分享设置</h3> <h3 class="dm-title__label">分享设置</h3>
<el-form-item label="分享设置" class="width50 is-required"> <el-form-item label="分享设置" class="width50 is-required">
<el-radio-group v-model="form.shareFlag"> <el-radio-group v-model="form.shareFlag">
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
</div> </div>
<div class="width60 fl"> <div class="width60 fl">
<el-form-item label="提示图片" prop="tipsImg"> <el-form-item label="提示图片" prop="tipsImg">
<dm-upload-avatar :limit="{ maxSize: 1 }" :model.sync="form.tipsImg" fileType="fileShare" label="上传图片" tips="图片建议尺寸:200*200,格式为jpg/png/gif。图片大小不超过1MB,点击图片可重新上传。" :disabled="isInfo"></dm-upload-avatar> <dm-upload-avatar :limit="{ maxSize: 1 }" :model.sync="form.tipsImg" fileType="fileShare" label="上传图片" tips="图片建议尺寸:200*200,格式为jpg/png/gif。图片大小不超过1MB,点击图片可重新上传。"></dm-upload-avatar>
</el-form-item> </el-form-item>
<el-form-item label="提示文字" prop="tipTitle"> <el-form-item label="提示文字" prop="tipTitle">
<dm-input v-model="form.tipTitle" type="textarea" placeholder="最多输入60个字" :maxlength="60" class="w400" :rows="6"></dm-input> <dm-input v-model="form.tipTitle" type="textarea" placeholder="最多输入60个字" :maxlength="60" class="w400" :rows="6"></dm-input>
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </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> <el-pagination v-show="tableList.length" background class="dm-pagination" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="listParams.currentPage" :page-sizes="[20, 40, 60, 80]" :page-size="listParams.pageSize" layout="total, sizes, prev, pager, next" :total="total"></el-pagination>
<links :show.sync="linkShow" :obj="linksObj" :gameTypeName="gameTypeName"></links> <links :show.sync="linkShow" :obj="linksObj" :gameTypeName="gameTypeName"></links>
</section> </section>
</template> </template>
...@@ -144,6 +144,9 @@ export default { ...@@ -144,6 +144,9 @@ export default {
.then(res => { .then(res => {
if (res.errorCode === 0) { if (res.errorCode === 0) {
this.$tips({ type: 'success', message: '删除成功!' }); this.$tips({ type: 'success', message: '删除成功!' });
if (this.tableList.length === 1 && this.listParams.currentPage !== 1) {
this.listParams.currentPage--;
}
this.getTableList(); this.getTableList();
} else { } else {
this.$tips({ type: 'error', message: res.message || '删除失败!' }); this.$tips({ type: 'error', message: res.message || '删除失败!' });
......
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
<el-table-column :min-width="150" align="left" label="积分消耗" prop="costIntegral"></el-table-column> <el-table-column :min-width="150" align="left" label="积分消耗" prop="costIntegral"></el-table-column>
<el-table-column :min-width="150" align="left" label="奖品" prop="prizeName"></el-table-column> <el-table-column :min-width="150" align="left" label="奖品" prop="prizeName"></el-table-column>
</el-table> </el-table>
<el-pagination v-show="recordList.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> <el-pagination v-show="recordList.length" background class="dm-pagination" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="listParams.currentPage" :page-sizes="[20, 40, 60, 80]" :page-size="listParams.pageSize" layout="total, sizes, prev, pager, next" :total="total"></el-pagination>
<vue-gic-export-excel :dialogVisible.sync="dialogVisible" :dataArr="recordList" :type="2" :excelUrl="excelUrl" :params="params" :projectName="projectName"></vue-gic-export-excel> <vue-gic-export-excel :dialogVisible.sync="dialogVisible" :dataArr="recordList" :type="2" :excelUrl="excelUrl" :params="params" :projectName="projectName"></vue-gic-export-excel>
</div> </div>
</template> </template>
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </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> <el-pagination v-show="tableList.length" background class="dm-pagination" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="listParams.currentPage" :page-sizes="[20, 40, 60, 80]" :page-size="listParams.pageSize" layout="total, sizes, prev, pager, next" :total="total"></el-pagination>
<links :show.sync="linkShow" :obj="linksObj" :gameTypeName="gameTypeName"></links> <links :show.sync="linkShow" :obj="linksObj" :gameTypeName="gameTypeName"></links>
</section> </section>
</template> </template>
...@@ -143,6 +143,9 @@ export default { ...@@ -143,6 +143,9 @@ export default {
.then(res => { .then(res => {
if (res.errorCode === 0) { if (res.errorCode === 0) {
this.$tips({ type: 'success', message: '删除成功!' }); this.$tips({ type: 'success', message: '删除成功!' });
if (this.tableList.length === 1 && this.listParams.currentPage !== 1) {
this.listParams.currentPage--;
}
this.getTableList(); this.getTableList();
} else { } else {
this.$tips({ type: 'error', message: res.message || '删除失败!' }); this.$tips({ type: 'error', message: res.message || '删除失败!' });
......
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
<el-table-column :min-width="150" align="left" label="积分消耗" prop="costIntegral"></el-table-column> <el-table-column :min-width="150" align="left" label="积分消耗" prop="costIntegral"></el-table-column>
<el-table-column :min-width="150" align="left" label="奖品" prop="prizeName"></el-table-column> <el-table-column :min-width="150" align="left" label="奖品" prop="prizeName"></el-table-column>
</el-table> </el-table>
<el-pagination v-show="recordList.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> <el-pagination v-show="recordList.length" background class="dm-pagination" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="listParams.currentPage" :page-sizes="[20, 40, 60, 80]" :page-size="listParams.pageSize" layout="total, sizes, prev, pager, next" :total="total"></el-pagination>
<vue-gic-export-excel :dialogVisible.sync="dialogVisible" :dataArr="recordList" :type="2" :excelUrl="excelUrl" :params="params" :projectName="projectName"></vue-gic-export-excel> <vue-gic-export-excel :dialogVisible.sync="dialogVisible" :dataArr="recordList" :type="2" :excelUrl="excelUrl" :params="params" :projectName="projectName"></vue-gic-export-excel>
</div> </div>
</template> </template>
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </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> <el-pagination v-show="tableList.length" background class="dm-pagination" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="listParams.currentPage" :page-sizes="[20, 40, 60, 80]" :page-size="listParams.pageSize" layout="total, sizes, prev, pager, next" :total="total"></el-pagination>
<links :show.sync="linkShow" :obj="linksObj" :gameTypeName="gameTypeName"></links> <links :show.sync="linkShow" :obj="linksObj" :gameTypeName="gameTypeName"></links>
</section> </section>
</template> </template>
...@@ -123,6 +123,9 @@ export default { ...@@ -123,6 +123,9 @@ export default {
let res = await deleteGame({ gameActivityId: row.gameActivityId }); let res = await deleteGame({ gameActivityId: row.gameActivityId });
if (res.errorCode === 0) { if (res.errorCode === 0) {
this.$tips({ type: 'success', message: '删除成功!' }); this.$tips({ type: 'success', message: '删除成功!' });
if (this.tableList.length === 1 && this.listParams.currentPage !== 1) {
this.listParams.currentPage--;
}
this.getTableList(); this.getTableList();
} else { } else {
this.$tips({ type: 'error', message: res.message || '删除失败!' }); this.$tips({ type: 'error', message: res.message || '删除失败!' });
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
</el-table-column> </el-table-column>
<el-table-column v-for="(v, i) in rankHeader" :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 v-for="(v, i) in rankHeader" :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> </el-table>
<el-pagination v-show="rankList.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> <el-pagination v-show="rankList.length" background class="dm-pagination" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="listParams.currentPage" :page-sizes="[20, 40, 60, 80]" :page-size="listParams.pageSize" layout="total, sizes, prev, pager, next" :total="total"></el-pagination>
<vue-gic-export-excel :dialogVisible.sync="dialogVisible" :dataArr="rankList" :type="2" :excelUrl="excelUrl" :params="params" :projectName="projectName"></vue-gic-export-excel> <vue-gic-export-excel :dialogVisible.sync="dialogVisible" :dataArr="rankList" :type="2" :excelUrl="excelUrl" :params="params" :projectName="projectName"></vue-gic-export-excel>
</section> </section>
</template> </template>
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </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> <el-pagination v-show="tableList.length" background class="dm-pagination" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="listParams.currentPage" :page-sizes="[20, 40, 60, 80]" :page-size="listParams.pageSize" layout="total, sizes, prev, pager, next" :total="total"></el-pagination>
<config :show.sync="configShow"></config> <config :show.sync="configShow"></config>
<links :show.sync="linkShow" :obj="linksObj" :gameTypeName="gameTypeName"></links> <links :show.sync="linkShow" :obj="linksObj" :gameTypeName="gameTypeName"></links>
</section> </section>
...@@ -122,6 +122,9 @@ export default { ...@@ -122,6 +122,9 @@ export default {
let res = await deleteGame({ gameActivityId: row.gameActivityId }); let res = await deleteGame({ gameActivityId: row.gameActivityId });
if (res.errorCode === 0) { if (res.errorCode === 0) {
this.$tips({ type: 'success', message: '删除成功!' }); this.$tips({ type: 'success', message: '删除成功!' });
if (this.tableList.length === 1 && this.listParams.currentPage !== 1) {
this.listParams.currentPage--;
}
this.getTableList(); this.getTableList();
} else { } else {
this.$tips({ type: 'error', message: res.message || '删除失败!' }); this.$tips({ type: 'error', message: res.message || '删除失败!' });
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
</el-table-column> </el-table-column>
<el-table-column v-for="(v, i) in rankHeader" :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 v-for="(v, i) in rankHeader" :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> </el-table>
<el-pagination v-show="rankList.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> <el-pagination v-show="rankList.length" background class="dm-pagination" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="listParams.currentPage" :page-sizes="[20, 40, 60, 80]" :page-size="listParams.pageSize" layout="total, sizes, prev, pager, next" :total="total"></el-pagination>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="参与记录" name="second"> <el-tab-pane label="参与记录" name="second">
<div class="clearfix pb22"> <div class="clearfix pb22">
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
</el-table-column> </el-table-column>
<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 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> </el-table>
<el-pagination v-show="recordList.length" background class="dm-pagination" @size-change="handleSizeChange1" @current-change="handleCurrentChange1" :current-page="listParams1.currentPage" :page-sizes="[10, 20, 30, 40]" :page-size="listParams1.pageSize" layout="total, sizes, prev, pager, next" :total="total1"></el-pagination> <el-pagination v-show="recordList.length" background class="dm-pagination" @size-change="handleSizeChange1" @current-change="handleCurrentChange1" :current-page="listParams1.currentPage" :page-sizes="[20, 40, 60, 80]" :page-size="listParams1.pageSize" layout="total, sizes, prev, pager, next" :total="total1"></el-pagination>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
<vue-gic-export-excel :dialogVisible.sync="dialogVisible" :dataArr="rankList" :type="2" :excelUrl="excelUrl" :params="params" :projectName="projectName"></vue-gic-export-excel> <vue-gic-export-excel :dialogVisible.sync="dialogVisible" :dataArr="rankList" :type="2" :excelUrl="excelUrl" :params="params" :projectName="projectName"></vue-gic-export-excel>
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </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> <el-pagination v-show="tableList.length" background class="dm-pagination" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="listParams.currentPage" :page-sizes="[20, 40, 60, 80]" :page-size="listParams.pageSize" layout="total, sizes, prev, pager, next" :total="total"></el-pagination>
<links :show.sync="linkShow" :obj="linksObj" :gameTypeName="gameTypeName"></links> <links :show.sync="linkShow" :obj="linksObj" :gameTypeName="gameTypeName"></links>
</section> </section>
</template> </template>
...@@ -114,6 +114,9 @@ export default { ...@@ -114,6 +114,9 @@ export default {
let res = await deleteGame({ gameActivityId: row.gameActivityId }); let res = await deleteGame({ gameActivityId: row.gameActivityId });
if (res.errorCode === 0) { if (res.errorCode === 0) {
this.$tips({ type: 'success', message: '删除成功!' }); this.$tips({ type: 'success', message: '删除成功!' });
if (this.tableList.length === 1 && this.listParams.currentPage !== 1) {
this.listParams.currentPage--;
}
this.getTableList(); this.getTableList();
} else { } else {
this.$tips({ type: 'error', message: res.message || '删除失败!' }); this.$tips({ type: 'error', message: res.message || '删除失败!' });
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
</el-table-column> </el-table-column>
<el-table-column v-for="(v, i) in rankHeader" :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 v-for="(v, i) in rankHeader" :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> </el-table>
<el-pagination v-show="rankList.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> <el-pagination v-show="rankList.length" background class="dm-pagination" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="listParams.currentPage" :page-sizes="[20, 40, 60, 80]" :page-size="listParams.pageSize" layout="total, sizes, prev, pager, next" :total="total"></el-pagination>
</el-tab-pane> </el-tab-pane>
<!-- 参与记录 --> <!-- 参与记录 -->
<el-tab-pane label="参与记录" name="second"> <el-tab-pane label="参与记录" name="second">
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
</el-table-column> </el-table-column>
<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 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> </el-table>
<el-pagination v-show="recordList.length" background class="dm-pagination" @size-change="handleSizeChange1" @current-change="handleCurrentChange1" :current-page="listParams1.currentPage" :page-sizes="[10, 20, 30, 40]" :page-size="listParams1.pageSize" layout="total, sizes, prev, pager, next" :total="total1"></el-pagination> <el-pagination v-show="recordList.length" background class="dm-pagination" @size-change="handleSizeChange1" @current-change="handleCurrentChange1" :current-page="listParams1.currentPage" :page-sizes="[20, 40, 60, 80]" :page-size="listParams1.pageSize" layout="total, sizes, prev, pager, next" :total="total1"></el-pagination>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
<vue-gic-export-excel :dialogVisible.sync="dialogVisible" :dataArr="dataArr" :type="2" :excelUrl="excelUrl" :params="params" :projectName="projectName"></vue-gic-export-excel> <vue-gic-export-excel :dialogVisible.sync="dialogVisible" :dataArr="dataArr" :type="2" :excelUrl="excelUrl" :params="params" :projectName="projectName"></vue-gic-export-excel>
......
...@@ -93,7 +93,7 @@ ...@@ -93,7 +93,7 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-pagination v-show="messageList.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> <el-pagination v-show="messageList.length" background class="dm-pagination" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="listParams.currentPage" :page-sizes="[20, 40, 60, 80]" :page-size="listParams.pageSize" layout="total, sizes, prev, pager, next" :total="total"></el-pagination>
</section> </section>
<error-code-dialog :show.sync="errorCodeShow"></error-code-dialog> <error-code-dialog :show.sync="errorCodeShow"></error-code-dialog>
<vue-gic-export-excel :dialogVisible.sync="dialogVisible" :dataArr="messageList" :type="2" :excelUrl="excelUrl" :params="params" :projectName="projectName"></vue-gic-export-excel> <vue-gic-export-excel :dialogVisible.sync="dialogVisible" :dataArr="messageList" :type="2" :excelUrl="excelUrl" :params="params" :projectName="projectName"></vue-gic-export-excel>
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-pagination v-show="messageList.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> <el-pagination v-show="messageList.length" background class="dm-pagination" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="listParams.currentPage" :page-sizes="[20, 40, 60, 80]" :page-size="listParams.pageSize" layout="total, sizes, prev, pager, next" :total="total"></el-pagination>
</section> </section>
</template> </template>
<script> <script>
......
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
<img class="block block-center pt100" width="60" height="60" src="../../assets/img/no-data_icon.png" alt="" /> <img class="block block-center pt100" width="60" height="60" src="../../assets/img/no-data_icon.png" alt="" />
<el-button class="block block-center mt10" type="text" @click="$router.push('/message/temp/add')">新建短信模板</el-button> <el-button class="block block-center mt10" type="text" @click="$router.push('/message/temp/add')">新建短信模板</el-button>
</div> </div>
<el-pagination v-show="smsTempList.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> <el-pagination v-show="smsTempList.length" background class="dm-pagination" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="listParams.currentPage" :page-sizes="[20, 40, 60, 80]" :page-size="listParams.pageSize" layout="total, sizes, prev, pager, next" :total="total"></el-pagination>
</section> </section>
</template> </template>
<script> <script>
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </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> <el-pagination v-show="tableList.length" background class="dm-pagination" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="listParams.currentPage" :page-sizes="[20, 40, 60, 80]" :page-size="listParams.pageSize" layout="total, sizes, prev, pager, next" :total="total"></el-pagination>
</section> </section>
</template> </template>
<script> <script>
...@@ -147,6 +147,9 @@ export default { ...@@ -147,6 +147,9 @@ export default {
.then(res => { .then(res => {
if (res.errorCode === 0) { if (res.errorCode === 0) {
this.$tips({ type: 'success', message: '删除成功!' }); this.$tips({ type: 'success', message: '删除成功!' });
if (this.tableList.length === 1 && this.listParams.currentPage !== 1) {
this.listParams.currentPage--;
}
this.pageTemplateMessage(); this.pageTemplateMessage();
} else { } else {
this.$tips({ type: 'error', message: res.message || '删除失败!' }); this.$tips({ type: 'error', message: res.message || '删除失败!' });
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<section class="recharge"> <section class="recharge">
<div class="dm-wrap"> <div class="dm-wrap">
<h3 class="dm-title__label--outer">账户余额</h3> <h3 class="dm-title__label--outer">账户余额</h3>
<span class="fz22 danger-color vertical-middle pr20">{{ (recharge.balance / 100).toFixed(2) || 0 }}</span> <span class="fz22 danger-color vertical-middle pr20">{{ (recharge.balance / 100) | amount }}</span>
<el-button class="ml10 vertical-middle" size="mini" type="primary" @click="$router.push('/recharge/do')">充值</el-button> <el-button class="ml10 vertical-middle" size="mini" type="primary" @click="$router.push('/recharge/do')">充值</el-button>
<el-button style="padding: 3px 0" type="text" @click="$router.push('/recharge/record')">充值记录</el-button> <el-button style="padding: 3px 0" type="text" @click="$router.push('/recharge/record')">充值记录</el-button>
</div> </div>
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<p class="text-right"> <p class="text-right">
<span class="fz30">{{ recharge.messageCount || 0 }}</span> <span class="fz30">{{ recharge.messageCount || 0 }}</span>
</p> </p>
<p class="regular-font-color">合计费用:¥{{ (recharge.messageFee / 1000).toFixed(2) || 0 }}</p> <p class="regular-font-color">合计费用:¥{{ (recharge.messageFee / 1000) | amount }}</p>
</div> </div>
</div> </div>
</el-col> </el-col>
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
<p class="text-right"> <p class="text-right">
<span class="fz30">{{ recharge.smsCount || 0 }}</span> <span class="fz30">{{ recharge.smsCount || 0 }}</span>
</p> </p>
<p class="regular-font-color">合计费用:¥{{ (recharge.smsFee / 1000).toFixed(2) || 0 }}</p> <p class="regular-font-color">合计费用:¥{{ (recharge.smsFee / 1000) | amount }}</p>
</div> </div>
</div> </div>
</el-col> </el-col>
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
<p class="text-right"> <p class="text-right">
<span class="fz30">{{ recharge.voiceCount || 0 }}</span> <span class="fz30">{{ recharge.voiceCount || 0 }}</span>
</p> </p>
<p class="regular-font-color">合计费用:¥{{ (recharge.voiceFee / 1000).toFixed(2) || 0 }}</p> <p class="regular-font-color">合计费用:¥{{ (recharge.voiceFee / 1000) | amount }}</p>
</div> </div>
</div> </div>
</el-col> </el-col>
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
<p class="text-right"> <p class="text-right">
<span class="fz30">{{ recharge.callTime || 0 }}</span> 分钟 <span class="fz30">{{ recharge.callTime || 0 }}</span> 分钟
</p> </p>
<p class="regular-font-color">合计费用:¥{{ (recharge.callFee / 1000).toFixed(2) || 0 }}</p> <p class="regular-font-color">合计费用:¥{{ (recharge.callFee / 1000) | amount }}</p>
</div> </div>
</div> </div>
</el-col> </el-col>
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
<p class="text-right"> <p class="text-right">
<span class="fz30">{{ recharge.recordCallTime || 0 }}</span> 分钟 <span class="fz30">{{ recharge.recordCallTime || 0 }}</span> 分钟
</p> </p>
<p class="regular-font-color">合计费用:¥{{ (recharge.recordCallfee / 100).toFixed(2) || 0 }}</p> <p class="regular-font-color">合计费用:¥{{ (recharge.recordCallfee / 100) | amount }}</p>
</div> </div>
</div> </div>
</el-col> </el-col>
...@@ -145,6 +145,14 @@ export default { ...@@ -145,6 +145,14 @@ export default {
this.consumeRecord(); this.consumeRecord();
this.$store.commit('mutations_breadcrumb', [{ name: '企业管理', path: '' }, { name: '计费中心', path: '' }]); this.$store.commit('mutations_breadcrumb', [{ name: '企业管理', path: '' }, { name: '计费中心', path: '' }]);
}, },
filters: {
// 金额处理 保留2位小数
amount: function(value) {
if (!value) return '0.00';
if (isNaN(value)) return value;
return value.toFixed(2);
}
},
methods: { methods: {
async rechargeCenter() { async rechargeCenter() {
try { try {
......
...@@ -196,7 +196,7 @@ ...@@ -196,7 +196,7 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </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> <el-pagination v-show="tableList.length" background class="dm-pagination" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="listParams.currentPage" :page-sizes="[20, 40, 60, 80]" :page-size="listParams.pageSize" layout="total, sizes, prev, pager, next" :total="total"></el-pagination>
</div> </div>
</section> </section>
</template> </template>
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </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> <el-pagination v-show="tableList.length" background class="dm-pagination" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="listParams.currentPage" :page-sizes="[20, 40, 60, 80]" :page-size="listParams.pageSize" layout="total, sizes, prev, pager, next" :total="total"></el-pagination>
</section> </section>
</template> </template>
<script> <script>
......
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-pagination v-show="recordList.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> <el-pagination v-show="recordList.length" background class="dm-pagination" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="listParams.currentPage" :page-sizes="[20, 40, 60, 80]" :page-size="listParams.pageSize" layout="total, sizes, prev, pager, next" :total="total"></el-pagination>
<dm-dialog :show.sync="dmDialogShow" :dataId="dmDialogId"></dm-dialog> <dm-dialog :show.sync="dmDialogShow" :dataId="dmDialogId"></dm-dialog>
</section> </section>
</template> </template>
...@@ -83,7 +83,7 @@ export default { ...@@ -83,7 +83,7 @@ export default {
// return date.y + '\n' + date.h; // return date.y + '\n' + date.h;
// } // }
// }, // },
{ label: '用户名称', prop: 'clerkName', align: 'left', fixed: 'left', width: '120' }, { label: '用户名称', prop: 'clerkName', align: 'left', fixed: 'left', minWidth: '100' },
{ {
label: '标题', label: '标题',
prop: 'content', prop: 'content',
...@@ -193,7 +193,6 @@ export default { ...@@ -193,7 +193,6 @@ export default {
async sendRecordList() { async sendRecordList() {
this.loading = true; this.loading = true;
let res = await sendRecordList(this.listParams); let res = await sendRecordList(this.listParams);
console.log(res);
this.recordList = res.result.result || []; this.recordList = res.result.result || [];
this.total = res.result.totalCount; this.total = res.result.totalCount;
this.loading = false; this.loading = false;
...@@ -213,6 +212,9 @@ export default { ...@@ -213,6 +212,9 @@ export default {
delWechatMarketingRecord({ wechatTeletextId: row.wechatTeletextId }) delWechatMarketingRecord({ wechatTeletextId: row.wechatTeletextId })
.then(res => { .then(res => {
this.$tips({ type: 'success', message: '删除成功!' }); this.$tips({ type: 'success', message: '删除成功!' });
if (this.recordList.length === 1 && this.listParams.currentPage !== 1) {
this.listParams.currentPage--;
}
this.sendRecordList(); this.sendRecordList();
}) })
.catch(err => { .catch(err => {
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<!-- <img class="block block-center pt100" width="60" height="60" src="../../../assets/img/no-data_icon.png" alt=""> <!-- <img class="block block-center pt100" width="60" height="60" src="../../../assets/img/no-data_icon.png" alt="">
<el-button class="block block-center mt10" type="text" @click="$router.push('/wechat/temp/video/add')">新增视频</el-button> --> <el-button class="block block-center mt10" type="text" @click="$router.push('/wechat/temp/video/add')">新增视频</el-button> -->
<!-- </div> --> <!-- </div> -->
<!-- <el-pagination v-show="videoList.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> --> <!-- <el-pagination v-show="videoList.length" background class="dm-pagination" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="listParams.currentPage" :page-sizes="[20, 40, 60, 80]" :page-size="listParams.pageSize" layout="total, sizes, prev, pager, next" :total="total"></el-pagination> -->
</section> </section>
</template> </template>
<script> <script>
......
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