Merge remote-tracking branch 'origin/master'

components/appeal/AccountAppeal.vue

@@ -26,7 +26,7 @@
               <span v-show="codeErrorChecked" class="tip codeError-tip" >{{codeErrorMsg}}</span>
             </el-form-item>
             <el-form-item prop="password">
-              <el-input type="password" v-model="account.password" auto-complete="off" placeholder="登录密码"></el-input>
+              <el-input type="password" v-model="account.password" auto-complete="new-password" placeholder="登录密码"></el-input>
             </el-form-item>
             <el-form-item prop="description">
               <el-input type="textarea" v-model="account.description" placeholder="申诉说明"></el-input>
@@ -377,7 +377,11 @@
       },
 //      跳转至个人中心页面
       goCloudCenter () {
-        window.location.href = '/cloudcenter'
+        if (this.$route.query.returnURL) {
+          window.location.href = decodeURIComponent(this.$route.query.returnURL)
+        } else {
+          this.$router.push('/cloudcenter')
+        }
       }
     }
   }

components/appeal/ChangeManagerAppeal.vue

@@ -481,6 +481,7 @@
           if (file.size > 5 * 1024 * 1024) {
             this.uploadFileChecked = false
             this.isShowLoading = false
+            this.$message.error('文件大小不能超过5M')
           } else {
             let param = new FormData()
             param.append('image', file, file.name)
@@ -617,7 +618,11 @@
       },
 //      跳转至个人中心页面
       goCloudCenter () {
-        window.location.href = '/cloudcenter'
+        if (this.$route.query.returnURL) {
+          window.location.href = decodeURIComponent(this.$route.query.returnURL)
+        } else {
+          this.$router.push('/cloudcenter')
+        }
       }
     }
   }

components/appeal/PasswordRestAppeal.vue

@@ -456,7 +456,11 @@
       },
 //      跳转至个人中心页面
       goCloudCenter () {
-        window.location.href = '/cloudcenter'
+        if (this.$route.query.returnURL) {
+          window.location.href = decodeURIComponent(this.$route.query.returnURL)
+        } else {
+          this.$router.push('/cloudcenter')
+        }
       }
     }
   }

components/certification/EnterpriseCertification.vue

@@ -337,6 +337,7 @@
           if (file.size > 5 * 1024 * 1024) {
             this.uploadFileChecked = false
             this.isShowLoading = false
+            this.$message.error('文件大小不能超过5M')
           } else {
             let param = new FormData()
             param.append('image', file, file.name)
@@ -456,7 +457,11 @@
       },
       //      跳转至个人中心页面
       goCloudCenter () {
-        window.location.href = '/cloudcenter'
+        if (this.$route.query.returnURL) {
+          window.location.href = decodeURIComponent(this.$route.query.returnURL)
+        } else {
+          this.$router.push('/cloudcenter')
+        }
       }
     }
   }

components/certification/RealNameCertification.vue

@@ -212,7 +212,11 @@
       },
       //      跳转至个人中心页面
       goCloudCenter () {
-        window.location.href = '/cloudcenter'
+        if (this.$route.query.returnURL) {
+          window.location.href = decodeURIComponent(this.$route.query.returnURL)
+        } else {
+          this.$router.push('/cloudcenter')
+        }
       }
     }
   }

components/change/ChangeStepNew.vue

