提交

src/layout/components/header.vue

@@ -187,15 +187,18 @@ export default class extends Vue {
     }
   }
   .navs {
+    padding: 1rem 0;
     .nav {
-      display: inline-block;
+      height: 5rem;
+      line-height: 5rem;
       font-size: 1.6rem;
-      color: rgb(51, 51, 51);
+      color: #333;
       margin-right: 5rem;
-      padding-bottom: 20px;
-      &.router-link-active {
-        color: rgb(253, 85, 34);
-        border-bottom: 1px rgb(253, 85, 34) solid;
+      border-bottom: 0.2rem solid #fff;
+      display: inline-block;
+      &:hover {
+        border-bottom: 0.2rem solid #fd5522 !important;
+        color: #fd5522 !important;
       }
     }
   }

src/styles/index.scss

@@ -51,6 +51,9 @@ html {
     .bg-F5 {
       background: #f5f5f5;
     }
+    .bg-white {
+      background: #FFF;
+    }
     .relative {
       position: relative;
     }
@@ -68,7 +71,110 @@ html {
       padding: 0;
       margin: 0;
       outline: none;
-      list-style: none;
+      list-style-image: none;
+    }
+  }
+}
+// 顶部条样式
+.header {
+  background: #fff;
+  .topDiv {
+    height: 4rem;
+    line-height: 4rem;
+    font-size: 1.2rem;
+    background: #f5f5f5;
+    border: 0.1rem solid #e5e5e5;
+    .container {
+      .login {
+        a{
+          color: #fd5522; 
+        }
+        margin-right: 2rem;
+        margin-left: 2rem;
+        display: inline-block;
+      }
+      .register {
+        color: #333;
+        display: inline-block;
+      }
+      .rightDiv {
+        height: 4rem;
+        float: right;
+        color: #fd5522;
+        div {
+          margin-right: 2rem;
+          vertical-align: middle;
+        }
+        .sjrz,
+        .spfb {
+          a{
+            color: #fd5522;
+          }
+          display: inline-block;
+          img {
+            height: 1.4rem;
+            margin-right: 0.2rem;
+            vertical-align: middle;
+          }
+        }
+        .line {
+          height: 1.4rem;
+          width: 0.1rem;
+          background: #e5e5e5;
+          display: inline-block;
+          vertical-align: middle;
+        }
+      }
+    }
+  }
+  .logoDiv {
+    padding: 3rem 0 1rem 0;
+    .logoTitle {
+      height: 4rem;
+      line-height: 4rem;
+      font-size: 2.4rem;
+      margin-right: 1rem;
+      display: inline;
+      vertical-align: middle;
+    }
+    .searchDiv {
+      height: 4rem;
+      line-height: 4rem;
+      width: 55rem;
+      font-size: 1.4rem;
+      display: inline-block;
+      border-radius: 2rem;
+      border: 1px solid #fd5522;
+      overflow: hidden;
+      vertical-align: middle;
+      .searchFl {
+        width: 8rem;
+        color: #fd5522;
+        height:100%;
+      }
+      .line {
+        display: inline-block;
+        height: 1.8rem;
+        width: 0.1rem;
+        background: #fd5522;
+        vertical-align: middle;
+      }
+      .el-icon-search {
+        color: #fd5522;
+      }
+      .input-with-select {
+        width: 38.9rem;
+        height: 100%;
+      }
+      .searchBtn {
+        width: 8rem;
+        height: 100%;
+        font-size: 1.6rem;
+        background: #fd5522;
+        color: #fff;
+        border: 0;
+        border-radius: 0;
+      }
     }
   }
 }
@@ -122,3 +228,27 @@ html {
     border-color: #409eff;
   }
 }
+.loginDiv{
+  .el-checkbox__input.is-checked .el-checkbox__inner{
+    background-color: #FFF;
+    border-color: #e5e5e5;
+  }
+  .el-checkbox__inner::after{
+    border-color: #333;
+  }
+  .el-checkbox__inner:hover {
+    border-color: #e5e5e5;
+  }
+  .el-checkbox__input.is-checked + .el-checkbox__label{
+    color: #333;
+  }
+}
+.el-select-dropdown__item.selected{
+  color: #fd5522;
+}
+.navs{
+  .router-link-active{
+    border-bottom: 0.2rem solid #fd5522 !important;
+    color: #fd5522 !important;
+  }
+} 

src/views/account/findPassword.vue

