Compare commits

..

No commits in common. "733fab40de1fe85dae5ca14ca0a6647d253c135e" and "5cf8512fb3b91ee55c3c961fafd5c15d48882073" have entirely different histories.

5 changed files with 8 additions and 13 deletions

View File

@ -22,7 +22,7 @@ VUE_APP_LOGOUT_FOR_PERMISSION = false
VUE_APP_LOGOUT_FOR_TIME = 1800 VUE_APP_LOGOUT_FOR_TIME = 1800
# 是否开启密码正则验证 true:是 false:否 # 是否开启密码正则验证 true:是 false:否
VUE_APP_PASSWORD_FOR_PERMISSION = false VUE_APP_PASSWORD_FOR_PERMISSION = true
# 是否开启密码正则验证 true:是 false:否 # 是否开启密码正则验证 true:是 false:否
VUE_APP_PASSWORD_FOR_REGULAR = ^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[-_.@^+\$!%#*?&\$~])[A-Za-z0-9-~_.@^+\$~!%#*?&]{8,32}$ VUE_APP_PASSWORD_FOR_REGULAR = ^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[-_.@^+\$!%#*?&\$~])[A-Za-z0-9-~_.@^+\$~!%#*?&]{8,32}$

View File

@ -1,6 +1,6 @@
# just a flag # just a flag
ENV = 'uat' ENV = 'production'
NODE_ENV = 'uat' NODE_ENV = 'production'
# base public path # base public path
VUE_APP_BASE_PATH = '/' VUE_APP_BASE_PATH = '/'

View File

@ -1,6 +1,6 @@
# just a flag # just a flag
ENV = 'usa' ENV = 'production'
NODE_ENV = 'usa' NODE_ENV = 'production'
# base public path # base public path
VUE_APP_BASE_PATH = '/' VUE_APP_BASE_PATH = '/'

View File

@ -157,9 +157,4 @@ export default {
}, },
}, },
}; };
</script> </script>
<style lang="scss" scoped>
::v-deep .is-error{
margin-bottom: 44px;
}
</style>

View File

@ -72,14 +72,14 @@
{{ $t("common:button:reset") }} {{ $t("common:button:reset") }}
</el-button> </el-button>
<!-- 自动绑定 --> <!-- 自动绑定 -->
<!-- <el-button <el-button
type="primary" type="primary"
@click="automaticBind" @click="automaticBind"
:loading="automaticBindLoading" :loading="automaticBindLoading"
v-if="activeName === 'notSubmit'" v-if="activeName === 'notSubmit'"
> >
{{ $t("trials:study:button:automaticBind") }} {{ $t("trials:study:button:automaticBind") }}
</el-button> --> </el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</template> </template>