auth 排除passwordback

src/dashoo.cn/frontend_web/src/middleware/check-auth.js

@@ -10,6 +10,9 @@ export default function ({ isServer, store, req, route, redirect }) {
   if (route.name == 'signup') {
     return
   }
+  if (route.name == 'passwordback') {
+    return
+  }
   if (route.name == 'login') {
     return
   }

src/dashoo.cn/frontend_web/src/pages/login.vue

@@ -187,10 +187,11 @@
                         <el-button type="text" round>没有账户？请注册</el-button>
                       </router-link>
                     </el-col>
-                    <el-col :span="12">
-                      <router-link :to="'/passwordback'">
+                    <el-col :span="12" style="text-align: right; margin-top: 15px">
+                      <el-link href="/passwordback" type="primary">忘记密码?</el-link>
+                      <!--<router-link :to="'/passwdset'">
                         <el-button type="text" round>忘记密码？</el-button>
-                      </router-link>
+                      </router-link>-->
                     </el-col>
                   </el-row>
                 </el-form>

src/dashoo.cn/frontend_web/src/pages/passwordback.vue

@@ -23,7 +23,7 @@
           </el-menu-item>
         </el-menu>
       </div>
-      
+
       <el-card>
         <div class="home-wrapper" v-if="activeIndex==1">
             <el-form label-width="135px" ref="formData" :model="formData" :rules="rules">
@@ -40,12 +40,12 @@
                 </el-col>
                 <el-col :span="24">
                   <el-form-item label="法定代表人姓名" label-width="150px" style="width: 100%" prop="LegalPerson">
-                    <el-input v-model="formData.LegalPerson"  placeholder="请输入法定代表人姓名"></el-input>           
+                    <el-input v-model="formData.LegalPerson"  placeholder="请输入法定代表人姓名"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="16">
                   <el-form-item label="法定代表人身份证号" label-width="150px" style="width: 100%" prop="LegalPersonId">
-                    <el-input v-model="formData.LegalPersonId"  placeholder="请输入法定代表人身份证号"></el-input>           
+                    <el-input v-model="formData.LegalPersonId"  placeholder="请输入法定代表人身份证号"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="8">
@@ -61,12 +61,12 @@
                 </el-col>
                 <el-col :span="24">
                   <el-form-item label="联系人姓名" label-width="150px" style="width: 100%" prop="ContactName">
-                    <el-input v-model="formData.ContactName"  placeholder="请输入联系人姓名"></el-input>           
+                    <el-input v-model="formData.ContactName"  placeholder="请输入联系人姓名"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="16">
                   <el-form-item label="联系人身份证号" label-width="150px" style="width: 100%" prop="ContactId">
-                    <el-input v-model="formData.ContactId"  placeholder="请输入联系人身份证号"></el-input>           
+                    <el-input v-model="formData.ContactId"  placeholder="请输入联系人身份证号"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="8">
@@ -97,7 +97,7 @@
                     <el-input v-model="formData.Telephone" placeholder="用于审核通知和密码找回"></el-input>
                   </el-form-item>
                 </el-col>
-                <el-col :span="12">              
+                <el-col :span="12">
                   <el-form-item label="密码" label-width="150px" style="width: 100%" prop="UserPass" >
                     <el-input type="password" v-model="formData.UserPass"  auto-complete="off" placeholder="请输入密码(8-20位，字母数字组合)"></el-input>
                   </el-form-item>
@@ -108,9 +108,9 @@
                   </el-form-item>
                 </el-col>
                 <!-- <el-form-item label="验证码" prop="telep"  style="width: 100%">
-                  </el-form-item>                           
+                  </el-form-item>
                   <el-form-item label="短信验证码" prop="phober"  style="width: 100%">
-                  </el-form-item>             
+                  </el-form-item>
                   <el-checkbox v-model="checked1" style="margin-left: 80px">阅读并同意</el-checkbox>
                 <router-link to="#">《麦吉轮用户注册协议》</router-link><router-link to="#">《隐私政策》</router-link> -->
               </el-row>
@@ -234,7 +234,7 @@
 
         rules: {
           SupplierName: [
-            { required: true, 
+            { required: true,
               validator: checkSupplierName,
               trigger: 'blur'
             }
@@ -279,9 +279,9 @@
             { required: true, message: '请输入密码', trigger: 'blur' }
           ],
           UserPass2: [
-            { required: true, 
+            { required: true,
               message: '请输入确认密码',
-              trigger: 'blur' 
+              trigger: 'blur'
             }
           ],
         }