From bada6ede697516a65e619cfb539f95c62f5c154a Mon Sep 17 00:00:00 2001
From: luofei <604446095@qq.com>
Date: Wed, 15 May 2024 17:33:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=97=E9=93=BA=E4=BF=9D?=
=?UTF-8?q?=E8=AF=81=E9=87=91=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../merchant/list/handle/merEditForm.vue | 6 ++---
src/views/merchant/list/handle/merInfo.vue | 24 +++++++++----------
vue.config.js | 6 ++---
3 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/src/views/merchant/list/handle/merEditForm.vue b/src/views/merchant/list/handle/merEditForm.vue
index 37662df..6db9cba 100644
--- a/src/views/merchant/list/handle/merEditForm.vue
+++ b/src/views/merchant/list/handle/merEditForm.vue
@@ -127,8 +127,8 @@
费用信息
-
- {{ merData.is_margin == 0 ? '无' : merData.ot_margin + '元' }}
+
+ {{ merData.is_margin == 0 ? '无' : merData.margin + '元' }}
@@ -138,7 +138,7 @@
- {{ merData.margin }}
+ {{ merData.ot_margin }}
diff --git a/src/views/merchant/list/handle/merInfo.vue b/src/views/merchant/list/handle/merInfo.vue
index 9fbd30e..6ea405f 100644
--- a/src/views/merchant/list/handle/merInfo.vue
+++ b/src/views/merchant/list/handle/merInfo.vue
@@ -58,7 +58,7 @@
{{merData.commission_switch ? "开启" : "关闭"}}
-
+
手续费:
@@ -69,7 +69,7 @@
店铺保证金:
- {{merData.is_margin == 0 ? '无' : merData.ot_margin}}
+ {{merData.is_margin == 0 ? '无' : merData.margin}}
@@ -80,8 +80,8 @@
保证金余额:
- {{merData.margin}}
-
+
{{merData.ot_margin}}
+
@@ -116,9 +116,9 @@
商户资质:
@@ -140,7 +140,7 @@
登录密码:
{{merData.mer_password}}
-
+
联系人:
@@ -149,7 +149,7 @@
联系电话:
{{merData.mer_phone}}
-
+
+ -->
@@ -252,8 +252,8 @@
![]()
-
-
+
+