15

public/javascripts/main.js

 /**
  * Created by liaili on 16/8/1.
  */
+
+/**
+ * callback
+ * @param something
+ */
+// function learn(something){
+//     console.log(something)
+// }
+// function we(callback,something){
+//     something += 'is cool!';
+//     callback(something);
+// }
+// we(learn, 'Nodejs');
+
+/**
+ * asynic
+ */
+// var a=0;
+// function print(){
+//     console.log(a);
+// }
+// function plusIt(callback){
+//     setTimeout(function(){
+//         a++;
+//         callback();
+//     },1000)
+// }
+//
+// plusIt(print());
+
+/**
+ * 作用域和上下文
+ */
+function pet(words) {
+    this.words = words;
+    console.log(this);
+    console.log(this.words)
+}
+pet('...');

public/javascripts/project.js

@@ -69,6 +69,8 @@
             }).catch(function () {
                 alert('提交失败, 请稍后再试!');
             });
+            $introducerMobile.val('');
+            $projectDescription.val('');
         }
     });
 })();

public/javascripts/project.jsx

@@ -68,6 +68,8 @@
             }).catch(()=> {
                 alert('提交失败, 请稍后再试!');
             });
+            $introducerMobile.val('');
+            $projectDescription.val('');
         }
     });
 })();

public/stylesheets/about.css

@@ -72,6 +72,8 @@
   float: left;
   width: 33.33%;
   text-align: center;
+  height: 243px;
+  overflow: hidden;
 }
 .company-introduction .gudong-list li > div {
   padding: 0 50px 60px;
@@ -135,7 +137,7 @@
 .company-introduction .friend-list a:nth-child(6),
 .company-introduction .friend-list a:nth-child(7),
 .company-introduction .friend-list a:nth-child(8) {
-  background-position: 0 38px;
+  background-position: center 38px;
 }
 /* .company-introduction end */
 /* .address-map */

public/stylesheets/about.less

@@ -80,6 +80,8 @@
       float: left;
       width: 33.33%;
       text-align: center;
+      height: 243px;
+      overflow: hidden;
       & > div {
         padding: 0 50px 60px;
         border-right: 1px solid #c3c3c3;
@@ -146,7 +148,7 @@
       &:nth-child(6),
       &:nth-child(7),
       &:nth-child(8) {
-        background-position: 0 38px;
+        background-position: center 38px;
       }
     }
   }

public/stylesheets/product.css

