From 839a01e1140174cf74877a14978b58b84a0bf679 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B2=90?= <hehaijiun@126.产品，>
Date: Thu, 5 Jun 2025 00:00:31 +0800
Subject: [PATCH] =?UTF-8?q?refactor(merchant):=20=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E5=95=86=E6=88=B7=E5=88=97=E8=A1=A8=E5=92=8C=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在商户列表页面添加商户类型的徽章显示，根据不同类型显示不同颜色
- 在商户表单页面将"卡密取卡权限"修改为"卡库提卡权限"
---
 app/merchant/view/merchant/form.html  | 2 +-
 app/merchant/view/merchant/index.html | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/merchant/view/merchant/form.html b/app/merchant/view/merchant/form.html
index f8e6b6d..33aecc7 100644
--- a/app/merchant/view/merchant/form.html
+++ b/app/merchant/view/merchant/form.html
@@ -285,7 +285,7 @@
 
             <div class="layui-col-xs4">
                 <label class="relative block">
-                    <span class="font-w7">卡密取卡权限</span>
+                    <span class="font-w7">卡库提卡权限</span>
                     <select class="layui-select" lay-filter="kami_status" lay-search name="kami_status">
                         {foreach [ 0=>'未开通',1=> '已开通'] as $k => $v}
                         {if isset($vo.kami_status) and $vo.kami_status eq $k}
diff --git a/app/merchant/view/merchant/index.html b/app/merchant/view/merchant/index.html
index 25fbb9e..491784f 100644
--- a/app/merchant/view/merchant/index.html
+++ b/app/merchant/view/merchant/index.html
@@ -47,7 +47,14 @@
                 </td>-->
                 <td class='text-left nowrap'>
                     <span class="color-blue"><b>{$vo.name|default=''}</b></span>（ <span class="color-desc">{$vo.id|default=''}</span>
-                    ）
+                    ） {eq name='vo.merchant_type' value='2'}<span class="layui-badge think-bg-green">自</span>{/eq}
+                    {eq name='vo.merchant_type' value='3'}<span class="layui-badge think-bg">京</span>{/eq}
+                    {eq name='vo.merchant_type' value='4'}<span class="layui-badge think-bg-blue">苏</span>{/eq}
+                    {eq name='vo.merchant_type' value='5'}<span class="layui-badge think-bg-blue">快</span>{/eq}
+                    {eq name='vo.merchant_type' value='6'}<span class="layui-badge think-bg-gray">抖</span>{/eq}
+                    {eq name='vo.merchant_type' value='7'}<span class="layui-badge think-bg-violet">蜜</span>{/eq}
+                    {eq name='vo.merchant_type' value='8'}<span class="layui-badge think-bg-red">天</span>{/eq}
+                    {eq name='vo.merchant_type' value='9'}<span class="layui-badge think-bg-orange">淘</span>{/eq}
                     <br>
                     {eq name='vo.status' value='0'}<span class="color-red">已禁用</span>{else}<span class="color-green">使用中</span>{/eq}
                     <!--