Skip to content

M
member
Commit 54548f99 by shaojiawen
Options

Merge branch 'feature/7月迭代-会员' into dev

parents 802d2d2a f5ccf5d3
Showing with 103 additions and 140 deletions
src/components/allCustomers/customerDetail.vue
......@@ -374,7 +374,7 @@
<div :class="['scores', { 'is-clique': showClique }]">
<div class="scores-box" v-if="showClique" @click="goLinkWithClique('/enterpriseIntegralDataPage')">
<div class="scores-info">
<icon-label-value label="集团积分" :value="memberInfo.cliqueMemberIntegral ? memberInfo.cliqueMemberIntegral : 0">
<icon-label-value label="集团积分" :value="memberInfo.totalPointEnterprise || 0">
<div class="score-icon" slot="icon">
<i class="iconfont icon-jifenjiabei"></i>
</div>
......
src/components/allCustomers/info.js
......@@ -182,11 +182,10 @@ export default {
watch: {
count: function (n, o) {
if (n === 3) {
this.fullscreenLoading = false;
if (this.memberInfo.erpIntegralFlag) {
// 需要erp积分
doFetch(url.getErpIntegral, { cardNo: this.memberInfo.cardNum })
doFetch(url.getErpIntegral, { cardNo: this.memberInfo.cardNum || ''})
.then(res => {
this.fullscreenLoading = false;
if (res.data.errorCode === 0) {
if (
res.data.result == null ||
......@@ -201,15 +200,12 @@ export default {
this.memberInfo.accumulatPoints = res.data.result;
this.memberInfo.invalidIntegral = 0;
} else {
this.fullscreenLoading = false;
checkFalse(res.data.message);
}
})
.catch(err => {
checkStatus(err);
});
} else {
this.fullscreenLoading = false;
}
}
},
......@@ -321,7 +317,8 @@ export default {
if (api === 'memberLoadmemberInfo') {
this.memberInfo = Object.assign({}, ret.memberInfo);
this.memberInfo.totalPoint= ret.memberInfo.invalidIntegral+ret.memberInfo.accumulatPoints
this.memberInfo.totalPoint= ret.memberInfo.invalidIntegral+ret.memberInfo.accumulatPoints;
this.memberInfo.totalPointEnterprise= ret.memberInfo.cliqueMemberInvalidIntegral+ret.memberInfo.cliqueMemberIntegral;
}
if (api === 'memberLoadTagDetail') {
this.tagAndRemarkInfo = Object.assign(
......
src/components/axios/url.js
......@@ -124,7 +124,9 @@ const urlConfig = {
getMemberLogReason: '/api-plug/member-oper-reason-list',
getFrozenList: "/api-member/ajax-frozen-members",
batchUpdateFrozen: "/api-member/members-batch-update-frozen",
getExceptionList: '/api-member/list-exception-member'
getExceptionList: '/api-member/list-exception-member',
getErpIntegral: '/api-member/member-erp-integral'
}
const defaultUrl = Object.assign({}, urlConfig);
......
src/components/wechatmembers/enterpriseIntegralDetial.vue
......@@ -68,8 +68,7 @@
<el-table-column
prop="createTime"
label="时间"
min-width="155px"
show-overflow-tooltip
min-width="130px"
>
<template slot-scope="scope">
<div class="line-20">{{ scope.row.createTime | formatYMD }}</div>
......@@ -80,7 +79,6 @@
prop="intervalInout"
label="日志类型"
min-width="90px"
show-overflow-tooltip
>
<template slot-scope="scope">
<span v-if="scope.row.intervalInout == 1">积分获取</span>
......@@ -91,20 +89,17 @@
prop="memberIntegralName"
label="事由"
min-width="90px"
show-overflow-tooltip
></el-table-column>
<el-table-column
prop="intervalHistory"
label="日志详情"
min-width="90px"
show-overflow-tooltip
></el-table-column>
<el-table-column prop="sourceType" label="来源渠道" min-width="90px" :formatter="formatSourceType" show-overflow-tooltip></el-table-column>
<el-table-column
prop="brandName"
label="来源品牌"
min-width="150px"
show-overflow-tooltip
>
<template slot-scope="scope">
<el-tooltip placement="top">
......@@ -113,17 +108,20 @@
</div>
<div class="integral-box text-ellipsis-2 line-20">{{ scope.row.brandName }}</div>
</el-tooltip>
<!-- <div class="integral-box text-ellipsis-2 line-20">{{ scope.row.brandName || '--'}}</div> -->
</template>
</el-table-column>
<el-table-column
prop="remark"
label="备注"
min-width="160px"
show-overflow-tooltip
>
<template slot-scope="scope">
<div class="integral-box text-ellipsis-2 line-20">{{ scope.row.remark }}</div>
<el-tooltip placement="top">
<div slot="content">
<p>{{scope.row.remark}}</p>
</div>
<div class="integral-box text-ellipsis-2 line-20">{{ scope.row.remark }}</div>
</el-tooltip>
</template>
</el-table-column>
</el-table>
......@@ -192,9 +190,7 @@ export default {
{label:'冻结积分',value:1},
{label:'可用积分',value:0}
],
memberData: [
// {createTime:12334494943,intervalInout:1,memberIntegralName:'新增其他',intervalHistory:1333,sourceType:1}
],
memberData: [],
form:{
intervalInOut: -1,
dictCode: -1,
......@@ -231,18 +227,10 @@ export default {
para['currentPage'] = this.page.currentPage
para['beginTime'] = this.dateDefault[0]
para['endTime'] = this.dateDefault[1]
// console.log(para);
doFetch(url.enterpriseIntegralDetailData, para)
.then(res => {
if (res.data.errorCode === 0) {
this.memberData =
res.data.result.page.result
// &&
// res.data.result.page.result.map(ele => ({
// ...ele,
// mainStoreName: !!ele.mainStoreName ? ele.mainStoreName : "--",
// openStoreName: !!ele.openStoreName ? ele.openStoreName : "--"
// }));
this.memberData = res.data.result.page.result;
this.page.currentPage = res.data.result.page.currentPage;
this.page.totalCount = res.data.result.page.totalCount;
} else {
......@@ -285,7 +273,7 @@ export default {
};
</script>
<style lang="stylus">
<style lang="scss">
.search-top{
display: flex;
justify-content:space-between;
......@@ -306,6 +294,17 @@ export default {
overflow: auto;
}
.line-20{
line-height: 20px;
line-height: 20px;
}
.integral-box{
display: flex;
align-items: center;
}
.text-ellipsis-2 {
overflow: hidden;
-webkit-line-clamp: 2;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-box-orient: vertical;
}
</style>
src/components/wechatmembers/enterpriseIntergralWithhold.vue
<template>
<div >
<div>
<div class="mBottom20 search-top">
<div class="left-search-wrap">
<el-select
class="width160"
v-model="processStatus"
placeholder="处理状态"
@change="handleSearch"
>
<el-option
v-for="item in statusList"
:key="item.code"
:label="item.name"
:value="item.code"
></el-option>
<el-select class="width160" v-model="processStatus" placeholder="处理状态" @change="handleSearch">
<el-option v-for="item in statusList" :key="item.code" :label="item.name" :value="item.code"></el-option>
</el-select>
<el-date-picker style="width: 256px;" v-model="dateDefault" type="daterange" range-separator="~" start-placeholder="创建开始日期" end-placeholder="创建结束日期" :default-time="['00:00:00', '23:59:59']" :picker-options="pickerOptions()" value-format="yyyy-MM-dd" @change="handleSearch"> </el-date-picker>
<el-date-picker style="width: 256px;" v-model="dateDefault" type="daterange" range-separator="~"
start-placeholder="创建开始日期" end-placeholder="创建结束日期" :default-time="['00:00:00', '23:59:59']"
:picker-options="pickerOptions()" value-format="yyyy-MM-dd" @change="handleSearch"> </el-date-picker>
</div>
</div>
<div>
<el-table
:data="memberData"
tooltip-effect="dark"
ref="multipleTable"
max-height="659"
>
<el-table-column
prop="createTime"
label="时间"
min-width="157px"
show-overflow-tooltip
>
<template slot-scope="scope">
<el-table :data="memberData" tooltip-effect="dark" ref="multipleTable" max-height="659">
<el-table-column prop="createTime" label="时间" min-width="157px">
<template slot-scope="scope">
<div class="line-20">{{ scope.row.createTime | formatYMD }}</div>
<div class="line-20">{{ scope.row.createTime | formatHMS }}</div>
</template>
</template>
</el-table-column>
<el-table-column prop="processStatus" label="处理状态" min-width="110px">
<template slot-scope="scope">
<span :class="statusList[scope.row.processStatus].icon"></span>
{{ statusList[scope.row.processStatus].name }}
</template>
</el-table-column>
<el-table-column
prop="integralVal"
label="预扣除积分值"
min-width="128px"
show-overflow-tooltip
></el-table-column>
<el-table-column
prop="integralCode"
label="事由"
min-width="90px"
show-overflow-tooltip
></el-table-column>
<el-table-column prop="sourceType" label="预扣截止时间" min-width="138px" show-overflow-tooltip>
<template slot="header">
预扣截止时间
<el-tooltip effect="dark" placement="top">
<div slot="content">
<p>预扣积分到达“截止日期”，若还未确认扣除，系统将自动将这笔积分转为“可用”状态（无截止日期的预扣积分，系统不会主动变更积分状态）</p>
</div>
<i class="iconfont icon-QuestionCircleOutlined icon"></i>
</el-tooltip>
</template>
<template slot-scope="scope">
<div class="line-20">{{ scope.row.limitTime | formatYMD }}</div>
<div class="line-20">{{ scope.row.limitTime | formatHMS }}</div>
<template slot-scope="scope">
<span :class="statusList[scope.row.processStatus].icon"></span>
{{ statusList[scope.row.processStatus].name }}
</template>
</el-table-column>
<el-table-column
prop="relationId"
label="关联id"
min-width="160px"
show-overflow-tooltip
>
<template slot-scope="scope">
<div class="integral-box text-ellipsis-2 line-20">{{ scope.row.relationId }}</div>
</template>
<el-table-column prop="integralVal" label="预扣除积分值" min-width="128px"></el-table-column>
<el-table-column prop="integralCode" label="事由" min-width="100px"></el-table-column>
<el-table-column prop="sourceType" label="预扣截止时间" min-width="138px">
<template slot="header">
预扣截止时间
<el-tooltip effect="dark" placement="top">
<div slot="content">
<p>预扣积分到达“截止日期”，若还未确认扣除，系统将自动将这笔积分转为“可用”状态（无截止日期的预扣积分，系统不会主动变更积分状态）</p>
</div>
<i class="iconfont icon-QuestionCircleOutlined icon"></i>
</el-tooltip>
</template>
<template slot-scope="scope">
<div v-if="scope.row.limitTime">
<div class="line-20">{{ scope.row.limitTime | formatYMD }}</div>
<div class="line-20">{{ scope.row.limitTime | formatHMS }}</div>
</div>
<div v-else>无截止时间</div>
</template>
</el-table-column>
<el-table-column
prop="openStoreName"
label="积分成本主体"
min-width="180px"
show-overflow-tooltip
>
<template slot-scope="scope">
<div class="integral-box text-ellipsis-2 line-20">{{ scope.row.openStoreName }}</div>
</template>
<el-table-column prop="relationId" label="关联id" min-width="160px">
<template slot-scope="scope">
<el-tooltip placement="top">
<div slot="content">
<p>{{scope.row.relationId}}</p>
</div>
<div class="integral-box text-ellipsis-2 line-20">{{ scope.row.relationId }}</div>
</el-tooltip>
</template>
</el-table-column>
<el-table-column
prop="intervalEffect"
label="备注信息"
min-width="130px"
show-overflow-tooltip
>
<template slot-scope="scope">
<div class="integral-box text-ellipsis-2 line-20">{{ scope.row.intervalEffect }}</div>
</template>
<el-table-column prop="openStoreName" label="积分成本主体" min-width="180px">
<template slot-scope="scope">
<el-tooltip placement="top">
<div slot="content">
<p>{{scope.row.openStoreName}}</p>
</div>
<div class="integral-box text-ellipsis-2 line-20">{{ scope.row.openStoreName }}</div>
</el-tooltip>
</template>
</el-table-column>
<el-table-column prop="intervalEffect" label="备注信息" min-width="130px">
<template slot-scope="scope">
<el-tooltip placement="top">
<div slot="content">
<p>{{scope.row.intervalEffect}}</p>
</div>
<div class="integral-box text-ellipsis-2 line-20">{{ scope.row.intervalEffect }}</div>
</el-tooltip>
</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"
>
<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>
</div>
</template>
<script>
......@@ -149,12 +115,7 @@ export default {
},
data() {
return {
memberData: [
// {createTime:1723736363636,integralVal:344,intervalEffect:'的好',processStatus:2,limitTime:236363738821,openStoreName:'ii u 合适就说好多好多好多的好多好多好多的反反复复 u 合适',relationId:'udjdhdu883733737'},
// {createTime:1723736363636,integralVal:344,intervalEffect:'的好多好多',processStatus:1,openStoreName:'i u 合精华的和阿胶恶毒的接电话电话讲的点点滴滴是适'},
// {createTime:1723736363636,integralVal:344,intervalEffect:'的好多好多',processStatus:3},
// {createTime:1723736363636,integralVal:344,intervalEffect:'的好多好多',processStatus:4},
],
memberData: [],
page: {
currentPage: 1,
pageSize: 20,
......@@ -194,7 +155,8 @@ export default {
})
.then(res => {
if (res.data.errorCode === 0) {
this.memberData = res.data.result.page.result
// res.data.result.page.result[0].openStoreName = '积分兑换积分兑换是吗积分兑换是吗积分兑换是吗积分兑换是吗是吗'
this.memberData = res.data.result.page.result;
this.page.currentPage = res.data.result.page.currentPage;
this.page.totalCount = res.data.result.page.totalCount;
} else {
......@@ -234,6 +196,9 @@ export default {
.integral-box{
display: flex;
align-items: center;
// justify-content: flex-start;
// height: 40px;
// position: relative;
}
.text-ellipsis-2 {
overflow: hidden;
......
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