@@ -275,7 +275,7 @@ body {
   height: 450px;
   position: fixed;
   left: 50%;
-  top: 300px;
+  top: 200px;
   margin-left: -225px;
   border-radius: 10px;
   background: #fff;
@@ -307,6 +307,7 @@ body {
   border-radius: 50%;
   border: 2px solid #fff;
   color: #fff;
+  cursor: pointer;
 }
 /* .modal-box-erweima end */
 @media screen and (min-width: 769px) {

public/stylesheets/product.less

@@ -296,7 +296,7 @@ body {
     height: 450px;
     position: fixed;
     left:50%;
-    top:300px;
+    top:200px;
     margin-left: -225px;
     border-radius: 10px;
     background: #fff;
@@ -327,6 +327,7 @@ body {
       border-radius: 50%;
       border: 2px solid #fff;
       color: #fff;
+      cursor: pointer;
     }
   }
 }

views/about.hbs

@@ -47,14 +47,14 @@
         </ul>
         <h2>合作伙伴</h2>
         <div class="friend-list">
-            <a href="javascrpt:;" style="background-image:url(/images/about_us/zhongjiang.jpg);"></a>
-            <a href="javascrpt:;" style="background-image:url(/images/about_us/zhongrong.jpg);"></a>
-            <a href="javascrpt:;" style="background-image:url(/images/about_us/guomin.jpg);"></a>
-            <a href="javascrpt:;" style="background-image:url(/images/about_us/guangda.jpg);"></a>
-            <a href="javascrpt:;" style="background-image:url(/images/about_us/zhongxing.jpg);"></a>
-            <a href="javascrpt:;" style="background-image:url(/images/about_us/fangzheng.jpg);"></a>
-            <a href="javascrpt:;" style="background-image:url(/images/about_us/huaxing.jpg);"></a>
-            <a href="javascrpt:;" style="background-image:url(/images/about_us/zhongtai.jpg);"></a>
+            <a href="http://www.jxi.cn/Index.aspx" target='_blank 'style="background-image:url(/images/about_us/zhongjiang.jpg);"></a>
+            <a href="http://www.zritc.com/" target='_blank 'style="background-image:url(/images/about_us/zhongrong.jpg);"></a>
+            <a href="http://www.natrust.cn/home/cn/" target='_blank 'style="background-image:url(/images/about_us/guomin.jpg);"></a>
+            <a href="http://www.ebtrust.com/" target='_blank 'style="background-image:url(/images/about_us/guangda.jpg);"></a>
+            <a href="http://trust.ecitic.com/" target='_blank 'style="background-image:url(/images/about_us/zhongxing.jpg);"></a>
+            <a href="http://www.fd-trust.com/" target='_blank 'style="background-image:url(/images/about_us/fangzheng.jpg);"></a>
+            <a href="http://www.huaxintrust.com/" target='_blank 'style="background-image:url(/images/about_us/huaxing.jpg);"></a>
+            <a href="http://ztxt.show.imosi.com/" target='_blank 'style="background-image:url(/images/about_us/zhongtai.jpg);"></a>
         </div>
     </div>
 </div>
@@ -64,7 +64,7 @@
             <span><img src="/images/about_us/icon01.png"/></span>
             <h4>杭州枢纽科技</h4>
             <hr/>
-            <p>浙江省杭州市余杭区良睦路1299号 互联网村5-305</p>
+            <p>浙江省杭州市余杭区良睦路1288号梦想小镇5-305</p>
             <h3>400-879-9900</h3>
         </div>
     </div>

views/index.hbs

-https://res.fudou6.com/c/4/20160802/acpNi5waWNfaGQ=_280x280.jpg<div class="banner">
+<div class="banner">
     <div class="banner-box">
         <h1>海量资源 轻松抢单</h1>
         <p>

views/layout.hbs

@@ -29,16 +29,11 @@
     <h2>400-879-9900</h2>
     <!--<hr class="line-separate"/>-->
     <p class="copyright">Copyright2016 <span>shuniu</span> All Right Reserved&copy;2014-2015 杭州枢纽科技有限公司 版权所有</p>
-<<<<<<< HEAD
     <address>
         浙江省杭州市余杭区良睦路1288号梦想小镇5-305
         <br>上海市浦东新区福山路458号同盛大厦1808室 <br>
         <a href="mailto:hr@shuniu.com">E-mail:hr@shuniu.com</a>
     </address>
-=======
-    <address>浙江省杭州市余杭区良睦路1288号梦想小镇5-305 E-mail: <a href="mailto:hr@shuniu.com">hr@shuniu.com</a></address>
-    <address>上海市浦东新区福山路458号同盛大厦1808室</address>
->>>>>>> 546ba5723d0162ab25246abb551367aad882f2e0
 </footer>
 <script src="/javascripts/jquery-1.8.3.min.js"></script>
 {{#each scripts}}

views/project.hbs

 <div class="hot-project-banner clear">
     <h4>富豆优投</h4>
-    <p>枢纽科技旗下专为地方性项目或企业提供有保障的融资渠道、合理对投资资金需求的互联网平台，拥有数个大型项目资金问题解决方案</p>
+    <p>枢纽科技旗下专为地方性项目或企业提供有保障的融资渠道、合理对接资金需求的互联网平台，拥有数个大型项目资金问题解决方案</p>
 </div>
 <div class="hot-project-introducer">
     <ul class="clear">
@@ -26,7 +26,7 @@
         <h2>寻找优质项目介绍人</h2>
         <div class="clear">
             <label for="introducerMobile">联系方式：</label>
-            <input type="text" id="introducerMobile" placeholder="填写您的联系方式"
+            <input type="text" id="introducerMobile" placeholder="填写您的电话号码"
                    maxlength="11"/>
             <p class="error-phone"></p>
         </div>