@@ -220,7 +220,7 @@
 //      获取第二步手机验证码
       getSecondCheckCode () {
         this.isShowLoading = true
-        this.$http.get(`/sso/change/admin/check/newMobile`, {params: {mobile: this.valid2.mobile, token: this.tokenId}})
+        this.$http.get(`/sso/change/admin/check/newMobile`, {params: {mobile: this.valid2.mobile, token: this.tokenId ? this.tokenId : this.$route.query.token}})
           .then(response => {
             this.isShowLoading = false
             if (response.data.success) {
@@ -256,7 +256,7 @@
           param.append('newAdminName', this.valid2.newAdminName)
           param.append('mobile', this.valid2.mobile)
           param.append('code', this.valid2.code)
-          param.append('token', this.tokenId)
+          param.append('token', this.tokenId ? this.tokenId : this.$route.query.token)
           param.append('codeToken', this.secondToken)
           param.append('changeReason', this.valid2.changeReason)
           param.append('contactTel', this.valid2.contactTel)

components/change/ChangeStepSuccess.vue

@@ -25,7 +25,11 @@
     methods: {
 //      跳转至云中心页面
       goCloudCenter () {
-        window.location.href = '/cloudcenter'
+        if (this.$route.query.returnURL) {
+          window.location.href = decodeURIComponent(this.$route.query.returnURL)
+        } else {
+          this.$router.push('/cloudcenter')
+        }
       }
     }
   }

components/encrypted-setting/EncryptedNew.vue

@@ -136,7 +136,7 @@
           userQuestion.push({'question': this.valid2.question1, 'answer': this.valid2.answer1, 'sort': '1'}, {'question': this.valid2.question2, 'answer': this.valid2.answer2, 'sort': '2'})
           let userQuestions = JSON.stringify(userQuestion)
           param.append('userQuestions', userQuestions)
-          param.append('token', this.tokenId)
+          param.append('token', this.tokenId ? this.tokenId : this.$route.query.token)
           let config = {
             headers: {'Content-Type': 'multipart/form-data'}
           }

components/encrypted-setting/EncryptedSuccess.vue

@@ -25,7 +25,11 @@
     methods: {
 //      跳转至云中心页面
       goCloudCenter () {
-        window.location.href = '/cloudcenter'
+        if (this.$route.query.returnURL) {
+          window.location.href = decodeURIComponent(this.$route.query.returnURL)
+        } else {
+          this.$router.push('/cloudcenter')
+        }
       }
     }
   }

components/mobile/changeManager/StepAppeal.vue

@@ -191,7 +191,6 @@
         this.regStreet = detail
       },
       setPopAddress (detail) {
-        console.log('popAddress', detail)
         this.popAddress = detail
       },
       showAddress (info) {
@@ -251,8 +250,8 @@
                     })
                     return Promise.reject(response.data)
                   }
-                }).catch(() => {
-                  this.downToast('请检查网络是否正常或联系服务商')
+                }).catch((err) => {
+                  this.downToast(err.errMsg)
                 })
             } else {
               this.downToast('请点击先获取验证码信息')
@@ -289,9 +288,9 @@
                     }
                   }, 1000)
                 }
-              }).catch(() => {
+              }).catch((err) => {
                 this.$indicator.close()
-                this.downToast('请检查网络是否正常或联系服务商')
+                this.downToast(err.errMsg)
               })
           }
         }
@@ -362,6 +361,7 @@
         if (file) {
           if (file.size > 5 * 1024 * 1024) {
             this.uploadFileChecked = false
+            this.downToast('文件大小不能超过5M')
           } else {
             this.$indicator.open('上传中...')
             let param = new FormData()
@@ -473,6 +473,7 @@
           param.append('spaceName', this.valid.spaceName)
           param.append('businessCode', this.valid.businessCode)
           param.append('businessCodeImage', this.valid.businessCodeImage)
+          param.append('corporation', this.valid.corporation)
           param.append('regAddress', this.regAddress)
           param.append('regProvince', this.regProvince)
           param.append('regCity', this.regCity)
@@ -496,9 +497,9 @@
               } else {
                 this.downToast(response.data.errMsg)
               }
-            }).catch(() => {
+            }).catch((err) => {
               this.$indicator.close()
-              this.downToast('请检查网络是否正常或联系服务商')
+              this.downToast(err.errMsg)
             })
         }
       }

components/mobile/changeManager/StepEmail.vue

@@ -62,9 +62,9 @@
               this.hasSend = false
               this.downToast(response.data.errMsg)
             }
-          }).catch(() => {
+          }).catch((err) => {
             this.$indicator.close()
-            this.downToast('请检查网络是否正常或联系服务商')
+            this.downToast(err.errMsg)
           })
       }
     }

components/mobile/changeManager/StepMobile.vue

@@ -109,9 +109,9 @@
                   }
                 }, 1000)
               }
-            }).catch(() => {
+            }).catch((err) => {
               this.$indicator.close()
-              this.downToast('请检查网络是否正常或联系服务商')
+              this.downToast(err.errMsg)
             })
         }
       },
@@ -137,9 +137,9 @@
               } else {
                 this.downToast(response.data.errMsg)
               }
-            }).catch(() => {
+            }).catch((err) => {
               this.$indicator.close()
-              this.downToast('请检查网络是否正常或联系服务商')
+              this.downToast(err.errMsg)
             })
         }
       }

components/mobile/changeManager/StepNew.vue

