Merge pull request #8 from chengdujs/develop

Fix swipe bug
chengdujs · Jan 26, 2017 · 841ba90 · 841ba90
2 parents aac288e + 025e71c
commit 841ba90
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/src/css/all.scss b/src/css/all.scss
@@ -1,4 +1,8 @@
+html{
+  font-size: calc(100vw / 16); // 设计稿320，每份20px
+}
 body{
+  font-size: 14px;
 	font-family: '\5FAE\8F6F\96C5\9ED1';
 	background:#e5e5e5;
 }
@@ -7,4 +11,4 @@ a{
 }
 a:hover{
 	color:#f00;
-}
+}
diff --git a/src/pages/home/HomePage.vue b/src/pages/home/HomePage.vue
@@ -10,7 +10,7 @@
       </div>
     </div>
     <div class="job-content">
-      <div class="job-banner">
+      <div class="job-banner" style="height: 5.5rem;">
         <vw-swipe >
           <vw-swipe-item>
             <a href="">

diff --git a/src/vw-ui/components/swipe/swipe.vue b/src/vw-ui/components/swipe/swipe.vue
@@ -1,9 +1,8 @@
 <style scoped>
   .vw-swipe{
     position: relative;
-    width: 320px;
-    height: 110px;
     overflow: hidden;
+    height: 100%;
   }
   .vw-swipe ul{
     height: 100%;