@@ -16,14 +16,16 @@
               <el-input
                 placeholder="登录账号"
                 prefix-icon="el-icon-user"
-                v-model="form.username">
+                v-model="form.username"
+              >
               </el-input>
             </div>
             <div>
               <el-input
                 placeholder="手机号码"
                 prefix-icon="el-icon-mobile-phone"
-                v-model="form.phone">
+                v-model="form.phone"
+              >
               </el-input>
             </div>
             <div>
@@ -31,7 +33,8 @@
                 placeholder="验证码"
                 prefix-icon="el-icon-lock"
                 style="width:70%;"
-                v-model="form.yzm">
+                v-model="form.yzm"
+              >
               </el-input>
               <div class="yzm">获取验证码</div>
             </div>
@@ -40,7 +43,8 @@
                 type="password"
                 placeholder="新密码"
                 prefix-icon="el-icon-lock"
-                v-model="form.password">
+                v-model="form.password"
+              >
               </el-input>
             </div>
             <div>
@@ -60,111 +64,111 @@ export default {
   data() {
     return {
       form: {
-        username:'',
-        password:'',
-        yzm:'',
-        zddl:false,
-        phone:'',
-      },
+        username: "",
+        password: "",
+        yzm: "",
+        zddl: false,
+        phone: ""
+      }
     };
   },
-  methods: {},
-}
+  methods: {}
+};
 </script>
 <style lang="scss" scoped>