@@ -145,10 +145,9 @@
                       message: response.data.errMsg,
                       iconClass: 'el-icon-error'
                     })
-                    return Promise.reject(response.data)
                   }
-                }).catch(() => {
-                  this.downToast('请检查网络是否正常或联系服务商')
+                }).catch((err) => {
+                  this.downToast(err.errMsg)
                 })
             } else {
               this.downToast('请点击先获取验证码信息')
@@ -159,7 +158,6 @@
       },
       // 获取验证码
       getCheckCode () {
-        console.log(this.tokenId)
         if (this.tokenTime > 0 && this.tokenTime < 60) {
           this.downToast('请稍后再点击，我在倒计时')
         } else {
@@ -186,9 +184,9 @@
                     }
                   }, 1000)
                 }
-              }).catch(() => {
+              }).catch((err) => {
                 this.$indicator.close()
-                this.downToast('请检查网络是否正常或联系服务商')
+                this.downToast(err.errMsg)
               })
           }
         }
@@ -252,9 +250,9 @@
               } else {
                 this.downToast(response.data.errMsg)
               }
-            }).catch(() => {
+            }).catch((err) => {
               this.$indicator.close()
-              this.downToast('请检查网络是否正常或联系服务商')
+              this.downToast(err.errMsg)
             })
         }
       }

components/mobile/changeManager/StepSecurity.vue

@@ -107,9 +107,9 @@
               } else {
                 this.downToast(response.data.errMsg)
               }
-            }).catch(() => {
+            }).catch((err) => {
               this.$indicator.close()
-              this.downToast('请检查网络是否正常或联系服务商')
+              this.downToast(err.errMsg)
             })
         }
       }

components/mobile/encryptedSetting/StepEmail.vue

@@ -62,9 +62,9 @@
               this.hasSend = false
               this.downToast(response.data.errMsg)
             }
-          }).catch(() => {
+          }).catch((err) => {
             this.$indicator.close()
-            this.downToast('请检查网络是否正常或联系服务商')
+            this.downToast(err.errMsg)
           })
       }
     }

components/mobile/encryptedSetting/StepMobile.vue

@@ -109,9 +109,9 @@
                   }
                 }, 1000)
               }
-            }).catch(() => {
+            }).catch((err) => {
               this.$indicator.close()
-              this.downToast('请检查网络是否正常或联系服务商')
+              this.downToast(err.errMsg)
             })
         }
       },
@@ -137,9 +137,9 @@
               } else {
                 this.downToast(response.data.errMsg)
               }
-            }).catch(() => {
+            }).catch((err) => {
               this.$indicator.close()
-              this.downToast('请检查网络是否正常或联系服务商')
+              this.downToast(err.errMsg)
             })
         }
       }

components/mobile/encryptedSetting/StepNew.vue

@@ -121,9 +121,9 @@
               } else {
                 this.downToast(response.data.errMsg)
               }
-            }).catch(() => {
+            }).catch((err) => {
               this.$indicator.close()
-              this.downToast('请检查网络是否正常或联系服务商')
+              this.downToast(err.errMsg)
             })
         }
       }

components/mobile/enterpriseCertification/stepOne.vue

@@ -186,7 +186,6 @@
                     this.downToast('该企业已被认证，请确认')
                   }
                 }).catch(err => {
-                  console.log(err)
                   this.$message.error(err.errMsg)
                 })
             } else {
@@ -216,6 +215,7 @@
         if (file) {
           if (file.size > 5 * 1024 * 1024) {
             this.uploadFileChecked = false
+            this.downToast('文件大小不能超过5M')
           } else {
             this.$indicator.open('上传中...')
             let param = new FormData()
@@ -282,9 +282,9 @@
                 } else {
                   this.downToast(response.data.errMsg)
                 }
-              }).catch(() => {
+              }).catch((err) => {
                 this.$indicator.close()
-                this.downToast('请检查网络是否正常或联系服务商')
+                this.downToast(err.errMsg)
               })
           }
         }

components/mobile/realNameCertification/stepOne.vue

@@ -114,9 +114,9 @@
               } else {
                 this.downToast(response.data.errMsg)
               }
-            }).catch(() => {
+            }).catch((err) => {
               this.$indicator.close()
-              this.downToast('请检查网络是否正常或联系服务商')
+              this.downToast(err.errMsg)
             })
         }
       }

components/mobile/registerEnterprise/index.vue

