Commit 91be8368 authored by 汪波's avatar 汪波

Merge remote-tracking branch 'origin/master'

parents 10ee8cfb f3292277
<?php <?php
require(__DIR__ . '/../../extend/internalApi/autoload.php');
require(__DIR__ . '/../../config/config_ibanshou.php');
require(__DIR__ . "/../../class/connect.php"); require(__DIR__ . "/../../class/connect.php");
require(__DIR__ . "/../../class/db_sql.php"); require(__DIR__ . "/../../class/db_sql.php");
require(__DIR__ . "/../../member/class/user.php"); require(__DIR__ . "/../../member/class/user.php");
require(__DIR__ . "/../../class/q_functions.php"); require(__DIR__ . "/../../class/q_functions.php");
\internalApi\base\Client::config($config['wxh.internal']['client']);
use internalApi\ucenter\Favorite;
use internalApi\ucenter\BrowsingHistory;
$link=db_connect(); $link=db_connect();
$empire=new mysqlquery(); $empire=new mysqlquery();
...@@ -17,53 +23,109 @@ $newsid = isset($_POST['newsid']) ? intval($_POST['newsid']) : 0; ...@@ -17,53 +23,109 @@ $newsid = isset($_POST['newsid']) ? intval($_POST['newsid']) : 0;
if (!$newsid) { if (!$newsid) {
returnmsg(false, '内容ID参数错误'); returnmsg(false, '内容ID参数错误');
} }
$tablenews = $dbtbpre.'ecms_news';
$sql = "select * from {$tablenews} where id={$newsid}";
$news = $empire->fetchassoc1($sql);
if (empty($news)) {
returnmsg(false, '该内容不存在');
}
if ($mod == 'diggtop') { if ($mod == 'diggtop') {
diggtop($newsid, $user); diggtop($news, $user);
} elseif ($mod == 'checkdiggtop') { } elseif ($mod == 'init') {
checkdiggtop($newsid, $user); init($news, $user);
} elseif ($mod == 'favorite') {
favorite($news, $user);
} }
function checkdiggtop($newsid, $user) { function init($news, $user) {
global $empire,$dbtbpre; global $empire,$dbtbpre,$ecms_config;
$tablenewsdiggtop = $dbtbpre.'ecms_news_diggtop'; $tablenewsdiggtop = $dbtbpre.'ecms_news_diggtop';
$sql = "select * from {$tablenewsdiggtop} where user_id={$user['userid']} and news_id={$newsid}"; //浏览记录
$image = newsimage($news);
$url = $ecms_config['site_url'].$news['titleurl'];
BrowsingHistory::add($user['ucid'], $news['title'], $image, $url, 's', 'content', $news['id']);
//是否点赞
$sql = "select * from {$tablenewsdiggtop} where user_id={$user['userid']} and news_id={$news['id']}";
$newsdiggtop = $empire->fetch1($sql); $newsdiggtop = $empire->fetch1($sql);
if ($newsdiggtop) { $data['isdiggtop'] = $newsdiggtop ? 1 : 0;
returnmsg(true, '已赞');
} else { //是否收藏
returnmsg(false); $result = Favorite::isFavorite('s', 'content', [$news['id']], $user['ucid']);
} $data['isfava'] = $result[$news['id']] ? 1 : 0;
returnmsg(true, '', $data);
} }
function diggtop($newsid, $user) { function diggtop($news, $user) {
global $empire,$dbtbpre; global $empire,$dbtbpre;
$tablenews = $dbtbpre.'ecms_news'; $tablenews = $dbtbpre.'ecms_news';
$tablenewsdiggtop = $dbtbpre.'ecms_news_diggtop'; $tablenewsdiggtop = $dbtbpre.'ecms_news_diggtop';
$sql = "select id,classid,userid from {$tablenews} where id={$newsid}"; $sql = "select * from {$tablenewsdiggtop} where user_id={$user['userid']} and news_id={$news['id']}";
$news = $empire->fetch1($sql); $newsdiggtop = $empire->fetchassoc1($sql);
if (empty($news)) {
returnmsg(false, '该内容不存在');
}
$sql = "select * from {$tablenewsdiggtop} where user_id={$user['userid']} and news_id={$newsid}";
$newsdiggtop = $empire->fetch1($sql);
if ($newsdiggtop) { if ($newsdiggtop) {
returnmsg( false, '已赞过该内容', 'diggtoped'); returnmsg( false, '已赞过该内容', 'diggtoped');
} }
$now = time(); $now = time();
$sql = "insert into {$tablenewsdiggtop} (user_id,news_uid,news_id,created_at) VALUES ({$user['userid']}, {$news['userid']}, {$newsid}, {$now})"; $sql = "insert into {$tablenewsdiggtop} (user_id,news_uid,news_id,created_at) VALUES ({$user['userid']}, {$news['userid']}, {$news['id']}, {$now})";
$empire->query($sql); $empire->query($sql);
$id = $empire->lastid(); $id = $empire->lastid();
if ($id) { if ($id) {
$sql = "update {$tablenews} set diggtop=diggtop+1 where id={$newsid}"; $sql = "update {$tablenews} set diggtop=diggtop+1 where id={$news['id']}";
$empire->query($sql); $empire->query($sql);
returnmsg(true, '点赞成功'); returnmsg(true, '点赞成功');
} else { } else {
returnmsg(false, '点赞失败'); returnmsg(false, '点赞失败');
} }
}
function favorite($news, $user) {
global $empire,$dbtbpre,$ecms_config;
$tablenews = $dbtbpre.'ecms_news';
$isfava = Favorite::isFavorite('s', 'content', [$news['id']], $user['ucid']);
$image = newsimage($news);
$url = $ecms_config['site_url'].$news['titleurl'];
//删除
if ($isfava[$news['id']]) {
$num = Favorite::delete('s', 'content', $news['id'], $user['ucid']);
$type = "删除";
} else { //添加
$num = Favorite::add($user['ucid'], $news['title'], $image, $url, 's', 'content', $news['id']);
$type = "添加";
}
if ($num >= 0) {
$sql = "update {$tablenews} set favanum={$num} where id={$news['id']}";
$empire->query($sql);
returnmsg(true, $type.'成功', $num);
} else {
returnmsg(false, $type.'失败');
}
}
function newsimage($news) {
global $empire,$dbtbpre,$ecms_config;
$img = $news['titlepic'];
if (!$img) {
$tablenewsdata = $dbtbpre.'ecms_news_data_1';
$sql = "select * from {$tablenewsdata} where id={$news['id']}";
$newsdata = $empire->fetchassoc1($sql);
$newstext = stripslashes($newsdata['newstext']);
preg_match('/src="([^"]+?)"/i', $newstext, $match);
$img = isset($match[1]) ? $match[1] : '';
}
if ($img && !preg_match('/^https?:/', $img)) {
$img = $ecms_config['site_url'] . $img;
}
return $img;
} }
\ No newline at end of file
<?php
/**
* Created by PhpStorm.
* User: xiabin
* Date: 06/07/2017
* Time: 8:01 PM
*/
namespace internalApi\ucenter;
use internalApi\base\Client;
class BrowsingHistory extends Client
{
public static function add($userId, $title, $img, $sourceUrl, $from, $type, $sourceId)
{
return self::call('browsingHistory.add', compact('userId', 'title', 'img', 'sourceUrl', 'from', 'type', 'sourceId'));
}
}
\ No newline at end of file
<?php
/**
* Created by PhpStorm.
* User: xiabin
* Date: 06/07/2017
* Time: 1:45 PM
*/
namespace internalApi\ucenter;
use internalApi\base\Client;
class Favorite extends Client
{
public static function add($userId, $title, $img, $sourceUrl, $from, $type, $sourceId)
{
return self::call('favorite.add', compact('userId', 'title', 'img', 'sourceUrl', 'from', 'type', 'sourceId'));
}
public static function delete($from, $type, $sourceId, $userId)
{
return self::call('favorite.delete', compact('from', 'type', 'sourceId', 'userId'));
}
/**
* @param $from
* @param $type
* @param array $sourceId
* @param $userId
* @return mixed
*/
public static function isFavorite($from, $type, $sourceId,$userId)
{
return self::call('favorite.isFavorite', compact('from', 'type', 'sourceId','userId'));
}
}
\ No newline at end of file
...@@ -361,7 +361,7 @@ function islogin($uid=0,$uname='',$urnd=''){ ...@@ -361,7 +361,7 @@ function islogin($uid=0,$uname='',$urnd=''){
} }
printerror("NotLogin",$gotourl,$petype); printerror("NotLogin",$gotourl,$petype);
} }
$cr=$empire->fetch1("select ".eReturnSelectMemberF('userid,username,email,groupid,userfen,money,userdate,zgroupid,havemsg,checked,registertime')." from ".eReturnMemberTable()." where ".egetmf('userid')."='$userid' and ".egetmf('username')."='$username' and ".egetmf('rnd')."='$rnd' limit 1"); $cr=$empire->fetch1("select ".eReturnSelectMemberF('userid,username,email,groupid,userfen,money,userdate,zgroupid,havemsg,checked,registertime,ucid')." from ".eReturnMemberTable()." where ".egetmf('userid')."='$userid' and ".egetmf('username')."='$username' and ".egetmf('rnd')."='$rnd' limit 1");
if(!$cr['userid']) if(!$cr['userid'])
{ {
EmptyEcmsCookie(); EmptyEcmsCookie();
...@@ -430,6 +430,7 @@ function islogin($uid=0,$uname='',$urnd=''){ ...@@ -430,6 +430,7 @@ function islogin($uid=0,$uname='',$urnd=''){
$re[zgroupid]=$cr['zgroupid']; $re[zgroupid]=$cr['zgroupid'];
$re[havemsg]=$cr['havemsg']; $re[havemsg]=$cr['havemsg'];
$re[registertime]=$cr['registertime']; $re[registertime]=$cr['registertime'];
$re[ucid]=$cr['ucid'];
return $re; return $re;
} }
......
...@@ -12,10 +12,11 @@ ...@@ -12,10 +12,11 @@
<link href="/skin/default/css/basic.css" rel="stylesheet"> <link href="/skin/default/css/basic.css" rel="stylesheet">
<link href="/skin/default/css/style.css" rel="stylesheet"> <link href="/skin/default/css/style.css" rel="stylesheet">
<!--Font Icon--> <!--Font Icon-->
<link rel="stylesheet" href="//at.alicdn.com/t/font_p8fypobopm5z5mi.css"> <link rel="stylesheet" href="//at.alicdn.com/t/font_f2m4zq69fqbsm7vi.css">
<style>body{background-color: #f3f3f3}</style> <style>body{background-color: #f3f3f3}</style>
</head> </head>
<body> <body>
<!--
<div class="top"> <div class="top">
<form name="searchform" method="post" action="/e/search/index.php"> <form name="searchform" method="post" action="/e/search/index.php">
<div class="search-box"> <div class="search-box">
...@@ -26,12 +27,19 @@ ...@@ -26,12 +27,19 @@
</form> </form>
<a href="#" class="sign"><i class="iconfont icon-qiandao1111"></i></a> <a href="#" class="sign"><i class="iconfont icon-qiandao1111"></i></a>
</div> </div>
<div class="nav-main"> -->
<a href="/" class="cur">推荐</a>
<a href="/shifu">师傅</a> <div class="empty-block"></div>
<a href="/hangye">行业</a> <div class="common-top">
<a href="/changshang">厂商</a> <a href="#" class="sign"><i class="iconfont icon-qiandao1111"></i></a>
</div> <div class="nav-main">
<a href="/" class="cur">推荐</a>
<a href="/shifu">师傅</a>
<a href="/hangye">行业</a>
<a href="/changshang">厂商</a>
</div>
<a href="#" class="search"><i class="iconfont icon-sousuo"></i></a>
</div>
<div class="swiper-container"> <div class="swiper-container">
<div class="swiper-wrapper"> <div class="swiper-wrapper">
...@@ -87,7 +95,7 @@ ...@@ -87,7 +95,7 @@
<div class="lc-img"><a href="http://xue.yunya.com/home/course-detail?courseId=37"><img <div class="lc-img"><a href="http://xue.yunya.com/home/course-detail?courseId=37"><img
src="http://deimg.c.xixia.cc/preview/14/af/53/vhc0QjF8zCEDRVLD5135.jpg-ym.preview"></a></div> src="http://deimg.c.xixia.cc/preview/14/af/53/vhc0QjF8zCEDRVLD5135.jpg-ym.preview"></a></div>
<h3><a href="http://xue.yunya.com/home/course-detail?courseId=37">我来发个系列课程试试看</a></h3> <h3><a href="http://xue.yunya.com/home/course-detail?courseId=37">我来发个系列课程试试看</a></h3>
<p><span>3人已学</span><span>6人评论</span></p> <p><span>2人已学</span><span>6人评论</span></p>
</div><div class="learn-course-box"> </div><div class="learn-course-box">
<div class="lc-img"><a href="http://xue.yunya.com/home/course-detail?courseId=5"><img <div class="lc-img"><a href="http://xue.yunya.com/home/course-detail?courseId=5"><img
src="http://deimg.c.xixia.cc/preview/27/8f/26/mOuzx8G2eAYefYOL2159.jpg-ym.preview"></a></div> src="http://deimg.c.xixia.cc/preview/27/8f/26/mOuzx8G2eAYefYOL2159.jpg-ym.preview"></a></div>
...@@ -99,11 +107,11 @@ ...@@ -99,11 +107,11 @@
<h3><a href="http://xue.yunya.com/home/course-detail?courseId=2">指掌时代公司介绍</a></h3> <h3><a href="http://xue.yunya.com/home/course-detail?courseId=2">指掌时代公司介绍</a></h3>
<p><span>4人已学</span><span>35人评论</span></p> <p><span>4人已学</span><span>35人评论</span></p>
</div></div></div><div class="latest-news"> </div></div></div><div class="latest-news">
<div class="common-tit-index">热门互动</div> <div class="common-tit-index">热门互动<a href="http://bbs.yunya.com">参与互动</a></div>
<ul class="news-list"><li> <ul class="news-list"><li>
<a href="http://bbs.yunya.com/forum.php?mod=viewthread&tid=167"> <a href="http://bbs.yunya.com/forum.php?mod=viewthread&tid=167">
<h3>我对冰箱漏,堵的一点看法与处理(转)</h3> <h3>我对冰箱漏,堵的一点看法与处理(转)</h3>
<p>4人已参与</p> <p>7人已参与</p>
<img src="/skin/default/images/notimg.gif"> <img src="/skin/default/images/notimg.gif">
</a> </a>
</li><li> </li><li>
...@@ -144,7 +152,7 @@ ...@@ -144,7 +152,7 @@
<script type='text/javascript' src="/skin/default/js/jquery-1.11.3.min.js"></script> <script type='text/javascript' src="/skin/default/js/jquery-1.11.3.min.js"></script>
<script type='text/javascript' src="/skin/default/js/swiper.min.js"></script> <script type='text/javascript' src="/skin/default/js/swiper.min.js"></script>
<script type='text/javascript' src="http://u.test.yunyamooc.com/js/nav.js"></script> <script type='text/javascript' src="http://u.yunya.com/common/nav.js"></script>
<script> <script>
var mySwiper = new Swiper ('.swiper-container', { var mySwiper = new Swiper ('.swiper-container', {
autoplay: 5000, autoplay: 5000,
......
...@@ -196,30 +196,48 @@ if (scrollLoad.length > 0) { ...@@ -196,30 +196,48 @@ if (scrollLoad.length > 0) {
} }
//检查内容点赞状态 //init
$.post("/e/action/news/index.php?mod=checkdiggtop", {newsid: newsid}, function (e) { $.post("/e/action/news/index.php?mod=init", {newsid: newsid}, function (e) {
if (e.status) { //点赞
if (e.data.isdiggtop) {
$("#zan").find('i').removeClass('icon-zan').addClass('icon-zan-fill'); $("#zan").find('i').removeClass('icon-zan').addClass('icon-zan-fill');
} else { } else {
$('#zan').one('click',function () { diggtop();
diggtop(); }
});
//收藏
if (e.data.isfava) {
$('#favor').find('i').removeClass('icon-favor').addClass('icon-favor-fill');
} }
}, 'json'); }, 'json');
//点赞
function diggtop() { function diggtop() {
$.post("/e/action/news/index.php?mod=diggtop", {newsid: newsid}, function (e) { $('#zan').one('click',function () {
$.post("/e/action/news/index.php?mod=diggtop", {newsid: newsid}, function (e) {
if (e.status) {
$("#zan").find('i').removeClass('icon-zan').addClass('icon-zan-fill');
$('.zan-tip').animate({opacity: "1", top: "-=30"},500).animate({opacity: "0", top: "-30"}, "slow");
} else {
pop(e.msg);
}
}, 'json');
});
}
//收藏
$('#favor').click(function () {
var self = this;
var fill = $(self).find("i").hasClass("icon-favor");
$.post("/e/action/news/index.php?mod=favorite", {newsid: newsid}, function (e) {
if (e.status) { if (e.status) {
$("#zan").find('i').removeClass('icon-zan').addClass('icon-zan-fill'); if (fill) {
$('.zan-tip').animate({opacity: "1", top: "-=30"},500).animate({opacity: "0", top: "-30"}, "slow"); $(self).find('i').removeClass('icon-favor').addClass('icon-favor-fill');
} else {
$(self).find('i').removeClass('icon-favor-fill').addClass('icon-favor');
}
} else { } else {
pop(e.msg); pop(e.msg);
} }
}, 'json'); }, 'json');
}
//收藏
$('#favor').click(function () {
$(this).find('i').removeClass('icon-favor').addClass('icon-favor-fill');
}); });
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