Skip to content

M
member
Commit 889bc588 by huaying
Options

fix: 客户列表，卡券样式修改

parent f0c11e3f
Showing with 236 additions and 7 deletions
src/components/allCustomers/allCustomersList.less
......@@ -51,7 +51,7 @@
padding: 20px;
background: #fff;
.contain-header {
margin-bottom: 20px;
// margin-bottom: 20px;
.top-header {
display: flex;
align-items: center;
......
src/components/allCustomers/allCustomersList.vue
......@@ -21,8 +21,8 @@
>取消勾选</span>
</p>
</div>
<div class="action-wrap">
<div class="left">
<el-form inline>
<el-form-item>
<el-input
style="width:300px;"
v-model="pageParam.phoneNameCard"
......@@ -31,8 +31,54 @@
@change="onSearch"
clearable
/>
</el-form-item>
<el-form-item>
<vue-gic-select-tree :options="selectTreeOptions" @change="onSelectTreeChange" style="display: inline-block;margin:0 10px; height: 32px" />
</el-form-item>
<el-form-item style="margin-right:10px;">
<vue-gic-select-tree :options="selectChannelList" @change="onSelectChannelChange" style="display: inline-block;height: 32px" />
</el-form-item>
<el-form-item>
<el-button type="text" @click="showSearch = !showSearch" class="senior-search">
高级搜索<i
:class="showSearch ? 'el-icon-d-arrow-left' : 'el-icon-d-arrow-right'"
/>
</el-button>
</el-form-item>
<el-form-item style="float:right;
margin-bottom: 20px;">
<el-select
v-model="batchValue"
placeholder="批量操作"
@change="handleFocusBatch"
style="width: 150px;margin-right:7px;"
@visible-change="handleVisibleBatch"
>
<template v-for="item in batchOpt">
<el-option
v-if="getCodeAuth(item.code)"
:key="item.value"
:label="item.label"
:limit-code="getCode(item.code)"
:value="item.value"
/>
</template>
</el-select>
<el-button v-if="getCodeAuth('memberBatchImport')" :limit-code="getCode('memberBatchImport')" type="primary" @click="batchImport" style="margin-right:5px">批量导入修改</el-button>
</el-form-item>
</el-form>
<!-- <div class="action-wrap">
<div class="left">
<el-input
style="width:300px;"
v-model="pageParam.phoneNameCard"
prefix-icon="el-icon-search"
placeholder="输入姓名/昵称/手机号/会员卡号"
@change="onSearch"
clearable
/>
<vue-gic-select-tree :options="selectTreeOptions" @change="onSelectTreeChange" style="display: inline-block;margin:0 10px; height: 32px" />
<vue-gic-select-tree :options="selectChannelList" @change="onSelectChannelChange" style="display: inline-block;height: 32px" /> -->
<!-- <el-select v-model="selectChannelValue" multiple placeholder="请选择">
<el-option
v-for="item in selectChannelList"
......@@ -41,7 +87,7 @@
:value="item.value">
</el-option>
</el-select> -->
<el-button type="text" @click="showSearch = !showSearch" class="senior-search">
<!-- <el-button type="text" @click="showSearch = !showSearch" class="senior-search">
高级搜索<i
:class="showSearch ? 'el-icon-d-arrow-left' : 'el-icon-d-arrow-right'"
/>
......@@ -67,7 +113,7 @@
</el-select>
<el-button v-if="getCodeAuth('memberBatchImport')" :limit-code="getCode('memberBatchImport')" type="primary" @click="batchImport">批量导入修改</el-button>
</div>
</div>
</div> -->
<div v-show="showSearch" class="senior-search-content">
<!-- 人群筛选器 -->
<vue-gic-people
......@@ -305,6 +351,10 @@ export default { ...action };
</script>
<style lang="less" scoped>
@import './allCustomersList.less';
.el-form--inline .el-form-item {
margin-right: -5px;
margin-bottom: 16px;
}
</style>
<style lang="less">
.channel-box {
......
src/components/allCustomers/allCustomersList.wxss 0 → 100644
.list-section {
min-height: 100%;
}
.list-section .top-search-wrap {
display: flex;
align-items: center;
margin: 20px 20px 10px;
padding: 20px;
background: #fff;
}
.list-section .top-search-wrap > .label {
font-size: 14px;
font-weight: 400;
color: #606266;
line-height: 20px;
}
.list-section .top-search-wrap .flex-wrap {
display: flex;
align-items: center;
justify-content: flex-start;
}
.list-section .top-search-wrap .flex-wrap .el-checkbox:first-child {
margin-right: 0;
}
.list-section .top-search-wrap .flex-wrap /deep/ .el-checkbox__label {
font-size: 14px;
font-weight: 400;
color: #303133;
line-height: 22px;
}
.list-section .top-search-wrap .flex-wrap .line {
display: block;
width: 1px;
height: 14px;
margin: 0 26px;
background: #e4e7ed;
}
.list-section .top-search-wrap .flex-wrap .label {
font-size: 14px;
font-weight: 400;
color: #909399;
line-height: 20px;
}
.list-section .top-search-wrap .flex-wrap /deep/ .el-checkbox__label {
font-size: 14px;
font-weight: 400;
color: #303133;
line-height: 22px;
}
.list-section-contain {
padding: 20px;
background: #fff;
}
.list-section-contain .contain-header .top-header {
display: flex;
align-items: center;
margin-bottom: 20px;
}
.list-section-contain .contain-header .top-header h2 {
margin-right: 20px;
font-size: 16px;
font-weight: bold;
color: #303133;
line-height: 22px;
}
.list-section-contain .contain-header .top-header .right {
margin: 0;
font-size: 14px;
color: #606266;
}
.list-section-contain .contain-header .action-wrap {
display: flex;
justify-content: space-between;
align-items: center;
}
.list-section-contain .contain-header .action-wrap .left {
font-size: 0;
}
.list-section-contain .contain-header .action-wrap .senior-search {
margin-left: 17px;
}
.list-section-contain .contain-header .action-wrap .senior-search .el-icon-d-arrow-right,
.list-section-contain .contain-header .action-wrap .senior-search .el-icon-d-arrow-left {
display: inline-block;
transform: rotate(90deg);
margin-left: 5px;
font-size: 12px;
}
.list-section-contain .contain-header .senior-search-content {
margin-top: 20px;
}
/deep/ .el-table th > .cell:first-child,
/deep/ .el-table td > .cell:first-child {
padding-left: 10px;
}
/deep/ .el-table .setting-cell.el-table__cell {
display: flex;
align-items: center;
height: 59px;
padding: 0;
}
/deep/ .el-table .setting-cell.el-table__cell .cell.setting-cell {
display: flex;
justify-content: space-between;
align-items: center;
height: 59px;
padding-right: 0;
}
/deep/ .el-table .setting-cell.el-table__cell .cell.setting-cell .el-icon-setting {
display: flex;
justify-content: center;
align-items: center;
width: 60px;
height: 100%;
font-size: 20px;
color: #666;
cursor: pointer;
background: #eaeaea;
}
/deep/ .el-table .setting-cell.el-table__cell .cell.setting-cell .el-icon-setting:hover {
color: #000;
}
/deep/ .el-table .customer-info-cell {
display: flex;
align-items: center;
}
/deep/ .el-table .customer-info-cell img {
display: block;
width: 60px;
height: 60px;
margin-right: 10px;
}
/deep/ .el-table .customer-info-cell .memberName {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
/deep/ .el-table .status-icon {
font-size: 20px;
line-height: 19px;
vertical-align: middle;
color: #e2e4e8;
}
/deep/ .el-table .status-icon.icon-weixin1.follow {
color: #28c445;
}
/deep/ .el-table .status-icon.unfollow {
width: 20px;
height: 20px;
}
/deep/ .el-table .status-icon.icon-xiaochengxu1.used {
color: #11c18b;
}
/deep/ .el-table .status-icon + .status-icon {
margin-left: 6px;
}
src/components/allCustomers/components/customerLog.vue
......@@ -178,7 +178,7 @@ export default {
handler: function(selectTime) {
if(!selectTime){
let start = new Date();
start.setFullYear(start.getFullYear() - 2);
start.setFullYear(start.getFullYear() - 1);
start.setDate(start.getDate() + 1);
start = `${start.getFullYear()}-${start.getMonth() + 1}-${start.getDate()}`;
let end = new Date();
......
src/components/wechatmembers/cardvoucher.vue
......@@ -85,6 +85,7 @@
prop="putOnTime"
label="投放时间"
width="160px"
fixed
>
<template slot-scope="scope">
{{ scope.row.putOnTime | formatTime }}
......@@ -196,7 +197,7 @@
</div>
</template>
</el-table-column>
<el-table-column label="操作">
<el-table-column label="操作" width="100px" fixed="right">
<template slot-scope="scope">
<div class="operate">
<el-button
......@@ -335,6 +336,7 @@ import nav from "../../common/navbar/navbar.vue";
import { doFetch } from "../../components/axios/api";
import url from "../../components/axios/url";
import authMethods from '@/mixins/auth';
import {formatYMD} from '@/common/filters/custom.js';
import {
checkFalse,
checkStatus,
......@@ -475,6 +477,9 @@ export default {
this.handleCheckDestory();
},
handleSearch() {
if(!this.dateDefault) {
this.setDefalutTime();
}
this.page.currentPage = 1;
this.getMemberCardsPage();
},
......@@ -607,6 +612,23 @@ export default {
},
components: {
"v-nav": nav
},
watch: {
'dateDefault': {
handler: function(selectTime) {
if(!selectTime){
let start = new Date();
start.setFullYear(start.getFullYear() - 1);
start.setDate(start.getDate() + 1);
start = `${start.getFullYear()}-${start.getMonth() + 1}-${start.getDate()}`;
let end = new Date();
end = `${end.getFullYear()}-${end.getMonth() + 1}-${end.getDate()}`;
selectTime = [formatYMD(new Date(start).getTime()), formatYMD(new Date(end).getTime())]
this.dateDefault = [formatYMD(new Date(start).getTime()), formatYMD(new Date(end).getTime())]
}
},
immediate: true
}
}
};
</script>
......
src/components/wechatmembers/integralDataPage.vue
......@@ -115,6 +115,7 @@
<el-table-column
prop="remark"
label="备注"
show-overflow-tooltip
min-width="128px"
></el-table-column>
<el-table-column
......
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