@@ -59,6 +59,7 @@
                     v-model="step2.password"
                     :state="state.password"
                     type="password"
+                    auto-complete="new-password"
                     @input.native="validatePassword"
                     @blur.native.capture="validatePasswordTip"></mt-field>
           <template v-if="step2.password">
@@ -71,6 +72,7 @@
                     v-model="step2.password"
                     :state="state.password"
                     type="password"
+                    auto-complete="new-password"
                     @blur.native.capture="validatePasswordTipHas"></mt-field>
           <template v-if="!step2.password">
             <p class="pwd" style="text-align:right;"><a href="/reset/forgetPasswordValidationAccount">忘记密码?</a></p>
@@ -84,6 +86,7 @@
                     v-model="step2.confirm"
                     :state="state.confirm"
                     type="password"
+                    auto-complete="new-password"
                     @blur.native.capture="validateConfirm"></mt-field>
         </div>
         <div class="page-part" v-if="!hasEmail">
@@ -115,7 +118,7 @@
           vipName: 'error',
           password: 'error',
           confirm: 'error',
-          email: 'error'
+          email: 'success'
         },
         step1: {
           mobile: '',
@@ -193,8 +196,8 @@
                       iconClass: 'el-icon-error'
                     })
                   }
-                }).catch(() => {
-                  this.downToast('请检查网络是否正常或联系服务商')
+                }).catch((err) => {
+                  this.downToast(err.errMsg)
                 })
             } else {
               this.downToast('请点击先获取验证码信息')
@@ -231,9 +234,9 @@
                     }
                   }, 1000)
                 }
-              }).catch(() => {
+              }).catch((err) => {
                 this.$indicator.close()
-                this.downToast('请检查网络是否正常或联系服务商')
+                this.downToast(err.errMsg)
               })
           }
         }
@@ -262,9 +265,9 @@
                 response.data.content.hasRegister ? this.hasRegister = true : this.hasRegister = false
                 this.step = 2
               }
-            }).catch(() => {
+            }).catch((err) => {
               this.$indicator.close()
-              this.downToast('请检查网络是否正常或联系服务商')
+              this.downToast(err.errMsg)
             })
         }
       },
@@ -396,13 +399,13 @@
                 } else {
                   this.state.email = 'success'
                 }
-              }).catch(() => {
-                this.downToast('请检查网络是否正常或联系服务商')
+              }).catch((err) => {
+                this.downToast(err.errMsg)
               })
           }
         } else {
-          this.downToast('请填写联系邮箱信息')
-          this.state.email = 'error'
+          // this.downToast('请填写联系邮箱信息')
+          this.state.email = 'success'
         }
       },
       // 注册请求方法
@@ -455,9 +458,9 @@
             } else {
               this.downToast(response.data.errMsg)
             }
-          }).catch(() => {
+          }).catch((err) => {
             this.$indicator.close()
-            this.downToast('请检查网络是否正常或联系服务商')
+            this.downToast(err.errMsg)
           })
       },
       // 企业注册

components/mobile/registerPersonal/index.vue

@@ -165,8 +165,8 @@
               } else {
                 this.state.mobile = 'success'
               }
-            }).catch(() => {
-              this.downToast('请检查网络是否正常或联系服务商')
+            }).catch((err) => {
+              this.downToast(err.errMsg)
             })
         }
       },
@@ -198,8 +198,8 @@
                       iconClass: 'el-icon-error'
                     })
                   }
-                }).catch(() => {
-                  this.downToast('请检查网络是否正常或联系服务商')
+                }).catch((err) => {
+                  this.downToast(err.errMsg)
                 })
             } else {
               this.downToast('请点击先获取验证码信息')
@@ -233,9 +233,9 @@
                   }
                 }, 1000)
               }
-            }).catch(() => {
+            }).catch((err) => {
               this.$indicator.close()
-              this.downToast('请检查网络是否正常或联系服务商')
+              this.downToast(err.errMsg)
             })
         }
       },
@@ -308,9 +308,9 @@
                   iconClass: 'el-icon-error'
                 })
               }
-            }).catch(() => {
+            }).catch((err) => {
               this.$indicator.close()
-              this.downToast('请检查网络是否正常或联系服务商')
+              this.downToast(err.errMsg)
             })
         }
       },

components/mobile/reset/stepAppeal.vue

