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

public/javascripts/project.js.map

-<<<<<<< HEAD
-{"version":3,"sources":["project.jsx"],"names":[],"mappings":"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","file":"project.js","sourcesContent":["/**\n * Created by Administrator on 2016/7/27.\n */\n(()=> {\n    const $form = $('#container .introducer');\n    const $submit = $('input[type=\"submit\"]', $form);\n    const $introducerMobile = $('#introducerMobile', $form);\n    const $projectDescription = $('#projectDescription', $form);\n    const $errorPhone = $('.error-phone', $form);\n    const $errorDescription = $('.error-description', $form);\n    const $successDialog = $('.modal-box-success');\n\n    const filterMobileInput = ($mobile)=> {\n        $mobile.val(($mobile.val() + '').replace(/[^\\d]/g, ''));\n    };\n\n    const validateMobile = ()=> {\n        let mobile = $.trim($introducerMobile.val() + '');\n        if (/^[\\d]{11}$/g.test(mobile)) {\n            $errorPhone.empty();\n            return mobile;\n        } else {\n            $errorPhone.html('手机号输入错误!');\n            return false;\n        }\n    };\n\n    const validateDescription = ()=> {\n        let description = $.trim($projectDescription.val() + '');\n        if (description.length) {\n            $errorDescription.empty();\n            return description;\n        } else {\n            $errorDescription.html('请输入项目描述内容!');\n            return false;\n        }\n    };\n\n    $introducerMobile.on('keyup', (e)=> {\n        filterMobileInput($introducerMobile);\n    }).on('change blur', (e)=> {\n        validateMobile();\n    }).on('focus', (e)=> {\n        $errorPhone.empty();\n    });\n\n    $projectDescription.on('change blur', (e)=> {\n        validateDescription();\n    }).on('focus', (e)=> {\n        $errorDescription.empty();\n    });\n\n\n    $successDialog.on('click', '.modal-dialog-close', (e)=> {\n        $successDialog.fadeOut(300);\n    });\n\n    $form.on('submit', (e)=> {\n        e.preventDefault();\n        let mobile = validateMobile();\n        let description = validateDescription();\n        if (mobile && description) {\n            request('/api/1.0/proj/add.json', {\n                mobile,\n                description\n            }, 'POST').then(()=> {\n                $successDialog.fadeIn(300);\n            }).catch(()=> {\n                alert('提交失败, 请稍后再试!');\n            });\n            $introducerMobile.val('');\n            $projectDescription.val('');\n        }\n    });\n})();\n\n(()=> {\n    const $modalBox = $('.modal-box');\n\n    let projectsList = [\n        {\n            'projectName':'中电投天津',\n            'projectType':'保障房建设',\n            'projectTime':'2年',\n            'projectInfo':'用于补充公司现金流，承载天津市保障房建设。'\n        },\n        {\n            'projectName':'中电投西安',\n            'projectType':'基础建设项目',\n            'projectTime':'2年',\n            'projectInfo':'用于认购光大信托计划,用于向“绿源公司”发放信托贷款，用于建设西安绿源农产品批发市场项目。'\n        },\n        {\n            'projectName':'金元百利海安',\n            'projectType':'企业流贷',\n            'projectTime':'3年',\n            'projectInfo':'用于受让南通新沿海对海安经济技术开发区管委会的应收账款债 权,资金最终用于补充南通新沿海的流动资金。'\n        },\n        {\n            'projectName':'中电投金堂',\n            'projectType':'基础建设项目',\n            'projectTime':'2年',\n            'projectInfo':'用于认购光大信托先融锐金1号集合资金信托计划,补充公司流动资金,用于基础建设项目'\n        },\n        {\n            'projectName':'国信巴中',\n            'projectType':'基础建设项目',\n            'projectTime':'2年',\n            'projectInfo':'用于通江县壁州大道二期(高速连接道)建设项目用款。'\n        },\n        {\n            'projectName':'枢纽铜仁',\n            'projectType':'保障房建设项目',\n            'projectTime':'18个月',\n            'projectInfo':'用于贵州省铜仁市碧江区城市棚户区改造安置房项目'\n        },\n        {\n            'projectName':'枢纽余庆',\n            'projectType':'基础建设项目',\n            'projectTime':'1年',\n            'projectInfo':'用于贵州遵义市余庆县敖溪镇至关兴镇道路工程建设'\n        },\n        {\n            'projectName':'中电投黔南州',\n            'projectType':'基础建设项目',\n            'projectTime':'2年',\n            'projectInfo':'用于认购光大信托先融黔南1号集合资金信托计划,补充公司流 动资金,用于基础建设项目 '\n        },\n    ];\n\n    const template = ({projectName, projectTime, projectType, projectInfo})=>{\n       return `<h4>${projectName}</h4><h3>${projectTime}</h3><h6>${projectType}</h6><p>${projectInfo}</p>\n        <img src=\"https://res.fudou6.com/c/4/20160801/zupNy5waWNfaGQ=_257x423.jpg\">\n        <a href=\"javascript:void('close');\" class=\"modal-dialog-close\">×</a>`;\n    };\n\n    const $modalDialog = $('.modal-dialog',$modalBox);\n\n    $('.hot-project-address').on('click','a', (e)=> {\n        e.preventDefault();\n        var target=e.target;\n        let html = '';\n        let index = $(target).data(index).index;\n        let project = projectsList[index];\n        if(project){\n            html= template(project);\n            $modalDialog.html(html);\n            $modalBox.fadeIn(300);\n\n        }\n    });\n\n    $modalBox.on('click', '.modal-dialog-close', (e)=> {\n        e.preventDefault();\n        $modalBox.fadeOut(300);\n    });\n\n\n})();\n\n\n// (function () {\n//\n//\n//\n//\n//\n//     var $modalBoxProject = $('.modal-box-project');\n//     var $modalBoxSuccess = $('.modal-box-success');\n//\n//\n//\n//\n//     /**\n//      * 地图项目地址弹框\n//      */\n//     $('.hot-project-address a').click(function (e) {\n//         e.preventDefault();\n//         $modalBox.fadeIn(300);\n//     });\n//     $('#modalBoxHidden').click(function (e) {\n//         e.preventDefault();\n//         $modalBox.fadeOut(300);\n//     });\n//\n//     /**\n//      * 项目提交弹框\n//      */\n//     $submit.on('click',function(e){\n//         e.preventDefault();\n//         $modalBoxSuccess.fadeIn(300);\n//     });\n//     $('.modal-box-success a').on('click',function(e){\n//         e.preventDefault();\n//         $modalBoxSuccess.fadeOut(300);\n//     });\n//\n//\n// })();"]}
-=======
-{"version":3,"sources":["project.jsx"],"names":[],"mappings":"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","file":"project.js","sourcesContent":["/**\n * Created by Administrator on 2016/7/27.\n */\n(()=> {\n    const $form = $('#container .introducer');\n    const $submit = $('input[type=\"submit\"]', $form);\n    const $introducerMobile = $('#introducerMobile', $form);\n    const $projectDescription = $('#projectDescription', $form);\n    const $errorPhone = $('.error-phone', $form);\n    const $errorDescription = $('.error-description', $form);\n    const $successDialog = $('.modal-box-success');\n\n    const filterMobileInput = ($mobile)=> {\n        $mobile.val(($mobile.val() + '').replace(/[^\\d]/g, ''));\n    };\n\n    const validateMobile = ()=> {\n        let mobile = $.trim($introducerMobile.val() + '');\n        if (/^[\\d]{11}$/g.test(mobile)) {\n            $errorPhone.empty();\n            return mobile;\n        } else {\n            $errorPhone.html('手机号输入错误!');\n            return false;\n        }\n    };\n\n    const validateDescription = ()=> {\n        let description = $.trim($projectDescription.val() + '');\n        if (description.length) {\n            $errorDescription.empty();\n            return description;\n        } else {\n            $errorDescription.html('请输入项目描述内容!');\n            return false;\n        }\n    };\n\n    $introducerMobile.on('keyup', (e)=> {\n        filterMobileInput($introducerMobile);\n    }).on('change blur', (e)=> {\n        validateMobile();\n    }).on('focus', (e)=> {\n        $errorPhone.empty();\n    });\n\n    $projectDescription.on('change blur', (e)=> {\n        validateDescription();\n    }).on('focus', (e)=> {\n        $errorDescription.empty();\n    });\n\n\n    $successDialog.on('click', '.modal-dialog-close', (e)=> {\n        $successDialog.fadeOut(300);\n    });\n\n    $form.on('submit', (e)=> {\n        e.preventDefault();\n        let mobile = validateMobile();\n        let description = validateDescription();\n        if (mobile && description) {\n            request('/api/1.0/proj/add.json', {\n                mobile,\n                description\n            }, 'POST').then(()=> {\n                $successDialog.fadeIn(300);\n            }).catch(()=> {\n                alert('提交失败, 请稍后再试!');\n            });\n        }\n    });\n})();\n\n(()=> {\n    const $modalBox = $('.modal-box');\n\n    let projectsList = [\n        {\n            'projectName':'中电投天津',\n            'projectType':'保障房建设',\n            'projectTime':'2年',\n            'projectInfo':'用于补充公司现金流，承载天津市保障房建设。'\n        },\n        {\n            'projectName':'中电投西安',\n            'projectType':'基础建设项目',\n            'projectTime':'2年',\n            'projectInfo':'用于认购光大信托计划,用于向“绿源公司”发放信托贷款，用于建设西安绿源农产品批发市场项目。'\n        },\n        {\n            'projectName':'金元百利海安',\n            'projectType':'企业流贷',\n            'projectTime':'3年',\n            'projectInfo':'用于受让南通新沿海对海安经济技术开发区管委会的应收账款债 权,资金最终用于补充南通新沿海的流动资金。'\n        },\n        {\n            'projectName':'中电投金堂',\n            'projectType':'基础建设项目',\n            'projectTime':'2年',\n            'projectInfo':'用于认购光大信托先融锐金1号集合资金信托计划,补充公司流动资金,用于基础建设项目'\n        },\n        {\n            'projectName':'国信巴中',\n            'projectType':'基础建设项目',\n            'projectTime':'2年',\n            'projectInfo':'用于通江县壁州大道二期(高速连接道)建设项目用款。'\n        },\n        {\n            'projectName':'枢纽铜仁',\n            'projectType':'保障房建设项目',\n            'projectTime':'18个月',\n            'projectInfo':'用于贵州省铜仁市碧江区城市棚户区改造安置房项目'\n        },\n        {\n            'projectName':'枢纽余庆',\n            'projectType':'基础建设项目',\n            'projectTime':'1年',\n            'projectInfo':'用于贵州遵义市余庆县敖溪镇至关兴镇道路工程建设'\n        },\n        {\n            'projectName':'中电投黔南州',\n            'projectType':'基础建设项目',\n            'projectTime':'2年',\n            'projectInfo':'用于认购光大信托先融黔南1号集合资金信托计划,补充公司流 动资金,用于基础建设项目 '\n        },\n    ];\n\n    const template = ({projectName, projectTime, projectType, projectInfo})=>{\n        return `<h4>${projectName}</h4><h3>${projectTime}</h3><h6>${projectType}</h6><p>${projectInfo}</p>\n        <img src=\"https://res.fudou6.com/c/4/20160801/zupNy5waWNfaGQ=_257x423.jpg\">\n        <a href=\"javascript:void('close');\" class=\"modal-dialog-close\">×</a>`;\n    };\n\n    const $modalDialog = $('.modal-dialog',$modalBox);\n\n    $('.hot-project-address').on('click','a', (e)=> {\n        e.preventDefault();\n        var target=e.target;\n        let html = '';\n        let index = $(target).data(index).index;\n        let project = projectsList[index];\n        if(project){\n            html= template(project);\n            $modalDialog.html(html);\n            $modalBox.fadeIn(300);\n\n        }\n    });\n\n    $modalBox.on('click', '.modal-dialog-close', (e)=> {\n        e.preventDefault();\n        $modalBox.fadeOut(300);\n    });\n\n\n})();\n"]}
->>>>>>> 154aa487f78754ac42ca3b115af181d72b5dad65
+{"version":3,"sources":["project.jsx"],"names":[],"mappings":"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","file":"project.js","sourcesContent":["/**\n * Created by Administrator on 2016/7/27.\n */\n(()=> {\n    const $form = $('#container .introducer');\n    const $submit = $('input[type=\"submit\"]', $form);\n    const $introducerMobile = $('#introducerMobile', $form);\n    const $projectDescription = $('#projectDescription', $form);\n    const $errorPhone = $('.error-phone', $form);\n    const $errorDescription = $('.error-description', $form);\n    const $successDialog = $('.modal-box-success');\n\n    const filterMobileInput = ($mobile)=> {\n        $mobile.val(($mobile.val() + '').replace(/[^\\d]/g, ''));\n    };\n\n    const validateMobile = ()=> {\n        let mobile = $.trim($introducerMobile.val() + '');\n        if (/^[\\d]{11}$/g.test(mobile)) {\n            $errorPhone.empty();\n            return mobile;\n        } else {\n            $errorPhone.html('手机号输入错误!');\n            return false;\n        }\n    };\n\n    const validateDescription = ()=> {\n        let description = $.trim($projectDescription.val() + '');\n        if (description.length) {\n            $errorDescription.empty();\n            return description;\n        } else {\n            $errorDescription.html('请输入项目描述内容!');\n            return false;\n        }\n    };\n\n    $introducerMobile.on('keyup', (e)=> {\n        filterMobileInput($introducerMobile);\n    }).on('change blur', (e)=> {\n        validateMobile();\n    }).on('focus', (e)=> {\n        $errorPhone.empty();\n    });\n\n    $projectDescription.on('change blur', (e)=> {\n        validateDescription();\n    }).on('focus', (e)=> {\n        $errorDescription.empty();\n    });\n\n\n    $successDialog.on('click', '.modal-dialog-close', (e)=> {\n        $successDialog.fadeOut(300);\n    });\n\n    $form.on('submit', (e)=> {\n        e.preventDefault();\n        let mobile = validateMobile();\n        let description = validateDescription();\n        if (mobile && description) {\n            request('/api/1.0/proj/add.json', {\n                mobile,\n                description\n            }, 'POST').then(()=> {\n                $successDialog.fadeIn(300);\n            }).catch(()=> {\n                alert('提交失败, 请稍后再试!');\n            });\n            $introducerMobile.val('');\n            $projectDescription.val('');\n        }\n    });\n})();\n\n(()=> {\n    const $modalBox = $('.modal-box');\n\n    let projectsList = [\n        {\n            'projectName':'中电投天津',\n            'projectType':'保障房建设',\n            'projectTime':'2年',\n            'projectInfo':'用于补充公司现金流，承载天津市保障房建设。'\n        },\n        {\n            'projectName':'中电投西安',\n            'projectType':'基础建设项目',\n            'projectTime':'2年',\n            'projectInfo':'用于认购光大信托计划,用于向“绿源公司”发放信托贷款，用于建设西安绿源农产品批发市场项目。'\n        },\n        {\n            'projectName':'金元百利海安',\n            'projectType':'企业流贷',\n            'projectTime':'3年',\n            'projectInfo':'用于受让南通新沿海对海安经济技术开发区管委会的应收账款债 权,资金最终用于补充南通新沿海的流动资金。'\n        },\n        {\n            'projectName':'中电投金堂',\n            'projectType':'基础建设项目',\n            'projectTime':'2年',\n            'projectInfo':'用于认购光大信托先融锐金1号集合资金信托计划,补充公司流动资金,用于基础建设项目'\n        },\n        {\n            'projectName':'国信巴中',\n            'projectType':'基础建设项目',\n            'projectTime':'2年',\n            'projectInfo':'用于通江县壁州大道二期(高速连接道)建设项目用款。'\n        },\n        {\n            'projectName':'枢纽铜仁',\n            'projectType':'保障房建设项目',\n            'projectTime':'18个月',\n            'projectInfo':'用于贵州省铜仁市碧江区城市棚户区改造安置房项目'\n        },\n        {\n            'projectName':'枢纽余庆',\n            'projectType':'基础建设项目',\n            'projectTime':'1年',\n            'projectInfo':'用于贵州遵义市余庆县敖溪镇至关兴镇道路工程建设'\n        },\n        {\n            'projectName':'中电投黔南州',\n            'projectType':'基础建设项目',\n            'projectTime':'2年',\n            'projectInfo':'用于认购光大信托先融黔南1号集合资金信托计划,补充公司流 动资金,用于基础建设项目 '\n        },\n    ];\n\n    const template = ({projectName, projectTime, projectType, projectInfo})=>{\n        return `<h4>${projectName}</h4><h3>${projectTime}</h3><h6>${projectType}</h6><p>${projectInfo}</p>\n        <img src=\"https://res.fudou6.com/c/4/20160801/zupNy5waWNfaGQ=_257x423.jpg\">\n        <a href=\"javascript:void('close');\" class=\"modal-dialog-close\">×</a>`;\n    };\n\n    const $modalDialog = $('.modal-dialog',$modalBox);\n\n    $('.hot-project-address').on('click','a', (e)=> {\n        e.preventDefault();\n        var target=e.target;\n        let html = '';\n        let index = $(target).data(index).index;\n        let project = projectsList[index];\n        if(project){\n            html= template(project);\n            $modalDialog.html(html);\n            $modalBox.fadeIn(300);\n\n        }\n    });\n\n    $modalBox.on('click', '.modal-dialog-close', (e)=> {\n        e.preventDefault();\n        $modalBox.fadeOut(300);\n    });\n\n\n})();\n"]}
\ 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}}