-  .topDiv{
-    height: 9rem;
-    line-height: 9rem;
-    background: #FFF;
-    .title{
-      font-size: 2.2rem;
-      font-weight: bold;
-      color: #fd5522;
-    }
-    .line{
+.topDiv {
+  height: 9rem;
+  line-height: 9rem;
+  background: #fff;
+  .title {
+    font-size: 2.2rem;
+    font-weight: bold;
+    color: #fd5522;
+  }
+  .line {
+    display: inline-block;
+    height: 3rem;
+    width: 0.1rem;
+    background: #e5e5e5;
+    margin: 0 2rem;
+    vertical-align: middle;
+  }
+  .info {
+    font-size: 1.8rem;
+    font-weight: bold;
+    color: #666;
+  }
+}
+.loginDiv {
+  background: #fff;
+  padding: 1.6rem;
+  box-sizing: border-box;
+  border-radius: 0.4rem;
+  box-shadow: 2px 2px 12px #ddd;
+  .name {
+    height: 3rem;
+    line-height: 3rem;
+    font-size: 1.6rem;
+    color: #333;
+    position: relative;
+    .line {
       display: inline-block;
-      height: 3rem;
-      width: 0.1rem;
-      background: #E5E5E5;
-      margin: 0 2rem;
-      vertical-align: middle;
-    }
-    .info{
-      font-size: 1.8rem;
-      font-weight: bold;
-      color: #666;
+      height: 1.8rem;
+      width: 0.4rem;
+      background: #fd5522;
+      position: absolute;
+      left: -1.6rem;
+      top: 0.6rem;
     }
   }
-  .loginDiv{
-    background: #FFF;
-    padding: 1.6rem;
-    box-sizing: border-box;
-    border-radius: 0.4rem;
-    box-shadow: 2px 2px 12px #ddd;
-    .name{
-      height: 3rem;
-      line-height: 3rem;
-      font-size: 1.6rem;
-      color: #333;
-      position: relative;
-      .line{
-        display: inline-block;
-        height: 1.8rem;
-        width: 0.4rem;
-        background: #fd5522;
-        position: absolute;
-        left:-1.6rem;
-        top:0.6rem;
-      }
-    }
-    div{
-      margin-top: 1rem;
-      .yzm{
-        height: 4rem;
-        line-height: 4rem;
-        width: 28%;
-        font-size: 1.4rem;
-        color:#fd5522;
-        text-align:center;
-        float: right;
-        background: #FFDED5;
-        border-radius:0.4rem;
-      }
-      .loginBtn{
-        width: 100%;
-        background:#fd5522;
-        color: #FFF;
-        border-color: #fd5522;
-      }
-    }
-    .newDiv{
+  div {
+    margin-top: 1rem;
+    .yzm {
       height: 4rem;
       line-height: 4rem;
-      text-align: right;
+      width: 28%;
       font-size: 1.4rem;
-      .line{
-        height: 1rem;
-        width:0.1rem;
-        background:#e5e5e5;
-        margin: 0 1rem;
-        vertical-align: middle;
-        display: inline-block;
-      }
-      .forgetPass{
-        color: #666;
-      }
-      .register{
-        color:#fd5522;
-      }
+      color: #fd5522;
+      text-align: center;
+      float: right;
+      background: #ffded5;
+      border-radius: 0.4rem;
+    }
+    .loginBtn {
+      width: 100%;
+      background: #fd5522;
+      color: #fff;
+      border-color: #fd5522;
     }
   }
-  .bg-F5{
-    background: #F5F5F5;
-  }
-  .pt3rem{
-    padding-top: 3rem;
-  }
-  .pb3rem{
-    padding-bottom: 3rem;
+  .newDiv {
+    height: 4rem;
+    line-height: 4rem;
+    text-align: right;
+    font-size: 1.4rem;
+    .line {
+      height: 1rem;
+      width: 0.1rem;
+      background: #e5e5e5;
+      margin: 0 1rem;
+      vertical-align: middle;
+      display: inline-block;
+    }
+    .forgetPass {
+      color: #666;
+    }
+    .register {
+      color: #fd5522;
+    }
   }
+}
+.bg-F5 {
+  background: #f5f5f5;
+}
+.pt3rem {
+  padding-top: 3rem;
+}
+.pb3rem {
+  padding-bottom: 3rem;
+}
 </style>

src/views/account/login.vue

@@ -16,7 +16,8 @@
               <el-input
                 placeholder="用户名(支持手机号)"
                 prefix-icon="el-icon-user"
-                v-model="form.username">
+                v-model="form.username"
+              >
               </el-input>
             </div>
             <div>
@@ -24,7 +25,8 @@
                 type="password"
                 placeholder="密码"
                 prefix-icon="el-icon-lock"
-                v-model="form.password">
+                v-model="form.password"
+              >
               </el-input>
             </div>
             <div>
@@ -32,7 +34,8 @@
                 placeholder="验证码"
                 prefix-icon="el-icon-lock"
                 style="width:70%;"
-                v-model="form.yzm">
+                v-model="form.yzm"
+              >
               </el-input>
               <div class="yzm">NSVP</div>
             </div>
@@ -43,9 +46,13 @@
               <el-button class="loginBtn">登录</el-button>
             </div>
             <div class="newDiv">
-              <router-link class="forgetPass" to="/findPassword">忘记密码</router-link>
+              <router-link class="forgetPass" to="/findPassword"
+                >忘记密码</router-link
+              >
               <span class="line"></span>
-              <router-link class="register" to="/register">注册新账号</router-link>
+              <router-link class="register" to="/register"
+                >注册新账号</router-link
+              >
             </div>
           </div>
         </el-col>
@@ -61,107 +68,107 @@ export default {
   data() {
     return {
       form: {
-        username:'',
-        password:'',
-        yzm:'',
-        zddl:false,
-      },
+        username: "",
+        password: "",
+        yzm: "",
+        zddl: false
+      }
     };
   },
-  methods: {},
-}
+  methods: {}
+};
 </script>
 <style lang="scss" scoped>
-  .topDiv{
-    height: 9rem;
-    line-height: 9rem;
-    background: #FFF;
-    .title{
-      font-size: 2.2rem;
-      font-weight: bold;
-      color: #fd5522;
-    }
-    .line{
+.topDiv {
+  height: 9rem;
+  line-height: 9rem;
+  background: #fff;
+  .title {
+    font-size: 2.2rem;
+    font-weight: bold;
+    color: #fd5522;
+  }
+  .line {
+    display: inline-block;
+    height: 3rem;
+    width: 0.1rem;
+    background: #e5e5e5;
+    margin: 0 2rem;
+    vertical-align: middle;
+  }
+  .info {
+    font-size: 1.8rem;
+    font-weight: bold;
+    color: #666;
+  }
+}
+.loginDiv {
+  background: #fff;
+  padding: 1.6rem;
+  box-sizing: border-box;
+  border-radius: 0.4rem;
+  box-shadow: 2px 2px 12px #ddd;
+  .name {
+    height: 3rem;
+    line-height: 3rem;
+    font-size: 1.6rem;
+    color: #333;
+    position: relative;
+    .line {
       display: inline-block;
-      height: 3rem;
-      width: 0.1rem;
-      background: #E5E5E5;
-      margin: 0 2rem;
-      vertical-align: middle;
-    }
-    .info{
-      font-size: 1.8rem;
-      font-weight: bold;
-      color: #666;
+      height: 1.8rem;
+      width: 0.4rem;
+      background: #fd5522;
+      position: absolute;
+      left: -1.6rem;
+      top: 0.6rem;
     }
   }
-  .loginDiv{
-    background: #FFF;
-    padding: 1.6rem;
-    box-sizing: border-box;
-    border-radius: 0.4rem;
-    box-shadow: 2px 2px 12px #ddd;
-    .name{
-      height: 3rem;
-      line-height: 3rem;
-      font-size: 1.6rem;
-      color: #333;
-      position: relative;
-      .line{
-        display: inline-block;
-        height: 1.8rem;
-        width: 0.4rem;
-        background: #fd5522;
-        position: absolute;
-        left:-1.6rem;
-        top:0.6rem;
-      }
-    }
-    div{
-      margin-top: 1rem;
-      .yzm{
-        height: 4rem;
-        line-height: 4rem;
-        width: 28%;
-        float: right;
-        background: #EEEEEE;
-        border-radius:0.4rem;
-      }
-      .loginBtn{
-        width: 100%;
-        background:#fd5522;
-        color: #FFF;
-        border-color: #fd5522;
-      }
-    }
-    .newDiv{
+  div {
+    margin-top: 1rem;
+    .yzm {
       height: 4rem;
       line-height: 4rem;
-      text-align: right;
-      font-size: 1.4rem;
-      .line{
-        height: 1rem;
-        width:0.1rem;
-        background:#e5e5e5;
-        margin: 0 1rem;
-        vertical-align: middle;
-        display: inline-block;
-      }
-      .forgetPass{
-        color: #666;
-      }
-      .register{
-        color:#fd5522;
-      }
+      width: 28%;
+      float: right;
+      background: #eeeeee;
+      border-radius: 0.4rem;
+    }
+    .loginBtn {
+      width: 100%;
+      background: #fd5522;
+      color: #fff;
+      border-color: #fd5522;
     }
   }
-  .bg-F5{
-    background: #F5F5F5;
-  }
-  .pt3rem{
-    padding-top: 3rem;
-  }
-  .pb3rem{
-    padding-bottom: 3rem;
+  .newDiv {
+    height: 4rem;
+    line-height: 4rem;
+    text-align: right;
+    font-size: 1.4rem;
+    .line {
+      height: 1rem;
+      width: 0.1rem;
+      background: #e5e5e5;
+      margin: 0 1rem;
+      vertical-align: middle;
+      display: inline-block;
+    }
+    .forgetPass {
+      color: #666;
+    }
+    .register {
+      color: #fd5522;
+    }
   }
+}
+.bg-F5 {
+  background: #f5f5f5;
+}
+.pt3rem {
+  padding-top: 3rem;
+}
+.pb3rem {
+  padding-bottom: 3rem;
+}
 </style>

src/views/account/register.vue

@@ -16,7 +16,8 @@
               <el-input
                 placeholder="登录账号"
                 prefix-icon="el-icon-user"
-                v-model="form.username">
+                v-model="form.username"
+              >
               </el-input>
             </div>
             <div>
@@ -24,14 +25,16 @@
                 type="password"
                 placeholder="登录密码"
                 prefix-icon="el-icon-lock"
-                v-model="form.password">
+                v-model="form.password"
+              >
               </el-input>
             </div>
             <div>
               <el-input
                 placeholder="手机号码"
                 prefix-icon="el-icon-mobile-phone"
-                v-model="form.phone">
+                v-model="form.phone"
+              >
               </el-input>
             </div>
             <div>
@@ -39,12 +42,16 @@
                 placeholder="验证码"
                 prefix-icon="el-icon-lock"
                 style="width:70%;"
-                v-model="form.yzm">
+                v-model="form.yzm"
+              >
               </el-input>
               <div class="yzm">获取验证码</div>
             </div>
             <div>
-              <el-checkbox v-model="form.zddl">我已阅读并同意</el-checkbox><a class="xieyi" href="javascript:;">《用户服务协议和平台免责条款》</a>
+              <el-checkbox v-model="form.zddl">我已阅读并同意</el-checkbox
+              ><a class="xieyi" href="javascript:;"
+                >《用户服务协议和平台免责条款》</a
+              >
             </div>
             <div>
               <el-button class="loginBtn">注册</el-button>
@@ -63,114 +70,114 @@ export default {
   data() {
     return {
       form: {
-        username:'',
-        password:'',
-        yzm:'',
-        zddl:false,
-        phone:'',
-      },
+        username: "",
+        password: "",
+        yzm: "",
+        zddl: false,
+        phone: ""
+      }
     };
   },
-  methods: {},
-}
+  methods: {}
+};
 </script>
 <style lang="scss" scoped>
-  .topDiv{
-    height: 9rem;
-    line-height: 9rem;
-    background: #FFF;
-    .title{
-      font-size: 2.2rem;
-      font-weight: bold;
-      color: #fd5522;
-    }
-    .line{
+.topDiv {
+  height: 9rem;
+  line-height: 9rem;
+  background: #fff;
+  .title {
+    font-size: 2.2rem;
+    font-weight: bold;
+    color: #fd5522;
+  }
+  .line {
+    display: inline-block;
+    height: 3rem;
+    width: 0.1rem;
+    background: #e5e5e5;
+    margin: 0 2rem;
+    vertical-align: middle;
+  }
+  .info {
+    font-size: 1.8rem;
+    font-weight: bold;
+    color: #666;
+  }
+}
+.loginDiv {
+  background: #fff;
+  padding: 1.6rem;
+  box-sizing: border-box;
+  border-radius: 0.4rem;
+  box-shadow: 2px 2px 12px #ddd;
+  .name {
+    height: 3rem;
+    line-height: 3rem;
+    font-size: 1.6rem;
+    color: #333;
+    position: relative;
+    .line {
       display: inline-block;
-      height: 3rem;
-      width: 0.1rem;
-      background: #E5E5E5;
-      margin: 0 2rem;
-      vertical-align: middle;
-    }
-    .info{
-      font-size: 1.8rem;
-      font-weight: bold;
-      color: #666;
+      height: 1.8rem;
+      width: 0.4rem;
+      background: #fd5522;
+      position: absolute;
+      left: -1.6rem;
+      top: 0.6rem;
     }
   }
-  .loginDiv{
-    background: #FFF;
-    padding: 1.6rem;
-    box-sizing: border-box;
-    border-radius: 0.4rem;
-    box-shadow: 2px 2px 12px #ddd;
-    .name{
-      height: 3rem;
-      line-height: 3rem;
-      font-size: 1.6rem;
-      color: #333;
-      position: relative;
-      .line{
-        display: inline-block;
-        height: 1.8rem;
-        width: 0.4rem;
-        background: #fd5522;
-        position: absolute;
-        left:-1.6rem;
-        top:0.6rem;
-      }
-    }
-    div{
-      margin-top: 1rem;
-      .yzm{
-        height: 4rem;
-        line-height: 4rem;
-        width: 28%;
-        font-size: 1.4rem;
-        color:#fd5522;
-        text-align:center;
-        float: right;
-        background: #FFDED5;
-        border-radius:0.4rem;
-      }
-      .loginBtn{
-        width: 100%;
-        background:#fd5522;
-        color: #FFF;
-        border-color: #fd5522;
-      }
-      .xieyi{
-        color: #fd5522;
-      }
-    }
-    .newDiv{
+  div {
+    margin-top: 1rem;
+    .yzm {
       height: 4rem;
       line-height: 4rem;
-      text-align: right;
+      width: 28%;
       font-size: 1.4rem;
-      .line{
-        height: 1rem;
-        width:0.1rem;
-        background:#e5e5e5;
-        margin: 0 1rem;
-        vertical-align: middle;
-        display: inline-block;
-      }
-      .forgetPass{
-        color: #666;
-      }
-      .register{
-        color:#fd5522;
-      }
+      color: #fd5522;
+      text-align: center;
+      float: right;
+      background: #ffded5;
+      border-radius: 0.4rem;
+    }
+    .loginBtn {
+      width: 100%;
+      background: #fd5522;
+      color: #fff;
+      border-color: #fd5522;
+    }
+    .xieyi {
+      color: #fd5522;
     }
   }
-  .bg-F5{
-    background: #F5F5F5;
-  }
-  .pt3rem{
-    padding-top: 3rem;
-  }
-  .pb3rem{
-    padding-bottom: 3rem;
+  .newDiv {
+    height: 4rem;
+    line-height: 4rem;
+    text-align: right;
+    font-size: 1.4rem;
+    .line {
+      height: 1rem;
+      width: 0.1rem;
+      background: #e5e5e5;
+      margin: 0 1rem;
+      vertical-align: middle;
+      display: inline-block;
+    }
+    .forgetPass {
+      color: #666;
+    }
+    .register {
+      color: #fd5522;
+    }
   }
+}
+.bg-F5 {
+  background: #f5f5f5;
+}
+.pt3rem {
+  padding-top: 3rem;
+}
+.pb3rem {
+  padding-bottom: 3rem;
+}
 </style>

src/views/home/index.vue

@@ -1,54 +1,5 @@
 <template>
   <div class="bg-F5">
-    <div class="header">
-      <div class="topDiv">
-        <div class="container">
-          <lang-select />
-          <div class="login">
-            <router-link to="/login">请登录</router-link>
-          </div>
-          <div class="register">
-            <router-link to="/register">免费注册</router-link>
-          </div>
-          <div class="rightDiv">
-            <div class="sjrz">
-              <router-link to="/merchantEntry">
-                <img src="@assets/sjrz.png" alt="" />
-                商家入驻
-              </router-link>
-            </div>
-            <div class="line"></div>
-            <div class="spfb">
-              <img src="@assets/spfb.png" alt="" />
-              商品发布
-            </div>
-            <div class="line"></div>
-            <div class="spfb">
-              个人中心
-            </div>
-          </div>
-        </div>
-      </div>
-      <div class="logoDiv container">
-        <div class="logoTitle">中国钢制家具产业聚集网</div>
-        <div class="searchDiv">
-          <el-select class="searchFl" v-model="homeSearchOption" placeholder="">
-            <el-option label="产品" value="1"></el-option>
-            <el-option label="企业" value="2"></el-option>
-          </el-select>
-          <span class="line"></span>
-          <el-input
-            placeholder="请输入内容"
-            v-model="homeSearchVal"
-            class="input-with-select"
-          >
-            <i slot="prefix" class="el-input__icon el-icon-search"></i>
-          </el-input>
-          <el-button class="searchBtn">搜索</el-button>
-        </div>
-      </div>
-      <y-nav />
-    </div>
     <div class="container">
       <el-row class="mt2rem" :gutter="20">
         <el-col :span="4">
@@ -89,10 +40,10 @@
             <div class="username">您还未登录哦！</div>
             <div class="btnDiv">
               <router-link to="/login">
-              <el-button class="leftBtn">登录</el-button>
+                <el-button class="leftBtn">登录</el-button>
               </router-link>
               <router-link to="/register">
-              <el-button class="rightBtn">注册</el-button>
+                <el-button class="rightBtn">注册</el-button>
               </router-link>
             </div>
           </div>
@@ -289,21 +240,14 @@
 </template>
 <script>
 import { Component, Vue } from "vue-property-decorator";
-import langSelect from "@/components/LangSelect.vue";
-import yNav from "@/layout/components/nav.vue";
 export default {
   name: "app",
-  components: {
-    langSelect,
-    yNav,
-  },
+  components: {},
   data() {
     return {
       shangpin: [],
       activeIndex: "a",
-      activeIndex2: "a",
-      homeSearchVal: "",
-      homeSearchOption: "1"
+      activeIndex2: "a"
     };
   },
   methods: {

src/views/home/merchantEntry.vue

@@ -1,54 +1,5 @@
 <template>
   <div class="bg-F5">
-    <div class="header">
-      <div class="topDiv">
-        <div class="container">
-          <lang-select />
-          <div class="login">
-            <router-link to="/login">请登录</router-link>
-          </div>
-          <div class="register">
-            <router-link to="/register">免费注册</router-link>
-          </div>
-          <div class="rightDiv">
-            <div class="sjrz">
-              <router-link to="/merchantEntry">
-                <img src="@assets/sjrz.png" alt="" />
-                商家入驻
-              </router-link>
-            </div>
-            <div class="line"></div>
-            <div class="spfb">
-              <img src="@assets/spfb.png" alt="" />
-              商品发布
-            </div>
-            <div class="line"></div>
-            <div class="spfb">
-              个人中心
-            </div>
-          </div>
-        </div>
-      </div>
-      <div class="logoDiv container">
-        <div class="logoTitle">中国钢制家具产业聚集网</div>
-        <div class="searchDiv">
-          <el-select class="searchFl" v-model="homeSearchOption" placeholder="">
-            <el-option label="产品" value="1"></el-option>
-            <el-option label="企业" value="2"></el-option>
-          </el-select>
-          <span class="line"></span>
-          <el-input
-            placeholder="请输入内容"
-            v-model="homeSearchVal"
-            class="input-with-select"
-          >
-            <i slot="prefix" class="el-input__icon el-icon-search"></i>
-          </el-input>
-          <el-button class="searchBtn">搜索</el-button>
-        </div>
-      </div>
-      <y-nav />
-    </div>
     <div class="bannerDiv">
       <div class="container">
         <router-link to="/merchantEntry/apply">商家入驻申请</router-link>
@@ -111,17 +62,11 @@
 </template>
 <script>
 import { Component, Vue } from "vue-property-decorator";
-import langSelect from "@/components/LangSelect.vue";
-import yNav from "@/layout/components/nav.vue";
 export default {
   name: "app",
-  components: {
-    yNav,
-  },
+  components: {},
   data() {
     return {
-      homeSearchVal: "",
-      homeSearchOption: "1",
       name: "",
       shStatus: "",
       statusArr: [

src/views/home/merchantEntryApply.vue

@@ -1,54 +1,5 @@
 <template>
   <div class="bg-F5">
-    <div class="header">
-      <div class="topDiv">
-        <div class="container">
-          <lang-select />
-          <div class="login">
-            <router-link to="/login">请登录</router-link>
-          </div>
-          <div class="register">
-            <router-link to="/register">免费注册</router-link>
-          </div>
-          <div class="rightDiv">
-            <div class="sjrz">
-              <router-link to="/merchantEntry">
-                <img src="@assets/sjrz.png" alt="" />
-                商家入驻
-              </router-link>
-            </div>
-            <div class="line"></div>
-            <div class="spfb">
-              <img src="@assets/spfb.png" alt="" />
-              商品发布
-            </div>
-            <div class="line"></div>
-            <div class="spfb">
-              个人中心
-            </div>
-          </div>
-        </div>
-      </div>
-      <div class="logoDiv container">
-        <div class="logoTitle">中国钢制家具产业聚集网</div>
-        <div class="searchDiv">
-          <el-select class="searchFl" v-model="homeSearchOption" placeholder="">
-            <el-option label="产品" value="1"></el-option>
-            <el-option label="企业" value="2"></el-option>
-          </el-select>
-          <span class="line"></span>
-          <el-input
-            placeholder="请输入内容"
-            v-model="homeSearchVal"
-            class="input-with-select"
-          >
-            <i slot="prefix" class="el-input__icon el-icon-search"></i>
-          </el-input>
-          <el-button class="searchBtn">搜索</el-button>
-        </div>
-      </div>
-      <y-nav />
-    </div>
     <div class="container">
       <div class="partTitle"><span class="orangeLine"></span>商户入驻申请</div>
       <el-form class="formPanel" ref="form" :model="form" label-width="280px">
@@ -115,7 +66,9 @@
             <span>纬度</span>
             <el-input class="input" v-model="form.lat"></el-input>
           </div>
-          <el-button class="submitBtn" @click="mapAddress">{{ mapVisible ? "关闭" : "选择" }}</el-button>
+          <el-button class="submitBtn" @click="mapAddress">{{
+            mapVisible ? "关闭" : "选择"
+          }}</el-button>
           <div :class="{ map: true, show: mapVisible }" id="map"></div>
         </el-form-item>
         <el-form-item class="formItem" label="企业法人">
@@ -138,7 +91,9 @@
               <div class="txt">上传图片</div>
             </div>
           </el-upload>
-          <div class="info">有效期内的企业营业执照，图片仅支持JPG,PNG格式，大小小于2M</div>
+          <div class="info">
+            有效期内的企业营业执照，图片仅支持JPG,PNG格式，大小小于2M
+          </div>
         </el-form-item>
         <el-form-item class="formItem" label="企业默认图片">
           <el-upload class="avatar-uploader" action="" :show-file-list="false">
@@ -177,17 +132,11 @@
 <script>
 import { Component, Vue } from "vue-property-decorator";
 import BMap from "BMap";
-import langSelect from "@/components/LangSelect.vue";
-import yNav from "@/layout/components/nav.vue";
 export default {
   name: "app",
-  components: {
-    yNav,
-  },
+  components: {},
   data() {
     return {
-      homeSearchVal: "",
-      homeSearchOption: "1",
       form: {
         name: "",
         password: "",
@@ -203,7 +152,7 @@ export default {
         lat: ""
       },
       mapVisible: false,
-      local:null,
+      local: null
     };
   },
   methods: {
@@ -231,64 +180,71 @@ export default {
       });
       return map;
     },
-    provinceChange(val){
+    provinceChange(val) {
       var that = this;
       var map = that.createMap();
-      map.centerAndZoom(val,11);
+      map.centerAndZoom(val, 11);
     },
-    cityChange(val){
+    cityChange(val) {
       var that = this;
       var map = that.createMap();
-      map.centerAndZoom(val,13);
+      map.centerAndZoom(val, 13);
     },
-    countyChange(val){
+    countyChange(val) {
       var that = this;
       var map = that.createMap();
       var myGeo = new BMap.Geocoder();
-      map.centerAndZoom(val,15);
-      myGeo.getPoint(that.form.shi + that.form.qu, function(point) {
+      map.centerAndZoom(val, 15);
+      myGeo.getPoint(
+        that.form.shi + that.form.qu,
+        function(point) {
           if (point) {
-              map.clearOverlays();
-              map.centerAndZoom(point, 12);
-              map.addOverlay(new BMap.Marker(point));
-              that.form.lng = point.lng;
-              that.form.lat = point.lat;
+            map.clearOverlays();
+            map.centerAndZoom(point, 12);
+            map.addOverlay(new BMap.Marker(point));
+            that.form.lng = point.lng;
+            that.form.lat = point.lat;
           } else {
-              that.$message('无法解析地址,请完善详细地址信息或者手动点击地图选择');
+            that.$message(
+              "无法解析地址,请完善详细地址信息或者手动点击地图选择"
+            );
           }
-      },that.form.sheng);
+        },
+        that.form.sheng
+      );
     },
-    mapFun(){
+    mapFun() {
       var that = this;
       var map = that.createMap();
       if (that.local.getResults().getPoi(0)) {
-          var pp = that.local.getResults().getPoi(0).point; //获取第一个智能搜索的结果
-          map.centerAndZoom(pp, 18);
-          map.addOverlay(new BMap.Marker(pp)); //添加标注
-          that.form.lng = pp.lng;
-          that.form.lat = pp.lat;
+        var pp = that.local.getResults().getPoi(0).point; //获取第一个智能搜索的结果
+        map.centerAndZoom(pp, 18);
+        map.addOverlay(new BMap.Marker(pp)); //添加标注
+        that.form.lng = pp.lng;
+        that.form.lat = pp.lat;
       } else {
-          that.$message("无法解析地址,请完善详细地址信息或者手动点击地图选择");
+        that.$message("无法解析地址,请完善详细地址信息或者手动点击地图选择");
       }
     },
-    mapAddress(){
+    mapAddress() {
       var that = this;
-      if(that.form.sheng=='' || that.form.shi=='' || that.form.qu==''){
-        that.$message('请选择区域！');
+      if (that.form.sheng == "" || that.form.shi == "" || that.form.qu == "") {
+        that.$message("请选择区域！");
         return;
       }
-      if(that.form.address == ''){
-        that.$message('输入详细地址后定位！');
+      if (that.form.address == "") {
+        that.$message("输入详细地址后定位！");
         return;
       }
       that.mapVisible = !that.mapVisible;
       var map = that.createMap();
       map.clearOverlays();
-      that.local = new BMap.LocalSearch(map, { //智能搜索
-          onSearchComplete: that.mapFun
+      that.local = new BMap.LocalSearch(map, {
+        //智能搜索
+        onSearchComplete: that.mapFun
       });
-      that.local.search(that.form.shi +that.form.qu + that.form.address);
-    },
+      that.local.search(that.form.shi + that.form.qu + that.form.address);
+    }
   },
   mounted() {
     var that = this;
@@ -326,11 +282,11 @@ export default {
         margin-right: 0;
       }
     }
-    .info{
+    .info {
       height: 3rem;
       line-height: 3rem;
       font-size: 1.2rem;
-      color:#666;
+      color: #666;
     }
   }
   .formTitle {
@@ -389,7 +345,7 @@ export default {
     color: #333;
   }
 }
-.map{
+.map {
   width: 100%;
   height: 50rem;
   position: absolute;
@@ -398,8 +354,8 @@ export default {
   z-index: 1;
   display: none;
   &.show {
-      display: block;
-    }
+    display: block;
+  }
 }
 .avatar {
   width: 178px;