From 04be125365bfd254166072f75da87e406f633ba3 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期四, 09 一月 2025 18:36:56 +0800
Subject: [PATCH] Merge branch 'master' of http://47.96.225.205:8888/r/operation_pc-v2

---
 pages/shop/list.vue |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/pages/shop/list.vue b/pages/shop/list.vue
index f61db60..97cf21b 100644
--- a/pages/shop/list.vue
+++ b/pages/shop/list.vue
@@ -25,6 +25,7 @@
           { label: '商户名称', prop: 'name', minWidth: 150, fixed: 'left' },
           { label: '商户昵称', prop: 'nickName', minWidth: 150 },
           { label: '所属合伙人', prop: 'partnerName', minWidth: 150 },
+          { label: '下单次数', prop: 'orderNum', minWidth: 150 },
           {
             label: '地址',
             formatter: (row) => this.getDistrict(row),
@@ -63,9 +64,10 @@
               },
               { label: '手机号', id: 'tel', type: 'input' },
               {
-                label: '启动/禁用',
+                label: '启用/禁用',
                 id: 'isEnabled',
                 type: 'bus-select-dict',
+                default: '1',
                 el: {
                   code: 'USER_ENABLED_OR_DISABLED',
                   clearable: true,

--
Gitblit v1.9.3