@@ -166,8 +166,8 @@
                         iconClass: 'el-icon-error'
                       })
                     }
-                  }).catch(() => {
-                    this.downToast('请检查网络是否正常或联系服务商')
+                  }).catch((err) => {
+                    this.downToast(err.errMsg)
                   })
               } else {
                 this.downToast('请点击先获取验证码信息')
@@ -204,9 +204,9 @@
                       }
                     }, 1000)
                   }
-                }).catch(() => {
+                }).catch((err) => {
                   this.$indicator.close()
-                  this.downToast('请检查网络是否正常或联系服务商')
+                  this.downToast(err.errMsg)
                 })
             }
           }
@@ -331,9 +331,9 @@
                 } else {
                   this.downToast(response.data.errMsg)
                 }
-              }).catch(() => {
+              }).catch((err) => {
                 this.$indicator.close()
-                this.downToast('请检查网络是否正常或联系服务商')
+                this.downToast(err.errMsg)
               })
           }
         }

components/mobile/reset/stepBefore.vue

@@ -70,9 +70,9 @@
                 } else {
                   this.downToast(response.data.errMsg)
                 }
-              }).catch(() => {
+              }).catch((err) => {
                 this.$indicator.close()
-                this.downToast('请检查网络是否正常或联系服务商')
+                this.downToast(err.errMsg)
               })
           }
         }

components/mobile/reset/stepEmail.vue

@@ -62,9 +62,9 @@
               this.hasSend = false
               this.downToast(response.data.errMsg)
             }
-          }).catch(() => {
+          }).catch((err) => {
             this.$indicator.close()
-            this.downToast('请检查网络是否正常或联系服务商')
+            this.downToast(err.errMsg)
           })
       }
     }

components/mobile/reset/stepFirst.vue

@@ -99,9 +99,9 @@
                   this.getCode()
                   this.downToast(response.data.errMsg)
                 }
-              }).catch(() => {
+              }).catch((err) => {
                 this.$indicator.close()
-                this.downToast('请检查网络是否正常或联系服务商')
+                this.downToast(err.errMsg)
               })
           }
         },

components/mobile/reset/stepMobile.vue

@@ -92,9 +92,9 @@
                   }
                 }, 1000)
               }
-            }).catch(() => {
+            }).catch((err) => {
               this.$indicator.close()
-              this.downToast('请检查网络是否正常或联系服务商')
+              this.downToast(err.errMsg)
             })
         }
       },
@@ -119,9 +119,9 @@
               } else {
                 this.downToast(response.data.errMsg)
               }
-            }).catch(() => {
+            }).catch((err) => {
               this.$indicator.close()
-              this.downToast('请检查网络是否正常或联系服务商')
+              this.downToast(err.errMsg)
             })
         }
       }

components/mobile/reset/stepNew.vue

@@ -121,9 +121,9 @@
               } else {
                 this.downToast(response.data.errMsg)
               }
-            }).catch(() => {
+            }).catch((err) => {
               this.$indicator.close()
-              this.downToast('请检查网络是否正常或联系服务商')
+              this.downToast(err.errMsg)
             })
         }
       }

components/mobile/reset/stepSecurity .vue

@@ -121,9 +121,9 @@
               } else {
                 this.downToast(response.data.errMsg)
               }
-            }).catch(() => {
+            }).catch((err) => {
               this.$indicator.close()
-              this.downToast('请检查网络是否正常或联系服务商')
+              this.downToast(err.errMsg)
             })
         }
       }

components/mobile/validation/StepAppeal.vue

@@ -27,7 +27,7 @@
         <mt-field placeholder="登录密码"
                   type="password"
                   v-model="valid.password"
-                  auto-complete="off"
+                  auto-complete="new-password"
                   :state="state.password"
                   @blur.native.capture="validatePassword"
         ></mt-field>
@@ -161,8 +161,8 @@
                     })
                     return Promise.reject(response.data)
                   }
-                }).catch(() => {
-                  this.downToast('请检查网络是否正常或联系服务商')
+                }).catch((err) => {
+                  this.downToast(err.errMsg)
                 })
             } else {
               this.downToast('请点击先获取验证码信息')
@@ -199,9 +199,9 @@
                     }
                   }, 1000)
                 }
-              }).catch(() => {
+              }).catch((err) => {
                 this.$indicator.close()
-                this.downToast('请检查网络是否正常或联系服务商')
+                this.downToast(err.errMsg)
               })
           }
         }
