feat(dmepa): 全局统一规范DMEPA命名并优化游客与品酒师身份显示
这个提交包含在:
@@ -32,8 +32,8 @@
|
||||
<el-table-column prop="gmv" label="GMV" min-width="110"></el-table-column>
|
||||
<el-table-column prop="order_count_n" label="汇率N" min-width="90"></el-table-column>
|
||||
<el-table-column prop="rate" label="汇率" min-width="120"></el-table-column>
|
||||
<el-table-column prop="madow_pool" label="马豆池" min-width="120"></el-table-column>
|
||||
<el-table-column prop="share_user_count" label="马豆人数" min-width="90"></el-table-column>
|
||||
<el-table-column prop="madow_pool" label="dmepa池" min-width="120"></el-table-column>
|
||||
<el-table-column prop="share_user_count" label="dmepa人数" min-width="90"></el-table-column>
|
||||
<el-table-column prop="venue_pool" label="酒道馆奖池" min-width="110"></el-table-column>
|
||||
<el-table-column prop="venue_user_count" label="馆人数" min-width="80"></el-table-column>
|
||||
<el-table-column prop="county_pool" label="区县奖池" min-width="110"></el-table-column>
|
||||
@@ -134,11 +134,11 @@
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<div style="background:#f4f4f5;padding:12px;border-radius:6px;">
|
||||
<div style="font-weight:600;font-size:13px;margin-bottom:6px;">马豆贡献池 (1:1 GMV)</div>
|
||||
<div style="font-weight:600;font-size:13px;margin-bottom:6px;">dmepa贡献池 (1:1 GMV)</div>
|
||||
<div style="font-size:12px;color:#606266;line-height:1.8;">
|
||||
马豆总池:<b>{{ previewDialog.result.madow?.pool }}</b> 豆<br>
|
||||
dmepa总池:<b>{{ previewDialog.result.madow?.pool }}</b> dmepa<br>
|
||||
合格人数:<b>{{ previewDialog.result.madow?.user_count }}</b> 人<br>
|
||||
人均马豆:<b>{{ previewDialog.result.madow?.each }}</b><br>
|
||||
人均dmepa:<b>{{ previewDialog.result.madow?.each }}</b><br>
|
||||
即时汇率:<b>{{ previewDialog.result.rate }}</b>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -58,11 +58,11 @@
|
||||
size="small"
|
||||
:type="scope.row.wallet_type === 'money' ? 'success' : (scope.row.wallet_type === 'madow' ? 'primary' : (scope.row.wallet_type === 'commission' ? 'warning' : 'info'))"
|
||||
>
|
||||
{{ scope.row.wallet_type_text || (Number(scope.row.amount) > 0 ? '商城余额' : (Number(scope.row.madow) > 0 ? '分红马豆' : '消费补贴')) }}
|
||||
{{ scope.row.wallet_type_text || (Number(scope.row.amount) > 0 ? '商城余额' : (Number(scope.row.madow) > 0 ? '分红dmepa' : '消费补贴')) }}
|
||||
</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="马豆" min-width="110">
|
||||
<el-table-column label="dmepa" min-width="110">
|
||||
<template #default="scope"> {{ scope.row.madow }} </template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="base_amount" label="基数" min-width="80"></el-table-column>
|
||||
@@ -147,7 +147,7 @@
|
||||
</div>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<div style="color:#909399;font-size:12px;">贡献马豆 (1:1 GMV)</div>
|
||||
<div style="color:#909399;font-size:12px;">贡献dmepa (1:1 GMV)</div>
|
||||
<div style="font-weight:bold;font-size:18px;color:#409eff;margin-top:2px;">{{ orderTreeDialog.data.summary?.total_madow || '0.00000000' }}</div>
|
||||
</el-col>
|
||||
</el-row>
|
||||
@@ -181,7 +181,7 @@
|
||||
</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="madow" label="马豆" width="100"></el-table-column>
|
||||
<el-table-column prop="madow" label="dmepa" width="100"></el-table-column>
|
||||
<el-table-column prop="status_text" label="状态" width="80">
|
||||
<template #default="scope">
|
||||
<span :class="scope.row.status == 1 ? 'sa-color--success' : (scope.row.status == -2 ? 'sa-color--danger' : 'sa-color--info')">
|
||||
|
||||
在新工单中引用
屏蔽一个用户