Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop

@@ -19,7 +19,7 @@
                 </div>
                 <div class="item-content">
                     <h2>{{title}}</h2>
-                    <p>¥{{# price}}<span>{{.}}</span>{{/ price}}¥{{sPrice}}</p>
+                    <p>{{# price}}<span>¥{{.}}</span>{{/ price}}¥{{sPrice}}</p>
                 </div>
             </li>
             {{/ list}} 

@@ -3532,7 +3532,7 @@ slide = new Slide({
     loop: false,
     auto: false,
     timeout: 2,
-    index: 1
+    index: 0
 });
 
 slide.on('change', function(data) {
@@ -4931,10 +4931,20 @@ exports.init = function(page) {
     $('#agree-terms').click(function() {
         if ($(this).attr('notchecked')) {
             $(this).removeAttr('notchecked');
+            $registerBtn.addClass('disable').attr('disabled', 'true');
         } else {
             $(this).attr('notchecked', 'true');
+            $registerBtn.removeClass('disable').removeAttr('disabled');
         }
+    });
+
+    // 按回车键提交
+    $registerPage.on('keydown', function(e) {
+        var key = e.which;
 
+        if (key === 13) {
+            $registerBtn.click();
+        }
     });
 
     $registerPage.find('.va').keyup(function() {
@@ -5041,7 +5051,6 @@ exports.init = function(page) {
 
     //ajax表单提交
     $registerBtn.click(function() {
-
         var url;
 
         if (page === 'reg') {
@@ -5111,7 +5120,8 @@ exports.init = function(page) {
 
         $captchaImg.attr('src', captchaImgSrc + '?t=' + time.getTime());
     });
-};
+};
+
 });
 define("js/passport/mail-phone-regx", [], function(require, exports, module){
 /**

@@ -422,10 +422,20 @@ exports.init = function(page) {
     $('#agree-terms').click(function() {
         if ($(this).attr('notchecked')) {
             $(this).removeAttr('notchecked');
+            $registerBtn.addClass('disable').attr('disabled', 'true');
         } else {
             $(this).attr('notchecked', 'true');
+            $registerBtn.removeClass('disable').removeAttr('disabled');
         }
+    });
+
+    // 按回车键提交
+    $registerPage.on('keydown', function(e) {
+        var key = e.which;
 
+        if (key === 13) {
+            $registerBtn.click();
+        }
     });
 
     $registerPage.find('.va').keyup(function() {
@@ -532,7 +542,6 @@ exports.init = function(page) {
 
     //ajax表单提交
     $registerBtn.click(function() {
-
         var url;
 
         if (page === 'reg') {
@@ -602,4 +611,4 @@ exports.init = function(page) {
 
         $captchaImg.attr('src', captchaImgSrc + '?t=' + time.getTime());
     });
-};
\ No newline at end of file
+};

@@ -70,6 +70,11 @@ class ToolsController extends WebAction
             }
         }
     }
+    
+    public function logAction()
+    {
+        print_r($_SERVER);
+    }
 }           
 
 ?>
\ No newline at end of file

-;woman首页
-routes.girlindex.type = "rewrite"
-routes.girlindex.match = "/woman"
-routes.girlindex.route.module = Index
-routes.girlindex.route.controller = Girls
-routes.girlindex.route.action = index
-
-;验证码
-routes.passportimage.type = "rewrite"
-routes.passportimage.match = "/passport/images"
-routes.passportimage.route.module = Passport
-routes.passportimage.route.controller = Images
-routes.passportimage.route.action = index
-
-; 登录页
-routes.login.type = "rewrite"
-routes.login.match = "/signin.html"
-routes.login.route.module = Passport
-routes.login.route.controller = Login
-routes.login.route.action = Index
-
-; 登录退出页
-routes.logout.type = "rewrite"
-routes.logout.match = "/logout.html"
-routes.logout.route.module = Passport
-routes.logout.route.controller = Login
-routes.logout.route.action = Out
-
-; 注册页
-routes.reg.type = "rewrite"
-routes.reg.match = "/reg.html"
-routes.reg.route.module = Passport
-routes.reg.route.controller = Register
+;默认首页
+routes.index.type = "rewrite"
+routes.index.match = "/index.html"
+routes.index.route.module = Index
+routes.index.route.controller = Index
+routes.index.route.action = Index
+
+;woman首页
+routes.girlindex.type = "rewrite"
+routes.girlindex.match = "/woman"
+routes.girlindex.route.module = Index
+routes.girlindex.route.controller = Girls
+routes.girlindex.route.action = index
+
+;验证码
+routes.passportimage.type = "rewrite"
+routes.passportimage.match = "/passport/images"
+routes.passportimage.route.module = Passport
+routes.passportimage.route.controller = Images
+routes.passportimage.route.action = index
+
+; 登录页
+routes.login.type = "rewrite"
+routes.login.match = "/signin.html"
+routes.login.route.module = Passport
+routes.login.route.controller = Login
+routes.login.route.action = Index
+
+; 登录退出页
+routes.logout.type = "rewrite"
+routes.logout.match = "/logout.html"
+routes.logout.route.module = Passport
+routes.logout.route.controller = Login
+routes.logout.route.action = Out
+
+; 注册页
+routes.reg.type = "rewrite"
+routes.reg.match = "/reg.html"
+routes.reg.route.module = Passport
+routes.reg.route.controller = Register
 routes.reg.route.action = Index
\ No newline at end of file