@@ -306,9 +306,9 @@
               } else {
                 this.downToast(response.data.errMsg)
               }
-            }).catch(() => {
+            }).catch((err) => {
               this.$indicator.close()
-              this.downToast('请检查网络是否正常或联系服务商')
+              this.downToast(err.errMsg)
             })
         }
       }

components/mobile/validation/ValidationEmailStepEmail.vue

@@ -62,9 +62,9 @@
               this.hasSend = false
               this.downToast(response.data.errMsg)
             }
-          }).catch(() => {
+          }).catch((err) => {
             this.$indicator.close()
-            this.downToast('请检查网络是否正常或联系服务商')
+            this.downToast(err.errMsg)
           })
       }
     }

components/mobile/validation/ValidationEmailStepMobile.vue

@@ -109,9 +109,9 @@
                   }
                 }, 1000)
               }
-            }).catch(() => {
+            }).catch((err) => {
               this.$indicator.close()
-              this.downToast('请检查网络是否正常或联系服务商')
+              this.downToast(err.errMsg)
             })
         }
       },
@@ -137,9 +137,9 @@
               } else {
                 this.downToast(response.data.errMsg)
               }
-            }).catch(() => {
+            }).catch((err) => {
               this.$indicator.close()
-              this.downToast('请检查网络是否正常或联系服务商')
+              this.downToast(err.errMsg)
             })
         }
       }

components/mobile/validation/ValidationEmailStepNew.vue

@@ -56,20 +56,7 @@
             this.downToast('请填写正确的邮箱号')
             this.state.email = 'warning'
           } else {
-            this.$http.get(`/update/user/email/hasRegister`, {params: {email: this.valid.email}})
-              .then(response => {
-                if (response.data.content.hasRegister) {
-                  this.$toast({
-                    message: '该邮箱号已被注册',
-                    iconClass: 'el-icon-error'
-                  })
-                } else {
-                  this.state.email = 'success'
-                }
-              }).catch(() => {
-                this.$indicator.close()
-                this.downToast('请检查网络是否正常或联系服务商')
-              })
+            this.state.email = 'success'
           }
         }
       },
@@ -88,9 +75,9 @@
                 this.hasSend = false
                 this.downToast(response.data.errMsg)
               }
-            }).catch(() => {
+            }).catch((err) => {
               this.$indicator.close()
-              this.downToast('请检查网络是否正常或联系服务商')
+              this.downToast(err.errMsg)
             })
         }
       }

components/mobile/validation/ValidationEmailStepSecurity.vue

@@ -117,9 +117,9 @@
               } else {
                 this.downToast(response.data.errMsg)
               }
-            }).catch(() => {
+            }).catch((err) => {
               this.$indicator.close()
-              this.downToast('请检查网络是否正常或联系服务商')
+              this.downToast(err.errMsg)
             })
         }
       }

components/mobile/validation/ValidationPhoneStepEmail.vue

@@ -62,9 +62,9 @@
               this.hasSend = false
               this.downToast(response.data.errMsg)
             }
-          }).catch(() => {
+          }).catch((err) => {
             this.$indicator.close()
-            this.downToast('请检查网络是否正常或联系服务商')
+            this.downToast(err.errMsg)
           })
       }
     }

components/mobile/validation/ValidationPhoneStepMobile.vue

@@ -109,9 +109,9 @@
                   }
                 }, 1000)
               }
-            }).catch(() => {
+            }).catch((err) => {
               this.$indicator.close()
-              this.downToast('请检查网络是否正常或联系服务商')
+              this.downToast(err.errMsg)
             })
         }
       },
@@ -137,9 +137,9 @@
               } else {
                 this.downToast(response.data.errMsg)
               }
-            }).catch(() => {
+            }).catch((err) => {
               this.$indicator.close()
-              this.downToast('请检查网络是否正常或联系服务商')
+              this.downToast(err.errMsg)
             })
         }
       }

components/mobile/validation/ValidationPhoneStepNew.vue

@@ -67,17 +67,7 @@
             this.downToast('请填写正确的手机号')
             this.state.mobile = 'warning'
           } else {
-            this.$http.get(`/update/user/mobile/hasRegister`, {params: {mobile: this.valid.mobile}})
-              .then(response => {
-                if (response.data.content.hasRegister) {
-                  this.$toast({
-                    message: '该手机号已被注册',
-                    iconClass: 'el-icon-error'
-                  })
-                } else {
-                  this.state.mobile = 'success'
-                }
-              })
+            this.state.mobile = 'success'
           }
         }
       },
