From deac15f7a7d209f8c5b3f3a05eee52d25d9408df Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Mon, 13 Mar 2023 15:13:54 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=96=B0=E5=A2=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/order/component/actions.vue | 7 ++++++-
 src/views/system/user.vue             | 8 ++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/views/order/component/actions.vue b/src/views/order/component/actions.vue
index 3c98482..74473fa 100644
--- a/src/views/order/component/actions.vue
+++ b/src/views/order/component/actions.vue
@@ -42,9 +42,13 @@ export default {
     },
     actionRender(){
       if(!this.row?.admin_actions) return
+      // if(this.row.order_state=='finished'&&this.row.state=='canceled_by_merchant'){
+      //   this.row.admin_actions['confirm_merchant_cancel'] = '确认商家无效单'
 
+      //    // console.log(this.row.order_state&&this.row.state,this.row.admin_actions)
+      // }
       let keys = Object.keys(this.row.admin_actions)
-
+      // console.log(keys)
       return keys.map(item => {
         return (
           <Button
@@ -230,6 +234,7 @@ export default {
     },
 
     actionPreClick(action){
+      console.log("action",action)
       this.action = action;
       if(this.row.merchant){
         this.form.follow.merchant_id=this.row.merchant.id;
diff --git a/src/views/system/user.vue b/src/views/system/user.vue
index c19fd26..2a8804e 100644
--- a/src/views/system/user.vue
+++ b/src/views/system/user.vue
@@ -115,9 +115,9 @@
               trigger: 'blur'
             },
             {
-              min: 3,
+              min: 2,
               max: 5,
-              message: '长度在 3 到 5 个字符',
+              message: '长度在 2 到 5 个字符',
               trigger: 'blur'
             }
           ],
@@ -127,9 +127,9 @@
               trigger: 'blur'
             },
             {
-              min: 3,
+              min: 2,
               max: 5,
-              message: '长度在 3 到 5 个字符',
+              message: '长度在 2 到 5 个字符',
               trigger: 'blur'
             }
           ],