Commit 2a67e3f7 authored by 夏彬's avatar 夏彬

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

# Conflicts:
#	e/member/login/indexloginstatus.php
parents db5eee17 ade3a167
[!--temp.header--]
<script type='text/javascript' src="[!--temp.ucenterurl--]common/nav.js"></script>
<script type='text/javascript' src="[!--temp.ucenterurl--]common/banshou.js"></script>
<script type='text/javascript' src="[!--temp.ucenterurl--]common/growing-io.js?20180330"></script>
<script>
function getAppVersion() {
var m = navigator.userAgent.match(/BanShou(\\\\/[\\\\d\\\\.]+)?/);
if (m) {
return m[1] ? m[1].substr(1) : 0;
} else {
return false;
}
}
if (/BanShou/.test(navigator.userAgent)) {
if (getAppVersion() === '2.5.5') {
WxhNative.toLoginAppForWxhWorker();
}
}
</script>
<div class="empty-block"></div>
<div class="common-top">
<a href="[!--temp.bbsurl--]home.php?mod=task2" class="sign"><i class="iconfont icon-jinbi1"></i></a>
<a href="javascript:;" id="quiz-enter" class="bs-winner" style="display:none;">
<span class="bsdyj-tip" id="bsdyj-tip" style="display:none">每日送出数千元现金</span>
</a>
<div class="nav-main">
<a href="[!--news.url--]" class="cur">推荐</a>
<a href="/ziliao/song" class="books">资料</a>
<a href="[!--temp.bbsurl--]plugin.php?id=xigua_integralmall:xigua_integralmall">兑换</a>
<!--<a href="[!--temp.bbsurl--]plugin.php?id=tom_tcptuan&site=1&mod=index">拼团<span class="new">new</span></a>-->
</div>
<a href="[!--temp.ucenterurl--]search?from=s" class="search"><i class="iconfont icon-sousuo"></i></a>
<span class="tips" style="display:none">签到领金币</span>
</div>
<div class="swiper-container topBanner">
<div class="swiper-wrapper">
[ecmsinfo]29,5,64,0,2,15,1[/ecmsinfo]
</div>
<!-- 如果需要分页器 -->
<div class="swiper-pagination"></div>
</div>
<div class="quick-link">
<ul class="link-item clearfix">
<li>
<a href="https://code.ibanshou.cn">
<i class="icon-kuaicha"></i>
<p>快查</p>
</a>
</li>
<li>
<a href="//bbs.ibanshou.cn/forum.php?mod=forumdisplay&fid=161">
<i class="icon-huati"></i>
<p>互助</p>
<span style="display: none" id="unquestioncount"></span>
</a>
</li>
<li>
<a href="//bbs.ibanshou.cn/forum.php?mod=forumdisplay&fid=157">
<i class="icon-more-pro"></i>
<p>日记</p>
</a>
</li>
<li>
<a href="//u.ibanshou.cn/vdeposit/today-orders">
<i class="icon-kuaiwen"></i>
<p>每日工单</p>
</a>
</li>
<li>
<a href="//xue.ibanshou.cn/home/category-detail?categoryId=41">
<i class="icon-kt"></i>
<p>空调</p>
</a>
</li>
<li>
<a href="//xue.ibanshou.cn/home/category-detail?categoryId=48">
<i class="icon-ds"></i>
<p>电视</p>
</a>
</li>
<li>
<a href="//xue.ibanshou.cn/home/category-detail?categoryId=46">
<i class="icon-bx"></i>
<p>冰箱</p>
</a>
</li>
<li>
<a href="//xue.ibanshou.cn/home/category-detail?categoryId=47">
<i class="icon-xyj"></i>
<p>洗衣机</p>
</a>
</li>
</ul>
</div>
<div class="recommend-info">
[ecmsinfo]0,1,100,0,3,14,0,'firsttitle=1'[/ecmsinfo]
</div>
<!-- 直播课程预约 -->
<div class="tuan-list" style="display:none;">
<a href="#">
<img src="https://pub-cdn.ibanshou.cn/preview/8f/e6/8e/yqsMGxSDtwCVlv9c4643.jpg-ym.preview">
<h3>液晶电视芯片级维修之系列讲座--第十集高压板电路检修</h3>
<p class="clearfix">
<span class="price">12931<b>人已预约</b></span>
<span class="go-buy-btn">预约报名<i class="iconfont icon-xiangyou1"></i></span>
</p>
</a>
</div>
[ibanshou]1[/ibanshou]
<div id="tuan-containter"></div>
<!-- 扳手幸运星 -->
<div class="recommend-info">
<div class="news-item has-pic one-picture">
<a href="//u.ibanshou.cn/luckdraw/2" class="content pb-none" style="min-height: 80px;">
<div class="tit">第二期幸运星,活动全面升级,抽奖居然无条件!</div>
<div class="img-item-box clearfix">
<div class="img-item"><img src="https://s1.ax1x.com/2018/03/29/9jg4df.jpg" alt=""></div>
</div>
</a>
</div>
</div>
<div class="tuan-list">
<a href="//sv.ibanshou.cn">
<img src="//s.ibanshou.cn/skin/default/images/sv_banner.jpg">
<h3>最美维修人,秀出你自己,参于活动赢大奖!</h3>
<p class="clearfix">
<span class="price"><span style="font-size: 14px;">参与活动赢豪礼</span></span>
<span class="go-buy-btn">立即参与<i class="iconfont icon-xiangyou1"></i></span>
</p>
</a>
</div>
<div class="interview-box">
<div class="tit">扳手专访<span>Interview</span> <a href="/zhuanfang">更多</a></div>
<div class="swiper-container interviewSlider">
<div class="swiper-wrapper">
[ecmsinfo]32,10,80,0,0,17,0[/ecmsinfo]
</div>
</div>
</div>
<div class="recommend-info">
[ecmsinfo]1,50,100,0,0,14,0,'isgood!=2 and firsttitle!=1','newstime DESC'[/ecmsinfo]
</div>
<div class="update-app-tip" id="update-app-tip" style="display: none">
<div class="uat-main">
<div class="tit">版本更新提示 <a href="javascript:;" class="UPDATE-CLOSE"><i
class="iconfont icon-close_light"></i></a>
</div>
<div class="txt">
<p>请将APP更新到最新版本</p>
<p>答题赢钱,千元现金等你来拿</p>
</div>
<a href="javascript;;" class="uat-now UPDATE-CLOSE" id="">我知道了</a>
</div>
</div>
<div class="update-app-tip" id="prompt" style="display: none">
<div class="uat-main">
<div class="tit">扳手大赢家 <a href="javascript:;" class="PROMPT-CLOSE"><i class="iconfont icon-close_light"></i></a>
</div>
<div class="screen">
<div class="item">
<p>4月1日</p>
<h3>20:00</h3>
</div>
<div class="item">
<p>奖池</p>
<h3>888</h3>
</div>
</div>
<a href="javascript:;" class="uat-now PROMPT-CLOSE">我知道了</a>
</div>
</div>
<!-- 登录有礼提示 -->
<a class="newer-tip" id="loginGits" href="[!--temp.ucenterurl--]login/web" style="display:none"><img src="images/login_gits.png"></a>
<script type='text/javascript' src="[!--news.url--]skin/default/js/swiper.min.js"></script>
<script>
/*
window.onerror = function (msg, url, lineNo, columnNo, error) {
var string = msg.toLowerCase();
var substring = "script error";
if (string.indexOf(substring) > -1){
alert('Script Error: See Browser Console for Detail');
} else {
var message = [
'Message: ' + msg,
'URL: ' + url,
'Line: ' + lineNo,
'Column: ' + columnNo,
'Error object: ' + JSON.stringify(error)
].join(' - ');
alert(message);
}
return false;
};
*/
var mySwiper = new Swiper('.topBanner', {
autoplay: 5000,
pagination: '.swiper-pagination'
});
$(function () {
setWidth();
$(window).resize(setWidth);
function setWidth() {
if ($(window).width() >= 900) {
$('.newest-list').find('.learn-course-box').width(427);
} else {
$('.newest-list').find('.learn-course-box').width(($(window).width() - 45) / 2);
}
}
var s = document.createElement("script");
s.type = "text/javascript";
document.getElementsByTagName("head")[0].appendChild(s);
s.src = "[!--news.url--]e/member/login/logincas.php";
var mySwiper2 = new Swiper('.interviewSlider', {
slidesPerView: 2,
grabCursor: true,
autoplay: 5000
});
$.getJSON("[!--temp.ucenterurl--]tip/state-call?tips=s_books&callback=?", function (data) {
var books = $(".common-top a.books");
var booksUrl = books.attr('href');
if (data.s_books) {
books.attr("href", booksUrl);
} else {
books.append('<span class="file-tip">送的书和专享视频,在这里</span>');
books.click(function () {
$.getJSON("[!--temp.ucenterurl--]tip/state-push?tip=s_books&callback=?", function (data) {
location.href = booksUrl;
});
});
}
});
})
</script>
[!--temp.stat-js--]
<script src="//res.wx.qq.com/open/js/jweixin-1.0.0.js"></script>
<script>
function wechatcallback(jsconfig) {
//其它的在对应页面
var link = window.location.href;
var imgUrl = "http://u.ibanshou.cn/assets/img/logo.jpg";
var title = "扳手 - 和百万家电维修人在一起";
var desc = "和百万家电维修人在一起";
wx.config(jsconfig);
wx.ready(function () {
wx.onMenuShareTimeline({
title: title, // 分享标题
link: link, // 分享链接,该链接域名或路径必须与当前页面对应的公众号JS安全域名一致
imgUrl: imgUrl, // 分享图标
success: function () {
// 用户确认分享后执行的回调函数
},
cancel: function () {
// 用户取消分享后执行的回调函数
}
});
wx.onMenuShareAppMessage({
title: title, // 分享标题
desc: desc, // 分享描述
link: link, // 分享链接,该链接域名或路径必须与当前页面对应的公众号JS安全域名一致
imgUrl: imgUrl, // 分享图标
type: 'link', // 分享类型,music、video或link,不填默认为link
dataUrl: '', // 如果type是music或video,则要提供数据链接,默认为空
success: function () {
// 用户确认分享后执行的回调函数
},
cancel: function () {
// 用户取消分享后执行的回调函数
}
});
wx.onMenuShareWeibo({
desc: desc, // 分享描述
title: title, // 分享标题
link: link, // 分享链接,该链接域名或路径必须与当前页面对应的公众号JS安全域名一致
imgUrl: imgUrl, // 分享图标
success: function () {
// 用户确认分享后执行的回调函数
},
cancel: function () {
// 用户取消分享后执行的回调函数
}
});
wx.onMenuShareQQ({
desc: desc, // 分享描述
title: title, // 分享标题
link: link, // 分享链接,该链接域名或路径必须与当前页面对应的公众号JS安全域名一致
imgUrl: imgUrl, // 分享图标
success: function () {
// 用户确认分享后执行的回调函数
},
cancel: function () {
// 用户取消分享后执行的回调函数
}
});
})
}
var script = document.createElement('script');
script.src = "/e/action/wechat/jsconfig.php?callback=wechatcallback&url=" + window.location.href;
document.getElementsByTagName('head')[0].appendChild(script);
</script>
<script src="[!--news.url--]e/extend/DoTimeRepage/"></script>
<script src="[!--temp.ucenterurl--]common/beat-home-popup.js"></script>
<script src="[!--temp.ucenterurl--]common/js-app.js?1"></script>
<script src="[!--news.url--]e/member/login/indexloginstatus.php"></script>
<script>
/*
if (BanShou.isSupport('messagePush')) {
BanShou.ready(function (native) {
$.ajax({type: "get", url: "[!--temp.ucenterurl--]member/regpushconf", dataType: "jsonp"}).done(function (conf) {
native.registerPushConfig(conf);
});
});
}
*/
/*
var isTipShow ;
function isShow() {
$.getJSON("[!--temp.ucenterurl--]tip/state-call?tips=quiz_bsdyj_tip&callback=?", function (data) {
if (data.quiz_bsdyj_tip) {
$('#bsdyj-tip').hide();
} else {
$('#bsdyj-tip').show();
}
isTipShow = !data.quiz_bsdyj_tip;
});
}
function toHide() {
$.getJSON("[!--temp.ucenterurl--]tip/state-push?tip=quiz_bsdyj_tip&callback=?", function (data) {
if (data) {
$('#bsdyj-tip').hide();
}
});
}
var md = new MobileDetect(window.navigator.userAgent);
var urgent = true;
if (BanShou.inApp()) {
if (BanShou.isSupport('quiz')) {
isShow();
$("#quiz-enter").show().click(function () {
if (isTipShow) {
toHide();
}
if (urgent) {
$('#prompt').show();
} else {
BanShou.ready(function (native) {
var obj = {
page: 'quiz_show', extra: {}
};
native.toIbanshouPage(obj);
});
}
});
} else {
if (!md.is('ios')) {
$("#quiz-enter").show().click(function () {
if (isTipShow) {
toHide();
}
$("#update-app-tip").show();
});
}
}
}
*/
$('.PROMPT-CLOSE').click(function () {
$('#prompt').hide();
});
$('.update-close').click(function () {
$("#update-app-tip").hide();
});
function showUnquestionCount() {
$.ajax({type: "get", url: "//s.ibanshou.cn/e/action/unquestion.php", dataType: "json"}).done(function (count) {
if (count > 0) {
$('#unquestioncount').html(parseInt(count)).show();
} else {
$('#unquestioncount').hide();
}
});
}
function showTuanProcess(num) {
$.getJSON("//s.ibanshou.cn/e/action/tcptuan.php?num=" + num, function (data) {
var html = '';
for (var i = 0, item; item = data[i]; i++) {
html += ' <div class="tuan-list" >' +
' <a href=" ' + '//bbs.ibanshou.cn/plugin.php?id=tom_tcptuan&site=1&mod=goodsinfo&goods_id=' + item.id + '">' +
' <img src="' + item.toppic + '">' +
' <h3>' + item.name + '</h3>' +
' <p class="clearfix"><span class="price">¥' + item.tuan_price + ' <b>' + item.tuan_num + '人团</b></span> <span class="go-buy-btn">去开团 <i class="iconfont icon-xiangyou1"></i></span></p>' +
' </a>' +
' </div>';
}
$('#tuan-containter').html(html).show();
});
}
$(function () {
showUnquestionCount();
showTuanProcess(0);
});
</script>
</body>
</html>
\ No newline at end of file
...@@ -16,6 +16,7 @@ if($iscas){ ...@@ -16,6 +16,7 @@ if($iscas){
<?php if (!$iscas) { ?> <?php if (!$iscas) { ?>
$(function(){ $(function(){
$(".books").attr("href", "/e/member/login"); $(".books").attr("href", "/e/member/login");
$("#loginGits").attr("style", "display:block;");
}); });
<?php }else { ?> <?php }else { ?>
var zhugeCheckRunHandler = false; var zhugeCheckRunHandler = false;
......
...@@ -184,7 +184,7 @@ ...@@ -184,7 +184,7 @@
display: inline-block; display: inline-block;
width: 50px; width: 50px;
height: 50px; height: 50px;
background-image: url(../images/icon_quick_link.png); background-image: url(../images/icon_quick_link.png?20180408);
background-size: cover; background-size: cover;
} }
.quick-link .link-item li a span { .quick-link .link-item li a span {
...@@ -1008,6 +1008,19 @@ ...@@ -1008,6 +1008,19 @@
border-right: 14px solid transparent; border-right: 14px solid transparent;
} }
/*登录有礼提示*/
.newer-tip {
position: fixed;
display: inline-block;
right: 15px;
top: 60%;
z-index: 6;
}
.newer-tip img {
width: 60px;
vertical-align: top;
}
/*适配电脑端*/ /*适配电脑端*/
@media screen and (min-width: 900px){ @media screen and (min-width: 900px){
html { html {
......
skin/default/images/icon_quick_link.png

29.6 KB | W: | H:

skin/default/images/icon_quick_link.png

29.3 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
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