@@ -110,8 +100,8 @@
                     })
                     this.state.token = 'error'
                   }
-                }).catch(() => {
-                  this.downToast('请检查网络是否正常或联系服务商')
+                }).catch((err) => {
+                  this.downToast(err.errMsg)
                 })
             } else {
               this.downToast('请点击先获取验证码信息')
@@ -148,9 +138,9 @@
                     }
                   }, 1000)
                 }
-              }).catch(() => {
+              }).catch((err) => {
                 this.$indicator.close()
-                this.downToast('请检查网络是否正常或联系服务商')
+                this.downToast(err.errMsg)
               })
           }
         }
@@ -177,9 +167,9 @@
               } else {
                 this.downToast(response.data.errMsg)
               }
-            }).catch(() => {
+            }).catch((err) => {
               this.$indicator.close()
-              this.downToast('请检查网络是否正常或联系服务商')
+              this.downToast(err.errMsg)
             })
         }
       }

components/mobile/validation/ValidationPhoneStepSecurity.vue

@@ -117,9 +117,9 @@
               } else {
                 this.downToast(response.data.errMsg)
               }
-            }).catch(() => {
+            }).catch((err) => {
               this.$indicator.close()
-              this.downToast('请检查网络是否正常或联系服务商')
+              this.downToast(err.errMsg)
             })
         }
       }

components/mobile/validation/phoneValidationFail.vue

@@ -16,7 +16,11 @@
     methods: {
 //      跳转至云中心页面
       goCloudCenter () {
-        window.location.href = '/cloudcenter'
+        if (this.$route.query.returnURL) {
+          window.location.href = decodeURIComponent(this.$route.query.returnURL)
+        } else {
+          this.$router.push('/cloudcenter')
+        }
       }
     }
   }

components/register/CityRegisterOver.vue

@@ -22,7 +22,6 @@
     name: 'city',
     computed: {
       loginStyle () {
-        console.log(this.$store.state.login.loginStyle.data.content)
         return this.$store.state.login.loginStyle.data.content ? this.$store.state.login.loginStyle.data.content : ''
       }
     }

components/register/EnterpriseRegistration.vue

