Skip to content

S
s_ibanshou
Commit 9a8105ce authored by 夏彬's avatar 夏彬
Browse files
Options

Merge branch 'test' into dev

parents af63ccd6 eae7048e
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 654 additions and 22 deletions
appdownload/css/basic.css 0 → 100644
View file @ 9a8105ce
@charset "utf-8";
/*! normalize.css v2.1.3 | MIT License | git.io/normalize */
/*Html5*/
article,
aside,
details,
figcaption,
figure,
footer,
header,
hgroup,
main,
nav,
section,
summary {
display: block;
}
audio,
canvas,
video {
display: inline-block;
}
audio:not([controls]) {
display: none;
height: 0;
}
/*Base*/
html {
font-family: "-apple-system-font","Microsoft YaHei","Helvetica Neue","Hiragino Sans GB","\9ED1\4F53",Arial,sans-serif;
color: #666;
-ms-text-size-adjust: 100%;
-webkit-text-size-adjust: 100%; /*修正手持设备字体变化*/
}
* {
margin: 0;
padding: 0;
}
a {
text-decoration: none;
background: transparent; /*修正win8系统IE连接灰色背景*/
outline:none;
blr:expression(this.onFocus=this.blur());
}
a:focus {
outline: thin dotted;
-webkit-tap-highlight-color: transparent;
}
a:active,
a:hover {
outline: 0;
-webkit-tap-highlight-color: transparent;
/*transition:text-shadow 500ms ease-in 0ms, color 500ms ease-in 0ms;*/
}
img {
border: 0;
-ms-interpolation-mode:bicubic
}
fieldset {
border: 1px solid #c0c0c0;
margin: 0 2px;
padding: 0.35em 0.625em 0.75em;
}
button,
input,
select,
textarea {
font-family: inherit;
font-size: 100%;
margin: 0;
}
button,
input {
line-height: normal;
}
button,
select {
text-transform: none;
}
button,
html input[type="button"],
input[type="reset"],
input[type="submit"] {
-webkit-appearance: button;
cursor: pointer;
}
button[disabled],
html input[disabled] {
cursor: default;
}
input[type="checkbox"],
input[type="radio"] {
box-sizing: border-box;
padding: 0;
}
input[type="search"] {
-webkit-appearance: textfield;
-moz-box-sizing: content-box;
-webkit-box-sizing: content-box;
box-sizing: content-box;
}
input[type="search"]::-webkit-search-cancel-button,
input[type="search"]::-webkit-search-decoration {
-webkit-appearance: none;
}
button::-moz-focus-inner,
input::-moz-focus-inner {
border: 0;
padding: 0;
}
input.submit {
border: 0;
margin: 0;
cursor: pointer;
}
input.radio,
input.checkbox{
float: left;
display: inline;
}
textarea {
overflow: auto;
vertical-align: top;
}
table {
border-collapse: collapse;
border-spacing: 0;
}
i,em {
font-style: normal;
}
/*清除浮动*/
.clearfix:after {
content: "\200B";
display: block;
height: 0;
clear: both;
}
.clearfix {
*zoom: 1;
*width: 100%;
*line-height: 0;
}
.fl {
float:left;
}
.fr {
float:right;
}
appdownload/css/style.css 0 → 100644
View file @ 9a8105ce
@charset "utf-8";
html,body {
height: 100%;
width: 100%;
}
body {
background: url(../img/iconbg.png) center 40px no-repeat #64cd08;
}
.foot-bar {
position: fixed;
left: 0;
bottom: 0;
width: 100%;
height: 150px;
background-color: #fff;
z-index: 20;
}
.warp {
position: relative;
width: 1000px;
margin: 0 auto;
height: 100%;
}
.pic-hand {
position: absolute;
left: 50%;
margin-left: -350px;
bottom: 100px;
z-index: 5;
}
.pic-text {
position: absolute;
right: 0;
top: 50%;
z-index: 4;
margin-top: -100px;
}
.logo {
padding-top: 45px;
}
.logo img {
vertical-align: top;
}
.download-group {
position: relative;
padding-right: 240px;
margin-top: 50px;
}
.download-group a {
display: inline-block;
border-radius: 44px;
height: 44px;
padding: 0 30px;
line-height: 44px;
color: #64cd08;
border: 3px solid #64cd08;
font-size: 14px;
margin-right: 10px;
transition: all 1s;
}
.download-group a:hover {
background-color: #64cd08;
color: #fff;
}
.download-group a i {
padding-right: 5px;
}
.download-group .qrcode {
position: absolute;
right: 0;
bottom: 0;
text-align: center;
font-size: 14px;
line-height: 24px;
}
.download-group .qrcode img {
width: 200px;
}
\ No newline at end of file
appdownload/js/index.js 0 → 100644
View file @ 9a8105ce
(function (global) {
var md = new MobileDetect(window.navigator.userAgent);
var appStoreUrl = 'https://itunes.apple.com/cn/app/wei-xiu-hui-shi-fu-ban/id1034283227?mt=8';
var yingYongBaoUrl ='http://fusion.qq.com/cgi-bin/qzapps/unified_jump?appid=42387359&from=wx&isTimeline=false&actionFlag=0&params=pname%3Dcom.wxhkj.weixiuhui%26versioncode%3D22%26channelid%3D%26actionflag%3D0';
//判断是否为移动端
if(md.mobile()){
if(md.is('iPhone')){
window.location.href = appStoreUrl;
}else if(md.is('iPad')){
window.location.href = appStoreUrl;
}else{
window.location.href = yingYongBaoUrl;
}
}
})(window);
\ No newline at end of file
appdownload/js/mobile-detect.min.js 0 → 100644
View file @ 9a8105ce
This diff is collapsed.
e/class/userfun.php
View file @ 9a8105ce
...@@ -12,37 +12,57 @@ function user_ibanshou($num) ...@@ -12,37 +12,57 @@ function user_ibanshou($num)
$thread = Thread::getHotThreads($num); $thread = Thread::getHotThreads($num);
$list = CourseList::getRecommendList($num); $list = CourseList::getRecommendList($num);
$str = '<div class="learnning-course newest"> $str = '<div clas=\"recommend-info\">';
<div class="tit">推荐课程<span></span><a href="'.$config['wxhpro']['xue'].'/home/all-course">全部课程</a></div>
<div class="newest-list clearfix">';
foreach ($list as $val) { foreach ($list as $val) {
$str .= "<div class=\"learn-course-box\"> $str .= "<div class=\"news-item portal-course\">
<div class=\"lc-img\"><a href=\"{$val['url']}\"><img <a href=\"{$val['url']}\" class=\"content pb-none\">
src=\"{$val['preview_pic']}-ym.preview\"></a></div> <div class=\"tit\">{$val['name']}</div>
<h3><a href=\"{$val['url']}\">{$val['name']}</a></h3>
<p><span>{$val['favorite_count']}人已学</span><span>{$val['comment_count']}人评论</span></p> <div class=\"img-item-box\">
</div>"; <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['comment_count']}</span>
<span class=\"fr\">{$val['favorite_count']}人已学</span>
</div>
</div>";
} }
$str .= '</div></div><div class="latest-news">
<div class="common-tit-index">热门互动<a href="'.$config['wxhpro']['bbs'].'">参与互动</a></div>
<ul class="news-list">';
foreach ($thread as $val) { foreach ($thread as $val) {
$val['image'] = $val['image'] ? : '/skin/default/images/notimg.gif'; $val['image'] = $val['image'] ? : '/skin/default/images/notimg.gif';
$str .= "<li> $str .= "<div class=\"news-item has-pic one-picture\">
<a href=\"{$val['url']}\"> <a href=\"{$val['url']}\" class=\"content pb-none\" style=\"min-height: 80px;\">
<h3>{$val['subject']}</h3> <div class=\"tit\">{$val['subject']}</div>
<p>{$val['views']}人已参与</p>
<img src=\"{$val['image']}\"> <div class=\"img-item-box clearfix\">
</a> <div class=\"img-item\"><img src=\"{$val['image']}\" alt=\"\"></div>
</li>"; </div>
</a>
<div class=\"portal-news-info clearfix\">
<span class=\"time fl\">来自扳手社区</span>
<span class=\"fr\">{$val['views']}人已参与</span>
</div>
</div>";
} }
echo $str . '</ul></div>'; echo $str . '</div>';
}
function user_ago($tm,$rcs = 0) {
$cur_tm = time(); $dif = $cur_tm-$tm;
$pds = array('秒','分钟','小时','天','周','个月','年');
$lngh = array(1,60,3600,86400,604800,2630880,31570560);
for($v = sizeof($lngh)-1; ($v >= 0)&&(($no = $dif/$lngh[$v])<=1); $v--); if($v < 0) $v = 0; $_tm = $cur_tm-($dif%$lngh[$v]);
$no = floor($no);
//if($no <> 1) $pds[$v] .='s'; //+s
$x=sprintf("%d %s",$no,$pds[$v]);
if(($rcs == 1)&&($v >= 1)&&(($cur_tm-$_tm) > 0)) $x .= time_ago($_tm);
return $x."前";
} }
?> ?>
\ No newline at end of file
skin/default/css/banshou.css 0 → 100644
View file @ 9a8105ce
@charset "utf-8";
.recommend-info {
background-color: #fff;
}
.empty-block {
height: 51px;
}
.common-top {
position: fixed;
left: 0;
top: 0;
width: 100%;
background-color: #fff;
height: 50px;
border-bottom: 1px solid #e7e7e7;
z-index: 3;
}
.common-top a.common-sign,
.common-top a.common-search {
position: absolute;
display: inline-block;
width: 50px;
height: 50px;
top: 0;
text-align: center;
line-height: 50px;
}
.common-top a.common-sign {
left: 0;
}
.common-top a.common-search {
right: 0;
}
.common-top a.common-sign i,
.common-top a.common-search i {
font-size: 20px;
}
.placeholder {
display: block;
height: 30px;
background-color: #f3f3f3;
border-radius: 3px;
margin: 10px 60px;
text-align: center;
font-size: 12px;
line-height: 30px;
color: #999;
}
.placeholder span {
position: relative;
display: inline-block;
padding-left: 25px;
}
.placeholder span i {
position: absolute;
left: 0;
top: 0;
display: inline-block;
width: 30px;
height: 30px;
text-align: center;
line-height: 33px;
}
.hot-nav {
background-color: #fff;
border-bottom: 1px solid #e7e7e7;
}
.hot-nav,
.hot-nav ul {
width: 100%;
}
.hot-nav ul li {
display: inline-block;
width: 25%;
float: left;
}
.hot-nav ul li a {
display: block;
text-align: center;
padding: 20px 0;
}
.hot-nav ul li a p {
font-size: 12px;
color: #333;
}
.hot-nav ul li a span {
display: block;
font-size: 12px;
color: #999;
margin-top: 5px;
}
.hot-nav ul li a i {
display: inline-block;
width: 44px;
height: 44px;
border-radius: 100%;
text-align: center;
line-height: 44px;
color: #26a087;
font-size: 30px;
}
.post-btn {
position: fixed;
display: block;
width: 50px;
height: 50px;
text-align: center;
line-height: 50px;
background-color: #007aff;
color: #fff;
border-radius: 100%;
right: 10px;
bottom: 60px;
}
.portal-post-box {
background-color: #fff;
margin-top: 10px;
border-top: 1px solid #e7e7e7;
}
.line-tab-box {
height: 48px;
text-align: center;
background-color: #fff;
border-bottom: 1px solid #f3f3f3;
width: 100%;
}
.line-tab-box-fixed {
position: fixed;
top: 50px;
left: 0;
z-index: 3;
}
.line-tab-box a {
position: relative;
display: inline-block;
height: 48px;
line-height: 44px;
padding: 0 20px;
font-size: 14px;
color: #898989;
}
.line-tab-box a.active {
color: #333;
}
.line-tab-box a.active:after {
content: '';
display: inline-block;
position: absolute;
left: 50%;
bottom: 4px;
margin-left: -5px;
width: 10px;
height: 2px;
border-radius: 2px;
background-color: #26a087;
}
.news-item {
border-bottom: 1px solid #f3f3f3;
background-color: #fff;
}
.news-item a.content {
position: relative;
display: block;
padding: 20px 15px;
}
.news-item a.content .tit {
color: #333;
font-size: 17px;
line-height: 1.4;
}
.news-item-info {
padding: 0 15px 20px;
}
.news-item-info .author-head {
position: relative;
height: 40px;
display: inline-block;
padding-left: 48px;
}
.news-item-info .author-head img {
position: absolute;
left: 0;
top: 0;
width: 40px;
height: 40px;
border-radius: 100%;
}
.news-item-info .author-head h3 {
font-size: 14px;
color: #666;
line-height: 20px;
font-weight: normal;
}
.news-item-info .author-head h3 span {
background-color: #26a087;
color: #fff;
font-size: 12px;
padding: 0 4px;
border-radius: 2px;
}
.news-item-info .author-head {
font-size: 12px;
color: #999;
}
.news-item-info .news-option {
position: relative;
display: inline-block;
height: 40px;
line-height: 40px;
font-size: 12px;
color: #999;
padding-left: 28px;
margin-left: 10px;
}
.news-item-info .news-option i {
position: absolute;
left: 0;
top: 0;
width: 30px;
height: 40px;
text-align: center;
line-height: 40px;
display: inline-block;
font-size: 20px;
}
.news-item-info .news-option i.icon-zan {
line-height: 38px;
}
.has-pic .img-item-box {
margin-top: 10px;
}
.has-pic .img-item-box .img-item {
width: 100%;
overflow: hidden;
}
.two-picture .img-item-box .img-item {
position: relative;
width: 50%;
float: left;
display: inline-block;
}
.two-picture .img-item-box .img-item img {
width: 100%;
vertical-align: top;
}
.three-picture .img-item-box .img-item {
position: relative;
width: 33%;
float: left;
display: inline-block;
}
.three-picture .img-item-box .img-item img {
width: 100%;
vertical-align: top;
}
.one-picture a.content {
padding: 20px 110px 20px 20px;
min-height: 64px;
}
.one-picture a.content .img-item-box .img-item {
position: absolute;
display: inline-block;
width: 80px;
height: 80px;
right: 20px;
top: 20px;
overflow: hidden;
}
.one-picture a.content .img-item-box .img-item img {
width: 100%;
vertical-align: top;
}
.two-picture .img-item-box .img-item:after,
.three-picture .img-item-box .img-item:after,
.two-picture .img-item-box .img-item:before,
.three-picture .img-item-box .img-item:before{
content: '';
position: absolute;
display: inline-block;
width: 1px;
height: 100%;
background-color: #fff;
right: 0;
top: 0;
}
.two-picture .img-item-box .img-item:before,
.three-picture .img-item-box .img-item:before{
right: auto;
left: 0;
}
.portal-news-info {
padding: 10px 15px 20px;
font-size: 12px;
}
.portal-news-info span {
padding-left: 10px;
color: #999;
}
.portal-news-info span.time {
padding-left: 0;
}
.pb-none {
padding-bottom: 0!important;
}
.portal-course .img-item-box {
padding-top: 10px;
}
.portal-course .img-item img{
width: 100%;
vertical-align: top;
border-radius: 6px;
}
.hot-nav ul li a i {
display: inline-block;
width: 40px;
height: 40px;
border-radius: 100%;
background-color: #63a5f0;
text-align: center;
line-height: 40px;
color: #fff;
font-size: 20px;
}
.hot-nav ul li a p {
margin-top: 10px;
}
.hot-nav ul li:first-child a i {
background-color: #63a5f0;
}
.hot-nav ul li:nth-child(2) a i {
background-color: #f7b321;
}
.hot-nav ul li:nth-child(3) a i {
background-color: #26a087;
}
.hot-nav ul li:last-child a i {
background-color: #ffa42f;
}
skin/default/css/style.css
View file @ 9a8105ce
...@@ -653,6 +653,15 @@ ...@@ -653,6 +653,15 @@
outline: none; outline: none;
font-size: 14px; font-size: 14px;
} }
.reply-root {
margin-top: 15px;
border-top: 1px solid #f3f3f3;
padding: 10px 0;
font-size: 14px;
}
.reply-root a {
color: #2C74E2;
}
.share-box { .share-box {
display: none; display: none;
......
skin/default/images/icon_quick_link.png
View replaced file @ af63ccd6 View file @ 9a8105ce
skin/default/images/icon_quick_link.png

13.4 KB | W: | H:

skin/default/images/icon_quick_link.png

13.6 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/news.js
View file @ 9a8105ce
...@@ -74,6 +74,11 @@ function tpl(comment) { ...@@ -74,6 +74,11 @@ function tpl(comment) {
//回复弹窗 //回复弹窗
function popReplyComment(id) { function popReplyComment(id) {
var parent = $('.comment-list').find('> li[data-id='+id+']');
var name = parent.find('> .name').text() + '：';
var content = parent.find('> .comment-main').text();
$('#reply-name').text(name);
$('#reply-content').text(content);
$("#maskCommon").show(); $("#maskCommon").show();
$(".comment-reply").show(); $(".comment-reply").show();
$("input[name='plid']").val(id); $("input[name='plid']").val(id);
......
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