update

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.min.js

@@ -24,15 +24,15 @@
         n.fadeOut(300);
     }), e.on("submit", function(e) {
         e.preventDefault();
-        var o = a(), t = i();
-        o && t && request("/api/1.0/proj/add.json", {
-            mobile: o,
-            description: t
+        var c = a(), r = i();
+        c && r && (request("/api/1.0/proj/add.json", {
+            mobile: c,
+            description: r
         }, "POST").then(function() {
             n.fadeIn(300);
         }).catch(function() {
             alert("提交失败, 请稍后再试!");
-        });
+        }), o.val(""), t.val(""));
     });
 }(), function() {
     var e = $(".modal-box"), o = [ {

views/layout.hbs

@@ -44,16 +44,8 @@
     <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>
->>>>>>> 1aadc14cedd435d1d092307bdabf4fa8badd531f
 </footer>
 <script src="/javascripts/jquery-1.8.3.min.js"></script>
 {{#if env}}