From fd4fc21e18283bc07b0459b2423fd6805749404b Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 24 May 2024 17:42:19 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E5=88=86=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E3=80=81=E9=85=8D=E7=BD=AE=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.production                                         | 2 +-
 .env.uat                                                | 4 ++--
 .env.usa                                                | 4 ++--
 src/views/trials/trials-myinfo/password.vue             | 7 ++++++-
 src/views/trials/trials-panel/study/components/list.vue | 4 ++--
 5 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/.env.production b/.env.production
index 68f45f4..e459511 100644
--- a/.env.production
+++ b/.env.production
@@ -22,7 +22,7 @@ VUE_APP_LOGOUT_FOR_PERMISSION = false
 VUE_APP_LOGOUT_FOR_TIME = 1800
 
 # 是否开启密码正则验证 true:是 false:否
-VUE_APP_PASSWORD_FOR_PERMISSION = true
+VUE_APP_PASSWORD_FOR_PERMISSION = false
 
 # 是否开启密码正则验证 true:是 false:否
 VUE_APP_PASSWORD_FOR_REGULAR = ^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[-_.@^+\$!%#*?&\$~])[A-Za-z0-9-~_.@^+\$~!%#*?&]{8,32}$
diff --git a/.env.uat b/.env.uat
index c2d8769..4e894be 100644
--- a/.env.uat
+++ b/.env.uat
@@ -1,6 +1,6 @@
 # just a flag
-ENV = 'production'
-NODE_ENV = 'production'
+ENV = 'uat'
+NODE_ENV = 'uat'
 # base public path
 VUE_APP_BASE_PATH = '/'
 
diff --git a/.env.usa b/.env.usa
index 7df52bb..cd4f5b4 100644
--- a/.env.usa
+++ b/.env.usa
@@ -1,6 +1,6 @@
 # just a flag
-ENV = 'production'
-NODE_ENV = 'production'
+ENV = 'usa'
+NODE_ENV = 'usa'
 # base public path
 VUE_APP_BASE_PATH = '/'
 
diff --git a/src/views/trials/trials-myinfo/password.vue b/src/views/trials/trials-myinfo/password.vue
index 4734c4d..50357a1 100644
--- a/src/views/trials/trials-myinfo/password.vue
+++ b/src/views/trials/trials-myinfo/password.vue
@@ -157,4 +157,9 @@ export default {
     },
   },
 };
-</script>
\ No newline at end of file
+</script>
+<style lang="scss" scoped>
+::v-deep .is-error{
+  margin-bottom: 44px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/trials/trials-panel/study/components/list.vue b/src/views/trials/trials-panel/study/components/list.vue
index 6d4367f..06ddaa5 100644
--- a/src/views/trials/trials-panel/study/components/list.vue
+++ b/src/views/trials/trials-panel/study/components/list.vue
@@ -72,14 +72,14 @@
             {{ $t("common:button:reset") }}
           </el-button>
           <!-- 自动绑定 -->
-          <el-button
+          <!-- <el-button
             type="primary"
             @click="automaticBind"
             :loading="automaticBindLoading"
             v-if="activeName === 'notSubmit'"
           >
             {{ $t("trials:study:button:automaticBind") }}
-          </el-button>
+          </el-button> -->
         </el-form-item>
       </el-form>
     </template>