diff --git a/src/assets/scss/pages/loginWork.scss b/src/assets/scss/pages/loginWork.scss
index 534cccba9..7f5689f2f 100644
--- a/src/assets/scss/pages/loginWork.scss
+++ b/src/assets/scss/pages/loginWork.scss
@@ -64,6 +64,7 @@
 
         .input {
           width: 85%;
+          margin-bottom: 0;
 
           input {
             display: block;
diff --git a/src/views/pages/login.vue b/src/views/pages/login.vue
index 9a86fa5b5..8e39a89e2 100644
--- a/src/views/pages/login.vue
+++ b/src/views/pages/login.vue
@@ -16,35 +16,35 @@
                 <div class="ico">
                   <img src="@/assets/img/login/zhanghao.png" alt="" />
                 </div>
-                <div class="input">
+                <el-form-item prop="phone" class="input">
                   <input
                     type="text"
                     v-model="dataForm.phone"
                     placeholder="账号"
                   />
-                </div>
+                </el-form-item>
               </div>
               <div class="fm-item">
                 <div class="ico">
                   <img src="@/assets/img/login/mima.png" alt="" />
                 </div>
-                <div class="input">
+                <el-form-item prop="password" class="input">
                   <input
                     type="password"
                     v-model="dataForm.password"
                     :placeholder="$t('login.password')"
                   />
-                </div>
+                </el-form-item>
               </div>
               <div class="fm-captcha">
                 <div class="fm-item">
-                  <div class="input">
+                  <el-form-item prop="captcha" class="input">
                     <input
                       type="text"
                       v-model="dataForm.captcha"
                       placeholder="验证码"
                     />
-                  </div>
+                  </el-form-item>
                 </div>
                 <div class="captcha">
                   <img :src="captchaPath" @click="getCaptcha()" />
@@ -175,35 +175,16 @@ export default {
     // 表单提交
     dataFormSubmitHandle() {
       this.$refs["dataForm"].validate((valid, messageObj) => {
+        console.log(valid, messageObj);
         if (!valid) {
           app.util.validateRule(messageObj);
+          return;
         }
         this.startLoading();
-        // const url = 'https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/epmetuser/customerstaff/customerlist'
         const url = "/epmetuser/customerstaff/customerlist";
         const params = {
-          phone: this.dataForm.phone,
+          phone: encryptedData(this.pubKey, this.dataForm.phone),
         };
-        // this.$http
-        // .post(url, params).then(({ data })=> {
-        //   console.log('res--comll', data)
-        //   if (data.data.length === 0) {
-        //     //没有客户，提示无法登录
-        //     this.$message.error('账号不存在')
-        //     this.endLoading()
-        //   } else if (data.data.length === 1) {
-        //     this.selectCustomer(data.data[0])
-        //   } else {
-        //     this.endLoading()
-        //     this.diaVisible = true
-        //     this.$nextTick(() => {
-        //       this.tableData = data.data
-        //     })
-        //   }
-        // }).catch((err) => {
-        //   this.endLoading()
-        //   this.$message.error(err)
-        // })
         window.app.ajax.post(
           url,
           params,
@@ -261,6 +242,7 @@ export default {
       this.dataForm.customerId = row.customerId;
       let param = {};
       Object.assign(param, this.dataForm);
+      param.phone = encryptedData(this.pubKey, this.dataForm.phone);
       param.password = encryptedData(this.pubKey, this.dataForm.password);
       this.$http
         .post(url, param)