From b77eaa21dc1236150b64ca90285a00b10de09d89 Mon Sep 17 00:00:00 2001
From: wangdong <1551135706@qq.com>
Date: Fri, 7 Jun 2024 13:27:47 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/shop/Index.vue | 26 --------------------------
 1 file changed, 26 deletions(-)

diff --git a/src/views/shop/Index.vue b/src/views/shop/Index.vue
index 101b75a..422ce6e 100644
--- a/src/views/shop/Index.vue
+++ b/src/views/shop/Index.vue
@@ -46,15 +46,9 @@
       <span slot="shop_label" slot-scope="text, item" style="white-space: pre-line;">
         {{ item.shop_label }}
       </span>
-      <span slot="company_name" slot-scope="text, item" style="white-space: pre-line;">
-        {{ item.company_name }}
-      </span>
       <span slot="is_select_mechant" slot-scope="text, item">
         {{ item.is_select_mechant ? '是' : '否' }}
       </span>
-      <span slot="is_show_license" slot-scope="text, item">
-        {{ item.is_show_license ? '是' : '否' }}
-      </span>
       <span slot="action" slot-scope="text, item">
         <template>
           <a v-action:edit style="margin-right: 8px" @click="handleEdit(item)">编辑</a>
@@ -123,26 +117,6 @@ export default {
           title: '评分',
           dataIndex: 'score'
         },
-        {
-          title: '公司名称',
-          width: '150px',
-          dataIndex: 'company_name',
-          scopedSlots: { customRender: 'company_name' }
-        },
-        {
-          title: '法人名字',
-          dataIndex: 'legal_person'
-        },
-        {
-          title: '手机号',
-          dataIndex: 'phone',
-          width: '120px'
-        },
-        {
-          title: '是否展示营业执照',
-          dataIndex: 'is_show_license',
-          scopedSlots: { customRender: 'is_show_license' }
-        },
         {
           title: '累计金额',
           dataIndex: 'total_amount'

From 78dce21e2468a784f6a483819a8dd5e02adf1d67 Mon Sep 17 00:00:00 2001
From: wangdong <1551135706@qq.com>
Date: Fri, 7 Jun 2024 17:26:00 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=8C=E6=96=87?=
 =?UTF-8?q?=E6=9C=AC=E7=BC=96=E8=BE=91=E5=99=A8=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/global.less | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/global.less b/src/global.less
index 2dfd915..a93d547 100644
--- a/src/global.less
+++ b/src/global.less
@@ -366,4 +366,11 @@ iframe {
 
 span.ant-radio+* {
   color: rgba(0, 0, 0, .5)
-}
\ No newline at end of file
+}
+
+.edui-editor {
+  width: 800px!important;
+  .edui-editor-iframeholder {
+    width: 100%!important;
+  }
+}

From 26aceb43bd689125bb4deb5a9cce236c10349751 Mon Sep 17 00:00:00 2001
From: wangdong <1551135706@qq.com>
Date: Fri, 7 Jun 2024 19:57:05 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=90=8D=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/manage/user/modules/EditForm.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/manage/user/modules/EditForm.vue b/src/views/manage/user/modules/EditForm.vue
index e69901a..1ad6a0f 100644
--- a/src/views/manage/user/modules/EditForm.vue
+++ b/src/views/manage/user/modules/EditForm.vue
@@ -17,6 +17,7 @@
         </a-form-item>
         <a-form-item label="用户名" :labelCol="labelCol" :wrapperCol="wrapperCol" extra="后台登录用户名">
           <a-input
+            disabled
             v-decorator="['user_name', { rules: [{ required: true, min: 4, message: '请输入至少4个字符' }] }]"
           />
         </a-form-item>