diff --git a/static/sass/category/_brand.scss b/static/sass/category/_brand.scss
index a34fe25..1b702b8 100644
--- a/static/sass/category/_brand.scss
+++ b/static/sass/category/_brand.scss
@@ -129,7 +129,7 @@
display: inline;
font-size: 28rem / $pxConvertRem;
vertical-align: middle;
- color: #444;
+ color: #666;
}
.clear-text {
diff --git a/template/www.yohobuy.com/partials/layout/page-footer.phtml b/template/www.yohobuy.com/partials/layout/page-footer.phtml
index 5e9baed..01e02ab 100644
--- a/template/www.yohobuy.com/partials/layout/page-footer.phtml
+++ b/template/www.yohobuy.com/partials/layout/page-footer.phtml
@@ -98,7 +98,7 @@
<li class="hide" key="2">
<form class="feed-back-form" action="#">
<div>您对新版还有哪些意见或建议？</div>
- <textarea name="answer" id="feedback-answer"></textarea>
+ <textarea name="answer" id="feedback-answer" class="feedback-answer"></textarea>
<div>
<span class="feed-back-btn button">提交</span>
</div>
diff --git a/template/www.yohobuy.com/partials/product/filter-box.phtml b/template/www.yohobuy.com/partials/product/filter-box.phtml
index a769ba5..1c181a7 100644
--- a/template/www.yohobuy.com/partials/product/filter-box.phtml
+++ b/template/www.yohobuy.com/partials/product/filter-box.phtml
@@ -208,22 +208,24 @@
<div class="senior-sub-wrap">
{{#each seniorChose}}
<div class="senior-sub hide" data-attr="{{attr}}">
- {{#if showMulti}}
- <span class="multi-select">多选 +</span>
- {{/if}}
- <ul class="clearfix check-container">
- {{#each sub}}
- <li class="attr {{#if checked}}checked{{/if}}">
- <a href="{{href}}">
- <span class="iconfont checkbox" data-id="{{id}}"></span>
- <span>{{name}}</span>
- </a>
- </li>
- {{/each}}
- </ul>
- <div class="btns">
- <button class="multi-select-ok dis">确定</button>
- <button class="multi-select-cancel">取消</button>
+ <div class="senior-content">
+ {{#if showMulti}}
+ <span class="multi-select">多选 +</span>
+ {{/if}}
+ <ul class="clearfix check-container">
+ {{#each sub}}
+ <li class="attr {{#if checked}}checked{{/if}}">
+ <a href="{{href}}">
+ <span class="iconfont checkbox" data-id="{{id}}"></span>
+ <span>{{name}}</span>
+ </a>
+ </li>
+ {{/each}}
+ </ul>
+ <div class="btns">
+ <button class="multi-select-ok dis">确定</button>
+ <button class="multi-select-cancel">取消</button>
+ </div>
</div>
</div>
{{/each}}
diff --git a/web-static/js/footer.js b/web-static/js/footer.js
index 645050b..48b590c 100644
--- a/web-static/js/footer.js
+++ b/web-static/js/footer.js
@@ -8,8 +8,6 @@ var $ = require('yoho.jquery');
var $returnTop = $('.return-top');
-var apiDomain;
-
/**
* 订阅
* @return {[type]} [description]
@@ -19,41 +17,36 @@ function actionSubscription() {
$subscriberBtn = $('#subscriber-btn'),
emailReg = /^[.\-_a-zA-Z0-9]+@[\-_a-zA-Z0-9]+\.[a-zA-Z0-9]/;
- var subscribeParam = {
- method: 'open.subscriber.subscriber',
- v: 1,
- return_type: 'jsonp',
- open_key: '12345'
- };
-
var iconCode = {
mail: '',
tick: ''
};
- var email = $.trim($subscriberBox.val());
-
- var params = {};
-
$subscriberBox.focus(function() {
$(this).val('').css('color', '');
$subscriberBtn.removeClass('done').html(iconCode.mail);
});
$subscriberBtn.click(function() {
+ var email = $.trim($subscriberBox.val());
+
if (email !== '' && emailReg.test(email)) {
- $.extend(params, subscribeParam, {
- email: email,
- tmp: Math.random(),
- uid: $.uid('_UID')
- });
try {
- $.getJSON('http://test.open.yohobuy.com' + '/?callback=?', params, function(data) {
- if (data.data.result === 1) {
- $subscriberBox.val('已订阅到:' + email);
- $subscriberBtn.addClass('done').html(iconCode.tick);
- } else {
- $subscriberBox.css('color', 'red');
+ $.ajax({
+ url: 'http://www.yohobuy.com/common/emailsubscriber',
+ dataType: 'jsonp',
+ data: {
+ email: email,
+ tmp: Math.random(),
+ uid: window.getUid()
+ },
+ success: function(data) {
+ if (data.data.result === 1) {
+ $subscriberBox.val('已订阅到:' + email);
+ $subscriberBtn.addClass('done').html(iconCode.tick);
+ } else {
+ $subscriberBox.css('color', 'red');
+ }
}
});
} catch (e) {
@@ -90,7 +83,6 @@ function actionhomeFootChange() {
var $this = $(this),
$li = $this.closest('li'),
index = $li.index(),
- params = {},
_solution = [];
var _answer = $li.find('.feedback-answer').val(),
@@ -101,28 +93,30 @@ function actionhomeFootChange() {
_solution.push($(this).val());
});
- params = {
- method: 'open.feedback.submit',
- feedback: _feedback || 0,
- question: _question || 0,
- answer: _answer || '',
- solution: _solution.join(',')
- };
-
- $.getData(apiDomain, params, function(data) {
- var next = index + 1;
-
- if (data.result === 1) {
- if (index === count - 1) {
- alert('感谢您的参与！');
- return;
- }
+ $.ajax({
+ url: 'http://www.yohobuy.com/common/suggestfeedback',
+ dataType: 'jsonp',
+ data: {
+ feedback_id: _feedback || 0,
+ question_id: _question || 0,
+ answer: _answer || '',
+ solution: _solution.join(',')
+ },
+ success: function(data) {
+ var next = index + 1;
+
+ if (~~data.data.result === 1) {
+ if (index === count - 1) {
+ alert('感谢您的参与！');
+ return;
+ }
- $li.addClass('hide');
+ $li.addClass('hide');
- $vote.eq(index + 1).removeClass('hide');
- $feedBackPage.children('.cur').removeClass('cur');
- $feedBackPage.eq(next).addClass('cur');
+ $vote.children(':eq(' + (index + 1) + ')').removeClass('hide');
+ $feedBackPage.children('.cur').removeClass('cur');
+ $feedBackPage.children(':eq(' + next + ')').addClass('cur');
+ }
}
});
});
diff --git a/web-static/sass/product/_filter-box.scss b/web-static/sass/product/_filter-box.scss
index be3005f..9cb592e 100644
--- a/web-static/sass/product/_filter-box.scss
+++ b/web-static/sass/product/_filter-box.scss
@@ -293,7 +293,6 @@
.senior {
padding-bottom: 6px;
- padding-right: 0;
.attr-content {
position: relative;
@@ -306,6 +305,8 @@
.senior-attr-wrap > .attr:hover,
.senior-attr-wrap > .attr.hover {
+ font-weight: bold;
+
> .iconfont {
visibility: hidden;
}
@@ -318,13 +319,13 @@
.senior-sub {
box-sizing: border-box;
position: absolute;
- padding: 15px 0 15px 91px;
+ padding: 0 15px 15px 91px;
left: -91px;
- right: -1px;
+ right: -16px;
top: 39px;
background: #fff;
border: 1px solid #dfdfdf;
- border-top-color: #eaeceb;
+ border-top: 0;
z-index: 2;
ul {
@@ -342,6 +343,11 @@
}
}
+ .senior-content {
+ padding-top: 15px;
+ border-top: 1px solid #eaeceb;
+ }
+
.senior-up-icon {
position: relative;
width: 100%;