Skip to content

S
s_ibanshou
Commit 55f33582 authored by 夏彬's avatar 夏彬
Browse files
Options

Merge remote-tracking branch 'origin/test' into test

parents 443ce621 881c5d4d
Hide whitespace changes
Inline Side-by-side
Showing with 157 additions and 33 deletions
e/class/userfun.php
View file @ 55f33582
......@@ -15,37 +15,46 @@ function user_ibanshou($num)
$str = '<div clas=\"recommend-info\">';
foreach ($list as $val) {
$str .= "<div class=\"news-item portal-course\">
<a href=\"{$val['url']}\" class=\"content pb-none\">
<div class=\"tit\">{$val['name']}</div>
<div class=\"img-item-box\">
<div class=\"img-item\"><img src=\"{$val['preview_pic']}-ym.preview\" alt=\"\"></div>
</div>
</a>
<div class=\"portal-news-info clearfix\">
<span class=\"time fl\">来自扳手学院</span>
<span class=\"fr\">{$val['view_count']}人阅读</span>
</div>
</div>";
//自适应 http, https
$val['url'] = str_replace('http://', '//', $val['url']);
$str .= <<<EOD
<div class=\"news-item portal-course\">
<a href=\"{$val['url']}\" class=\"content pb-none\">
<div class=\"tit\">{$val['name']}</div>
<div class=\"img-item-box\">
<div class=\"img-item\"><img src=\"{$val['preview_pic']}-ym.preview\" alt=\"\"></div>
</div>
</a>
<div class=\"portal-news-info clearfix\">
<span class=\"time fl\">来自扳手学院</span>
<span class=\"fr\">{$val['view_count']}人阅读</span>
</div>
</div>
EOD;
}
foreach ($thread as $val) {
$val['image'] = $val['image'] ? : '/skin/default/images/notimg.gif';
//自适应 http, https
$val['image'] = $val['image'] ? str_replace('http://', '//', $val['image']): '/skin/default/images/notimg.gif';
$val['url'] = str_replace('http://', '//', $val['url']);
$str .= <<<EOD
<div class=\"news-item has-pic one-picture\">
<a href=\"{$val['url']}\" class=\"content pb-none\" style=\"min-height: 80px;\">
<div class=\"tit\">{$val['subject']}</div>
$str .= "<div class=\"news-item has-pic one-picture\">
<a href=\"{$val['url']}\" class=\"content pb-none\" style=\"min-height: 80px;\">
<div class=\"tit\">{$val['subject']}</div>
<div class=\"img-item-box clearfix\">
<div class=\"img-item\"><img src=\"{$val['image']}\" alt=\"\"></div>
</div>
</a>
<div class=\"portal-news-info clearfix\">
<span class=\"time fl\">来自扳手社区</span>
<span class=\"fr\">{$val['views']}人已参与</span>
</div>
</div>";
<div class=\"img-item-box clearfix\">
<div class=\"img-item\"><img src=\"{$val['image']}\" alt=\"\"></div>
</div>
</a>
<div class=\"portal-news-info clearfix\">
<span class=\"time fl\">来自扳手社区</span>
<span class=\"fr\">{$val['views']}人已参与</span>
</div>
</div>
EOD;
}
echo $str . '</div>';
......
environments/prod/e/config/config_ibanshou.php
View file @ 55f33582
<?php
$scheme = (isset($_SERVER['REQUEST_SCHEME']) && $_SERVER['REQUEST_SCHEME'] == 'http') ? $_SERVER['REQUEST_SCHEME'] : 'https';
$config = [
//是否使用用户中心
......@@ -18,15 +19,15 @@ $config = [
'debug' => FALSE,
'server_ip' => ['54.222.158.174', '172.31.12.30'],
'logs' => 'e/data/phpcas.log',
'uc_base_url' => 'http://u.ibanshou.cn/',
'uc_base_url' => $scheme.'://u.ibanshou.cn/',
],
//产品
'wxhpro' => [
'ucenter' => 'http://u.ibanshou.cn',
'xue' => 'http://xue.ibanshou.cn',
's' => 'http://s.ibanshou.cn',
'bbs' => 'http://bbs.ibanshou.cn',
'ucenter' => $scheme.'://u.ibanshou.cn',
'xue' => $scheme.'://xue.ibanshou.cn',
's' => $scheme.'://s.ibanshou.cn',
'bbs' => $scheme.'://bbs.ibanshou.cn',
],
//wxh_internal_api
......
skin/default/css/banshou.css
View file @ 55f33582
......@@ -494,3 +494,117 @@
z-index: 1;
}
/*专访*/
.interview-box {
background-color: #f9f9f9;
border-bottom: 1px solid #f3f3f3;
}
.interview-box .tit {
position: relative;
padding: 20px 15px 10px;
font-size: 16px;
font-weight: 500;
}
.interview-box .tit span {
text-transform: uppercase;
padding-left: 5px;
color: #07c706;
font-size: 12px;
font-weight: normal;
}
.interview-box .tit a {
position: absolute;
right: 0;
top: 9px;
font-size: 12px;
color: #999;
display: inline-block;
padding: 0 15px;
height: 44px;
line-height: 44px;
}
.interview-main {
background-color: #fff;
border-radius: 3px;
text-align: center;
margin: 0 10px;
border-top: none;
}
.interview-main img {
width: 100%;
display: inline-block;
vertical-align: top;
border-radius: 3px 3px 0 0;
}
.interview-main h3 {
font-size: 14px;
padding: 10px;
text-align: left;
font-weight: normal;
color: #333;
}
.interview-main h3 span {
display: inline-block;
height: 40px;
overflow: hidden;
line-height: 20px;
}
.interview-main p {
font-size: 12px;
}
.interview-box .swiper-container {
padding: 5px 5px 20px;
}
.detail-top-nav p {
text-align: center;
line-height: 50px;
}
.interview-list,.interview-list li {
list-style: none;
}
.interview-list li {
position: relative;
float: left;
width: 50%;
}
.interview-list li:after {
content: '';
position: absolute;
display: inline-block;
width: 1px;
height: 100%;
right: 0;
top: 0;
background-color: #f3f3f3;
}
.interview-list li:nth-child(2n):after {
display: none;
}
.interview-list li:before {
content: '';
position: absolute;
display: inline-block;
width: 100%;
height: 1px;
left: 0;
bottom: 0;
background-color: #f3f3f3;
}
.interview-list li a {
display: block;
padding: 10px;
}
.interview-list li a img {
width: 100%;
}
.interview-list li a h3 {
font-size: 14px;
font-weight: normal;
color: #333;
padding: 5px 0 3px;
height: 36px;
overflow: hidden;
}
skin/default/images/icon_quick_link.png
View replaced file @ 443ce621 View file @ 55f33582
skin/default/images/icon_quick_link.png

31.8 KB | W: | H:

skin/default/images/icon_quick_link.png

30.4 KB | W: | H:

skin/default/images/icon_quick_link.png
skin/default/images/icon_quick_link.png
skin/default/images/icon_quick_link.png
skin/default/images/icon_quick_link.png
  • 2-up
  • Swipe
  • Onion skin
skin/default/js/videoClass.js
View file @ 55f33582
......@@ -286,7 +286,7 @@ $('#favor').click(function () {
function setVideo(node, vu, w, h) {
node.setAttribute("width", w);
node.setAttribute("height", h);
node.src = 'http://yuntv.letv.com/bcloud.html?uu=pjseptwfce&vu=' + vu + '&pu=510360dfc7&auto_play=1&width=' + w + '&height=' + h + '&lang=zh_CN';
node.src = '//yuntv.letv.com/bcloud.html?uu=pjseptwfce&vu=' + vu + '&pu=510360dfc7&auto_play=1&width=' + w + '&height=' + h + '&lang=zh_CN';
}
})(jQuery);
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment