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

# Conflicts:
#	public/javascripts/project.js
#	public/stylesheets/project.css
#	public/stylesheets/project.less
#	views/index.hbs
#	views/project.hbs

public/javascripts/project.js

@@ -7,7 +7,8 @@
     var $errorDescription = $('.error-description');
     var $introducerMobile = $('#introducerMobile');
     var $projectDescription = $('#projectDescription');
-    var $modalBox = $('.modal-box');
+    var $modalBoxProject = $('.modal-box-project');
+    var $modalBoxSuccess = $('.modal-box-success');
     var $introducer = $('#introducer');
 
 
@@ -89,5 +90,17 @@
         $modalBox.fadeOut(300);
     });
 
+    /**
+     * 项目提交弹框
+     */
+    $submit.on('click',function(e){
+        e.preventDefault();
+        $modalBoxSuccess.fadeIn(300);
+    });
+    $('.modal-box-success a').on('click',function(e){
+        e.preventDefault();
+        $modalBoxSuccess.fadeOut(300);
+    });
+
 
 })();
\ No newline at end of file

public/javascripts/project.min.js

-(function(){var $submit=$("#submit");var $errorPhone=$(".error-phone");var $errorDescription=$(".error-description");var $introducerMobile=$("#introducerMobile");var $projectDescription=$("#projectDescription");var $modalBox=$(".modal-box");var $introducer=$("#introducer");function valiTel(tel){var msg=/^[\d]/g.test(tel)?"":"电话号码有误，请再次输入！";/^[\d]/g.test(tel[tel.length-1])?$introducerMobile.val(tel):$introducerMobile.val(tel.slice(0,tel.length-1));console.log(tel[tel.length-1]);console.log(/^[\d]/g.test(tel[tel.length-1]));!msg&&$errorPhone.html(msg);$errorPhone.data("vali",!msg);disableSubmit();return!msg}function valiDescription(text){$errorDescription.html(text?"":"项目描述不能为空!");$errorDescription.data("vali",text);disableSubmit();return!text}function disableSubmit(){$errorPhone.data("vali")&&$errorDescription.data("vali")&&$submit.attr("disabled",false).css("background","#ff4a4b")}$introducerMobile.on({keyup:function(e){valiTel(($introducerMobile.val()+"").trim())}});$projectDescription.on({keyup:function(e){valiDescription(($projectDescription.val()+"").trim())}});$(".hot-project-address a").click(function(e){e.preventDefault();$modalBox.fadeIn(300)});$("#modalBoxHidden").click(function(e){e.preventDefault();$modalBox.fadeOut(300)})})();
\ No newline at end of file
+(function(){var $submit=$("#submit");var $errorPhone=$(".error-phone");var $errorDescription=$(".error-description");var $introducerMobile=$("#introducerMobile");var $projectDescription=$("#projectDescription");var $modalBoxProject=$(".modal-box-project");var $modalBoxSuccess=$(".modal-box-success");var $introducer=$("#introducer");function valiTel(tel){var msg=/^[\d]/g.test(tel)?"":"电话号码有误，请再次输入！";/^[\d]/g.test(tel[tel.length-1])?$introducerMobile.val(tel):$introducerMobile.val(tel.slice(0,tel.length-1));console.log(tel[tel.length-1]);console.log(/^[\d]/g.test(tel[tel.length-1]));!msg&&$errorPhone.html(msg);$errorPhone.data("vali",!msg);disableSubmit();return!msg}function valiDescription(text){$errorDescription.html(text?"":"项目描述不能为空!");$errorDescription.data("vali",text);disableSubmit();return!text}function disableSubmit(){$errorPhone.data("vali")&&$errorDescription.data("vali")&&$submit.attr("disabled",false).css("background","#ff4a4b")}$introducerMobile.on({keyup:function(e){valiTel(($introducerMobile.val()+"").trim())}});$projectDescription.on({keyup:function(e){valiDescription(($projectDescription.val()+"").trim())}});$(".hot-project-address a").click(function(e){e.preventDefault();$modalBox.fadeIn(300)});$("#modalBoxHidden").click(function(e){e.preventDefault();$modalBox.fadeOut(300)});$submit.on("click",function(e){e.preventDefault();$modalBoxSuccess.fadeIn(300)});$(".modal-box-success a").on("click",function(e){e.preventDefault();$modalBoxSuccess.fadeOut(300)})})();
\ No newline at end of file

public/stylesheets/project.css

@@ -395,7 +395,7 @@
   right: 55px;
   top: 108px;
 }
-.modal-box .modal-dialog b {
+.modal-box .modal-dialog a {
   font-size: 42px;
   position: absolute;
   right: 27px;

public/stylesheets/project.less

@@ -493,7 +493,7 @@
       right: 55px;
       top: 108px;
     }
-    b {
+    a {
       font-size: 42px;
       position: absolute;
       right: 27px;

views/product.hbs

@@ -59,7 +59,6 @@
             <span class="errorName"></span>
             <span class="errorTel" ></span>
         </div>
-
     </form>
 
 
@@ -163,7 +162,5 @@
             <h3>恭喜你预约成功</h3>
         </div>
         <p>富豆工作人员将第一时间与您取得联系!</p>
-
-
     </div>
 </div>
\ No newline at end of file