diff --git a/config/config.js b/config/config.js index 3d8944f..ce641b7 100644 --- a/config/config.js +++ b/config/config.js @@ -1,6 +1,7 @@ const name = "lilishop"; //全局商城name const schemeName = "lilishop"; //唤醒app需要的schemeName const wapUrl = process.env.VUE_APP_WAP_URL || "https://m-b2b2c.pickmall.cn"; +const loginCaptchaBypass = process.env.VUE_APP_LOGIN_CAPTCHA_BYPASS === "true"; export default { name: name, @@ -16,6 +17,7 @@ export default { customerServiceEmail: "lili@lili.com", //客服邮箱 imWebSrc: process.env.VUE_APP_IM_WEB_URL || "https://im.pickmall.cn", //IM地址 baseWsUrl: process.env.VUE_APP_IM_WS_URL || "wss://im-api.pickmall.cn/lili/webSocket", // IM WS 地址 + loginCaptchaBypass, enableGetClipboard: false, //是否启用粘贴板获取 scanAuthNavigation 中的链接,如果匹配则会跳转到对应页面 enableMiniBarStartUpApp: true, //是否在h5中右侧浮空按钮点击启动app /** diff --git a/pages/passport/login.vue b/pages/passport/login.vue index 82e398b..3213b32 100644 --- a/pages/passport/login.vue +++ b/pages/passport/login.vue @@ -103,12 +103,13 @@ } from "@/utils/Foundation"; //登录跳转 import storage from "@/utils/storage.js"; //缓存 import wechatH5Login from "./wechatH5Login.vue"; - import { - webConnect - } from "@/api/connect.js"; - import { - md5 - } from "@/utils/md5.js"; + import { + webConnect + } from "@/api/connect.js"; + import config from "@/config/config.js"; + import { + md5 + } from "@/utils/md5.js"; export default { components: { @@ -680,10 +681,15 @@ return false; } - if (!this.flage) { - this.$refs.verification.error(); //发送 - - return false; + if (config.loginCaptchaBypass) { + this.submitUserLogin(); + return; + } + + if (!this.flage) { + this.$refs.verification.error(); //发送 + + return false; } },