diff --git a/package-lock.json b/package-lock.json
index 7f94aa62ba43207439d7c059058cce3a180786ec..8eb5891e0616da961c0783f428f2c4853a95a7fc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13,6 +13,7 @@
         "element-ui": "^2.15.9",
         "less": "^3.9.0",
         "less-loader": "^5.0.0",
+        "qs": "^6.11.0",
         "view": "^1.1.1",
         "vue": "^2.6.11",
         "vue-router": "^3.2.0"
@@ -3985,7 +3986,6 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmmirror.com/call-bind/-/call-bind-1.0.2.tgz",
       "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
-      "dev": true,
       "dependencies": {
         "function-bind": "^1.1.1",
         "get-intrinsic": "^1.0.2"
@@ -7436,8 +7436,7 @@
     "node_modules/function-bind": {
       "version": "1.1.1",
       "resolved": "https://registry.npmmirror.com/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
-      "dev": true
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
     },
     "node_modules/function.prototype.name": {
       "version": "1.1.5",
@@ -7488,7 +7487,6 @@
       "version": "1.1.2",
       "resolved": "https://registry.npmmirror.com/get-intrinsic/-/get-intrinsic-1.1.2.tgz",
       "integrity": "sha512-Jfm3OyCxHh9DJyc28qGk+JmfkpO41A4XkneDSujN9MDXrm4oDKdHvndhZ2dN94+ERNfkYJWDclW6k2L/ZGHjXA==",
-      "dev": true,
       "dependencies": {
         "function-bind": "^1.1.1",
         "has": "^1.0.3",
@@ -7666,7 +7664,6 @@
       "version": "1.0.3",
       "resolved": "https://registry.npmmirror.com/has/-/has-1.0.3.tgz",
       "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-      "dev": true,
       "dependencies": {
         "function-bind": "^1.1.1"
       },
@@ -7723,7 +7720,6 @@
       "version": "1.0.3",
       "resolved": "https://registry.npmmirror.com/has-symbols/-/has-symbols-1.0.3.tgz",
       "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-      "dev": true,
       "engines": {
         "node": ">= 0.4"
       }
@@ -10910,8 +10906,7 @@
     "node_modules/object-inspect": {
       "version": "1.12.2",
       "resolved": "https://registry.npmmirror.com/object-inspect/-/object-inspect-1.12.2.tgz",
-      "integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==",
-      "dev": true
+      "integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ=="
     },
     "node_modules/object-is": {
       "version": "1.1.5",
@@ -12427,10 +12422,12 @@
       }
     },
     "node_modules/qs": {
-      "version": "6.5.3",
-      "resolved": "https://registry.npmmirror.com/qs/-/qs-6.5.3.tgz",
-      "integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==",
-      "devOptional": true,
+      "version": "6.11.0",
+      "resolved": "https://registry.npmmirror.com/qs/-/qs-6.11.0.tgz",
+      "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
+      "dependencies": {
+        "side-channel": "^1.0.4"
+      },
       "engines": {
         "node": ">=0.6"
       }
@@ -12792,6 +12789,15 @@
         "node": ">= 6"
       }
     },
+    "node_modules/request/node_modules/qs": {
+      "version": "6.5.3",
+      "resolved": "https://registry.npmmirror.com/qs/-/qs-6.5.3.tgz",
+      "integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==",
+      "devOptional": true,
+      "engines": {
+        "node": ">=0.6"
+      }
+    },
     "node_modules/require-directory": {
       "version": "2.1.1",
       "resolved": "https://registry.npmmirror.com/require-directory/-/require-directory-2.1.1.tgz",
@@ -13288,7 +13294,6 @@
       "version": "1.0.4",
       "resolved": "https://registry.npmmirror.com/side-channel/-/side-channel-1.0.4.tgz",
       "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
-      "dev": true,
       "dependencies": {
         "call-bind": "^1.0.0",
         "get-intrinsic": "^1.0.2",
@@ -19680,7 +19685,6 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmmirror.com/call-bind/-/call-bind-1.0.2.tgz",
       "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
-      "dev": true,
       "requires": {
         "function-bind": "^1.1.1",
         "get-intrinsic": "^1.0.2"
@@ -22526,8 +22530,7 @@
     "function-bind": {
       "version": "1.1.1",
       "resolved": "https://registry.npmmirror.com/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
-      "dev": true
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
     },
     "function.prototype.name": {
       "version": "1.1.5",
@@ -22569,7 +22572,6 @@
       "version": "1.1.2",
       "resolved": "https://registry.npmmirror.com/get-intrinsic/-/get-intrinsic-1.1.2.tgz",
       "integrity": "sha512-Jfm3OyCxHh9DJyc28qGk+JmfkpO41A4XkneDSujN9MDXrm4oDKdHvndhZ2dN94+ERNfkYJWDclW6k2L/ZGHjXA==",
-      "dev": true,
       "requires": {
         "function-bind": "^1.1.1",
         "has": "^1.0.3",
@@ -22718,7 +22720,6 @@
       "version": "1.0.3",
       "resolved": "https://registry.npmmirror.com/has/-/has-1.0.3.tgz",
       "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-      "dev": true,
       "requires": {
         "function-bind": "^1.1.1"
       }
@@ -22764,8 +22765,7 @@
     "has-symbols": {
       "version": "1.0.3",
       "resolved": "https://registry.npmmirror.com/has-symbols/-/has-symbols-1.0.3.tgz",
-      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-      "dev": true
+      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="
     },
     "has-tostringtag": {
       "version": "1.0.0",
@@ -25317,8 +25317,7 @@
     "object-inspect": {
       "version": "1.12.2",
       "resolved": "https://registry.npmmirror.com/object-inspect/-/object-inspect-1.12.2.tgz",
-      "integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==",
-      "dev": true
+      "integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ=="
     },
     "object-is": {
       "version": "1.1.5",
@@ -26600,10 +26599,12 @@
       "dev": true
     },
     "qs": {
-      "version": "6.5.3",
-      "resolved": "https://registry.npmmirror.com/qs/-/qs-6.5.3.tgz",
-      "integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==",
-      "devOptional": true
+      "version": "6.11.0",
+      "resolved": "https://registry.npmmirror.com/qs/-/qs-6.11.0.tgz",
+      "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
+      "requires": {
+        "side-channel": "^1.0.4"
+      }
     },
     "query-string": {
       "version": "4.3.4",
@@ -26898,6 +26899,14 @@
         "tough-cookie": "~2.5.0",
         "tunnel-agent": "^0.6.0",
         "uuid": "^3.3.2"
+      },
+      "dependencies": {
+        "qs": {
+          "version": "6.5.3",
+          "resolved": "https://registry.npmmirror.com/qs/-/qs-6.5.3.tgz",
+          "integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==",
+          "devOptional": true
+        }
       }
     },
     "require-directory": {
@@ -27321,7 +27330,6 @@
       "version": "1.0.4",
       "resolved": "https://registry.npmmirror.com/side-channel/-/side-channel-1.0.4.tgz",
       "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
-      "dev": true,
       "requires": {
         "call-bind": "^1.0.0",
         "get-intrinsic": "^1.0.2",
diff --git a/package.json b/package.json
index 781a6fc081455aa5a95ed53d5c14482ef8d11c87..f38ed7c561557795fe02d86269ff0bad57a03cdd 100644
--- a/package.json
+++ b/package.json
@@ -13,6 +13,7 @@
     "element-ui": "^2.15.9",
     "less": "^3.9.0",
     "less-loader": "^5.0.0",
+    "qs": "^6.11.0",
     "view": "^1.1.1",
     "vue": "^2.6.11",
     "vue-router": "^3.2.0"
diff --git a/src/components/Manager/enterpriseManager.vue b/src/components/Manager/enterpriseManager.vue
index d9db2872dd956f5e2241f0dcebf6f22642e55ba3..9dda88215c2228ed5538dceb8a3d53c904771cc9 100644
--- a/src/components/Manager/enterpriseManager.vue
+++ b/src/components/Manager/enterpriseManager.vue
@@ -1,5 +1,6 @@
 <template>
     <div>
+
         <el-button type="primary" @click="dialogFormVisible = true">添加企业</el-button>
         <!--添加-->
         <el-dialog title="添加企业" :visible.sync="dialogFormVisible">
diff --git a/src/components/Manager/logintest.vue b/src/components/Manager/logintest.vue
deleted file mode 100644
index 1e67e9a0501459b78bca59ec8d092f147f5d06cf..0000000000000000000000000000000000000000
--- a/src/components/Manager/logintest.vue
+++ /dev/null
@@ -1,58 +0,0 @@
-<template>
-<div>
-  测试登录页面
-
-  随便的账户:<el-input
-    placeholder="邮箱/电话"
-    v-model="user.uPhone"
-    value="这是账户"
-    clearable>
-</el-input>
-  随便的密码:<el-input
-    placeholder="请输入密码"
-    v-model="user.uPassword"
-    value="这是密码"
-    clearable>
-</el-input>
-  <el-button @click="submitAddUser">一键登录</el-button>
-</div>
-</template>
-
-<script>
-import axios from "axios";
-import qs from "qs";
-
-export default {
-  name: "logintest",
-  data() {
-    return{
-      user:{}
-    }
-  },
-  methods:{
-
-    submitAddUser(){
-      var _this=this;
-      let qsdata = qs.stringify(_this.user,{allowDots:true})
-      axios({
-        method:"post",
-        url:"http://localhost:82/loginUser",
-        data: qsdata
-      }).then(function (resp){
-        if(resp.data !=null){
-          sessionStorage.setItem("user",resp.data);
-          alert("登陆成功");
-          _this.$router.push("/userstageMain");
-        }
-        else {
-          alert("登录失败");
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style scoped>
-
-</style>
diff --git a/src/components/Manager/userManager.vue b/src/components/Manager/userManager.vue
index e792a99ae58bba99361c2509cb67f30afecbfbc8..dacbf508aedbe7170d4d992f691077d519d5da85 100644
--- a/src/components/Manager/userManager.vue
+++ b/src/components/Manager/userManager.vue
@@ -121,33 +121,22 @@ export default {
     }
   },
   methods: {
-    getData() {
-      const _this = this;
-      axios.get("http://localhost:82/userList").then(function (resp) {
-        _this.tableData = resp.data;
-      })
-    },
+      getData() {
+          const _this = this;
+          axios.get("http://localhost:82/userList").then(function (resp) {
+              _this.tableData = resp.data;
+          })
+      },
 
-    deleteList() { //信息提示
-      axios.get('http://localhost:82/')
-    }
+      deleteList() { //信息提示
+          axios.get('http://localhost:82/')
+      }
 
 
-    , mounted() {
-      this.getData();
-    }
-  },
-  methods:{
-    getData() {
-      const _this = this;
-      axios.get("http://localhost:82/test").then(function (resp) {
-        _this.tableData = resp.data;
-      })
-    }
-  }, mounted() {
-    this.getData();
-  }
-}
+      , mounted() {
+          this.getData();
+      }
+  }}
 </script>
 
 <style>
diff --git a/src/components/forget.vue b/src/components/forget.vue
index a4e5e2840cf0af7472a0eef0abe1c479156beea0..89c7ffe1067e7ac0dffaa1153778b5c556ea0ff9 100644
--- a/src/components/forget.vue
+++ b/src/components/forget.vue
@@ -1,17 +1,36 @@
 <template>
     <div>
-        忘记密码来这里
+        <el-form ref="form" :model="form" label-width="80px">
+            <el-form-item label="邮箱">
+                <i class="el-icon-monitor"></i>
+                <el-input type="text" v-model="form.uemail" placeholder="请输入邮箱"></el-input>
+            </el-form-item>
+        </el-form><br>
+        <el-steps :active="active" finish-status="success">
+            <el-step title="步骤 1" description="输入您的邮箱,系统会发送验证码到您的邮箱"></el-step>
+        </el-steps>
+        <el-button style="margin-top: 12px;" @click="next">下一步</el-button>
     </div>
-</template>
 
+</template>
 <script>
     export default {
-        name: "forget"
-    }
-</script>
-
-<style scoped>
-
-</style>
-
+        data() {
+            return {
+                active: 0,
+                form:{
+                    uemail: '',
+                }
+            };
+        },
 
+        methods: {
+            next() {
+                // const vm=this;
+                if (this.active++ > 2) this.active = 0;
+                // vm.$router.push({name:'forget2',params:{id:10}})
+                this.$router.replace('/forget2')
+            }
+        }
+    }
+</script>
\ No newline at end of file
diff --git a/src/components/forget2.vue b/src/components/forget2.vue
new file mode 100644
index 0000000000000000000000000000000000000000..45516f0efb8ca049f90a95419a771b49e78023b5
--- /dev/null
+++ b/src/components/forget2.vue
@@ -0,0 +1,41 @@
+<template>
+<div>
+
+        <el-form ref="form" :model="form" label-width="80px">
+            <el-form-item label="验证码">
+                <i class="el-icon-monitor"></i>
+                <el-input type="text" v-model="yanzhengma" placeholder="请输入验证码"></el-input>
+            </el-form-item>
+        </el-form><br>
+        <el-steps :active="active" finish-status="success">
+            <el-step title="步骤 2" description="输入您邮箱中的验证码,输入后可以重置您的密码"></el-step>
+        </el-steps>
+        <el-button style="margin-top: 12px;" @click="next">下一步</el-button>
+
+</div>
+</template>
+
+<script>
+    export default {
+        data() {
+            return {
+                active: 1,
+                yanzhengma:''
+            };
+        },
+
+        methods: {
+            next() {
+                // const vm=this;
+                if (this.active++ > 2) this.active = 0;
+                // vm.$router.push({name:'forget3',params:{id:10}})
+                this.$router.replace('/forget3')
+
+            }
+        }
+    }
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/src/components/forget3.vue b/src/components/forget3.vue
new file mode 100644
index 0000000000000000000000000000000000000000..c05c98b5de2cda94efe760d84a6742acbbc6e83b
--- /dev/null
+++ b/src/components/forget3.vue
@@ -0,0 +1,45 @@
+<template>
+    <div>
+
+        <el-form ref="form" :model="form" label-width="80px">
+            <el-form-item label="密码" prop="pass">
+                <i class="el-icon-view" ></i>
+
+                <el-input type="password" v-model="form.upassword" autocomplete="off" placeholder="密码长度6-12位"></el-input>
+            </el-form-item>
+            <el-form-item label="确认密码" prop="checkPass">
+                <i class="el-icon-view"></i>
+                <el-input type="password" v-model="form.upassword2" autocomplete="off" placeholder="与刚才输入密码一致"></el-input>
+            </el-form-item>
+        </el-form><br>
+        <el-steps :active="active" finish-status="success">
+            <el-step title="步骤 3" description="重置您的密码,确保两次密码一致.保存密码返回登陆界面DDDDDDDDD"></el-step>
+        </el-steps>
+        <el-button style="margin-top: 12px;" @click="next">返回登陆</el-button>
+
+    </div>
+</template>
+
+<script>
+    export default {
+        data() {
+            return {
+                active: 1,
+                form:{
+                    password:'',
+                }
+            };
+        },
+
+        methods: {
+            next() {
+                if (this.active++ > 2) this.active = 0;
+                this.$router.replace('/login')
+            }
+        }
+    }
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/src/components/login.vue b/src/components/login.vue
index 71c7443b25e5264f35fc96c786fbeb269020c3e2..71423a973b3c04a302712f80f9504c5cce83d2c2 100644
--- a/src/components/login.vue
+++ b/src/components/login.vue
@@ -1,156 +1,186 @@
+<template>
+    <div :style="abc" class="login_container">
+        <div class="login_box">
+            <!-- 登陆表单区域 -->
+            <el-form ref="loginFormRef" :model="loginFrom" :rules="LoginfromRules" label-width="0px" class="login_form">
+                <!-- 用戶名 -->
+                <el-form-item prop="username">
+                    邮箱/电话:
+                    <el-input  v-model="loginFrom.username">
+                    </el-input>
+                   <br>
+                </el-form-item>
+                <!-- 密碼 -->
+                    密码:
+                <el-form-item prop="password">
+                    <el-input v-model="loginFrom.password">
+                    </el-input>
+                    <el-link type="danger" href="forget">忘记密码?点击重置</el-link> &#12288;&#12288;&#12288;&#12288;&#12288;&#12288;&#12288;&#12288;&#12288;&#12288;&#12288;&#12288;<el-link type="primary" href="register">没有账号?点击注册</el-link>
+                </el-form-item>
+                <!-- 按鈕 -->
+                <el-form-item  class="btns">
+                    <el-button type="primary" @click="loginUser">登录</el-button>
+                    <el-button type="info" @click="resetLoginForm">重置</el-button>
+
+                </el-form-item>
+
+                <el-backtop target=".page-component__scroll .el-scrollbar__wrap"></el-backtop>
+            </el-form>
+        </div>
+
+    </div>
+</template>
+
+<script>
+    export default {
+        name: 'Login',
+        data(){
+            return{
+                abc:{
+                    backgroundImage:'url('+require('@/img/16pic_595877_b.jpg')+')',
+                    backgroundRepeat:'no-repeat',
+                    // backgroundSize: cover
+                },
+                loginFrom:{
+                    username:'',
+                    password:''
+                },
+                responseResult:[]
+                // LoginfromRules:{
+                //     // 验证用户名是否合法
+                //     username: [
+                //         { required: true, message: '请输入登录名称', trigger: 'blur' },
+                //         { min: 3, max: 10, message: '长度在 3 到 10 个字符', trigger: 'blur' }
+                //     ],
+                //     // 验证密码是否合法
+                //     password: [
+                //         { required: true, message: '请输入登录密码', trigger: 'blur' },
+                //         { min: 6, max: 15, message: '长度在 6 到 15 个字符', trigger: 'blur' }
+                //     ]}
+            }
+        },
+        methods:{
+           login(){
+               this.$axios
+               .post('/loginUser',{
+                   username: this.loginFrom.username,
+                   password: this.loginFrom.password
+               })
+               .then(successResponse=>{
+                   if (successResponse.data.code===200){
+                       this.$router.replace({})
+                   }
+               })
+            },
+        }
+
+    }
+</script>
+<style lang="less" scoped>
+  .login_container{
+     height:1000px;
+     width:1900px ;
+    background-size: 100%;
+  }
+  .login_box{
+    width: 450px;
+    height: 240px;
+    background-color: rgba(255, 255, 255, 0.418);
+    border-radius:5px;
+    position: absolute;
+    left: 50%;
+    top: 50%;
+    transform: translate(-50%,-50%);
+  }
+  .login_form{
+    position: absolute;
+    bottom: 0;
+    width: 100%;
+    padding: 0 20px;
+    // 元素指定宽度和高度包括了 padding 和 border
+    box-sizing: border-box;
+    border: 1px solid;
+    border-radius: 30px
+  }
+  .btns{
+    display: flex;
+    justify-content: center;
+  }
+</style>
 <!--<template>-->
-<!--    <div class="login_container":style="abc">-->
-<!--        <div class="login_box">-->
-<!--            &lt;!&ndash; 登陆表单区域 &ndash;&gt;-->
-<!--            <el-form ref="loginFormRef" :model="loginFrom" :rules="LoginfromRules" label-width="0px" class="login_form">-->
-<!--                &lt;!&ndash; 用戶名 &ndash;&gt;-->
-<!--                <el-form-item prop="username">-->
-<!--                    邮箱/电话:-->
-<!--                    <el-input  v-model="loginFrom.username">-->
-<!--                    </el-input>-->
-<!--                   <br>-->
-<!--                </el-form-item>-->
-<!--                &lt;!&ndash; 密碼 &ndash;&gt;-->
-<!--                    密码:-->
-<!--                <el-form-item prop="password">-->
-<!--                    <el-input v-model="loginFrom.password">-->
-<!--                    </el-input>-->
-<!--                    <el-link type="danger" href="forget">忘记密码?点击重置</el-link> &#12288;&#12288;&#12288;&#12288;&#12288;&#12288;&#12288;&#12288;&#12288;&#12288;&#12288;&#12288;<el-link type="primary" href="register">没有账号?点击注册</el-link>-->
-<!--                </el-form-item>-->
-<!--                &lt;!&ndash; 按鈕 &ndash;&gt;-->
-<!--                <el-form-item  class="btns">-->
-<!--                    <el-button type="primary" @click="loginUser">登录</el-button>-->
-<!--                    <el-button type="info" @click="resetLoginForm">重置</el-button>-->
+<!--    <div>-->
+<!--        登录页面-->
 
-<!--                </el-form-item>-->
-<!--            </el-form>-->
-<!--        </div>-->
+<!--        账户:<el-input-->
+<!--            placeholder="邮箱/电话"-->
+<!--            v-model="user.uphone"-->
+<!--            clearable>-->
+<!--    </el-input>-->
+<!--        密码:<el-input-->
+<!--            placeholder="请输入密码"-->
+<!--            v-model="user.password"-->
+<!--            clearable>-->
+<!--    </el-input>-->
+<!--        <el-link type="danger" href="forget">忘记密码?点击重置</el-link> &#12288;&#12288;&#12288;&#12288;&#12288;&#12288;&#12288;&#12288;&#12288;&#12288;&#12288;&#12288;<el-link type="primary" href="register">没有账号?点击注册</el-link>-->
+<!--        <br>-->
+<!--        <el-button type="primary" @click="login">登录</el-button>-->
+<!--        <el-button type="primary" @click="register">注册</el-button>-->
 <!--    </div>-->
 <!--</template>-->
 
 <!--<script>-->
+<!--    // import axios from "axios";-->
+<!--    // import qs from "qs";-->
 <!--    export default {-->
-<!--        name: 'Login',-->
-<!--        data(){-->
+<!--        name: "login2",-->
+<!--        data() {-->
 <!--            return{-->
-<!--                abc:{-->
-<!--                    backgroundImage:'url('+require('@/img/16pic_595877_b.jpg')+')',-->
-<!--                    backgroundRepeat:'no-repeat',-->
-<!--                    // backgroundSize: cover-->
-<!--                },-->
-<!--                loginFrom:{-->
-<!--                    username:'',-->
+<!--                user:{-->
+<!--                    uphone:'',-->
 <!--                    password:''-->
-<!--                },-->
-<!--                responseResult:[]-->
-<!--                // LoginfromRules:{-->
-<!--                //     // 验证用户名是否合法-->
-<!--                //     username: [-->
-<!--                //         { required: true, message: '请输入登录名称', trigger: 'blur' },-->
-<!--                //         { min: 3, max: 10, message: '长度在 3 到 10 个字符', trigger: 'blur' }-->
-<!--                //     ],-->
-<!--                //     // 验证密码是否合法-->
-<!--                //     password: [-->
-<!--                //         { required: true, message: '请输入登录密码', trigger: 'blur' },-->
-<!--                //         { min: 6, max: 15, message: '长度在 6 到 15 个字符', trigger: 'blur' }-->
-<!--                //     ]}-->
+<!--                }-->
+
 <!--            }-->
 <!--        },-->
 <!--        methods:{-->
-<!--           login(){-->
-<!--               this.$axios-->
-<!--               .post('/loginUser',{-->
-<!--                   username: this.loginFrom.username,-->
-<!--                   password: this.loginFrom.password-->
-<!--               })-->
-<!--               .then(successResponse=>{-->
-<!--                   if (successResponse.data.code===200){-->
-<!--                       this.$router.replace({})-->
-<!--                   }-->
-<!--               })-->
-<!--            },-->
-<!--        }-->
-
-<!--    }-->
-<!--</script>-->
-<!--<style lang="less" scoped>-->
-<!--  .login_container{-->
-<!--     height:1000px;-->
-<!--     width:1900px ;-->
-<!--    background-size: 100%;-->
-<!--  }-->
-<!--  .login_box{-->
-<!--    width: 450px;-->
-<!--    height: 240px;-->
-<!--    background-color: rgba(255, 255, 255, 0.418);-->
-<!--    border-radius:5px;-->
-<!--    position: absolute;-->
-<!--    left: 50%;-->
-<!--    top: 50%;-->
-<!--    transform: translate(-50%,-50%);-->
-<!--  }-->
-<!--  .login_form{-->
-<!--    position: absolute;-->
-<!--    bottom: 0;-->
-<!--    width: 100%;-->
-<!--    padding: 0 20px;-->
-<!--    // 元素指定宽度和高度包括了 padding 和 border-->
-<!--    box-sizing: border-box;-->
+<!--            register: function () {-->
+<!--                this.$router.replace('/register')-->
 
-<!--  }-->
-<!--  .btns{-->
-<!--    display: flex;-->
-<!--    justify-content: center;-->
-<!--  }-->
-<!--</style>-->
-<template>
-    <div>
-        登录页面
+<!--            }-->
+<!--                // this.$router.push({path:'/registry'});-->
+<!--            ,-->
+<!--            login: function () {-->
+<!--                this.axios.post('/api/login/', {-->
+<!--                    account: this.account,-->
+<!--                    password: this.password-->
+<!--                }).then(function () {-->
+<!--                    alert('登录成功');-->
+<!--                }).catch(function (e) {-->
+<!--                    alert(e)-->
+<!--                })-->
+<!--                // this.$router.push({path: '/board'});-->
+<!--            }-->
 
-        账户:<el-input
-            placeholder="邮箱/电话"
-            v-model="zhangHao"
-            clearable>
-    </el-input>
-        密码:<el-input
-            placeholder="请输入密码"
-            v-model="miMa"
-            clearable>
-    </el-input>
-        <el-button @click="submitAddUser">添加</el-button>
-    </div>
-</template>
 
-<script>
-    import axios from "axios";
-    import qs from "qs";
-    export default {
-        name: "login2",
-        data() {
-            return{
 
-                user:{}
-            }
-        },
-        methods:{
 
-            submitAddUser(){
-                var _this=this
-                let qsdata = qs.stringify(_this.user)
-                axios({
-                    method:"post",
-                    url:"http://localhost:82/testLogin",
-                    data: qsdata
-                }).then(function (resp){
-                    if(resp.data == "OK"){
-                        alert("登陆成功");
-                    }
-                })
-            }
-        }
-    }
-</script>
+<!--            // submitAddUser(){-->
+<!--            //     var _this=this-->
+<!--            //     let qsdata = qs.stringify(_this.user)-->
+<!--            //     axios({-->
+<!--            //         method:"post",-->
+<!--            //         url:"http://localhost:82/loginUser",-->
+<!--            //         data: qsdata-->
+<!--            //     }).then(function (resp){-->
+<!--            //         if(resp.data == "OK"){-->
+<!--            //             alert("登陆成功");-->
+<!--            //         }-->
+<!--            //     })-->
+<!--            // }-->
+<!--        }-->
+<!--    }-->
+<!--</script>-->
 
-<style scoped>
+<!--<style scoped>-->
 
-</style>
+<!--</style>-->
diff --git a/src/components/register.vue b/src/components/register.vue
index b63adc659ef3d759ff1bb2730edc0ac159707453..a0a944bc30b003ec07eed4ddebb1ca7acca10c16 100644
--- a/src/components/register.vue
+++ b/src/components/register.vue
@@ -3,15 +3,23 @@
         <h1>注册来这里</h1>
         <el-form ref="form" :model="form" label-width="80px">
             <el-form-item label="姓名">
-                <el-input v-model="form.uname"></el-input>
+                <i class="el-icon-user"></i>
+
+                <el-input v-model="form.uname"  placeholder="请输入姓名"></el-input>
             </el-form-item>
             <el-form-item label="邮箱">
-                <el-input v-model="form.uemail"></el-input>
+                <i class="el-icon-monitor"></i>
+                <el-input type="text" v-model="form.uemail" placeholder="请输入邮箱"></el-input>
             </el-form-item>
             <el-form-item label="电话">
-                <el-input v-model="form.uphone"></el-input>
+                <i class="el-icon-phone"></i>
+                <el-input type="text" placeholder="请输入电话"  maxlength="11"
+                          show-word-limit  v-model="form.uphone" ></el-input>
             </el-form-item>
             <el-form-item label="性别">
+                <i class="el-icon-male"></i>
+                <i class="el-icon-female"></i>
+
                 <el-select v-model="form.sex" placeholder="请选择性别">
                     <el-option label="男" value="男"></el-option>
                     <el-option label="女" value="女"></el-option>
@@ -29,17 +37,22 @@
             </el-form-item>
 
             <el-form-item label="密码" prop="pass">
-                <el-input type="password" v-model="form.upassword" autocomplete="off"></el-input>
+                <i class="el-icon-view" ></i>
+
+                <el-input type="password" v-model="form.upassword" autocomplete="off" placeholder="密码长度6-12位"></el-input>
             </el-form-item>
             <el-form-item label="确认密码" prop="checkPass">
-                <el-input type="password" v-model="form.upassword2" autocomplete="off"></el-input>
+                <i class="el-icon-view"></i>
+                <el-input type="password" v-model="form.upassword2" autocomplete="off" placeholder="与刚才输入密码一致"></el-input>
             </el-form-item>
 
             <el-form-item>
                 <el-button type="primary" @click="onSubmit">立即创建</el-button>
-                <el-button>取消</el-button>
+                <el-button @click="back">取消</el-button>
             </el-form-item>
         </el-form>
+        <el-backtop target=".page-component__scroll .el-scrollbar__wrap"></el-backtop>
+
     </div>
 </template>
 
@@ -56,12 +69,17 @@
                     delivery: false,
                     upassword:'',
                     upassword2:''
-                }
+                },
+                text: '',
+                textarea: ''
             }
         },
         methods: {
             onSubmit() {
                 console.log('submit!');
+            },
+            back(){
+                this.$router.replace('/login')
             }
         }
     }
diff --git a/src/components/registerQiye.vue b/src/components/registerQiye.vue
new file mode 100644
index 0000000000000000000000000000000000000000..3f73bc46f0d7a3f3e5c95b5377bf20c90945ea77
--- /dev/null
+++ b/src/components/registerQiye.vue
@@ -0,0 +1,84 @@
+<template>
+    <div>
+        <h1>注册企业来这里</h1>
+        <el-form ref="form" :model="form" label-width="80px">
+            <el-form-item label="企业名">
+                <i class="el-icon-s-shop"></i>
+                <el-input v-model="form.eame"  placeholder="请输入企业名"></el-input>
+            </el-form-item>
+            <el-form-item label="企业介绍">
+                <i class="el-icon-s-order"></i>
+                <el-input
+                        type="textarea"
+                        placeholder="请输入内容"
+                        v-model="form.eIntroduce"
+                        maxlength="30"
+                        show-word-limit
+                ></el-input>
+            </el-form-item>
+            <el-form-item label="企业类型">
+                <i class="el-icon-s-opportunity
+"></i>
+                <el-input type="text" placeholder="请输入企业类型"
+                            v-model="form.eType" ></el-input>
+            </el-form-item>
+
+            <el-form-item label="注册时间">
+                <el-col :span="11">
+                    <el-date-picker type="date" placeholder="选择日期" v-model="form.eStart" style="width: 100%;"></el-date-picker>
+                </el-col>
+                <el-col class="line" :span="2">-</el-col>
+
+            </el-form-item>
+            <el-form-item label="企业老板">
+                <i class="el-icon-s-custom"></i>
+                <el-input type="text" placeholder="请输入企业老板"
+                          v-model="form.eFounder" ></el-input>
+            </el-form-item>
+            <el-form-item label="企业地址">
+                <i class="el-icon-position"></i>
+                <el-input type="text" placeholder="请输入企业地址"
+                          v-model="form.eAddress" ></el-input>
+            </el-form-item>
+
+
+            <el-form-item>
+                <el-button type="primary" @click="onSubmit">上传等待审批</el-button>
+                <el-button @click="back">取消</el-button>
+            </el-form-item>
+        </el-form>
+    </div>
+</template>
+
+<script>
+    export default {
+        data() {
+            return {
+                form: {
+                    eName: '',
+                    eIntroduce: '',
+                    eStart: '',
+                    eType:'',
+                    eFounder: '',
+                    delivery: false,
+                    eAddress:'',
+                    eState:''
+                },
+                text: '',
+                textarea: ''
+            }
+        },
+        methods: {
+            onSubmit() {
+                console.log('submit!');
+            },
+            back(){
+                this.$router.replace('/login')
+            }
+        }
+    }
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/main.js b/src/main.js
index 7cfc4c827b43c8637e2dc3c5c7a2b58609ab9c7a..494d004a008c477982785ada0843d3b43bbb3b31 100644
--- a/src/main.js
+++ b/src/main.js
@@ -5,10 +5,13 @@ import ElementUI from 'element-ui'
 import 'element-ui/lib/theme-chalk/index.css'
 
 
+
 Vue.config.productionTip = false
 Vue.use(ElementUI)
 
+
 new Vue({
   router,
-  render: h => h(App)
+  render: h => h(App),
+  template: '<App/>'
 }).$mount('#app')
diff --git a/src/router/index.js b/src/router/index.js
index 55589faccd95f92cf2a08924bf1e7cfc06582b79..39e854ff9ea0912a82c980415ebf4499ff1b66c5 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -19,11 +19,33 @@ import userstageMain from "@/components/userstageMain";
 import stationList from "@/components/ForUser/stationList";
 import enterpriseList from "@/components/ForUser/enterpriseList";
 import wikiList from "@/components/ForUser/wikiList";
-import logintest from "@/components/Manager/logintest";
-
+// import logintest from "@/components/Manager/logintest";
+import registerQiye from "@/components/registerQiye";
+import forget from "@/components/forget"
+import forget2 from "@/components/forget2"
+import forget3 from "@/components/forget3"
 Vue.use(VueRouter)
 
 const routes = [
+  {name:"注册企业",
+    path: "/registerQiye",
+    component: registerQiye
+  },
+  {
+    name:"重置密码",
+    path:"/forget",
+    component: forget
+  },
+  {
+    name:"重置密码2",
+    path:"/forget2",
+    component: forget2
+  },
+  {
+    name:"重置密码3",
+    path:"/forget3",
+    component: forget3
+  },
   {
     name: "主页重定向",
     path: "/",
@@ -89,11 +111,11 @@ const routes = [
         path: "/wikiList",
         component: wikiList
       },
-      {
-        name: "登录测试",
-        path: "/logintest",
-        component: logintest
-      }
+      // {
+      //   name: "登录测试",
+      //   path: "/logintest",
+      //   component: logintest
+      // }
     ]
   },
   {