Skip to content

M
member
Commit d69960af by member
Options

Merge branch 'dev' of 115.159.76.241:gicmember/member into dev

parents 339b12dd a2f53e8f
Showing with 46 additions and 48 deletions
src/components/posmembers/posmembers.js
......@@ -173,8 +173,8 @@ export default {
if (tempVal == "attentionDate") {
returnVal = "关注时间";
}
if (tempVal == "costFeeReceivable") {
returnVal = "消费总额";
if (tempVal == "costFeePaid") {
returnVal = "消费总额(实付)";
}
if (tempVal == "costTimes") {
returnVal = "消费次数";
......@@ -182,8 +182,8 @@ export default {
if (tempVal == "lastCostTime") {
returnVal = "最近消费时间";
}
if (tempVal == "lastCostReceivable") {
returnVal = "最近消费";
if (tempVal == "lastCostPaid") {
returnVal = "最近消费(实付)";
}
if (tempVal == "avgCost") {
returnVal = "客单价";
......@@ -236,8 +236,8 @@ export default {
if (tempVal == "lastCost") {
returnVal = "最近消费(应收)";
}
if (tempVal == "highCostReceivable") {
returnVal = "最高单笔";
if (tempVal == "highCostPaid") {
returnVal = "最高单笔(实付)";
}
if (tempVal == "highCost") {
returnVal = "最高单笔(应收)";
......
src/components/posmembers/posmembers.vue
......@@ -155,7 +155,7 @@
<el-table-column
:fixed="item === 'name'"
:width="item == 'name' ? '150' : ''"
v-if="item == 'name' || item == 'highCost' || item == 'highCostReceivable' || item == 'grade' || item == 'status' || item == 'channel' || item == 'frozenStatus' || item == 'costFeeReceivable' || item == 'lastCostReceivable'"
v-if="item == 'name' || item == 'highCost' || item == 'highCostPaid' || item == 'grade' || item == 'status' || item == 'channel' || item == 'frozenStatus' || item == 'costFeePaid' || item == 'lastCostPaid'"
:prop="item"
:label="item | formatField"
>
......@@ -325,17 +325,17 @@
<span v-else-if="item == 'cardNo'">
{{ scope.row.cardNo }}
</span>
<span v-else-if="item == 'costFeeReceivable'">
{{ scope.row.costFeeReceivable }}
<span v-else-if="item == 'costFeePaid'">
{{ scope.row.costFeePaid }}
</span>
<span v-else-if="item == 'lastCostReceivable'">
{{ scope.row.lastCostReceivable }}
<span v-else-if="item == 'lastCostPaid'">
{{ scope.row.lastCostPaid }}
</span>
<span v-else-if="item == 'highCost'">
{{ scope.row.highCost }}
</span>
<span v-else-if="item == 'highCostReceivable'">
{{ scope.row.highCostReceivable }}
<span v-else-if="item == 'highCostPaid'">
{{ scope.row.highCostPaid }}
</span>
<div v-else-if="item == 'frozenStatus'">
<span
......
src/components/wechatmembers/ajaxmembersinfo.vue
......@@ -6,7 +6,7 @@
<div class="record-navitem">
<!-- 这里跑数据的时候去反了 -->
<p class="lheigth40">消费总额(实付)</p>
<p class="record-txt">￥{{ memberInfo.costFeeReceivable | fomatFloat }}</p>
<p class="record-txt">￥{{ memberInfo.costFeePaid | fomatFloat }}</p>
</div>
<div class="record-navitem">
<p class="lheigth40">消费总额(应收)</p>
......@@ -34,7 +34,7 @@
</div>
<div class="record-navitem">
<p class="lheigth40">最高单笔(实付)</p>
<p class="record-txt">{{ memberInfo.highCostReceivable | fomatFloat }}</p>
<p class="record-txt">{{ memberInfo.highCostPaid | fomatFloat }}</p>
</div>
<div class="record-navitem">
<p class="lheigth40">最高单笔(应收)</p>
......@@ -591,8 +591,8 @@ export default {
highCost: temp.highCost,
costCategoryCount: temp.costCategoryCount,
avgDiscount: temp.avgDiscount,
costFeeReceivable: temp.costFeeReceivable,
highCostReceivable: temp.highCostReceivable
costFeePaid: temp.costFeePaid,
highCostPaid: temp.highCostPaid
};
} else {
checkFalse(res.data.message);
......
src/components/wechatmembers/total.js
......@@ -227,17 +227,17 @@ export default {
if (tempVal == "frozenStatus") {
returnVal = "会员状态";
}
if (tempVal == "costFeeReceivable") {
returnVal = "消费总额";
if (tempVal == "costFeePaid") {
returnVal = "消费总额(实付)";
}
if (tempVal == "lastCostReceivable") {
returnVal = "最近消费";
if (tempVal == "lastCostPaid") {
returnVal = "最近消费(实付)";
}
if (tempVal == "highCost") {
returnVal = "最高单笔(应收)";
}
if (tempVal == "highCostReceivable") {
returnVal = "最高单笔";
if (tempVal == "highCostPaid") {
returnVal = "最高单笔(实付)";
}
return returnVal;
},
......
src/components/wechatmembers/wechat-total.vue
......@@ -165,7 +165,7 @@
:key="index">
<el-table-column
:fixed="item === 'name'"
v-if="item == 'name' || item == 'highCost' || item == 'highCostReceivable' || item == 'grade' || item == 'status' || item == 'channel' || item == 'createCardStoreName' || item == 'cardNo' || item == 'forzenStatus' || item == 'mainStoreName' || item == 'costFeeReceivable' || item == 'lastCostReceivable'"
v-if="item == 'name' || item == 'highCost' || item == 'highCostPaid' || item == 'grade' || item == 'status' || item == 'channel' || item == 'createCardStoreName' || item == 'cardNo' || item == 'forzenStatus' || item == 'mainStoreName' || item == 'costFeePaid' || item == 'lastCostPaid'"
:prop="item"
:label="item | formatField"
width="160"
......@@ -341,17 +341,17 @@
<span v-else-if="item == 'cardNo'">
{{ scope.row.cardNo }}
</span>
<span v-else-if="item == 'costFeeReceivable'">
{{ scope.row.costFeeReceivable }}
<span v-else-if="item == 'costFeePaid'">
{{ scope.row.costFeePaid }}
</span>
<span v-else-if="item == 'lastCostReceivable'">
{{ scope.row.lastCostReceivable }}
<span v-else-if="item == 'lastCostPaid'">
{{ scope.row.lastCostPaid }}
</span>
<span v-else-if="item == 'highCost'">
{{ scope.row.highCost }}
</span>
<span v-else-if="item == 'highCostReceivable'">
{{ scope.row.highCostReceivable }}
<span v-else-if="item == 'highCostPaid'">
{{ scope.row.highCostPaid }}
</span>
<div v-else-if="item == 'frozenStatus'">
<span
......@@ -1079,4 +1079,4 @@ export default { ...wechattotal };
color: #1890ff;
cursor: pointer;
}
</style>
\ No newline at end of file
</style>
src/components/wechatmembers/wechatmembers.js
......@@ -227,18 +227,18 @@ export default {
if (tempVal == "frozenStatus") {
returnVal = "会员状态";
}
if (tempVal == "costFeeReceivable") {
returnVal = "消费总额";
if (tempVal == "costFeePaid") {
returnVal = "消费总额(实付)";
}
if (tempVal == "lastCostReceivable") {
returnVal = "最近消费";
if (tempVal == "lastCostPaid") {
returnVal = "最近消费(实付)";
}
if (tempVal == "highCost") {
returnVal = "最高单笔(应收)";
}
if (tempVal == "highCostReceivable") {
returnVal = "最高单笔";
}
if (tempVal == "highCostPaid") {
returnVal = "最高单笔(实付)";
}
return returnVal;
},
formatFieldName: function(val) {
......
src/components/wechatmembers/wechatmembers.vue
......@@ -163,7 +163,7 @@
:key="index">
<el-table-column
:fixed="item === 'name'"
v-if="item == 'name' || item == 'highCost' || item == 'highCostReceivable' || item == 'grade' || item == 'status' || item == 'channel' || item == 'createCardStoreName' || item == 'cardNo' || item == 'forzenStatus' || item == 'mainStoreName' || item == 'costFeeReceivable' || item == 'lastCostReceivable'"
v-if="item == 'name' || item == 'highCost' || item == 'highCostPaid' || item == 'grade' || item == 'status' || item == 'channel' || item == 'createCardStoreName' || item == 'cardNo' || item == 'forzenStatus' || item == 'mainStoreName' || item == 'costFeePaid' || item == 'lastCostPaid'"
:prop="item"
:label="item | formatField"
width="160"
......@@ -337,17 +337,17 @@
<span v-else-if="item == 'cardNo'">
{{ scope.row.cardNo }}
</span>
<span v-else-if="item == 'costFeeReceivable'">
{{ scope.row.costFeeReceivable }}
<span v-else-if="item == 'costFeePaid'">
{{ scope.row.costFeePaid }}
</span>
<span v-else-if="item == 'lastCostReceivable'">
{{ scope.row.lastCostReceivable }}
<span v-else-if="item == 'lastCostPaid'">
{{ scope.row.lastCostPaid }}
</span>
<span v-else-if="item == 'highCost'">
{{ scope.row.highCost }}
</span>
<span v-else-if="item == 'highCostReceivable'">
{{ scope.row.highCostReceivable }}
<span v-else-if="item == 'highCostPaid'">
{{ scope.row.highCostPaid }}
</span>
<div v-else-if="item == 'frozenStatus'">
<span
......@@ -1068,4 +1068,4 @@ export default { ...wechatmembers };
color: #1890ff;
cursor: pointer;
}
</style>
\ No newline at end of file
</style>
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