登录蛇皮终究修改

denglu/denglu.wxml

@@ -1,11 +1,9 @@
 <form bindsubmit="formSubmit" > 
 <view class="container">
   <view class="login-icon">
-<<<<<<< HEAD
-    <image class="login-img" src="../images/123.jpg"></image>
-=======
+
     <image class="login-img" src="../image/123.jpg"></image>
->>>>>>> 0877d8ad681d47bc72cd343cd73f8dfb7321c3b6
+
   </view>
   <view class="login-from">
  
@@ -24,11 +22,9 @@
     </view>
     <!--按钮-->
     <view class="loginBtnView">
-<<<<<<< HEAD
-      <button class="loginBtn"  size="{{primarySize}}" loading="{{loading}}" plain="{{plain}}" disabled="{{disabled}}" bindtap="login" formType="submit">登录</button>
-=======
+
       <button class="loginBtn"  loading="{{loading}}" plain="{{plain}}" disabled="{{disabled}}" bindtap="login" formType="submit">登录</button>
->>>>>>> 0877d8ad681d47bc72cd343cd73f8dfb7321c3b6
+
     </view>
   </view>
 </view>

denglu/denglu.wxss

@@ -48,11 +48,9 @@ page{
   text-align: right;
   margin-right: 22px;
   margin-top: 11px;
-<<<<<<< HEAD
-  color: #cccccc;
-=======
+
   color: #000;
->>>>>>> 0877d8ad681d47bc72cd343cd73f8dfb7321c3b6
+
   font-size: 14px
 }
  
@@ -66,11 +64,9 @@ page{
 .loginBtnView {
   width: 100%;
   height: auto;
-<<<<<<< HEAD
-  background-color: rgb(253,253,65);
-=======
+
   
->>>>>>> 0877d8ad681d47bc72cd343cd73f8dfb7321c3b6
+
   margin-top: 0px;
   margin-bottom: 0px;
   padding-bottom: 0px;
@@ -79,8 +75,7 @@ page{
 .loginBtn {
   width: 80%;
   margin-top: 35px;
-<<<<<<< HEAD
-=======
+
   background-color:rgb(253, 153, 65);
->>>>>>> 0877d8ad681d47bc72cd343cd73f8dfb7321c3b6
+
 }