Merge branch 'express' of http://gitlab.yanky.cn/liaili/www.fudou6.com into express

public/stylesheets/index.css

@@ -32,7 +32,7 @@
   position: absolute;
   left: 50%;
   top: 140px;
-  margin-left: -467px;
+  margin-left: -575px;
   height: 68px;
   width: 268px;
   line-height: 68px;
@@ -73,9 +73,19 @@
   position: absolute;
   left: 50%;
   top: -140px;
-  margin-left: 60px;
-  width: 405px;
-  height: 515px;
+  margin-left: 133.33333333px;
+  width: 467px;
+  height: 558px;
+  background: url(http://res.fudou6.com/c/4/20160730/tq9bW9iaWxlXzAx_467x558.png) no-repeat;
+}
+.download .app-screen:after {
+  content: '';
+  background: url(http://res.fudou6.com/c/4/20160730/nw3bW9iaWxlLWNvbnRlbnRfMDM=_375x384.jpg) no-repeat 51px 62px;
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
 }
 .download hr {
   width: 95%;
@@ -384,6 +394,13 @@
   body .download {
     width: 990px;
   }
+  body .download .android,
+  body .download .iphone {
+    margin-left: -445.5px;
+  }
+  body .download .app-screen {
+    margin-left: -6px;
+  }
   body .character ul {
     width: 990px;
   }
@@ -427,6 +444,13 @@
   body .download {
     width: 1150px;
   }
+  body .download .android,
+  body .download .iphone {
+    margin-left: -517.5px;
+  }
+  body .download .app-screen {
+    margin-left: 90px;
+  }
   body .character ul {
     width: 1150px;
   }
@@ -470,6 +494,13 @@
   body .download {
     width: 1360px;
   }
+  body .download .android,
+  body .download .iphone {
+    margin-left: -612px;
+  }
+  body .download .app-screen {
+    margin-left: 216px;
+  }
   body .character ul {
     width: 1360px;
   }

public/stylesheets/index.less

@@ -34,7 +34,8 @@
     position: absolute;
     left: 50%;
     top: 140px;
-    margin-left: -467px;
+    margin-left: -@container-width / 2;
+    //margin-left: -467px;
     height: 68px;
     width: 268px;
     line-height: 68px;
@@ -74,9 +75,21 @@
     position: absolute;
     left: 50%;
     top: -140px;
-    margin-left: 60px;
-    width: 405px;
-    height: 515px;
+    margin-left: (@container-width - 990) / 1.2;
+    //margin-left: 60px;
+    width: 467px; // 405px;
+    height: 558px; // 515px;
+    background: url(http://res.fudou6.com/c/4/20160730/tq9bW9iaWxlXzAx_467x558.png) no-repeat;
+    &:after {
+      content: '';
+      background: url(http://res.fudou6.com/c/4/20160730/nw3bW9iaWxlLWNvbnRlbnRfMDM=_375x384.jpg) no-repeat 51px 62px;
+      position: absolute;
+      top: 0;
+      left: 0;
+      width: 100%;
+      height: 100%;
+    }
+
   }
   hr {
     width: 95%;
@@ -425,6 +438,13 @@
   }
   .download {
     width: @container-width;
+    .android,
+    .iphone {
+      margin-left: @container-width / 20 - @container-width/2;
+    }
+    .app-screen {
+      margin-left: (@container-width - 1000) * 1.2 / 2;
+    }
   }
   .character {
     ul {

routes/index.js

@@ -40,35 +40,35 @@ router.get('/', function(req, res) {
     products:[
       {
         title:'中电投先融-西安灞桥',
-        img:'/images/index/528ad57.jpg',
+        img:'http://res.fudou6.com/c/4/20160730/c4sNTI4YWQ1Nw==_1000x600.jpg',
         raiseTime:'28',
         raiseFunds: '4',
         maxProfits: '8.0%-8.5%',
         link:''
       },{
         title:'中电投先融-天津市级政信',
-        img:'/images/index/041c0cc.jpg',
+        img:'http://res.fudou6.com/c/4/20160730/m3gMDQxYzBjYw==_1000x600.jpg',
         raiseTime:'28',
         raiseFunds: '5',
         maxProfits: '8.3%',
         link:''
       },{
         title:'中电投先融-锐金1-2号',
-        img:'/images/index/fcfbb08.jpg',
+        img:'http://res.fudou6.com/c/4/20160730/eedZmNmYmIwOA==_600x375.jpg',
         raiseTime:'21',
         raiseFunds: '2',
         maxProfits: '8.5%-8.7%',
         link:''
       },{
         title:'金元南通新沿海1号',
-        img:'/images/index/5ce7cf8.jpg',
+        img:'http://res.fudou6.com/c/4/20160730/y3sNWNlN2NmOA==_1000x600.jpg',
         raiseTime:'20',
         raiseFunds: '2',
         maxProfits: '8.2%-8.5%',
         link:''
       },{
         title:'国信证券<br/>巴中市高明新区壁州大道',
-        img:'/images/index/38be78d.jpg',
+        img:'http://res.fudou6.com/c/4/20160730/pdeMzhiZTc4ZA==_1000x600.jpg',
         raiseTime:'52',
         raiseFunds: '1',
         maxProfits: '10.2%-10.6%',

views/index.hbs

@@ -22,7 +22,8 @@
         <img src="https://res.fudou6.com/c/4/20160730/e9e5a+M6LGG5LyY5oqV5LiL6L295LqM57u056CB_280x280.png" width="124" alt="">
         <span>扫描下载富豆APP</span>
     </a>
-    <img class="app-screen" src="/images/index/iphone.png" alt="app screen">
+    <div class="app-screen"></div>
+    <!--<img class="app-screen" src="/images/index/iphone.png" alt="app screen">-->
     <hr class="line-separate"/>
 </div>
 <div class="character">