@@ -764,7 +764,6 @@
           .then(response => {
             this.isShowLoading = false
             if (response.data.success) {
-              console.log(response.data)
               if (response.data.content) {
                 if (response.data.content.type === 'mall') {
                   let param = response.data.content.data

components/register/PersonalRegistration.vue

@@ -417,7 +417,6 @@
                 this.isShowLoading = false
                 if (response.data.success) {
                   if (response.data.content.type) {
-                    console.log(111)
                     if (response.data.content.type === 'mall') {
                       let param = response.data.content.data
                       let a = ''

components/reset/PasswordStepSelect.vue

@@ -73,7 +73,6 @@
       },
       // 获取验证方式
       getVerifyWay () {
-        console.log(this.$store.state.option.isLogin)
         this.$http.get('/sso/resetPwd/checkType/' + (this.$store.state.option.isLogin.data.content.isLogin ? 'update' : 'reset'))
           .then(response => {
             if (response.data.success) {

components/validation/EmailStepNew.vue

@@ -14,9 +14,7 @@
             <el-form :model="valid2" :rules="rules2" ref="valid2" label-width="100px" class="demo-ruleForm">
               <el-form-item prop="email">
                 <el-input v-model="valid2.email"
-                          v-bind:class="{ active: emailSecondExit }"
                           placeholder="新邮箱地址"></el-input>
-                <span class="tip tip-mobile" v-show="emailSecondExit">该邮箱已被注册</span>
               </el-form-item>
               <el-form-item>
                 <a class="btn finish"
@@ -50,25 +48,14 @@
         if (value === '') {
           callback(new Error('请填写正确的邮箱号'))
           this.emailSecondChecked = false
-          this.emailSecondExit = false
         } else {
           if (this.valid2.email !== '') {
             var reg = /^([\w-])+(\.\w+)*@([\w-])+((\.\w{2,3}){1,3})$/
             if (!reg.test(value)) {
               callback(new Error('请填写正确的邮箱号'))
               this.emailSecondChecked = false
-              this.emailSecondExit = false
             } else {
-              this.$http.get(`/update/user/email/hasRegister`, {params: {email: this.valid2.email}})
-                .then(response => {
-                  if (response.data.content.hasRegister) {
-                    this.emailSecondChecked = false
-                    this.emailSecondExit = true
-                  } else {
-                    this.emailSecondChecked = true
-                    this.emailSecondExit = false
-                  }
-                })
+              this.emailSecondChecked = true
             }
           }
           callback()
@@ -78,7 +65,6 @@
         isShowLoading: false,
         sendEmailSuccess: false,
         emailSecondChecked: false,
-        emailSecondExit: false,
         valid2: {
           email: ''
         },

components/validation/PhoneStepNew.vue

@@ -14,9 +14,7 @@
             <el-form :model="valid2" :rules="rules2" ref="valid2" label-width="100px" class="demo-ruleForm">
               <el-form-item prop="mobile">
                 <el-input v-model="valid2.mobile"
-                          v-bind:class="{active: mobileSecondExit}"
                           placeholder="新手机号码"></el-input>
-                <span class="tip tip-mobile" v-show="mobileSecondExit">该手机已被注册</span>
               </el-form-item>
               <el-form-item prop="code">
                 <el-input type="text" v-model="valid2.code"
@@ -61,7 +59,6 @@
           callback(new Error('请填写正确的手机号'))
           this.getCodeBtnIsDisabled = true
           this.mobileSecondChecked = false
-          this.mobileSecondExit = false
         } else {
           if (this.valid2.mobile !== '') {
             var reg = /^1[0-9]{10}$/
@@ -69,21 +66,9 @@
               callback(new Error('请填写正确的手机号'))
               this.getCodeBtnIsDisabled = true
               this.mobileSecondChecked = false
-              this.mobileSecondExit = false
             } else {
-              this.$http.get(`/update/user/mobile/hasRegister`, {params: {mobile: this.valid2.mobile}})
-                .then(response => {
-                  console.log(response.data.content.hasRegister, '111')
-                  if (response.data.content.hasRegister) {
-                    this.getCodeBtnIsDisabled = true
-                    this.mobileSecondChecked = false
-                    this.mobileSecondExit = true
-                  } else {
-                    this.getCodeBtnIsDisabled = false
-                    this.mobileSecondChecked = true
-                    this.mobileSecondExit = false
-                  }
-                })
+              this.getCodeBtnIsDisabled = false
+              this.mobileSecondChecked = true
             }
           }
           callback()

components/validation/ValidationFail.vue

@@ -18,7 +18,11 @@
     methods: {
 //      跳转至云中心页面
       goCloudCenter () {
-        window.location.href = '/cloudcenter'
+        if (this.$route.query.returnURL) {
+          window.location.href = decodeURIComponent(this.$route.query.returnURL)
+        } else {
+          this.$router.push('/cloudcenter')
+        }
       }
     }
   }

pages/change/changeManager.vue

@@ -28,7 +28,6 @@
     layout (content) {
       return content.store.state.option.isMobile ? 'mobile' : 'default'
     },
-    middleware: 'authenticated',
     transition: {
       name: 'fade',
       mode: 'out-in'
@@ -63,7 +62,15 @@
       }
     },
     mounted () {
-      this.$route.query.token ? this.step = 'new' : this.step = 'select'
+      if (this.$route.query.token) {
+        this.step = 'new'
+      } else {
+        if (this.$store.state.option.isLogin.data.content.isLogin) {
+          this.step = 'select'
+        } else {
+          this.$router.push('/')
+        }
+      }
     },
     methods: {
       setStep (type) {

pages/encrypted-setting/encryptedSetting.vue

@@ -56,7 +56,7 @@
         if (this.$store.state.option.isLogin.data.content.isLogin) {
           this.step = 'select'
         } else {
-          this.$route.push('/')
+          this.$router.push('/')
         }
       }
     },

pages/validation/emailValidation.vue

@@ -75,7 +75,6 @@
     },
     computed: {
       logged () {
-        console.log('12', this.$store.state.option.isLogin.data.content)
         return this.$store.state.option.isLogin.data.content
       },
       isMobile () {

pages/validation/phoneValidation.vue

@@ -60,6 +60,9 @@
     computed: {
       isMobile () {
         return this.$store.state.option.isMobile
+      },
+      logged () {
+        return this.$store.state.option.isLogin.data.content
       }
     },
     mounted () {