登录页面

src/pages/login/index.vue

@@ -788,7 +788,9 @@ export default {
       });
     },
     // 账号密码登录
-    loginIn(val) {
+    loginIn(a) {
+      let val = a.val;
+      let loginType = a.type;
       wx.setStorage({
         key: "enterpriseAccount",
         data: ""
@@ -798,9 +800,12 @@ export default {
       if (val.account == "") {
         return wx.showToast({title: "账号不能为空",icon: "none"});
       }
-      if (val.password == "") {
+      if (val.password == "" && loginType == 0) {
         return wx.showToast({title: "请输入密码", icon: "none"});
       }
+      if (val.verifycode == "" && loginType == 1) {
+        return wx.showToast({title: "请输入验证码", icon: "none"});
+      }
       if(this.content&&!this.checked) {
         wx.showToast({
           title: '您还未同意协议',