From 8e6e91d6fe365369955bccead271cd45e06536d5 Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Fri, 24 May 2024 11:36:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=EF=BC=9A=E8=B5=84=E6=BA=90?=
=?UTF-8?q?=E8=82=A1=E4=B8=9C=E4=BD=A3=E9=87=91=E6=AF=94=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/filters/commFilter.js | 7 +++++--
src/views/merchant/list/handle/merEditForm.vue | 5 +++++
src/views/merchant/list/handle/merInfo.vue | 5 ++++-
3 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/src/filters/commFilter.js b/src/filters/commFilter.js
index 0b264f9..15eb398 100644
--- a/src/filters/commFilter.js
+++ b/src/filters/commFilter.js
@@ -338,8 +338,11 @@ export function transactionTypeFilter(type) {
'refund_brokerage_one': '返还一级分佣',
'refund_brokerage_two': '返还二级分佣',
'order': '订单支付',
- 'supplier_mer': '供应商提成',
- 'province_mer': '省公司门店提成'
+ 'supplier_mer': '供应商收益',
+ 'province_mer': '省公司门店收益',
+ 'province_mer_dec': '省公司门店收益减少',
+ 'supplier_mer_dec': '供应商收益减少',
+ 'resource_shareholders_dec': '资源股东收益减少',
}
return typeMap[type]
}
diff --git a/src/views/merchant/list/handle/merEditForm.vue b/src/views/merchant/list/handle/merEditForm.vue
index b92c26d..e5dd011 100644
--- a/src/views/merchant/list/handle/merEditForm.vue
+++ b/src/views/merchant/list/handle/merEditForm.vue
@@ -371,6 +371,11 @@
+
+
+ %
+
+
diff --git a/src/views/merchant/list/handle/merInfo.vue b/src/views/merchant/list/handle/merInfo.vue
index 9a0f401..ee0067a 100644
--- a/src/views/merchant/list/handle/merInfo.vue
+++ b/src/views/merchant/list/handle/merInfo.vue
@@ -217,7 +217,10 @@
-
+
+ 资源股东收益比例：
+ {{ merData.resource_shareholders_rate || 0}}%
+