Authored by xuqi

Merge branch 'feature/loadMore' into develop

... ... @@ -14,13 +14,11 @@
"main": "index.js",
"dependencies": {
"jquery": "1.8.3",
"jquery-pjax": "1.0.1",
"mlellipsis": "0.0.2",
"lazyload": "1.9.5",
"iscroll": "5.1.2",
"mustache": "2.0.0",
"underscore": "1.6.0",
"fastclick": "1.0.2"
"underscore": "1.6.0"
},
"devDependencies": {
"expect.js": "0.3.1"
... ...
... ... @@ -50,7 +50,8 @@ exports.init = function() {
//请求相关数据
var page = 1,
query = $('#query').val(), //无author时
gender = $('#gender').val();
gender = $('#gender').val(),
clientType = $('#client-type').val();
//定位登录提示相关变量
var $loginTip = $('#login-tip'),
... ... @@ -116,13 +117,15 @@ exports.init = function() {
if (hasAuthor) {
setting = {
page: ++page,
id: authorId
id: authorId,
client_type: clientType
};
} else {
setting = {
page: ++page,
query: query,
gender: gender
gender: gender,
client_type: clientType
};
}
... ...
... ... @@ -125,13 +125,13 @@
.sort {
position: absolute;
right: 0;
top: -10rem / $pxConvertRem;
width: 12px;
overflow: hidden;
top: -8rem / $pxConvertRem;
width: 32rem / $pxConvertRem;
vertical-align: top;
overflow: hidden;
i {
font-size: 10px;
font-size: 28rem / $pxConvertRem;
position: relative;
&.down {
... ...
... ... @@ -20,5 +20,6 @@
{{> common/load_more}}
<input id="query" type="hidden" value="{{query}}">
<input id="gender" type="hidden" value="{{gender}}">
<input id="client-type" type="hidden" value="{{client_type}}">
{{/ data}}
</div>
\ No newline at end of file
... ...