Skip to content

M
member
Commit 6c706819 by chenyu
Options

update: update

parent 195aa84b
Showing with 769 additions and 484 deletions
src/components/achievement/achievement_interaction.vue
......@@ -2,7 +2,7 @@
<div class="member-achievement">
<div class="member-achievement-container">
<div>
<v-nav :navpath="navpath"></v-nav>
<!-- <v-nav :navpath="navpath"></v-nav> -->
<!-- <el-breadcrumb separator="/" class="member-breadcrumb">
<el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
<el-breadcrumb-item to="/achievement_interaction">会员成就</el-breadcrumb-item>
......@@ -531,12 +531,15 @@ export default {
.achievement {
display: block;
padding: 20px 25px;
background-color: #F7F8FA;
&-item {
padding: 15px 9px;
margin-bottom: 16px;
background-color: #fff;
border-radius: 6px
&+.achievement-item{
margin-top 16px
}
&:last-child {
margin-bottom: 0;
......@@ -593,11 +596,6 @@ export default {
color: #303133;
}
.member-achievement-container {
min-height: 100%;
padding-bottom: 100px;
}
.footer-box {
margin-top: -100px;
}
......
src/components/achievement/achievement_sale.vue
......@@ -2,7 +2,7 @@
<div class="member-achievement">
<div class="member-achievement-container">
<div>
<v-nav :navpath="navpath"></v-nav>
<!-- <v-nav :navpath="navpath"></v-nav> -->
<!-- <h2 class="member-title">会员消费</h2> -->
</div>
<div class="achievement" v-if="achievememntTypeList.length > 0">
......@@ -542,7 +542,7 @@ export default {
padding: 20px 20px;
&-item {
padding: 15px 9px;
// padding: 15px 9px;
margin-bottom: 16px;
background-color: #fff;
......@@ -601,11 +601,6 @@ export default {
color: #303133;
}
.member-achievement-container {
min-height: 100%;
padding-bottom: 100px;
}
.footer-box {
margin-top: -100px;
}
......
src/components/allCustomers/allCustomersList.less
......@@ -48,7 +48,6 @@
}
}
.list-section-contain {
margin: 20px;
padding: 20px;
background: #fff;
.contain-header {
......
src/components/allCustomers/allCustomersList.vue
<template>
<div class="list-section">
<div class="header-nav">
<!-- <div class="header-nav">
<nav-path :navpath="navpath" />
</div>
</div> -->
<div class="list-section-contain">
<div class="contain-header">
<div class="top-header">
......
src/components/allCustomers/consumption.vue
<template>
<div class="minwidth1200 member-fee">
<div class="consumption-container">
<v-nav :navpath="navpath" />
<!-- <v-nav :navpath="navpath" /> -->
<div class="record-count-wrap">
<div class="record-navitem" v-for="item in totalCountList" :key="item">
<p class="count-label">
......@@ -412,8 +412,7 @@ p {
display: flex;
justify-content: space-between;
align-items: center;
padding: 20px;
margin: 20px 20px 10px;
padding: 20px 20px 0;
background: #fff;
.record-navitem {
display: flex;
......@@ -435,7 +434,6 @@ p {
}
.record {
margin: 0 20px 20px;
padding: 20px;
background-color: #fff;
.record-search {
......
src/components/allCustomers/customerDetail.less
......@@ -2,8 +2,6 @@
max-width: 1600px;
}
.customer-contain-wrap {
min-height: calc(100vh - 208px);
margin: 20px;
padding: 20px;
background: #fff;
box-sizing: border-box;
......
src/components/allCustomers/customerDetail.vue
<template>
<div class="customer-details">
<v-nav :navpath="navpath" />
<!-- <v-nav :navpath="navpath" /> -->
<div class="customer-contain-wrap" v-loading="fullscreenLoading">
<div class="customer-info-item" v-for="section in customerInfoItemList" :key="section">
<div class="info-item-header">
......
src/components/allCustomers/dist/allCustomersList.css 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 {
margin-bottom: 20px;
}
.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/info.js
......@@ -244,7 +244,7 @@ export default {
this.getMarketingRecordNum();
},
mounted () {
const rightWrap = document.querySelector('.right-maincontainer');
const rightWrap = document.querySelector('.dm-layout-page');
rightWrap.scrollTo(0, 0);
this.initData();
this.getEnterpriseInfo();
......
src/components/block-list/index.vue
<template>
<div id="block-list">
<div class="min100">
<nav-path :navpath="navpath">
<div class="layout--tips" slot="member">
<div class="layout--tips mBottom20">
<i class="el-icon-info"></i>
查看被系统判定为异常风险的手机号，这部分手机将无法完成正常的注册认证流程；若为系统误判，可将手机号加入白名单后继续后续注册认证流程
</div>
</nav-path>
<div class="content">
<header>
......@@ -98,7 +95,6 @@
</span>
</el-dialog>
</div>
<!-- <div class="foot-add">
<vue-gic-footer></vue-gic-footer>
</div> -->
......@@ -223,15 +219,13 @@ export default {
</script>
<style lang="scss">
#block-list {
height: 100%;
padding: 20px;
header {
display: flex;
justify-content: space-between;
align-items: center;
}
.content {
margin: 24px;
padding: 20px;
background-color: #fff;
min-height: calc(100vh - 376px);
.el-table {
......
src/components/buyermembers/buyermembers.vue
<template>
<div class="buyer-part">
<Navbar></Navbar>
<div class="padding-container">
电商买家
</div>
</template>
......
src/components/labelmanager/labelmanager.vue
<template>
<div
class="labelmanage"
:style="{ height: bodyHeight - 64 + 'px'}"
>
<div class="labelmanage" >
<!-- <div class="achievementwrap-left" :style="{height: (bodyHeight - 64) + 'px'}">
<vue-gic-aside-menu :projectName="projectName" :leftModulesName="leftModulesName" :collapseFlag="$store.state.show"></vue-gic-aside-menu>
</div> -->
<div class="label-container min100">
<v-nav :navpath="navpath"></v-nav>
<div class="label-container">
<!-- <v-nav :navpath="navpath"></v-nav> -->
<div class="labelcontainer-wrap">
<div class="labelcontainer">
<div class="tr pad-b-24">
......@@ -440,12 +437,12 @@ export default {
flex: 0 0 200px;
}
.labelcontainer-wrap {
padding: 24px 24px 1px 24px;
}
// .labelcontainer-wrap {
// padding: 24px 24px 1px 24px;
// }
.labelcontainer {
padding: 24px 26px 59px 27px;
padding: 20px;
background: #fff;
.pad-b-24 {
......
src/components/marketingRecord/components/card.vue
<template>
<div class="marketing-card mt5">
<div class="marketing-card">
<div class="search mb10">
投放时间：<el-date-picker :clearable="false" class="w256 mb10 mr10" value-format="yyyy-MM-dd" :pickerOptions="pickerOptions" v-model="launchTime" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" @change="change"></el-date-picker>
领取时间：<el-date-picker :clearable="false" class="mr10 w256 mb10" value-format="yyyy-MM-dd" :pickerOptions="pickerOptions" v-model="collectionTime" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" @change="change"></el-date-picker>
......
src/components/marketingRecord/components/ecm.vue
<template>
<div class="marketing-ecm mt5">
<div class="marketing-ecm">
<div class="search">
<el-input
v-model="search.search"
......
src/components/marketingRecord/components/message.vue
<template>
<div class="marketing-message mt5">
<div class="marketing-message">
<div class="search">
<el-date-picker :clearable="false" value-format="yyyy-MM-dd" class="w256" :pickerOptions="pickerOptions" v-model="time" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" @change="change"></el-date-picker>
<el-select class="ml10 w160" v-model="search.smsType" placeholder="所有模板类型" clearable @change="change">
......
src/components/marketingRecord/components/wechat.vue
<template>
<div class="marketing-wechat mt5">
<div class="marketing-wechat">
<div class="search">
<el-date-picker :clearable="false" value-format="yyyy-MM-dd" class="w256" :pickerOptions="pickerOptions" v-model="time" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" @change="change"></el-date-picker>
<el-select class="ml10 w160" v-model="search.contentType" placeholder="所有素材类型" clearable @change="change">
......
src/components/marketingRecord/index.vue
<template>
<div class="marketing-record">
<div class="min20">
<nav-path :navpath="navpath"></nav-path>
<div class="marketing-container">
<div class="tabs">
<el-tabs v-model="tabsIndex" @tab-click="handleClick">
<el-tab-pane label="智能营销" name="1">
<ecm-record ref="ecmRecord" :tableData="ecmTableData" @changeSearch="onChange" />
</el-tab-pane>
<el-tab-pane label="卡券营销" name="2">
<card-record :tableData="cardTableData" @changeSearch="onChange" />
</el-tab-pane>
<el-tab-pane label="短信营销" name="3">
<message-record :tableData="messageTableData" @changeSearch="onChange" />
</el-tab-pane>
<el-tab-pane label="微信营销" name="4">
<wechat-record :tableData="wechatTableData" @changeSearch="onChange" />
</el-tab-pane>
</el-tabs>
</div>
</div>
<div class="tabs">
<el-tabs v-model="tabsIndex" @tab-click="handleClick">
<el-tab-pane label="智能营销" name="1">
<ecm-record ref="ecmRecord" :tableData="ecmTableData" @changeSearch="onChange" />
</el-tab-pane>
<el-tab-pane label="卡券营销" name="2">
<card-record :tableData="cardTableData" @changeSearch="onChange" />
</el-tab-pane>
<el-tab-pane label="短信营销" name="3">
<message-record :tableData="messageTableData" @changeSearch="onChange" />
</el-tab-pane>
<el-tab-pane label="微信营销" name="4">
<wechat-record :tableData="wechatTableData" @changeSearch="onChange" />
</el-tab-pane>
</el-tabs>
</div>
</div>
</template>
......@@ -258,11 +253,22 @@ export default {
<style lang="scss" scoped>
.marketing-container {
margin: 20px;
padding: 20px;
padding:5px 20px 20px;
background-color: #fff;
}
/deep/.el-tabs {
.el-tabs__header .el-tabs__nav-wrap{
/deep/.el-tabs__nav-scroll .el-tabs__nav .el-tabs__item:nth-child(2){
padding-left:20px ;
}
&::after{
height: 1px;
}
}
.el-tab-pane{
padding: 5px 20px 20px;
}
}
.table {
.pager {
text-align: right;
......
src/components/membergroup/membergroup.vue
<template>
<div
class="member-group"
:style="{height: (bodyHeight - 64) + 'px'}"
>
<div class="container">
<v-nav :navpath="navpath"></v-nav>
<div class="group-wrap">
<div
class="group"
......@@ -120,11 +115,6 @@
</div>
</div>
</div>
</div>
<!-- <div class="foot-add">
<vue-gic-footer></vue-gic-footer>
</div> -->
</div>
</template>
<script>
......@@ -257,19 +247,8 @@ export default {
</script>
<style lang="less" scoped>
.member-group {
background: #f0f2f5;
overflow-y: auto;
}
.group-wrap {
background-color: #f0f2f5;
padding: 24px;
min-height: 560px;
}
.group {
padding: 24px;
padding: 20px;
background: #fff;
.add-wrap {
......@@ -298,6 +277,10 @@ export default {
}
.groupwrap {
display: flex;
gap: 10px;
flex-wrap:wrap;
width: 100%;
.borderbmdashed {
border-color: #dcdfe6;
}
......@@ -324,9 +307,7 @@ export default {
}
.groupwrap-item {
display: inline-block;
vertical-align: middle;
margin: 0 10px 10px 0;
display: block;
border: 1px solid #dcdfe6;
border-radius: 4px;
max-width: 24%;
......@@ -337,15 +318,5 @@ export default {
float: right;
}
.member-group {
.container {
min-height: 100%;
box-sizing: border-box;
padding-bottom: 100px;
}
.foot-add {
margin-top: -100px;
}
}
</style>
src/components/membergroup/membergroupAdd.vue
<template>
<div
class="member-add"
:style="{ height: bodyHeight - 64 + 'px'}"
>
<div class="member-add">
<div class="container">
<v-nav :navpath="navpath"></v-nav>
<!-- <v-nav :navpath="navpath"></v-nav> -->
<div class="wrap">
<div class="wrap-cell">
<h1 class="wrap-title">分组内容设置</h1>
......@@ -81,7 +78,7 @@
</div>
</div>
<!-- <vue-gic-footer></vue-gic-footer> -->
<div class="footwrap">
<dm-form-bottom>
<el-button
type="primary"
size="small"
......@@ -92,7 +89,7 @@
size="small"
@click="goback"
>返回</el-button>
</div>
</dm-form-bottom>
</div>
</template>
......@@ -288,13 +285,12 @@ export default {
<style lang="stylus" scoped>
.member-add {
background: #f0f2f5;
background: #F7F8FA;
overflow: auto;
height 100%
}
.wrap {
padding: 24px;
background: #f0f2f5;
.wrap-cell {
background: #fff;
......
src/components/membergroup/membergroupDetail.vue
<template>
<div
class="member-group-detail"
:style="{ height: bodyHeight - 64 + 'px'}"
>
<v-nav :navpath="navpath"></v-nav>
<div class="wrap">
<div class="groupmember">
<p class="groupmember-title">会员共{{page.total}}人</p>
<div class="member-group-detail">
<p class="groupmember-title">会员共{{page.total||0}}人</p>
<div class="table-content">
<el-table
:data="memberData"
......@@ -186,8 +179,6 @@
</dm-pagination>
</div>
</div>
</div>
</div>
<!-- <vue-gic-footer></vue-gic-footer> -->
<!-- <div class="footwrap">
<el-button plain @click="goback">返回</el-button>
......@@ -427,17 +418,6 @@ export default {
</script>
<style lang="stylus" scoped>
.wrap {
min-height: 580px;
padding: 24px;
background: #f0f2f5;
.groupmember {
padding: 24px;
background: #fff;
}
}
.el-table {
>>>.el-table__empty-block {
height: 256px;
......@@ -453,6 +433,6 @@ export default {
}
.member-group-detail {
overflow: auto;
padding: 20px
}
</style>
src/components/memberlist/memberReturn.vue
<template>
<div
class="member-return"
:style="{ height: bodyHeight - 64 + 'px'}"
>
<div class="member-return">
<div class="member-container">
<nav-path :navpath="navpath"></nav-path>
<!-- <nav-path :navpath="navpath"></nav-path> -->
<div class="return-container">
<div class="handler">
<p
......@@ -219,7 +216,6 @@ export default { ...memberReturn };
}
}
.return-container {
margin: 24px;
padding: 20px;
background-color: #fff;
......@@ -240,11 +236,6 @@ p {
margin: 0;
}
.member-container {
min-height: 100%;
padding-bottom: 100px;
box-sizing: border-box;
}
.foot-add {
margin-top: -100px;
......
src/components/memberlist/pos-recycle.vue
<template>
<div
class="member-return"
:style="{ height: bodyHeight - 64 + 'px'}"
>
<div class="member-return">
<div class="member-container">
<nav-path :navpath="navpath"></nav-path>
<!-- <nav-path :navpath="navpath"></nav-path> -->
<div class="return-container">
<div class="handler">
<p
......@@ -61,7 +58,7 @@
></el-option> -->
</el-select>
<el-popover
placement="top-start"
placement="bottom-start"
title=""
width="450"
trigger="hover"
......@@ -659,7 +656,6 @@ export default { ...PosReturn };
<style lang="stylus">
.return-container {
margin: 24px;
padding: 20px;
background-color: #fff;
......@@ -680,12 +676,6 @@ p {
margin: 0;
}
.member-container {
min-height: 100%;
padding-bottom: 100px;
box-sizing: border-box;
}
.foot-add {
margin-top: -100px;
}
......
src/components/membertask/membertask.vue
<template>
<div
class="member-task"
:style="{ height: bodyHeight - 64 + 'px'}"
>
<div class="min100">
<v-nav :navpath="navpath"></v-nav>
<div class="member-task">
<div class="achievement">
<div
class="achievement-item"
......@@ -89,7 +83,6 @@
</div>
</div>
</div>
</div>
<!-- <div class="footer-box foot-add">
<vue-gic-footer></vue-gic-footer>
</div> -->
......@@ -234,21 +227,19 @@ export default {
<style lang="stylus">
.member-task {
background:#F7F8FA;
overflow: auto;
}
.achievement {
display: block;
padding: 24px;
&-item {
padding: 15px 9px;
margin-bottom: 16px;
background-color: #fff;
border-radius: 5px;
&:last-child {
margin-bottom: 0;
&+.achievement-item{
margin-top: 16px;
}
}
......
src/components/onlinemembers/onlinemembers.vue
<template>
<div class="online-part">
<Navbar></Navbar>
<div class="padding-container">
<!-- <Navbar></Navbar> -->
电商会员
</div>
</template>
......
src/components/photo-album/album.vue
<template>
<div class="page-content">
<v-nav :navpath="navpath"></v-nav>
<photo-album :member-id="memberId" :from="from" />
<!-- <vue-gic-footer style="padding-bottom:80px"></vue-gic-footer> -->
</div>
......
src/components/photo-album/img-list.vue
<template>
<div class="page-content">
<v-nav :navpath="navpath"></v-nav>
<photo-album :member-id="memberId" :folder-id="folderId"/>
<!-- <vue-gic-footer style="padding-bottom:80px"></vue-gic-footer> -->
</div>
......@@ -78,13 +77,6 @@ export default {
<style lang="scss" scoped>
.page-content {
min-width: 1400px;
}
.mall-section-container {
position: relative;
padding: 22px 24px 24px;
margin: 24px;
min-height: calc(100vh - 427px);
background: #fff;
min-width: 1200px;
}
</style>
src/components/photo-album/photo-album.vue
......@@ -134,8 +134,7 @@ export default {
<style lang="scss" scoped>
.mall-section-container {
position: relative;
padding: 22px 24px 24px;
margin: 24px;
padding: 20px;
min-height: calc(100vh - 427px);
background: #fff;
.folder-list {
......
src/components/wechatmembers/abnormal-member-option.vue
<template>
<div class="frozen-list">
<div class="min100">
<nav-path :navpath="navpath"></nav-path>
<div class="member-forzen-container">
<!--
会员列表
......@@ -207,13 +204,10 @@
</div>
</div>
</div>
</div>
<!-- <div class="foot-add">
<vue-gic-footer></vue-gic-footer>
</div> -->
</div>
</template>
<script>
......@@ -580,7 +574,7 @@ export default {
<style lang="stylus" scoped>
.member-forzen-container {
margin: 25px 24px 20px;
display: flex;
overflow: hidden;
......
src/components/wechatmembers/abnormal-member.vue
<template>
<div class="frozen-list">
<div class="min100">
<nav-path :navpath="navpath"></nav-path>
<div class="forzen-container">
<div class="search">
<div class="top-header">
......@@ -279,7 +277,6 @@
</div>
</div>
</div>
</div>
<!-- <div class="foot-add">
<vue-gic-footer></vue-gic-footer>
......@@ -650,8 +647,7 @@ export default {
<style lang="stylus" scoped>
.forzen-container {
margin: 25px 24px 20px;
padding: 24px 25px 30px 23px;
padding: 20px;
background-color: #fff;
.search {
......@@ -733,7 +729,7 @@ export default {
.frozen-table {
.pager {
text-align: right;
padding: 20px 0;
padding: 20px 0 0;
}
}
......
src/components/wechatmembers/ajaxmembersinfo.vue
<template>
<div class="minwidth1200 member-fee">
<div class="con-container">
<v-nav :navpath="navpath"></v-nav>
<div class="record-nav">
<div class="record-navitem">
<!-- 这里跑数据的时候去反了 -->
......@@ -49,9 +48,7 @@
<p class="record-txt">{{ memberInfo.avgDiscount | fomatFloat }}</p>
</div>
</div>
<div class="record">
<div class="mTop20">
<div class="record-search mBottom20">
<div class="record-searchitem">
<el-select
......@@ -237,7 +234,6 @@
</div>
</div>
</div>
</div>
<!-- <div class="footwrap">
<el-button plain @click="goback">返回</el-button>
</div> -->
......@@ -657,12 +653,12 @@ $bgcolor = #fbfcfd;
$bordercolor = #e3e5e9;
.record {
margin: 20px 25px;
padding: 20px;
background-color: #fff;
&-nav {
display: flex;
padding-bottom:20px;
background: #F7F8FA;
}
&-navitem {
......@@ -819,11 +815,6 @@ $bordercolor = #e3e5e9;
overflow: auto;
}
.con-container {
min-height: 100%;
padding-bottom: 100px;
box-sizing: border-box;
}
.record-txt {
font-size: 20px;
......
src/components/wechatmembers/bulkIntegral.vue
<template>
<div id="bulkIntegral">
<nav-path :navpath="navpath"></nav-path>
<div class="contentBulkIntegral">
<div class="contentInfo">
<div class="flex">
<div>
......@@ -94,7 +92,6 @@
:total="page.totalCount">
</dm-pagination>
</div>
</div>
<!-- <vue-gic-footer></vue-gic-footer> -->
<!-- 新建导入 -->
......@@ -492,22 +489,19 @@ export default {
</script>
<style lang="scss" scoped>
#bulkIntegral {
height: 100%;
padding:20px;
.el-table{
width: 99.9%;
}
.contentBulkIntegral {
padding: 22px 24px;
.contentInfo {
padding: 24px;
background-color:#fff;
.flex {
padding-bottom: 22px;
}
/deep/ .el-table th>.cell {
font-weight: 700;
color: #303133;
}
.contentInfo {
background-color:#fff;
.flex {
padding-bottom: 20px;
}
/deep/ .el-table th>.cell {
font-weight: 700;
color: #303133;
}
}
/deep/ .el-dialog__footer {
......@@ -561,7 +555,7 @@ export default {
}
/deep/ .dm-pagination {
text-align: right;
margin: 20px 0 40px;
margin-top: 20px;
}
}
.flex {
......
src/components/wechatmembers/bulkLogsDetail.vue
<template>
<div id="bulkLogsDetail">
<nav-path :navpath="navpath"></nav-path>
<div class="contentBulkIntegral">
<div class="contentInfo">
<div class="flex">
<span class="headerTips">总条数：{{ count.all }} 条，成功导入 {{ count.success }} 条，<span class="headerTipsError">错误 {{ count.error }} 条</span></span>
<el-button type="primary" @click="exportExcel"><i class="iconfont icon-icon_yunxiazai"></i> 导出</el-button>
......@@ -92,7 +90,6 @@
:total="page.totalCount">
</dm-pagination>
</div>
</div>
<!-- <vue-gic-footer></vue-gic-footer> -->
</div>
</template>
......@@ -184,33 +181,28 @@ export default {
</script>
<style lang="scss" scoped>
#bulkLogsDetail {
height: 100%;
.el-table{
width:99.9%;
}
.contentBulkIntegral {
padding: 22px 24px;
.contentInfo {
padding: 30px 24px;
background-color: #fff;
.headerTips {
color: #303133;
font-size: 14px;
}
.headerTipsError {
color: #F5222D;
}
.flex {
padding-bottom: 22px;
}
/deep/ .el-table th>.cell {
font-weight: 700;
color: #303133;
}
/deep/ .dm-pagination {
text-align: right;
margin: 20px 0 40px;
}
padding: 20px;
.headerTips {
color: #303133;
font-size: 14px;
}
.headerTipsError {
color: #F5222D;
}
.flex {
padding-bottom: 22px;
}
/deep/ .el-table th>.cell {
font-weight: 700;
color: #303133;
}
/deep/ .dm-pagination {
text-align: right;
margin-top: 20px;
}
}
}
......
src/components/wechatmembers/cardvoucher.vue
<template>
<div class="crad-con">
<div class="main-container min100">
<v-nav :navpath="navpath"></v-nav>
<div class="card-warp">
<div >
<div class="table-container-member">
<div class="mBottom20">
<el-select
......@@ -75,7 +72,6 @@
></el-option>
</el-select>
</div>
<div class="mBottom40">
<div class="table-content">
<el-table
:data="memberData"
......@@ -194,7 +190,6 @@
</el-table>
<div
class="page mTop20"
v-if="memberData.length > 0"
>
<dm-pagination
background
......@@ -209,9 +204,7 @@
</dm-pagination>
</div>
</div>
</div>
</div>
</div>
<el-dialog
title="选择订单"
:visible.sync="checkVisible"
......@@ -303,7 +296,6 @@
<!-- <div class="footer-box foot-add">
<vue-gic-footer></vue-gic-footer>
</div> -->
</div>
</template>
<script>
......
src/components/wechatmembers/frozenMember.vue
<template>
<div class="frozen-list">
<div class="min100">
<nav-path :navpath="navpath"></nav-path>
<!-- <nav-path :navpath="navpath"></nav-path> -->
<div class="member-forzen-container">
<!--
会员列表
......@@ -593,7 +593,6 @@ export default {
<style lang="stylus" scoped>
.member-forzen-container {
margin: 25px 24px 20px;
display: flex;
overflow: hidden;
......
src/components/wechatmembers/infoMall.vue
<template>
<div class="mall-container">
<div class="padding-container">
<div class="min100">
<v-nav :navpath="navpath"></v-nav>
<!-- <v-nav :navpath="navpath"></v-nav> -->
<div class="record-nav">
<div class="record-navitem">
<p class="lheigth40">消费总额</p>
......@@ -325,8 +325,6 @@ $bgcolor = #fbfcfd;
$bordercolor = #e3e5e9;
.record {
margin: 24px 24px 0;
padding: 20px 20px 0;
background-color: #fff;
&-nav {
......@@ -336,8 +334,10 @@ $bordercolor = #e3e5e9;
&-navitem {
flex: 1;
height: 100px;
padding-left: 25px;
background: #fff;
&+.record-navitem{
padding-left: 25px;
}
}
&-header {
......
src/components/wechatmembers/integralDataPage.vue
<template>
<div class="minwidth1200 wechat-point-details">
<div class="con-container">
<v-nav :navpath="navpath"></v-nav>
<div class="wrap table-container">
<div class="mBottom20">
<div class="search-top">
<div class="left-search-wrap">
<searchinput
stylelink="width: 280px"
prefix-icon="el-icon-search"
placeholder="请输入会员姓名/昵称/手机"
v-model="searchStr"
@handleSearch="handleSearch"
></searchinput>
<el-select
v-model="intervalInOut"
style="margin:0 6px;"
placeholder="所有日志"
@change="handleSearch"
>
<el-option
:key=-1
label="所有日志"
:value=-1
></el-option>
<el-option
:key=1
label="积分获取"
:value=1
></el-option>
<el-option
:key=2
label="积分扣除"
:value=2
></el-option>
</el-select>
<el-select
v-model="dictCode"
placeholder="所有事由"
@change="handleSearch"
>
<el-option
:key=-1
label="所有事由"
:value=-1
></el-option>
<el-option
v-for="item in dictList"
:key="item.dictCode"
:label="item.dictName"
:value="item.dictCode"
></el-option>
</el-select>
</div>
<el-button
v-if="getCodeAuth('memberAdjustIntegral')"
type="primary"
:limit-code="getCode('memberAdjustIntegral')"
@click="linkRoute('/modifyintegral')"
>调整积分</el-button>
</div>
</div>
<div class="mBottom40">
<div class="table-content">
<el-table
:data="memberData"
tooltip-effect="dark"
ref="multipleTable"
>
<el-table-column
prop="callBeginTime"
label="时间"
>
<template slot-scope="scope">
{{ scope.row.createTime | formatTime }}
</template>
</el-table-column>
<el-table-column
prop="intervalInout"
label="日志类型"
>
<template slot-scope="scope">
<span v-if="scope.row.intervalInout == 1">积分获取</span>
<span v-if="scope.row.intervalInout == 0">积分扣除</span>
</template>
</el-table-column>
<el-table-column
prop="intervalHistory"
label="日志详情"
>
<template slot-scope="scope">
<span :style="{color: scope.row.intervalHistory > 0 ? 'green' : 'red'}">{{ scope.row.intervalHistory }}</span>
</template>
</el-table-column>
<el-table-column
prop="memberIntegralName"
label="事由"
></el-table-column>
<el-table-column
prop="remark"
label="备注"
></el-table-column>
<el-table-column
prop="mainStoreName"
label="服务门店"
></el-table-column>
<el-table-column
prop="openStoreName"
label="开卡门店"
></el-table-column>
<el-table-column
prop="intervalEffect"
label="积分成本主体"
>
<template slot-scope="scope">
<span v-if="scope.row.intervalInout == 0">--</span>
<span v-if="scope.row.intervalInout == 1">{{scope.row.mainPartStoreName ? scope.row.mainPartStoreName : '--'}}</span>
</template>
</el-table-column>
</el-table>
<div
class="page mTop20"
v-if="page.totalCount > 0"
>
<dm-pagination
background
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page="page.currentPage"
:page-sizes="[20, 40, 60, 80]"
:page-size="page.pageSize"
layout="total, sizes, prev, pager, next"
:total="page.totalCount"
>
</dm-pagination>
</div>
</div>
</div>
<div class="search-top mBottom20">
<div class="left-search-wrap">
<searchinput
stylelink="width: 280px"
prefix-icon="el-icon-search"
placeholder="请输入会员姓名/昵称/手机"
v-model="searchStr"
@handleSearch="handleSearch"
></searchinput>
<el-select
v-model="intervalInOut"
style="margin:0 6px;"
placeholder="所有日志"
@change="handleSearch"
>
<el-option
:key=-1
label="所有日志"
:value=-1
></el-option>
<el-option
:key=1
label="积分获取"
:value=1
></el-option>
<el-option
:key=2
label="积分扣除"
:value=2
></el-option>
</el-select>
<el-select
v-model="dictCode"
placeholder="所有事由"
@change="handleSearch"
>
<el-option
:key=-1
label="所有事由"
:value=-1
></el-option>
<el-option
v-for="item in dictList"
:key="item.dictCode"
:label="item.dictName"
:value="item.dictCode"
></el-option>
</el-select>
</div>
<el-button
v-if="getCodeAuth('memberAdjustIntegral')"
type="primary"
:limit-code="getCode('memberAdjustIntegral')"
@click="linkRoute('/modifyintegral')"
>调整积分</el-button>
</div>
<div class="table-content">
<el-table
:data="memberData"
tooltip-effect="dark"
ref="multipleTable"
>
<el-table-column
prop="callBeginTime"
label="时间"
>
<template slot-scope="scope">
{{ scope.row.createTime | formatTime }}
</template>
</el-table-column>
<el-table-column
prop="intervalInout"
label="日志类型"
>
<template slot-scope="scope">
<span v-if="scope.row.intervalInout == 1">积分获取</span>
<span v-if="scope.row.intervalInout == 0">积分扣除</span>
</template>
</el-table-column>
<el-table-column
prop="intervalHistory"
label="日志详情"
>
<template slot-scope="scope">
<span :style="{color: scope.row.intervalHistory > 0 ? 'green' : 'red'}">{{ scope.row.intervalHistory }}</span>
</template>
</el-table-column>
<el-table-column
prop="memberIntegralName"
label="事由"
></el-table-column>
<el-table-column
prop="remark"
label="备注"
></el-table-column>
<el-table-column
prop="mainStoreName"
label="服务门店"
></el-table-column>
<el-table-column
prop="openStoreName"
label="开卡门店"
></el-table-column>
<el-table-column
prop="intervalEffect"
label="积分成本主体"
>
<template slot-scope="scope">
<span v-if="scope.row.intervalInout == 0">--</span>
<span v-if="scope.row.intervalInout == 1">{{scope.row.mainPartStoreName ? scope.row.mainPartStoreName : '--'}}</span>
</template>
</el-table-column>
</el-table>
<div
class="page mTop20"
>
<dm-pagination
background
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page="page.currentPage"
:page-sizes="[20, 40, 60, 80]"
:page-size="page.pageSize"
layout="total, sizes, prev, pager, next"
:total="page.totalCount"
>
</dm-pagination>
</div>
</div>
<!-- <div class="footwrap">
<el-button plain @click="goback">返回</el-button>
</div> -->
<el-dialog
title="积分扣除来源"
:visible.sync="loseVisible"
......@@ -408,20 +395,9 @@ export default {
}
.wechat-point-details {
height: 100%;
padding:20px;
overflow: auto;
.table-container {
padding: 20px;
margin: 20px;
background-color: #fff;
}
}
.con-container {
min-height: 100%;
padding-bottom: 100px;
box-sizing: border-box;
}
.footer-box {
......
src/components/wechatmembers/memberSetting.vue
<template>
<div class="member-setting">
<div class="minheight">
<v-nav :navpath="navpath"></v-nav>
<!-- <v-nav :navpath="navpath"></v-nav> -->
<div class="setting-con">
<div class="setting-container">
<el-switch v-model="value"></el-switch>
......@@ -94,8 +94,7 @@ export default {
<style lang="stylus" scoped>
.setting-con {
margin: 24px 24px 0;
padding: 24px 24px 48px;
padding: 20px;
background-color: #fff;
.setting-container {
......
src/components/wechatmembers/modifyintegral.vue
<template>
<div class="minwidth1200">
<v-nav :navpath="navpath"></v-nav>
<div class="wrap modify-container">
<div class="modify-container">
<el-form
ref="IntegralForm"
:model="IntegralForm"
......@@ -125,7 +123,6 @@
>主体为必填内容</div>
</el-form-item>
</el-form>
</div>
<div
class="table-container"
v-show="deductionType == 2 && IntegralForm.editType == 1"
......@@ -282,7 +279,7 @@
</div>
</div>
</div>
<div class="footwrap">
<dm-form-bottom>
<el-button
plain
@click="goback"
......@@ -291,7 +288,7 @@
type="primary"
@click="submitIntegral('IntegralForm')"
>确认调整</el-button>
</div>
</dm-form-bottom>
</div>
</template>
......@@ -629,15 +626,10 @@ export default {
}
.modify-container {
margin: 20px;
margin-bottom: -20px;
padding: 24px 24px 10px 24px;
background-color: #fff;
padding:20px;
}
.table-container {
padding: 0 20px 20px 140px;
margin: 20px;
background-color: #fff;
padding-left: 120px;
}
</style>
src/components/wechatmembers/storedValue.vue
<template>
<div class="minwidth1200 wechat-point-details">
<div class="con-container">
<v-nav :navpath="navpath"></v-nav>
<div class="wrap table-container">
<div class="mBottom20">
<el-date-picker class="w250" v-model="dateTime" value-format="yyyy-MM-dd" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" @change="handleTimeChange"></el-date-picker>
<el-select
......@@ -18,7 +15,6 @@
></el-option>
</el-select>
</div>
<div class="mBottom40">
<div class="table-content">
<el-table
:data="listData"
......@@ -77,7 +73,6 @@
</el-table>
<div
class="page mTop20"
v-if="page.totalCount > 0"
>
<dm-pagination
background
......@@ -92,10 +87,7 @@
</dm-pagination>
</div>
</div>
</div>
</div>
</div>
</div>
</template>
<script>
import nav from "../../common/navbar/navbar.vue";
......@@ -258,15 +250,3 @@ export default ({
}
})
</script>
<style lang="stylus">
.wechat-point-details {
height: 100%;
overflow: auto;
.table-container {
padding: 20px;
margin: 20px;
background-color: #fff;
}
}
</style>
src/components/wechatmembers/talkLogPage.vue
<template>
<div class="talk-container">
<div class="min100">
<v-nav :navpath="navpath"></v-nav>
<!-- <v-nav :navpath="navpath"></v-nav> -->
<div class="padding-container">
<div class="mBottom20">
<el-row>
......
src/components/wechatmembers/wechat-total.vue
<template>
<div class="wechat-gic">
<div class="min100">
<nav-path :navpath="navpath">
<!-- <router-link
to="/wechatmembers/memberSetting"
tag="span"
class="wechat-setting member-wechat-set-primary"
slot="member"
>设 置</router-link> -->
</nav-path>
<div class="wechat-part">
<div class="gic-people">
<h2 class="adpot-container">
......@@ -743,7 +735,7 @@ export default { ...wechattotal };
}
.wechat-part {
padding: 24px 24px 0;
padding: 20px 20px 0;
.member-wechat-setting {
position: relative;
......@@ -764,7 +756,6 @@ export default { ...wechattotal };
.handler {
background-color: #fff;
padding: 20px;
.handler-search {
margin-bottom: 20px;
......@@ -799,7 +790,7 @@ export default { ...wechattotal };
}
.people-box {
padding: 24px;
margin-top:20px;
background-color: #fff;
}
}
......
src/components/wechatmembers/wmDetail.vue
<template>
<div class="mall-container-new">
<v-nav :navpath="navpath" :showTitle="false"></v-nav>
<div class="record">
<header>
<el-select v-model="search" placeholder="全部类型" clearable @change="searchChangd">
......@@ -262,7 +261,6 @@ export default {
min-width: 1400px;
}
.record {
margin: 20px;
padding: 20px;
background-color: #fff;
......
src/router/index.js
......@@ -340,7 +340,7 @@ export const constantRouterMap = [
const router = new Router({
// mode: 'history',
// base: '/member/',
base: '/member/',
scrollBehavior: () => ({ y: 0 }),
routes: constantRouterMap,
});
......
src/view/layout/Layout.vue
<template>
<div>
<!-- <div>
<vue-gic-header
:projectName="projectName"
@collapseTag="collapseTag"
......@@ -24,13 +24,16 @@
<keep-alive>
<router-view v-if="$route.meta.keepAlive"></router-view>
</keep-alive>
<!-- <router-view></router-view> -->
<router-view v-if="!$route.meta.keepAlive"></router-view>
</div>
</div>
</div>
<!-- <router-view></router-view> -->
</div>
</div> -->
<div class="container">
<dm-layout projectName="integral-mall">
<router-view />
</dm-layout>
</div>
</template>
......
static/css/index.styl
......@@ -423,8 +423,7 @@ p {
background-color #f2f3f4
.padding-container
margin 24px 24px 0
padding 20px 20px 0
padding 20px
background-color #fff
.min-container
......
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