Authored by htoooth

merge

... ... @@ -35,6 +35,16 @@ exports.escapeType = (value) => {
if (strs.length === 2) {
strs[2] = strs[1];
strs[1] = '        ';
return strs.join('');
}
if (strs.length === 3) {
strs[4] = strs[2];
strs[2] = strs[1];
strs[1] = '  ';
strs[3] = '  ';
return strs.join('');
}
return strs.join('');
};
... ...
... ... @@ -55,12 +55,13 @@
{{# description}}
<ul class="basic clearfix">
{{# basic}}
<li>
<li><em class="justpostion">
{{#if dColor}}
{{{escapeType key}}}: <span id="desc-color" class="valueSpace">{{value}}</span>
{{^}}
{{{escapeType key}}}: <span class="valueSpace">{{value}}</span>
{{/if}}
</em>
</li>
{{/ basic}}
</ul>
... ...
... ... @@ -18,15 +18,15 @@ module.exports = {
domains: {
// test2
singleApi: 'http://192.168.102.27:8092/brower/',
singleApi: 'http://192.168.102.27:8092/brower',
api: 'http://api-test2.yohops.com:9999/',
service: 'http://service-test2.yohops.com:9999/',
//api: 'http://api.yoho.cn/',
//service: 'http://service.yoho.cn/',
// api: 'http://api.yoho.cn/',
// service: 'http://service.yoho.cn/',
//api: 'http://dev-api.yohops.com:9999/',
//service: 'http://dev-service.yohops.com:9999/',
// api: 'http://dev-api.yohops.com:9999/',
// service: 'http://dev-service.yohops.com:9999/',
search: 'http://192.168.102.216:8080/yohosearch/'
},
subDomains: {
... ...
... ... @@ -1666,6 +1666,28 @@ $(function() {
});
});
$(function() {
var font = $('.description-content .basic li');
var fontwidth = $('.description-content ul li:nth-child(4) .valueSpace').width();
$('.description-content ul li:nth-child(8) .valueSpace').css({
'display': 'inline-block',
'text-align': 'right',
'width': fontwidth
});
font.each(function(i, ele) {
if ((i + 1) % 4 === 0) {
$(this).find('.justpostion').css({'display': 'inline-block', 'float': 'right'});
} else if ((i + 1) % 4 === 1) {
return;
} else {
$(this).css('text-align', 'center');
}
});
});
// 数据懒加载
dataLazyLoad.init({cls: '.datalazyload', threshold: 500});
... ...
... ... @@ -873,7 +873,7 @@
background-color: #f5f5f5;
float: left;
height: 240px;
width: 188px;
width: 186px;
border-right: 1px solid #eaeceb;
height: 1000px;
margin-top: 30px;
... ... @@ -964,12 +964,12 @@
font-size: 12px;
.basic {
width: 840px;
width: 800px;
margin: 0 auto;
li {
float: left;
width: 210px;
width: 200px;
line-height: 30px;
color: #686868;
... ...