diff --git a/app/portal/controller/IndexController.php b/app/portal/controller/IndexController.php index 2d7a1c5..67a1aa5 100644 --- a/app/portal/controller/IndexController.php +++ b/app/portal/controller/IndexController.php @@ -24,7 +24,7 @@ class IndexController extends HomeBaseController //banner轮播图 // $coverImg = cache('coverImg'); // if(!$coverImg){ - $coverImg = $this->getCoverImg(CityCategoryModel::indexImg,3); + $coverImg = $this->getCoverImg(CityCategoryModel::indexImg,10); // cache('coverImg',$coverImg); // } $this->assign('coverImg',$coverImg); diff --git a/app/portal/controller/StarController.php b/app/portal/controller/StarController.php index 38b2992..d2c75cd 100644 --- a/app/portal/controller/StarController.php +++ b/app/portal/controller/StarController.php @@ -404,6 +404,9 @@ class StarController extends HomeBaseController //判断是否登录 $login = cmf_is_user_login(); $article_id = $this->request->param('article_id');//文章id + if(empty($article_id)){ + $this->apiResponse(0,'收藏失败!'); + } $post_url = $this->request->param('post_url');//文章链接 if($login){ $data['uid'] = cmf_get_current_user_id(); @@ -473,6 +476,9 @@ class StarController extends HomeBaseController //判断是否登录 $login = cmf_is_user_login(); $article_id = $this->request->param('article_id');//文章id + if(empty($article_id)){ + $this->apiResponse(0,'点赞失败!'); + } if($login){ $data['uid'] = cmf_get_current_user_id(); $data['post_id'] = $article_id; @@ -508,4 +514,47 @@ class StarController extends HomeBaseController $this->apiResponse(0,'请登录后操作!'); } } + + + + + + //更多视频显示是否收藏与点赞 + //是否收藏 + public function is_collections(){ + //判断是否登录 + $login = cmf_is_user_login(); + $article_id = $this->request->param('id');//文章id + if($login){ + $uid = cmf_get_current_user_id(); + $collectionModel = new CollectionModel(); + $res = $collectionModel->where(['uid'=>$uid,'post_id'=>$article_id])->find(); + if($res){ + $this->apiResponse(1); + }else{ + $this->apiResponse(0); + } + }else{ + $this->apiResponse(0); + } + } + + //是否点赞 + public function is_likes(){ + //判断是否登录 + $login = cmf_is_user_login(); + $article_id = $this->request->param('id');//文章id + if($login){ + $uid = cmf_get_current_user_id(); + $likeModel = new LikeModel(); + $res = $likeModel->where(['uid'=>$uid,'post_id'=>$article_id])->find(); + if($res){ + $this->apiResponse(1); + }else{ + $this->apiResponse(0); + } + }else{ + $this->apiResponse(0); + } + } } diff --git a/public/themes/simpleboot3/portal/index/index.html b/public/themes/simpleboot3/portal/index/index.html index f9653ee..510a7a7 100644 --- a/public/themes/simpleboot3/portal/index/index.html +++ b/public/themes/simpleboot3/portal/index/index.html @@ -102,7 +102,7 @@ </notempty> <!-- 侧边 --> <div class="index_sidebar"> - <a target="_blank" href="http://wpa.qq.com/msgrd?v=3&uin=1309572580&site=qq&menu=yes"> + <a target="_blank" href="http://wpa.qq.com/msgrd?v=3&uin=2250343976&site=qq&menu=yes"> <img src="__TMPL__/public/assets/starImg/aicon_24.png" alt="独角星球 小众目的地 旅游资讯"> </a> <img class="index_scrollTop" src="__TMPL__/public/assets/starImg/aicon_25.png" alt="独角星球 小众目的地 旅游资讯"> diff --git a/public/themes/simpleboot3/portal/region/get_more_video.html b/public/themes/simpleboot3/portal/region/get_more_video.html index 89de4a6..0f8c8f9 100644 --- a/public/themes/simpleboot3/portal/region/get_more_video.html +++ b/public/themes/simpleboot3/portal/region/get_more_video.html @@ -69,6 +69,8 @@ <p> {$vo.post_title} </p> + <!--id--> + <input type="hidden" value="{$vo.id}" class="li_id"> <input type="hidden" value="{:cmf_get_file_download_url($vo.video)}" class="li_video"> <!--标题--> <input type="hidden" value="{$vo.post_title}" class="li_post_title"> @@ -90,14 +92,19 @@ <!-- 国家 --> <div class="show_9_video_asideTxt2"> <!--<p>国家:<span class="city_name"></span></p>--> + <input type="hidden" value="" id="li_id"> <p>取景:<span class="framing"></span></p> <p>上映时间:<span class="release_time"></span></p> </div> <!-- 分享 --> <div class="show_9_video_asideTxt3 clearfix"> <p>分享:</p> + <input type="hidden" class="collection" value=""> + <input type="hidden" class="like" value=""> <img src="__TMPL__/public/assets/starImg/aicon_89.png" alt=""> <img src="__TMPL__/public/assets/starImg/aicon_90.png" alt=""> + <img id="collections" src="__TMPL__/public/assets/starImg/bicon_02.png" alt=""> + <img id="likes" src="__TMPL__/public/assets/starImg/bicon_03.png" alt=""> </div> </div> </div> @@ -215,15 +222,24 @@ 'z-index': "11", "display": "block" }); - //标题,国家,取景,上映时间 + //视频id,标题,国家,取景,上映时间 + var id = li_index.children('.li_id').val(); var post_title = li_index.children('.li_post_title').val(); var city_name = li_index.children('.li_city_name').val(); var framing = li_index.children('.li_framing').val(); var release_time = li_index.children('.li_release_time').val(); + $('#li_id').val(id); $('.post_title').text(post_title); $('.city_name').text(city_name); $('.framing').text(framing); $('.release_time').text(release_time); + + //是否收藏 + is_collections(id); + + //是否点赞 + is_likes(id); + } // 点击播放 function bofang() { @@ -232,6 +248,49 @@ $('.play_button').hide(); $('.video_poster').css('z-index', '-1'); } + + //是否收藏 + function is_collections(article_id){ + var host = 'http://'+window.location.host; + $.ajax({ + type: 'POST', + url: '/portal/star/is_collections', + data: { + 'id':article_id, + }, + dataType: 'json', + async : false, + success: function (data) { + console.log(data); + if (data.code == 1) { + $('#collections').attr('src',host+'/themes/simpleboot3/public/assets/starImg/bicon_15.png') + } else { + $('#collections').attr('src',host+'/themes/simpleboot3/public/assets/starImg/bicon_02.png') + } + } + }); + } + + //是否点赞 + function is_likes(article_id){ + var host = 'http://'+window.location.host; + $.ajax({ + type: 'POST', + url: '/portal/star/is_likes', + data: { + 'id':article_id, + }, + dataType: 'json', + async : false, + success: function (data) { + if (data.code == 1) { + $('#likes').attr('src',host+'/themes/simpleboot3/public/assets/starImg/bicon_16.png') + } else { + $('#likes').attr('src',host+'/themes/simpleboot3/public/assets/starImg/bicon_03.png') + } + } + }); + } </script> </body> diff --git a/public/themes/simpleboot3/portal/scenery_detail.html b/public/themes/simpleboot3/portal/scenery_detail.html index ed4e284..64dd275 100644 --- a/public/themes/simpleboot3/portal/scenery_detail.html +++ b/public/themes/simpleboot3/portal/scenery_detail.html @@ -31,7 +31,7 @@ </div> <a href="{$res.pay_url}"> <div class="wares_right_pay"> - 立即前往购买 + 立即前往咨询 </div> </a> </div> diff --git a/public/themes/simpleboot3/portal/scout/get_travel_detail.html b/public/themes/simpleboot3/portal/scout/get_travel_detail.html index 43d267a..d25bc58 100644 --- a/public/themes/simpleboot3/portal/scout/get_travel_detail.html +++ b/public/themes/simpleboot3/portal/scout/get_travel_detail.html @@ -48,7 +48,7 @@ </div> <div class="Travel_right_spec_pay"> <a href="{$res.pay_url}"> - 立即前往购买 + 立即前往咨询 </a> </div> </div> diff --git a/public/themes/simpleboot3/public/assets/js/public.js b/public/themes/simpleboot3/public/assets/js/public.js index c230e7a..8c9182f 100644 --- a/public/themes/simpleboot3/public/assets/js/public.js +++ b/public/themes/simpleboot3/public/assets/js/public.js @@ -32,6 +32,42 @@ $(function(){ $(this).children('img').attr('src', host+'/themes/simpleboot3/public/assets/starImg/bicon_03.png'); } }); + + // 收藏更多视频 + $('#collections').click(function() { + if ($(this).attr('src') == host+'/themes/simpleboot3/public/assets/starImg/bicon_02.png') { + var login = operation('/portal/star/collection',1); + if(login == 0){ + return false; + } + $(this).attr('src', host+'/themes/simpleboot3/public/assets/starImg/bicon_15.png'); + } else { + var login = operation('/portal/star/cancelCollection',1); + if(login == 0){ + return false; + } + $(this).attr('src', host+'/themes/simpleboot3/public/assets/starImg/bicon_02.png'); + } + }); + + //点赞 + $('#likes').click(function() { + if ($(this).attr('src') == host+'/themes/simpleboot3/public/assets/starImg/bicon_03.png') { + var login = operation('/portal/star/like',1); + if(login == 0){ + return false; + } + $(this).attr('src', host+'/themes/simpleboot3/public/assets/starImg/bicon_16.png'); + } else { + var login = operation('/portal/star/cancelLike',1); + if(login == 0){ + return false; + } + $(this).attr('src', host+'/themes/simpleboot3/public/assets/starImg/bicon_03.png'); + } + }); + + // 评论判断长度显示与隐藏 if ($('.show_2_pinL').length < 3) { $('.show_main_more').hide(); @@ -138,11 +174,31 @@ $(function(){ $("#searchForm").submit();//处理事件 } }); + + var share_url = encodeURIComponent(location.href); + var share_title = encodeURIComponent(document.title); + //分享到微博 + $('.weibo').click(function(){ + var param = { + url: share_url, + title: share_title, + rnd: new Date().valueOf() + }; + var temp = []; + for (var p in param) { + temp.push(p + '=' + encodeURIComponent(param[p] || '')) + } + window.open('http://v.t.sina.com.cn/share/share.php?' + temp.join('&')); + }); }); //点赞收藏 -function operation(url){ - var article_id = getUrlParam('id'); +function operation(url,id =''){ + if(id == ''){ + var article_id = getUrlParam('id'); + }else{ + var article_id = $('#li_id').val(); + } var is_login = 1; var post_url = window.location.pathname+window.location.search; $.ajax({ diff --git a/public/themes/simpleboot3/public/slide.html b/public/themes/simpleboot3/public/slide.html index 678e708..8f5602e 100644 --- a/public/themes/simpleboot3/public/slide.html +++ b/public/themes/simpleboot3/public/slide.html @@ -17,12 +17,12 @@ </notempty> </div> <!-- wx分享 --> - <div class="wx_go"> + <div class="wx_go weixin"> <img src="__TMPL__/public/assets/starImg/bicon_04.png" alt=""> <p>168</p> </div> <!-- wb分享 --> - <div class="wb_go"> + <div class="wb_go weibo"> <img src="__TMPL__/public/assets/starImg/bicon_05.png" alt=""> <p>168</p> </div> diff --git a/public/themes/simpleboot3_mobile/portal/region/get_more_video.html b/public/themes/simpleboot3_mobile/portal/region/get_more_video.html index 600df1d..4d562d9 100644 --- a/public/themes/simpleboot3_mobile/portal/region/get_more_video.html +++ b/public/themes/simpleboot3_mobile/portal/region/get_more_video.html @@ -87,7 +87,8 @@ {$vo.post_title} </div> </div> - + <!--id--> + <input type="hidden" value="{$vo.id}" class="li_id"> <input type="hidden" value="{:cmf_get_file_download_url($vo.video)}" class="li_video"> <!--标题--> <input type="hidden" value="{$vo.post_title}" class="li_post_title"> @@ -106,6 +107,8 @@ <!-- 影片信息 --> <div class="index_seventh_bottom"> <div class="index_seventh_bottom_one"><span class="post_title"></span></div> + + <input type="hidden" value="" id="li_id"> <!-- <div class="index_seventh_bottom_two">国家:<span class="city_name"></span></div> --> <div class="index_seventh_bottom_three">取景:<span class="framing"></span></div> <div class="index_seventh_bottom_four">上映时间:<span class="release_time"></span></div> @@ -117,6 +120,15 @@ <div class="index_seventh_bottom_img1"> <img src="__TMPL__/public/assets/images/cicon_72@2x.png" alt="" /> </div> + <div class="index_seventh_bottom_img1"> + <img id="collections" src="__TMPL__/public/assets/images/bicon_02.png" alt=""> + </div> + <div class="index_seventh_bottom_img1"> + <img id="likes" src="__TMPL__/public/assets/images/bicon_03.png" alt=""> + </div> + + <input type="hidden" class="collection" value=""> + <input type="hidden" class="like" value=""> </div> </div> @@ -269,14 +281,65 @@ // }); //标题,国家,取景,上映时间 + var id = li_index.children('.li_id').val(); var post_title = li_index.children('.li_post_title').val(); var city_name = li_index.children('.li_city_name').val(); var framing = li_index.children('.li_framing').val(); var release_time = li_index.children('.li_release_time').val(); + $('#li_id').val(id); $('.post_title').text(post_title); $('.city_name').text(city_name); $('.framing').text(framing); $('.release_time').text(release_time); + + //是否收藏 + is_collections(id); + + //是否点赞 + is_likes(id); + } + + //是否收藏 + function is_collections(article_id){ + var host = 'http://' + window.location.host + '/themes/simpleboot3_mobile/public/assets'; + $.ajax({ + type: 'POST', + url: '/portal/star/is_collections', + data: { + 'id':article_id, + }, + dataType: 'json', + async : false, + success: function (data) { + console.log(data); + if (data.code == 1) { + $('#collections').attr('src',host+'/images/bicon_15.png') + } else { + $('#collections').attr('src',host+'/images/bicon_02.png') + } + } + }); + } + + //是否点赞 + function is_likes(article_id){ + var host = 'http://' + window.location.host + '/themes/simpleboot3_mobile/public/assets'; + $.ajax({ + type: 'POST', + url: '/portal/star/is_likes', + data: { + 'id':article_id, + }, + dataType: 'json', + async : false, + success: function (data) { + if (data.code == 1) { + $('#likes').attr('src',host+'/images/bicon_16.png') + } else { + $('#likes').attr('src',host+'/images/bicon_03.png') + } + } + }); } </script> diff --git a/public/themes/simpleboot3_mobile/portal/scenery_detail.html b/public/themes/simpleboot3_mobile/portal/scenery_detail.html index d4ec274..509a24b 100644 --- a/public/themes/simpleboot3_mobile/portal/scenery_detail.html +++ b/public/themes/simpleboot3_mobile/portal/scenery_detail.html @@ -34,7 +34,7 @@ {$res.post_excerpt} </div> <a href="{$res.pay_url}"> - <div class="index_fifteenth_five">立即前往资讯</div> + <div class="index_fifteenth_five">立即前往咨询</div> </a> </div> </div> diff --git a/public/themes/simpleboot3_mobile/portal/scout/get_travel_detail.html b/public/themes/simpleboot3_mobile/portal/scout/get_travel_detail.html index 7ad1d4e..a2b183a 100644 --- a/public/themes/simpleboot3_mobile/portal/scout/get_travel_detail.html +++ b/public/themes/simpleboot3_mobile/portal/scout/get_travel_detail.html @@ -61,7 +61,7 @@ </div> <a href="{$res.pay_url}"> <div class="index_fifteenth_five"> - 立即前往资讯 + 立即前往咨询 </div> </a> </div> diff --git a/public/themes/simpleboot3_mobile/portal/scout/index.html b/public/themes/simpleboot3_mobile/portal/scout/index.html index a72edf1..9a194fb 100644 --- a/public/themes/simpleboot3_mobile/portal/scout/index.html +++ b/public/themes/simpleboot3_mobile/portal/scout/index.html @@ -117,7 +117,7 @@ </div> <div class="first_scene_top_ch">旅游<span>地产</span></div> <div class="first_scene_top_en"> - Tourism Real Estate + Overseas Investment </div> </div> </div> diff --git a/public/themes/simpleboot3_mobile/public/assets/js/public.js b/public/themes/simpleboot3_mobile/public/assets/js/public.js index 6222f5f..948d9f2 100644 --- a/public/themes/simpleboot3_mobile/public/assets/js/public.js +++ b/public/themes/simpleboot3_mobile/public/assets/js/public.js @@ -74,6 +74,41 @@ $(function() { } }); + // 收藏更多视频 + $('#collections').click(function() { + if ($(this).attr('src') == host + '/images/bicon_02.png') { + var login = operation('/portal/star/collection',1); + if(login == 0){ + return false; + } + $(this).attr('src', host + '/images/bicon_15.png'); + } else { + var login = operation('/portal/star/cancelCollection',1); + if(login == 0){ + return false; + } + $(this).attr('src', host + '/images/bicon_02.png'); + } + }); + + //点赞 + $('#likes').click(function() { + if ($(this).attr('src') == host + '/images/bicon_03.png') { + var login = operation('/portal/star/like',1); + if(login == 0){ + return false; + } + $(this).attr('src', host + '/images/bicon_16.png'); + } else { + var login = operation('/portal/star/cancelLike',1); + if(login == 0){ + return false; + } + $(this).attr('src', host + '/images/bicon_03.png'); + } + }); + + // 评论判断长度显示与隐藏 if ($('.show_2_pinL').length < 3) { $('.show_main_more').hide(); @@ -173,6 +208,27 @@ $(function() { $("#searchForm").submit(); //处理事件 } }); + var share_url = encodeURIComponent(location.href); + var share_title = encodeURIComponent(document.title); + //分享到微博 + $('.weibo').click(function(){ + var param = { + url: share_url, + title: share_title, + rnd: new Date().valueOf() + }; + var temp = []; + for (var p in param) { + temp.push(p + '=' + encodeURIComponent(param[p] || '')) + } + window.open('http://v.t.sina.com.cn/share/share.php?' + temp.join('&')); + }); + + //分享到微信 + // $('.weixin').click(function(){ + // var target_url = "http://qr.liantu.com/api.php?text="+share_url; + // window.open(target_url, 'weixin', 'height=320, width=320'); + // }); }); //弹框 @@ -195,8 +251,12 @@ function video_mask(msg) { }, 6000); } //点赞收藏 -function operation(url) { - var article_id = getUrlParam('id'); +function operation(url,id ='') { + if(id == ''){ + var article_id = getUrlParam('id'); + }else{ + var article_id = $('#li_id').val(); + } var is_login = 1; var post_url = window.location.pathname + window.location.search; $.ajax({ diff --git a/public/themes/simpleboot3_mobile/public/slide.html b/public/themes/simpleboot3_mobile/public/slide.html index 6f52b81..cc3c584 100644 --- a/public/themes/simpleboot3_mobile/public/slide.html +++ b/public/themes/simpleboot3_mobile/public/slide.html @@ -1,13 +1,13 @@ <div class="share"> <ul> <li class="share1"> - <div class="share1_Img"> + <div class="share1_Img weixin"> <img src="__TMPL__/public/assets/images/bicon_04.png" alt="" /> </div> <p class="share1_Txt">3.6k</p> </li> <li class="share1"> - <div class="share1_Img"> + <div class="share1_Img weibo"> <img src="__TMPL__/public/assets/images/bicon_05.png" alt="" /> </div> <p class="share1_Txt">168</p>