From 373bae166a95aef9863686a23fa5493f7dc55b0f Mon Sep 17 00:00:00 2001
From: wangfs <15029758498@163.com>
Date: Mon, 7 Sep 2020 16:23:27 +0800
Subject: [PATCH] 登陆验证码提交

---
 src/api/mycar.js               | 14 ++++++++++++++
 src/store/modules/user.js      |  2 +-
 src/views/login/index.vue      | 10 +++++++---
 src/views/mycar/index.vue      | 65 ++++++++++++++++++++++++++++++++++++++++++-----------------------
 src/views/myevaluate/index.vue |  9 +++++----
 5 files changed, 69 insertions(+), 31 deletions(-)

diff --git a/src/api/mycar.js b/src/api/mycar.js
index 5a18ec8..a5f81e3 100644
--- a/src/api/mycar.js
+++ b/src/api/mycar.js
@@ -35,3 +35,17 @@ export function unboundCarNum(params) {
 }
 
 
+/**
+ * 校验车牌号是否被其他人绑定
+ * @param params
+ */
+export function checkCarNumIsbind(params) {
+  return request({
+    url: '/personCarNumPc/checkCarNumIsbind',
+    method: 'post',
+    data:params
+  })
+}
+
+
+
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 2994bb3..a650d6c 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -33,7 +33,7 @@ const actions = {
         const { data } = response
         commit('SET_TOKEN', data.token)
         setToken(data.token)
-        resolve()
+        resolve(response)
       }).catch(error => {
         reject(error)
       })
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 655b588..25f89cf 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -169,9 +169,13 @@ export default {
       this.$refs.loginForm.validate(valid => {
         if (valid) {
           this.loading = true
-          this.$store.dispatch('user/login', this.loginForm).then(() => {
-            this.$router.push({ path: this.redirect || '/' })
-            this.loading = false
+          this.$store.dispatch('user/login', this.loginForm).then((reponse) => {
+              if(reponse.code =='8888'){
+                this.$router.push({ path: this.redirect || '/' })
+              }
+
+              this.loading = false
+
           }).catch(() => {
             this.loading = false
           })
diff --git a/src/views/mycar/index.vue b/src/views/mycar/index.vue
index fa26f20..23bdea2 100644
--- a/src/views/mycar/index.vue
+++ b/src/views/mycar/index.vue
@@ -67,7 +67,7 @@
 </template>
 
 <script>
-  import {getPersonCarNumPC,boundCarNum,unboundCarNum} from '@/api/mycar.js';
+  import {checkCarNumIsbind,getPersonCarNumPC,boundCarNum,unboundCarNum} from '@/api/mycar.js';
   export default {
     data() {
       var carNumValidator = (rule, value, callback) => {
@@ -115,32 +115,51 @@
         let carNum = this.bondform.carNum;
         let existFlg = false;
         this.$refs[formName].validate((valid) => {
-          if (valid) {
-            getPersonCarNumPC().then(response =>{
-              if(response.code ='8888'){
-                let data = response.data;
-                data.forEach(function(item,index){
-                    if(item.carNumber ==carNum){
-                      existFlg=true;
-                    }
+          if (!valid)  return false;
+          debugger
+
+          if(null != that.alredyBoundCar && that.alredyBoundCar.length >0){
+            if(that.alredyBoundCar.length >5){
+              this.$message({
+                type: 'error',
+                message: '最多只能绑定5个车牌！'
+              });
+              return false
+            }else{
+              let flg =false;
+              that.alredyBoundCar.forEach((item,index)=>{
+                if(item.carNumber == carNum){
+                  flg = true
+                }
+              });
+              if(flg){
+                this.$message({
+                  type: 'error',
+                  message: '请勿做重复绑定！'
                 });
-               if(data.length >=3){
-                 this.$message({
-                   type: 'error',
-                   message: '最多只能绑定3个车牌'
-                 });
-                }else if(existFlg){
-                  this.$message({
-                    type: 'error',
-                    message: '该车牌已经绑定！'
-                  });
-                }else {
-                  that.bondCarNum(custId,carNum);
+                return false
+              }else {
+                let checkReq ={
+                  carNumber:carNum
                 }
-
+                checkCarNumIsbind(checkReq).then(response =>{
+                  if(response.code =='8888'){
+                    if(null != response.data && null != response.data.id){
+                      this.$message({
+                        type: 'error',
+                        message: '改车牌已被其他车主绑定!'
+                      });
+                      return false
+                    }else{
+                      that.bondCarNum(custId,carNum)
+                    }
+                  }
+                });
               }
-            });
+            }
+
           }
+
         });
       },
       /**绑定车牌*/
diff --git a/src/views/myevaluate/index.vue b/src/views/myevaluate/index.vue
index 7a634ce..d62ccaf 100644
--- a/src/views/myevaluate/index.vue
+++ b/src/views/myevaluate/index.vue
@@ -20,7 +20,7 @@
 
     <el-card shadow="always" class="card-second-top">
       <div slot="header" class="clearfix" style="line-height: 32px;">
-        <span>详细记录</span>
+        <span style="float: left">详细记录</span>
         <el-button type="primary" size="small"  style="float: right" @click="dialogOpen">评价</el-button>
       </div>
       <el-table
@@ -55,7 +55,8 @@
       </el-table>
       <el-pagination
         :page-size="pageSize"
-        :pager-count="currentPage"
+        :current-page="currentPage"
+        :pager-count="5"
         layout="prev, pager, next"
         @current-change="handleCurrentChange"
         :total="total">
@@ -173,10 +174,10 @@
       },
 
       dialogOpen:function(){
-        let problemform= {
+        this.problemform= {
           resource: '1',
             desc:''
-        };
+        }
         this.dialogFormVisible=true;
       },
       /**提交.*/
--
libgit2 0.21.4