Merge branch 'new_pad_branch' of http://git.shengws.com/zhangbj/xt_pad into new_pad_branch

src/pages/home/login.vue

@@ -2,6 +2,9 @@
   <div class="container">
     <div class="newLogin">
       <div class="login">
+        <div>
+          <img src="../../assets/login/newImg.png" alt style="width: 100%;" />
+        </div>
         <div class="logo">
           <img src="../../assets/login/newLogo.png" alt />
         </div>
@@ -10,11 +13,21 @@
             <ul>
               <li>
                 <span class="iconfont">&#xe78b;</span>
-                <input placeholder="请输入手机号" type="tel" class="tel" v-model="form.mobile" />
+                <input
+                  placeholder="请输入手机号"
+                  type="tel"
+                  class="tel"
+                  v-model="form.mobile"
+                />
               </li>
               <li>
                 <span class="iconfont">&#xe6c0;</span>
-                <input placeholder="请输入密码" type="password" class="tel" v-model="form.pwd" />
+                <input
+                  placeholder="请输入密码"
+                  type="password"
+                  class="tel"
+                  v-model="form.pwd"
+                />
               </li>
             </ul>
           </div>
@@ -35,7 +48,9 @@
             @click="submitForm"
             :class="loginDisable ? 'disableLoginBtn' : ''"
             :disabled="loginDisable"
-          >登录</button>
+          >
+            登录
+          </button>
 
           <!-- <router-link to="/forgetPassword">
             <div class="newForget">忘记密码</div>
@@ -246,7 +261,8 @@ export default {
     @include flex-direction;
     height: 100%;
     .logo {
-      padding: 3rem 0 2.5rem;
+      // padding: 3rem 0 2.5rem;
+      padding: 0 0 0.5rem;
       img {
         width: 44%;
         height: auto;