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

# Conflicts:
#	views/layout.hbs

public/javascripts/product.min.js

 !function() {
     function t(t) {
-        return u.html(t ? "" : "请输入您的姓名！"), !t;
-    }
-    function n(t) {
-        return !/[^\d]/g.test(t) || (a.val(t.replace(/[^\d]/g, "")), !1);
+        return i.html(t ? "" : "请输入您的姓名！"), !t;
     }
     function e(t) {
-        return /^[\d]{11}$/g.test(t) ? (i.html(""), !1) : (i.html("手机号有误，请重新输入！"), !0);
+        return !/[^\d]/g.test(t) || (r.val(t.replace(/[^\d]/g, "")), !1);
+    }
+    function n(t) {
+        return /^[\d]{11}$/g.test(t) ? (u.html(""), !1) : (u.html("手机号有误，请重新输入！"), !0);
     }
-    var r = $("#form"), o = $('input[name="userName"]', r), a = $('input[name="userTel"]', r), u = $(".appointment .errorName"), i = $(".appointment .errorTel"), l = $(".modal-box"), m = ($(".balance").html(), 
-    $(".total").html(), $(".progress-bar i"));
-    m.width(m.data("width")), o.on("keyup", function() {
-        t($.trim(o.val() + ""));
-    }), a.on("keyup", function() {
-        var t = a.val();
-        n(t), e(t);
-    }), r.on("submit", function(n) {
-        return n.preventDefault(), t($.trim(o.val() + "")) ? void o.focus() : e($.trim(a.val() + "")) ? void a.focus() : (request(), 
+    var o = $("#form"), a = $('input[name="userName"]', o), r = $('input[name="userTel"]', o), i = $(".appointment .errorName"), u = $(".appointment .errorTel"), l = $(".modal-box"), c = ($(".balance").html(), 
+    $(".total").html(), $(".progress-bar i")), f = $(".modal-box-erweima");
+    c.width(c.data("width")), a.on("keyup", function() {
+        t($.trim(a.val() + ""));
+    }), r.on("keyup", function() {
+        var t = r.val();
+        e(t), n(t);
+    }), o.on("submit", function(e) {
+        return e.preventDefault(), t($.trim(a.val() + "")) ? void a.focus() : n($.trim(r.val() + "")) ? void r.focus() : (request(), 
         void l.fadeIn(300));
     }), $("#modalBoxHidden").click(function(t) {
         t.preventDefault(), l.fadeOut(300);
+    }), $(".login-app").on("click", function(t) {
+        t.preventDefault(), f.fadeIn(300);
+    }), $(".modal-dialog-close").on("click", function(t) {
+        t.preventDefault(), f.fadeOut(300);
     });
 }();
\ No newline at end of file

views/layout.hbs

@@ -44,11 +44,16 @@
     <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}}