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

# Conflicts:
#	public/stylesheets/project.css

public/stylesheets/about.css

@@ -141,7 +141,6 @@
 /* .address-map */
 .address-map {
   height: 575px;
-  width: 100%;
   background: url("../images/about_us/map.jpg") no-repeat center center;
   background-size: cover;
 }

public/stylesheets/about.less

@@ -158,14 +158,13 @@
 
 .address-map {
   height: 575px;
-  width: 100%;
   background: url("../images/about_us/map.jpg") no-repeat center center;
   background-size: cover;
-  > div {
+  & > div {
     width: 1200px;
     height: 100%;
     margin: 0 auto;
-    > div {
+    & > div {
       margin: 150px 0 0 240px;
       width: 291px;
       height: 207px;

public/stylesheets/project.css

 /* .hot-project-banner start */
 .hot-project-banner {
   height: 470px;
-  width: 100%;
   background: url('../images/hot_project/hot_project_banner.jpg') no-repeat center center;
   background-size: cover;
   text-align: center;
@@ -121,6 +120,7 @@
   background: #ff4a4b;
   border-radius: 10px;
   text-align: center;
+  cursor: pointer;
 }
 .hot-project-introducer .introducer p {
   position: absolute;
@@ -217,7 +217,6 @@
   padding: 180px 0 160px 0;
 }
 .hot-project-tabs ul {
-  width: 1150px;
   margin: 0 auto;
   border: 1px solid #43abb6;
 }
@@ -227,6 +226,7 @@
   font-size: 16px;
   color: #000;
   text-align: center;
+  cursor: pointer;
   background: #f6f6f6;
   transition-delay: .1s;
   transition: background .5s, color .5s;

public/stylesheets/project.less

@@ -70,7 +70,6 @@
 
 .hot-project-banner {
   height: 470px;
-  width: 100%;
   background: url('../images/hot_project/hot_project_banner.jpg') no-repeat center center;
   background-size: cover;
   text-align: center;
@@ -167,7 +166,6 @@
       width: 500px;
       font-size: 18px;
       border: 1px solid #939393;
-      border: 1px solid #939393;
       border-radius: 10px;
       color: #7f7f7f;
       outline: none;
@@ -195,6 +193,7 @@
       background: #ff4a4b;
       border-radius: 10px;
       text-align: center;
+      cursor: pointer;
     }
     p {
       position: absolute;
@@ -300,7 +299,6 @@
   background: #f6f6f6;
   padding: 180px 0 160px 0;
   ul {
-    width: @container-width;
     margin: 0 auto;
     border: 1px solid #43abb6;
     li {
@@ -309,6 +307,7 @@
       font-size: 16px;
       color: #000;
       text-align: center;
+      cursor: pointer;
       background: #f6f6f6;
       transition-delay: .1s;
       transition: background .5s, color .5s;

routes/index.js

@@ -20,21 +20,21 @@ router.get('/', function (req, res) {
             {
                 sum: '3075位',
                 text: '精英理财师数',
-                img: '/images/index/picture_01.png',
+                img: '/images/index/picture_02.png',
                 c1: '严格风控',
                 c2: '原招商银行风控团队'
             },
             {
                 sum: '335款',
                 text: '发行产品数',
-                img: '/images/index/picture_01.png',
+                img: '/images/index/picture_03.png',
                 c1: '快速结拥',
                 c2: '新用户款到结拥'
             },
             {
                 sum: '3.7亿',
                 text: '累计发行佣金',
-                img: '/images/index/picture_01.png',
+                img: '/images/index/picture_04.png',
                 c1: '佣金超高',
                 c2: '高于市场千八的佣金体系'
             },

views/project.hbs

@@ -4,23 +4,19 @@
 </div>
 <div class="hot-project-introducer">
     <ul class="clear">
-        <li class="fl">
-            <i></i>
+        <li>
             <b></b>
             <span>债权融资</span>
         </li>
-        <li class="fl">
-            <i></i>
+        <li>
             <b></b>
             <span>项目融资</span>
         </li>
-        <li class="fl">
-            <i></i>
+        <li>
             <b></b>
             <span>融资租赁</span>
         </li>
-        <li class="fl">
-            <i></i>
+        <li>
             <b></b>
             <span>扩展融资渠道</span>
         </li>