Merge branch 'zhanghui' into 'develop'

fixbug



See merge request !2

src/assets/less/style.less

@@ -79,7 +79,7 @@ html,body {-webkit-tap-highlight-color: rgba(0, 0, 0,0); font-size: 0.28rem; bac
 		.back {width:44px;height:44px; vertical-align: middle;.tc;
 		.back {width:44px;height:44px; vertical-align: middle;.tc;
 			i {font-size:30px;.txt-ver(44px);}
 			i {font-size:30px;.txt-ver(44px);}
 		}
 		}
-		.title {font-size:0.36rem;.pos(a); left:44px; right:44px; .tc;}
+		.title {font-size:0.36rem;.pos(a); left:100px; right:100px; .tc;}
 		.btns {font-size:0.36rem; padding:0 15px;}
 		.btns {font-size:0.36rem; padding:0 15px;}
 	}
 	}
 	.page-content {position:absolute;top:44px;width:100%;height:auto;left:0;right:0;bottom:0;overflow-x:hidden;overflow-y:auto;}
 	.page-content {position:absolute;top:44px;width:100%;height:auto;left:0;right:0;bottom:0;overflow-x:hidden;overflow-y:auto;}
@@ -157,5 +157,6 @@ html,body {-webkit-tap-highlight-color: rgba(0, 0, 0,0); font-size: 0.28rem; bac
 	
 	
 }
 }
 .mobile-ios {
 .mobile-ios {
-	.mint-header {padding-top: 20px; box-sizing: content-box;}
+	.page-header {padding-top: 20px;}
+	.page-content {top:66px;}
 }
 }
\ No newline at end of file

src/components/Login.vue

@@ -66,7 +66,7 @@ export default {
 }
 }
 
 
 </script>
 </script>
-<style>
+<style lang="less">
 
 
 
 
 </style>
 </style>

src/components/Reg.vue

@@ -6,8 +6,8 @@
       <div class="btns" @click="goLogin">登录</div>
       <div class="btns" @click="goLogin">登录</div>
     </div>
     </div>
     <div class="page-content">
     <div class="page-content">
-      {{msg}}
-      <button @click="loginOk">注册成功后？重新登录：直接跳jump！</button>
+      
+      <!-- <button @click="loginOk">注册成功后？重新登录：直接跳jump！</button> -->
     </div>
     </div>
   </div>
   </div>
 </template>
 </template>
@@ -16,7 +16,6 @@ export default {
   name: 'reg',
   name: 'reg',
   data() {
   data() {
     return {
     return {
-      msg: '用户注册'
     }
     }
   },
   },
   mounted() {
   mounted() {