Commit 88815aba by crushh

Merge branch 'feature/act-code' of http://git.gicdev.com/office/haoban-3 into feature/act-code

parents 7449bc58 ed487920
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
<el-table-column label="活码状态" width="130"> <el-table-column label="活码状态" width="130">
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<p><span class="dot normal" v-if="row.statusFlag == 1">正常</span><span class="dot voided" v-if="row.statusFlag == 2">作废</span><span class="dot needSure" v-if="row.statusFlag == 3">待生效</span></p> <p><span class="dot normal" v-if="row.statusFlag == 1">正常</span><span class="dot voided" v-if="row.statusFlag == 2">作废</span><span class="dot needSure" v-if="row.statusFlag == 3">待生效</span></p>
<p class="toTopTip" v-if="row.statusFlag == 1">(今日已达上限)</p> <p class="toTopTip" v-if="row.overFlag == 1">(今日已达上限)</p>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="添加好友人数" prop="addNum" sortable="custom" width="150"> <el-table-column label="添加好友人数" prop="addNum" sortable="custom" width="150">
...@@ -132,7 +132,7 @@ ...@@ -132,7 +132,7 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<div class="block common-wrap__page text-right m-t-24" v-if="tableData.length"> <div class="block common-wrap__page text-right m-t-24" v-if="tableData.length">
<el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :page-size.sync="pageParam.pageSize" :current-page.sync="pageParam.pageNum" layout="total, sizes, prev, pager, next, jumper" :page-sizes="[20, 40, 60, 80]" :total="totalCount"> </el-pagination> <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :page-size.sync="pageParam.pageSize" :current-page.sync="pageParam.pageNo" layout="total, sizes, prev, pager, next, jumper" :page-sizes="[20, 40, 60, 80]" :total="totalCount"> </el-pagination>
</div> </div>
<el-dialog title="选择分组" :visible.sync="dialogGroupFormVisible" width="25%"> <el-dialog title="选择分组" :visible.sync="dialogGroupFormVisible" width="25%">
<el-form :model="formGroup"> <el-form :model="formGroup">
...@@ -284,7 +284,7 @@ export default { ...@@ -284,7 +284,7 @@ export default {
// 分页参数 // 分页参数
pageParam: { pageParam: {
pageSize: 20, pageSize: 20,
pageNum: 1 pageNo: 1
}, },
sortColumn: '', sortColumn: '',
sortType: '', sortType: '',
...@@ -428,12 +428,12 @@ export default { ...@@ -428,12 +428,12 @@ export default {
}, },
// 当前页变化 // 当前页变化
handleCurrentChange(val) { handleCurrentChange(val) {
this.pageParam.pageNum = val; this.pageParam.pageNo = val;
this.getTableList(); this.getTableList();
}, },
// 页码 // 页码
handleSizeChange(val) { handleSizeChange(val) {
this.pageParam.pageNum = 1; this.pageParam.pageNo = 1;
this.pageParam.pageSize = val; this.pageParam.pageSize = val;
this.getTableList(); this.getTableList();
}, },
...@@ -445,7 +445,7 @@ export default { ...@@ -445,7 +445,7 @@ export default {
this.getTableList(); this.getTableList();
}, },
searchList() { searchList() {
this.pageNum = 1; this.pageParam.pageNo = 1;
this.getTableList(); this.getTableList();
}, },
getTableList() { getTableList() {
...@@ -491,10 +491,9 @@ export default { ...@@ -491,10 +491,9 @@ export default {
watch: { watch: {
currentGroupId: { currentGroupId: {
handler: function(val) { handler: function(val) {
console.log('val', val, 'val');
// if (val != null) { // if (val != null) {
this.currentGroupId = val; this.currentGroupId = val;
this.pageParam.pageNum = 1; this.pageParam.pageNo = 1;
this.getTableList(); this.getTableList();
// } // }
}, },
......
...@@ -47,6 +47,7 @@ export default { ...@@ -47,6 +47,7 @@ export default {
}; };
}, },
created() { created() {
console.log(this.$route.query.hmId, 'this.$route.query.hmId');
if (this.$route.query.hmId) { if (this.$route.query.hmId) {
this.getActCodeInfo(); this.getActCodeInfo();
} }
......
...@@ -140,6 +140,7 @@ export default { ...@@ -140,6 +140,7 @@ export default {
}, },
// 保存按钮 // 保存按钮
save() { save() {
console.log(this.form, 'this.form');
if (!this.$refs.welcomeItem.submit()) { if (!this.$refs.welcomeItem.submit()) {
return; return;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment