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

@@ -11,7 +11,7 @@
                 </span>
                 </span>
                 <ul id="country-code-list" class="country-code-list">
                 <ul id="country-code-list" class="country-code-list">
                     {{# countryList}}
                     {{# countryList}}
-                    <li data-cc="+{{code}}">{{name}} +{{code}}</li>
+                    <li data-cc="{{areaCode}}">{{name}} {{areaCode}}</li>
                     {{/ countryList}}                      
                     {{/ countryList}}                      
                 </ul>
                 </ul>
             </div>
             </div>
@@ -28,7 +28,7 @@
                     </li>
                     </li>
                     <li class="input-container-li clearfix">
                     <li class="input-container-li clearfix">
                         <input id="captcha" class="input va captcha" type="text" name="captcha" placeholder="验证码" autocomplete="off" maxlength="4">
                         <input id="captcha" class="input va captcha" type="text" name="captcha" placeholder="验证码" autocomplete="off" maxlength="4">
-                        <img id="captcha-img" class="captcha-img" src="http://web.dev.yohobuy.com/passport/images" alt="">
+                        <img id="captcha-img" class="captcha-img" src="{{captchaUrl}}" alt="">
                         <a id="change-captcha" class="link change-captcha">换一张</a>
                         <a id="change-captcha" class="link change-captcha">换一张</a>
                         <span id="captcha-err" class="err-tip captcha-err hide">
                         <span id="captcha-err" class="err-tip captcha-err hide">
                             <i></i>
                             <i></i>

@@ -1483,305 +1483,309 @@ require("js/product/sort-pager");
 require("js/product/product");
 require("js/product/product");
 });
 });
 define("js/product/filter", ["jquery"], function(require, exports, module){
 define("js/product/filter", ["jquery"], function(require, exports, module){
-/**
- * 商品筛选逻辑
- * @author: xuqi<qi.xu@yoho.cn>
- * @date: 2015/12/4
- */
-
-var $ = require("jquery");
-
-var checkUnicode = {
-    unchecked: '&#xe613;',
-    checked: '&#xe612;'
-},
-moreUnicode = {
-    up: '&#xe610;',
-    down: '&#xe600;'
-};
-
-//品牌相关变量
-var $brandDefault = $('.brand .default'),
-    $brandPanel = $('.brand .brand-panel'),
-    $brandAttrs = $('.brand .attr'),
-    $brandMore = $('#brand-more'),
-    $brandMulti = $('#brand-multi');
-
-var $brandMoreTxt, $brandMoreIcon;
-
-//价格相关变量
-var $udPrice = $('.ud-price-range'),
-    interReg = /^\d+$/,
-    $limit, $min, $max, $btn;
-
-//分类相关变量
-var $sortSub = $('.sort-sub-wrap');
-
-//高级选项相关变量
-var $seniorSubWrap = $('.senior-sub-wrap'),
-    $seniorAttrWrap = $('.senior-attr-wrap');
-
-var seniorHoverTime, hoveredIndex;
-
-//清除checkbox选中状态
-function clearChecked($checkbox) {
-    $checkbox.removeClass('checked').html(checkUnicode.unchecked);
-}
-
-//显示更多品牌面板
-function brandShowMore() {
-    $brandDefault.addClass('hide');
-    $brandPanel.removeClass('hide');
-}
-
-//隐藏更多品牌面板
-function brandHideMore() {
-    $brandPanel.addClass('hide');
-    $brandDefault.removeClass('hide');
-}
-
-//url构造&跳转
-function uriLoc(attr, val) {
-    var href = decodeURIComponent(window.location.search),
-        query = attr + '=' + val,
-        newHref;
-
-    if (href === '') {
-        newHref = '?' + query;
-    } else {
-        newHref = href + '&' + query;
-    }
-
-    window.location.href = newHref;
-}
-
-//隐藏高级选项面板
-function hideSeniorPanel(index) {
-    $seniorSubWrap.children('.senior-sub:eq(' + hoveredIndex + ')').addClass('hide');
-    $seniorAttrWrap.children('.attr:eq(' + hoveredIndex + ')').removeClass('hover');
-    hoveredIndex = -1;
-}
-
-//屏蔽筛选项双击文字选中
-$('.filter-box').on('selectstart', '.attr, .brands-index span', function() {
-    return false;
-});
-
-//【分类】
-$('.sort-pre').on('click', 'li', function() {
-    var $this = $(this),
-        index = $this.index();
-
-    $this.siblings('.active').removeClass('active');
-    $this.addClass('active');
-
-    $sortSub.children(':not(.hide)').addClass('hide');
-    $sortSub.children(':eq(' + index + ')').removeClass('hide');
-});
-
-//【品牌】
-if ($brandMore.length > 0) {
-    $brandMoreTxt = $brandMore.children('em');
-    $brandMoreIcon = $brandMore.children('.iconfont');
-}
-
-//【品牌】多选
-$brandMulti.click(function() {
-    if ($brandPanel.css('display') === 'none') {
-
-        //显示品牌面板
-        brandShowMore();
-    }
-
-    $brandPanel.addClass('multi'); //显示出checkbox
-    $(this).addClass('hide');
-});
-
-//【品牌】更多
-$brandMore.click(function() {
-    var $this = $(this);
-
-    if ($this.hasClass('more')) {
-        brandHideMore();
-
-        $brandMoreTxt.text('更多');
-        $brandMoreIcon.html(moreUnicode.down);
-    } else {
-        brandShowMore();
-
-        $brandMoreTxt.text('收起');
-        $brandMoreIcon.html(moreUnicode.up);
-    }
-
-    $(this).toggleClass('more');
-});
-
-//【品牌】索引
-$('.brands-index').on('click', 'span', function() {
-    var $this = $(this),
-        index = $this.data('index');
-
-    if ($this.index() === 0) {
-
-        //全部
-        $brandAttrs.removeClass('hide');
-    } else {
-        $brandAttrs.addClass('hide').filter('[data-index=' + index + ']').removeClass('hide');
-    }
-});
-
-//【品牌】搜索
-$('#brand-search-input').keyup(function() {
-    var val = $(this).val().toLowerCase();
-
-    if (val === '') {
-        $brandAttrs.removeClass('hide');
-    } else {
-        $brandAttrs.addClass('hide').filter('[data-key*=' + val + ']').removeClass('hide');
-    }
-});
-
-//【品牌】多选确定
-$('#brand-multi-ok').click(function() {
-    var val = '';
-
-    if ($(this).hasClass('dis')) {
-        return;
-    }
-
-    $brandPanel.find('.checked').each(function() {
-        var id = $(this).data('id');
-
-        val += (val === '') ? id : (',' + id);
-    });
-
-    uriLoc('brand', val);
-});
-
-//【品牌/高级选项】多选取消
-$('.multi-select-cancel').click(function() {
-    var $panel = $(this).closest('.multi');
-
-    if ($panel.hasClass('brand-panel')) {
-        brandHideMore();
-
-        $brandMulti.removeClass('hide'); //显示多选按钮
-    }
-
-    $panel.removeClass('multi');
-    clearChecked($panel.find('.checkbox.checked')); //清除选中状态
-});
-
-//【品牌/高级选项】checkbox
-$('.check-container').on('click', '.attr', function() {
-    var $this = $(this),
-        $check = $this.find('.checkbox'),
-        $btnOk = $this.parent('.check-container').next('.btns').find('.multi-select-ok');
-
-    $check.toggleClass('checked');
-
-    if ($check.hasClass('checked')) {
-        $check.html(checkUnicode.checked);
-    } else {
-        $check.html(checkUnicode.unchecked);
-    }
-
-    //更新按钮状态
-    if ($check.hasClass('checked') ||
-        $this.siblings('.attr').find('.checked').length > 0) {
-        $btnOk.removeClass('dis');
-    } else {
-        $btnOk.addClass('dis');
-    }
-});
-
-//【品牌/高级选项】当多选时阻止链接默认跳转
-$('.brand, .senior').on('click', '.attr > a', function(e) {
-    if ($(this).closest('.multi').length > 0) {
-        e.preventDefault();
-    }
-});
-
-//【价格】用户定义价格处理
-if ($udPrice.length > 0) {
-    $limit = $udPrice.find('.limit');
-    $min = $limit.filter('.min');
-    $max = $limit.filter('.max');
-    $btn = $udPrice.find('.price-sure');
-
-    //【价格】输入
-    $limit.keyup(function() {
-        var min = $.trim($min.val()),
-            max = $.trim($max.val()),
-            isMinInt = interReg.test(min),
-            isMaxInt = interReg.test(max);
-
-        if (isMaxInt && (min === '' || isMinInt) ||
-            isMinInt && (max === '' || isMaxInt)
-            ) {
-            $btn.removeClass('hide');
-        } else {
-            $btn.addClass('hide');
-        }
-    });
-
-    //【价格】多项查询
-    $btn.click(function() {
-        var min = $.trim($min.val()),
-            max = $.trim($max.val()),
-            tmp;
-
-        //对于min大于max的情况，交换位置
-        if (min !== '' && max !== '' && +min > +max) {
-            tmp = max;
-            max = min;
-            min = tmp;
-        }
-
-        uriLoc('price', min + ',' + max);
-    });
-}
-
-//【高级选项】鼠标移入显示子项
-$seniorAttrWrap.on('mouseenter', '.attr', function() {
-    var index = $(this).addClass('hover').index();
-
-    $seniorSubWrap.children('.senior-sub:eq(' + index + ')').removeClass('hide');
-}).on('mouseleave', '.attr', function() {
-    var $this = $(this),
-        index = $this.index();
-
-    hoveredIndex = index;
-
-    seniorHoverTime = setTimeout(function() {
-        hideSeniorPanel();
-    }, 100);
-});
-
-//【高级选项】多选
-$('.senior-sub').on('click', '.multi-select', function() {
-    $(this).closest('.senior-sub').addClass('multi');
-}).on('click', '.multi-select-ok', function() {
-    var $btn = $(this),
-        $sub = $btn.closest('.senior-sub'),
-        val = '';
-
-    if ($btn.hasClass('dis')) {
-        return;
-    }
-
-    $sub.find('.checked').each(function() {
-        var id = $(this).data('id');
-
-        val += (val === '') ? id : (',' + id);
-    });
-
-    uriLoc($sub.data('attr'), val);
-}).on('mouseenter', function() {
-    clearTimeout(seniorHoverTime);
-}).on('mouseleave', function() {
-    hideSeniorPanel();
+/**
+ * 商品筛选逻辑
+ * @author: xuqi<qi.xu@yoho.cn>
+ * @date: 2015/12/4
+ */
+
+var $ = require("jquery");
+
+var checkUnicode = {
+    unchecked: '&#xe613;',
+    checked: '&#xe612;'
+},
+moreUnicode = {
+    up: '&#xe610;',
+    down: '&#xe600;'
+};
+
+//品牌相关变量
+var $brandDefault = $('.brand .default'),
+    $brandPanel = $('.brand .brand-panel'),
+    $brandAttrs = $('.brand .attr'),
+    $brandMore = $('#brand-more'),
+    $brandMulti = $('#brand-multi');
+
+var $brandMoreTxt, $brandMoreIcon;
+
+//价格相关变量
+var $udPrice = $('.ud-price-range'),
+    interReg = /^\d+$/,
+    $limit, $min, $max, $btn;
+
+//分类相关变量
+var $sortSub = $('.sort-sub-wrap');
+
+//高级选项相关变量
+var $seniorSubWrap = $('.senior-sub-wrap'),
+    $seniorAttrWrap = $('.senior-attr-wrap');
+
+var seniorHoverTime, hoveredIndex;
+
+//清除checkbox选中状态
+function clearChecked($checkbox) {
+    $checkbox.removeClass('checked').html(checkUnicode.unchecked);
+}
+
+//显示更多品牌面板
+function brandShowMore() {
+    $brandDefault.addClass('hide');
+    $brandPanel.removeClass('hide');
+}
+
+//隐藏更多品牌面板
+function brandHideMore() {
+    $brandPanel.addClass('hide');
+    $brandDefault.removeClass('hide');
+}
+
+//url构造&跳转
+function uriLoc(attr, val) {
+    var href = decodeURIComponent(window.location.search),
+        query = attr + '=' + val,
+        newHref;
+
+    if (href === '') {
+        newHref = '?' + query;
+    } else {
+        newHref = href + '&' + query;
+    }
+
+    window.location.href = newHref;
+}
+
+//隐藏高级选项面板
+function hideSeniorPanel(index) {
+    $seniorSubWrap.children('.senior-sub:eq(' + hoveredIndex + ')').addClass('hide');
+    $seniorAttrWrap.children('.attr:eq(' + hoveredIndex + ')').removeClass('hover');
+    hoveredIndex = -1;
+}
+
+//屏蔽筛选项双击文字选中
+$('.filter-box').on('selectstart', '.attr, .brands-index span', function() {
+    return false;
+});
+
+//【分类】
+$('.sort-pre').on('click', 'li', function() {
+    var $this = $(this),
+        index = $this.index();
+
+    $this.siblings('.active').removeClass('active');
+    $this.addClass('active');
+
+    $sortSub.children(':not(.hide)').addClass('hide');
+    $sortSub.children(':eq(' + index + ')').removeClass('hide');
+});
+
+//【品牌】
+if ($brandMore.length > 0) {
+    $brandMoreTxt = $brandMore.children('em');
+    $brandMoreIcon = $brandMore.children('.iconfont');
+}
+
+//【品牌】多选
+$brandMulti.click(function() {
+    if ($brandPanel.css('display') === 'none') {
+
+        //显示品牌面板
+        brandShowMore();
+    }
+
+    $brandPanel.addClass('multi'); //显示出checkbox
+    $(this).addClass('hide');
+});
+
+//【品牌】更多
+$brandMore.click(function() {
+    var $this = $(this);
+
+    if ($this.hasClass('more')) {
+        brandHideMore();
+
+        $brandMoreTxt.text('更多');
+        $brandMoreIcon.html(moreUnicode.down);
+    } else {
+        brandShowMore();
+
+        $brandMoreTxt.text('收起');
+        $brandMoreIcon.html(moreUnicode.up);
+    }
+
+    $(this).toggleClass('more');
+});
+
+//【品牌】索引
+$('.brands-index').on('click', 'span', function() {
+    var $this = $(this),
+        index = $this.data('index');
+
+    if ($this.index() === 0) {
+
+        //全部
+        $brandAttrs.removeClass('hide');
+    } else {
+        $brandAttrs.addClass('hide').filter('[data-index=' + index + ']').removeClass('hide');
+    }
 });
 });
+
+//【品牌】搜索
+$('#brand-search-input').keyup(function() {
+    var val = $(this).val().toLowerCase();
+
+    if (val === '') {
+        $brandAttrs.removeClass('hide');
+    } else {
+        $brandAttrs.addClass('hide').filter('[data-key*=' + val + ']').removeClass('hide');
+    }
+});
+
+//【品牌】多选确定
+$('#brand-multi-ok').click(function() {
+    var val = '';
+
+    if ($(this).hasClass('dis')) {
+        return;
+    }
+
+    $brandPanel.find('.checked').each(function() {
+        var id = $(this).data('id');
+
+        val += (val === '') ? id : (',' + id);
+    });
+
+    uriLoc('brand', val);
+});
+
+//【品牌/高级选项】多选取消
+$('.multi-select-cancel').click(function() {
+    var $panel = $(this).closest('.multi');
+
+    if ($panel.hasClass('brand-panel')) {
+        brandHideMore();
+
+        $brandMulti.removeClass('hide'); //显示多选按钮
+    }
+
+    $panel.removeClass('multi');
+    clearChecked($panel.find('.checkbox.checked')); //清除选中状态
+});
+
+//【品牌/高级选项】checkbox
+$('.check-container').on('click', '.attr', function() {
+    var $this = $(this),
+        $check = $this.find('.checkbox'),
+        $btnOk = $this.parent('.check-container').next('.btns').find('.multi-select-ok');
+
+    $check.toggleClass('checked');
+
+    if ($check.hasClass('checked')) {
+        $check.html(checkUnicode.checked);
+    } else {
+        $check.html(checkUnicode.unchecked);
+    }
+
+    //更新按钮状态
+    if ($check.hasClass('checked') ||
+        $this.siblings('.attr').find('.checked').length > 0) {
+        $btnOk.removeClass('dis');
+    } else {
+        $btnOk.addClass('dis');
+    }
+});
+
+//【品牌/高级选项】当多选时阻止链接默认跳转
+$('.brand, .senior').on('click', '.attr > a', function(e) {
+    if ($(this).closest('.multi').length > 0) {
+        e.preventDefault();
+    }
+});
+
+//【价格】用户定义价格处理
+if ($udPrice.length > 0) {
+    $limit = $udPrice.find('.limit');
+    $min = $limit.filter('.min');
+    $max = $limit.filter('.max');
+    $btn = $udPrice.find('.price-sure');
+
+    //【价格】输入
+    $limit.keyup(function() {
+        var min = $.trim($min.val()),
+            max = $.trim($max.val()),
+            isMinInt = interReg.test(min),
+            isMaxInt = interReg.test(max);
+
+        if (isMaxInt && (min === '' || isMinInt) ||
+            isMinInt && (max === '' || isMaxInt)
+            ) {
+            $btn.removeClass('hide');
+        } else {
+            $btn.addClass('hide');
+        }
+    });
+
+    //【价格】多项查询
+    $btn.click(function() {
+        var min = $.trim($min.val()),
+            max = $.trim($max.val()),
+            tmp;
+
+        //对于min大于max的情况，交换位置
+        if (min !== '' && max !== '' && +min > +max) {
+            tmp = max;
+            max = min;
+            min = tmp;
+        }
+
+        uriLoc('price', min + ',' + max);
+    });
+}
+
+//【高级选项】鼠标移入显示子项
+$seniorAttrWrap.on('mouseenter', '.attr', function() {
+    var $this = $(this);
+    var index = $this.index();
+
+    $this.addClass('hover').siblings().removeClass('hover');
+
+    $seniorSubWrap.children('.senior-sub:eq(' + index + ')').removeClass('hide').siblings().addClass('hide');
+}).on('mouseleave', '.attr', function() {
+    var $this = $(this),
+        index = $this.index();
+
+    hoveredIndex = index;
+
+    seniorHoverTime = setTimeout(function() {
+        hideSeniorPanel();
+    }, 100);
+});
+
+//【高级选项】多选
+$('.senior-sub').on('click', '.multi-select', function() {
+    $(this).closest('.senior-sub').addClass('multi');
+}).on('click', '.multi-select-ok', function() {
+    var $btn = $(this),
+        $sub = $btn.closest('.senior-sub'),
+        val = '';
+
+    if ($btn.hasClass('dis')) {
+        return;
+    }
+
+    $sub.find('.checked').each(function() {
+        var id = $(this).data('id');
+
+        val += (val === '') ? id : (',' + id);
+    });
+
+    uriLoc($sub.data('attr'), val);
+}).on('mouseenter', function() {
+    clearTimeout(seniorHoverTime);
+}).on('mouseleave', function() {
+    hideSeniorPanel();
+});
+
 });
 });
 define("js/product/sort-pager", ["jquery"], function(require, exports, module){
 define("js/product/sort-pager", ["jquery"], function(require, exports, module){
 /**
 /**
@@ -3962,7 +3966,7 @@ function picCaptchaAjaxFn(page, callback) {
         type: 'POST',
         type: 'POST',
         url: url,
         url: url,
         data: {
         data: {
-            code: $ca.val()
+            verifyCode: $ca.val()
 
 
             //mobile: $pn.val(),
             //mobile: $pn.val(),
             //area: $region.text().split('+')[1]
             //area: $region.text().split('+')[1]
@@ -3995,7 +3999,7 @@ function msgCaptchaAjaxFn(page, callback) {
         type: 'POST',
         type: 'POST',
         url: url,
         url: url,
         data: {
         data: {
-            code: $ca.val(),
+            verifyCode: $ca.val(),
             mobile: $pn.val(),
             mobile: $pn.val(),
             area: $region.text().split('+')[1]
             area: $region.text().split('+')[1]
         }
         }
@@ -4291,7 +4295,7 @@ exports.init = function(page) {
 
 
     $regionSelect.change(function() {
     $regionSelect.change(function() {
 
 
-        $region.text('+' + $('#region').val());
+        $region.text($('#region').val());
 
 
         validateRule(page, $pn, showErrTip); //验证
         validateRule(page, $pn, showErrTip); //验证
     });
     });
@@ -4319,7 +4323,7 @@ exports.init = function(page) {
             data: {
             data: {
                 area: $region.text().split('+')[1],
                 area: $region.text().split('+')[1],
                 mobile: $pn.val(),
                 mobile: $pn.val(),
-                code: $ca.val()
+                verifyCode: $ca.val()
             }
             }
         }).then(function(data) {
         }).then(function(data) {
             if (data.code === 200) {
             if (data.code === 200) {

@@ -218,10 +218,11 @@
     .price-sure {
     .price-sure {
         height: 24px;
         height: 24px;
         width: 44px;
         width: 44px;
-        border: 1px solid #e0e0e0;
-        background: #fff;
-        color: #666;
+        background: #333;
+        color: #fff;
         margin-left: 10px;
         margin-left: 10px;
+        outline: none;
+        border: none;
     }
     }
 
 
     .color-block {
     .color-block {

@@ -43,6 +43,7 @@
             color: #222;
             color: #222;
             cursor: pointer;
             cursor: pointer;
             margin-right: 10px;
             margin-right: 10px;
+            background: #fff;
         }
         }
 
 
         .iconfont {
         .iconfont {

@@ -22,6 +22,7 @@ class BackController extends WebAction
                 'coverImg' => $banner['img'],
                 'coverImg' => $banner['img'],
                 'countryCode' => '86',
                 'countryCode' => '86',
                 'countryName' => '中国',
                 'countryName' => '中国',
+                'captchaUrl'=>'/passport/images?t=1449799445',
                 'countryList' => RegData::getAreasData(),
                 'countryList' => RegData::getAreasData(),
             )
             )
         );
         );
@@ -40,7 +41,7 @@ class BackController extends WebAction
     {
     {
         $phoneNum = $this->post('phoneNum','');
         $phoneNum = $this->post('phoneNum','');
         $area = $this->post('area','86');
         $area = $this->post('area','86');
-        $captcha = $this->post('captcha','');
+        $verifyCode = $this->post('verifyCode','');
         if(Helpers::verifyEmail($phoneNum)){ //验证邮箱
         if(Helpers::verifyEmail($phoneNum)){ //验证邮箱
             $email = $phoneNum;
             $email = $phoneNum;
             $data = BackData::sendCodeToEmail($email);
             $data = BackData::sendCodeToEmail($email);
@@ -56,7 +57,7 @@ class BackController extends WebAction
             $data = BackData::sendCodeToMobile($mobile);
             $data = BackData::sendCodeToMobile($mobile);
             $this->setSession('phoneNum', $phoneNum);
             $this->setSession('phoneNum', $phoneNum);
             $this->setSession('area', $area);
             $this->setSession('area', $area);
-            $this->setSession('captcha', $captcha);
+            $this->setSession('verifyCode', $verifyCode);
             if($data['code'] == 200) {
             if($data['code'] == 200) {
                 $this->redirect('verification');
                 $this->redirect('verification');
             }
             }
@@ -75,23 +76,6 @@ class BackController extends WebAction
             $this->redirect('index');
             $this->redirect('index');
         }
         }
         $banner = PassportModel::getLeftBanner(PassportModel::BACK_LFFT_BANNER_CODE);
         $banner = PassportModel::getLeftBanner(PassportModel::BACK_LFFT_BANNER_CODE);
-        $simpleHeader = array(
-            'logo' => array(
-                'img' => 'http://static.yohobuy.com/newheader/img/logo_e.png',
-                'url' => 'http://www.yohobuy.com'
-            ),
-            'tool' => array(
-                'user' => '2586703@qq.com',
-                'userCenter' => '',
-                'loginHref' => '',
-                'logoutHref' => '',
-                'registerHref' => '',
-                'favoriteHref' => '',
-                'couponHref' => '',
-                'orderHref' => '',
-                'helpHref' => ''
-            )
-        );
         $data = array(
         $data = array(
             'simpleHeader' => PassportModel::getSimpleHeader(false),
             'simpleHeader' => PassportModel::getSimpleHeader(false),
             'sendEmail' => array(
             'sendEmail' => array(
@@ -176,7 +160,7 @@ class BackController extends WebAction
     public function verificationAction() {
     public function verificationAction() {
         $phoneNum = $this->getSession('phoneNum');
         $phoneNum = $this->getSession('phoneNum');
         $area = $this->getSession('area');
         $area = $this->getSession('area');
-        $captcha = $this->getSession('captcha');
+        $verifyCode = $this->getSession('verifyCode');
         if(empty($phoneNum)) {
         if(empty($phoneNum)) {
             $this->redirect('index');
             $this->redirect('index');
         }
         }

@@ -27,7 +27,7 @@ class RegisterController extends WebAction
                 'loginUrl' => '/signin.html?refer='.$refer,
                 'loginUrl' => '/signin.html?refer='.$refer,
                 'coverHref' => $cover['url'],
                 'coverHref' => $cover['url'],
                 'coverImg' => $cover['img'],
                 'coverImg' => $cover['img'],
-                'regBtnText' => '快速登录'
+                'regBtnText' => '立即注册'
             )
             )
         );
         );
         $this->setCookie('refer', $refer);
         $this->setCookie('refer', $refer);