This commit is contained in:
pplokijuhyg 2019-12-18 17:37:50 +08:00
parent 7296d226f4
commit 5195fcfa8a
15 changed files with 337 additions and 110 deletions

View File

@ -13,7 +13,10 @@
:nickname="item.nickname"
:text="item.articlecontent"
:comment="item.comment"
:num="item.islike"
:like="item.islike"
:collect="item.collect"
:islike="item.isClick"
:iscllect="item.isCollect"
></follow>
</div>

View File

@ -6,7 +6,18 @@
</div>
<div class="all" v-if="no==0">
<div class="all1" v-for="(i,j) in list" :key="j" @click="todetail(i.id,i.type)">
<indexfindall :title="i.title" :num="i.comment" :content="i.text" :right="'http://lawpro.earnest.pro/'+i.avatar"></indexfindall>
<indexfindall
:title="i.title"
:num="i.comment"
:content="i.text"
:right="'http://lawpro.earnest.pro/'+i.avatar"
:islike="i.isClick"
:iscllect="i.isCollect"
:like="i.islike"
:collect="i.collect"
:id="i.id"
:type="i.type"
></indexfindall>
</div>
<div style="width:100%;height:0.5rem;text-align:center;line-height:0.3rem">{{text}}</div>
@ -73,8 +84,8 @@ export default {
indedfinduser
},
mounted() {
this.getlist1()
},
this.getlist1();
},
watch: {
no() {
this.page = 0;
@ -82,7 +93,7 @@ export default {
this.list = [];
this.lock = false;
// this.getlist1();
this.text="加载中"
this.text = "加载中";
}
},
beforeRouteLeave(a, b, c) {
@ -90,41 +101,39 @@ export default {
c();
},
methods: {
getlist1(){
let t=this;
t.list=[]
getlist1() {
let t = this;
t.list = [];
t.axios
.post("http://lawpro.earnest.pro/api/login_main/indexsearch", {
where: t.$route.query.word,
type: t.no,
}).then((res)=>{
if(res.data.data){
t.list=res.data.data
window.console.log(t.list.length,"hfihaifohog")
if(t.list.length<5){
t.text="暂无数据"
token: localStorage.getItem("token")
})
.then(res => {
if (res.data.data) {
t.list = res.data.data;
window.console.log(t.list.length, "hfihaifohog");
if (t.list.length < 5) {
t.text = "暂无数据";
}
window.$(window).scroll(() => {
var windowH = window.$(window).height(); //
var documentH = window.$(document).height(); //
var scrollH = window.$(window).scrollTop(); //
// scrollH = $(document).scrollTop();
if (windowH + scrollH >= documentH) {
// do something
// alert(2);
window.console.log(1);
t.getlist();
}
});
}else{
window.console.log("errir")
t.text="暂无数据"
var windowH = window.$(window).height(); //
var documentH = window.$(document).height(); //
var scrollH = window.$(window).scrollTop(); //
// scrollH = $(document).scrollTop();
if (windowH + scrollH >= documentH) {
// do something
// alert(2);
window.console.log(1);
t.getlist();
}
});
} else {
window.console.log("errir");
t.text = "暂无数据";
}
})
});
},
getlist() {
if (this.lock) {
@ -142,36 +151,34 @@ export default {
.then(res => {
window.console.log(res);
if (res.data.code == 200) {
if(res.data.data){
t.list = t.list.concat(res.data.data);
if (res.data.data) {
t.list = t.list.concat(res.data.data);
}
t.lock = false;
window.$(window).scroll(() => {
var windowH = window.$(window).height(); //
var documentH = window.$(document).height(); //
var scrollH = window.$(window).scrollTop(); //
// scrollH = $(document).scrollTop();
if (windowH + scrollH >= documentH) {
// do something
// alert(2);
window.console.log(1);
t.getlist();
}
});
window.$(window).scroll(() => {
var windowH = window.$(window).height(); //
var documentH = window.$(document).height(); //
var scrollH = window.$(window).scrollTop(); //
// scrollH = $(document).scrollTop();
if (windowH + scrollH >= documentH) {
// do something
// alert(2);
window.console.log(1);
t.getlist();
}
});
} else {
t.text = "暂无更多";
}
// t.list=res.data.data
});
},
getno(e) {
window.console.log(e);
this.no = e;
this.list = [];
this.getlist1()
window.console.log(this.list.length,"list")
this.getlist1();
window.console.log(this.list.length, "list");
},
todetail(e, type) {
window.console.log(e);
@ -198,21 +205,21 @@ export default {
// // res.data.data[i].avatar= "http://lawpro.earnest.pro/"+res.data.data[i].avatar
// // }
// // t.list=res.data.data
// if (res.data.code == 200) {
// t.list = res.data.data;
// window.$(window).scroll(() => {
// var windowH = window.$(window).height(); //
// var documentH = window.$(document).height(); //
// var scrollH = window.$(window).scrollTop(); //
// // scrollH = $(document).scrollTop();
// if (windowH + scrollH >= documentH) {
// // do something
// // alert(2);
// window.console.log(1);
// t.getlist();
// }
// });
// } else {
// if (res.data.code == 200) {
// t.list = res.data.data;
// window.$(window).scroll(() => {
// var windowH = window.$(window).height(); //
// var documentH = window.$(document).height(); //
// var scrollH = window.$(window).scrollTop(); //
// // scrollH = $(document).scrollTop();
// if (windowH + scrollH >= documentH) {
// // do something
// // alert(2);
// window.console.log(1);
// t.getlist();
// }
// });
// } else {
// t.text = "";
// }
// })

View File

@ -22,7 +22,7 @@
<div :class="types == 3?'select':''" @click="types=3">回答</div>
<div :class="types == 1?'select':''" @click="types=1">文章</div>
<div :class="types == 2?'select':''" @click="types=2">提问</div>
<!-- <div :class="types == 5?'select':''" @click="types=5">收藏</div> -->
<div :class="types == 5?'select':''" @click="types=5">收藏</div>
</div>
<div class="list">
<div v-for="(item,index) in dynamiclist" :key="index">
@ -31,7 +31,8 @@
<follow v-if="types == 3" operation="我发布了该回答" :day="item.time" :title="item.title" :nickname="item.nickname" :userimg="'http://lawpro.earnest.pro' + userimg" :num="item.islike" :img="'http://lawpro.earnest.pro' + item.avatar" :text="item.text" :comment="item.comment" :sid="item.id" :type="item.status"></follow>
<answer v-if="types==1" operation="我发布了该文章" :day="item.time" :title="item.title" types="1" :sid="item.id" :type="item.status"></answer>
<answer v-if="types==2" operation="我发布了该问题" :day="item.time" :title="item.title" types="2" :sid="item.id" :type="item.status"></answer>
<follow v-if="types == 5 && item.type==2" operation="我收藏了该回答" :day="item.time" :title="item.title" :nickname="item.nickname" :userimg="'http://lawpro.earnest.pro' + userimg" :num="item.islike" :img="'http://lawpro.earnest.pro' + item.avatar" :text="item.text" :comment="item.comment" :sid="item.id" :type="item.status"></follow>
<answer v-if="types==5 && item.type ==1" operation="我收藏了该文章" :day="item.time" :title="item.title" types="1" :sid="item.id" :type="item.status"></answer>
</div>
</div>
@ -165,7 +166,7 @@ export default {
return ;
}
this.dynamiclist = this.dynamiclist.concat(res.data.data)
this.dynamiclist = res.data.data
this.lock = false
}
@ -183,12 +184,13 @@ export default {
}).then((res)=>{
window.console.log(res)
if(res.data.code == 200){
if(res.data.data.length == 0){
// if(res.data.data.length == 0){
// return ;
// }
// alert(1)
return ;
}
this.dynamiclist = this.dynamiclist.concat(res.data.data)
this.dynamiclist = res.data.data
this.lock = false
}

View File

@ -13,6 +13,10 @@
:text="list.data.articlecontent"
:title="list.data.title"
:guanzhu="ifgz"
:like = "list.data.islike"
:collect = "list.data.comment"
:islike="list.data.isClick"
:iscllect="list.data.isCollect"
@pinglun="pinglu"
@guanzhu="gz"
></follow>
@ -45,6 +49,7 @@
:img="'http://lawpro.earnest.pro/' + item.avatar"
:name="item.nickname"
:text="item.text"
></comment>
</div>
<div class="msg" v-show="msgs">{{msg}}</div>

BIN
src/assets/collect.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 255 B

BIN
src/assets/collects.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 278 B

BIN
src/assets/like.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 230 B

BIN
src/assets/likes.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 247 B

View File

@ -13,14 +13,22 @@
<p>{{text}}</p>
</div>
<div class="operation">
<div @click.stop="shar">
<!-- <div @click.stop="shar">
<img src="../assets/share.png" alt srcset />
分享
</div>
</div> -->
<div>
<img src="../assets/pl.png" alt srcset />
{{num}}回答
</div>
<div @click.stop="clike">
<img :src="islike?plikes:plike" alt srcset />
{{like}}点赞
</div>
<div @click.stop="ccollect">
<img :src="iscllect?pcollects:pcollect" alt srcset />
{{collect}}收藏
</div>
<div v-show="false" class="more" @click="show = !show">
<div></div>
<div></div>
@ -177,14 +185,22 @@
}
</style>
<script>
import plike from "../assets/like.png"
import plikes from "../assets/likes.png"
import pcollect from '../assets/collect.png'
import pcollects from '../assets/collects.png'
export default {
name: "PersonafFollow",
data() {
return {
show: false
show: false,
plike,
plikes,
pcollect,
pcollects
};
},
props: ["title", "id", "img", "text", "num",'type'],
props: ["title", "id", "img", "text", "num",'type','like','collect','islike','iscllect'],
methods: {
shar() {
const input = document.createElement("input");
@ -199,6 +215,37 @@ export default {
}
document.body.removeChild(input);
},
clike(){
this.axios.post("http://lawpro.earnest.pro/api/login_main/clickLike",{
token:localStorage.getItem("token"),
type:this.type,
id:this.id,
status: 1
}).then(()=>{
if(this.islike){
this.like = parseInt(this.like) - 1
}else{
this.like = parseInt(this.like) + 1
}
this.islike = !this.islike
})
},
ccollect(){
this.axios.post("http://lawpro.earnest.pro/api/login_main/plusCollect",{
token:localStorage.getItem("token"),
type:this.type,
id:this.id
}).then(()=>{
if(this.iscllect){
this.collect = parseInt(this.collect) - 1
}else{
this.collect = parseInt(this.collect) + 1
}
this.iscllect = !this.iscllect
})
}
}
};

View File

@ -21,14 +21,14 @@
</p>
</div>
<div class="operation">
<div>
<!-- <div>
<img src="../assets/share.png" alt="" srcset="">
分享
</div>
<div>
<img src="../assets/pl.png" alt="" srcset="">
{{comment}}评论
</div>
</div> -->
<div>
</div>

View File

@ -21,10 +21,10 @@
</p>
</div>
<div class="operation">
<div>
<!-- <div>
<img src="../assets/share.png" alt="" srcset="">
分享
</div>
</div> -->
<div>
<img src="../assets/pl.png" alt="" srcset="">
{{comment}}评论

View File

@ -15,13 +15,21 @@
<div class="gengduo" v-show="show" @click="shows">展开阅读全文</div>
</div>
<div class="operation">
<div @click="shar">
<!-- <div @click="shar">
<img src="../assets/share.png" alt srcset />
分享
</div>
</div> -->
<div @click="pinglun">
<img src="../assets/pl.png" alt srcset />
{{comment}}评论
</div>
<div @click.stop="clike">
<img :src="islike?plikes:plike" alt srcset />
{{like}}点赞
</div>
<div @click.stop="ccollect">
<img :src="iscllect?pcollects:pcollect" alt srcset />
{{collect}}收藏
</div>
<div v-show="!show && lang" @click="hadd">收起</div>
</div>
@ -126,12 +134,20 @@
}
</style>
<script>
import plike from "../assets/like.png"
import plikes from "../assets/likes.png"
import pcollect from '../assets/collect.png'
import pcollects from '../assets/collects.png'
export default {
name: "PersonafFollow",
data() {
return {
show: false,
lang: true
lang: true,
plike,
plikes,
pcollect,
pcollects
};
},
props: {
@ -141,10 +157,13 @@ export default {
userimg: {},
nickname: {},
role: {},
num: {},
like: {},
comment: {},
text: {},
sid:{}
sid:{},
collect:{},
islike:{},
iscllect:{}
},
methods: {
@ -174,6 +193,37 @@ export default {
}
document.body.removeChild(input);
},
clike(){
this.axios.post("http://lawpro.earnest.pro/api/login_main/clickLike",{
token:localStorage.getItem("token"),
type:3,
click_id:this.sid,
status: 1
}).then(()=>{
if(this.islike){
this.like = parseInt(this.like) - 1
}else{
this.like = parseInt(this.like) + 1
}
this.islike = !this.islike
})
},
ccollect(){
this.axios.post("http://lawpro.earnest.pro/api/login_main/plusCollect",{
token:localStorage.getItem("token"),
type:3,
id:this.sid
}).then(()=>{
if(this.iscllect){
this.collect = parseInt(this.collect) - 1
}else{
this.collect = parseInt(this.collect) + 1
}
this.iscllect = !this.iscllect
})
}
},
mounted() {

View File

@ -33,15 +33,23 @@
<!-- <div v-show="show" @click="shows">展开阅读全文</div> -->
</div>
<div class="operation">
<div @click="shar">
<!-- <div @click="shar">
<img src="../assets/share.png" alt srcset />
分享
</div>
</div> -->
<div @click="$emit('pinglun')">
<img src="../assets/pl.png" alt srcset />
{{num}}评论
</div>
<div></div>
<div @click.stop="clike">
<img :src="islike?plikes:plike" alt srcset />
{{like}}点赞
</div>
<div @click.stop="ccollect">
<img :src="iscllect?pcollects:pcollect" alt srcset />
{{collect}}收藏
</div>
<!-- <div></div> -->
<!-- <div v-show="!show && lang" @click="hadd">收起</div> -->
</div>
</div>
@ -166,7 +174,7 @@
}
}
> div:last-child {
margin-left: 300px;
// margin-left: 300px;
margin-right: 0;
}
}
@ -198,12 +206,20 @@
}
</style>
<script>
import plike from "../assets/like.png"
import plikes from "../assets/likes.png"
import pcollect from '../assets/collect.png'
import pcollects from '../assets/collects.png'
export default {
name: "PersonafFollow",
data() {
return {
show: false,
lang: true
lang: true,
plike,
plikes,
pcollect,
pcollects
};
},
@ -235,6 +251,37 @@ export default {
}
document.body.removeChild(input);
},
clike(){
this.axios.post("http://lawpro.earnest.pro/api/login_main/clickLike",{
token:localStorage.getItem("token"),
type:1,
id:this.$route.query.id,
status: 1
}).then(()=>{
if(this.islike){
this.like = parseInt(this.like) - 1
}else{
this.like = parseInt(this.like) + 1
}
this.islike = !this.islike
})
},
ccollect(){
this.axios.post("http://lawpro.earnest.pro/api/login_main/plusCollect",{
token:localStorage.getItem("token"),
type:1,
id:this.$route.query.id
}).then(()=>{
if(this.iscllect){
this.collect = parseInt(this.collect) - 1
}else{
this.collect = parseInt(this.collect) + 1
}
this.iscllect = !this.iscllect
})
}
},
mounted() {
@ -253,6 +300,6 @@ export default {
}
});
},
props:['img','nickname','sole','title','date','num','text','guanzhu']
props:['img','nickname','sole','title','date','num','text','guanzhu','like','collect','islike','iscllect']
};
</script>

View File

@ -6,14 +6,22 @@
<!-- <p class="text"> <b>职问</b>因为学习工作而在不同程度上变得麻木实际上长期从事法律</p> -->
<p class="text">{{content}}</p>
<div class="operation">
<div>
<!-- <div>
<img src="../assets/share.png" alt class="icon" />
<p>分享</p>
</div>
</div> -->
<div>
<img src="../assets/pl.png" alt class="icon" />
<p>{{num}}条评论</p>
</div>
<div @click.stop="clike">
<img :src="islike?plikes:plike" alt srcset />
<p>{{like}}点赞</p>
</div>
<div @click.stop="ccollect">
<img :src="iscllect?pcollects:pcollect" alt srcset />
<p>{{collect}}收藏</p>
</div>
</div>
</div>
<img :src="right" alt class="right" />
@ -22,11 +30,19 @@
</template>
<script>
import plike from "../assets/like.png"
import plikes from "../assets/likes.png"
import pcollect from '../assets/collect.png'
import pcollects from '../assets/collects.png'
export default {
name: "indexfindall",
data() {
return {
aaa: "../assets/ad.png"
aaa: "../assets/ad.png",
plike,
plikes,
pcollect,
pcollects
};
},
props: {
@ -39,7 +55,46 @@ export default {
content: {
type: String
},
right: {}
right: {},
like:{},
collect:{},
islike:{},
iscllect:{},
id:{},
type:{}
},
methods:{
clike(){
this.axios.post("http://lawpro.earnest.pro/api/login_main/clickLike",{
token:localStorage.getItem("token"),
type:this.type,
click_id:this.id,
status: 1
}).then(()=>{
if(this.islike){
this.like = parseInt(this.like) - 1
}else{
this.like = parseInt(this.like) + 1
}
this.islike = !this.islike
})
},
ccollect(){
this.axios.post("http://lawpro.earnest.pro/api/login_main/plusCollect",{
token:localStorage.getItem("token"),
type:this.type,
id:this.id
}).then(()=>{
if(this.iscllect){
this.collect = parseInt(this.collect) - 1
}else{
this.collect = parseInt(this.collect) + 1
}
this.iscllect = !this.iscllect
})
}
}
};
</script>
@ -54,7 +109,7 @@ export default {
font-size: 34px;
font-weight: 500;
padding: 0 41px;
text-indent:0;
text-indent: 0;
padding-top: 34px;
padding-bottom: 23px;
}
@ -88,9 +143,13 @@ export default {
> div {
display: flex;
> p {
margin-right: 60px;
margin-right: 10px;
margin-left: 10px;
}
>img{
width: 18px;
height: 18px;
}
}
// justify-content: space-between;

View File

@ -2,7 +2,11 @@
<div class="box">
<heads></heads>
<div class="list">
<div v-for="(item,index) in list" :key="index" @click="todetail(item.id,item.type,item.user_id)" >
<div
v-for="(item,index) in list"
:key="index"
@click="todetail(item.id,item.type,item.user_id)"
>
<list
:title="item.title"
:id="item.id"
@ -10,6 +14,10 @@
:img="item.img"
:text="item.text"
:type="item.type"
:like="item.islike"
:collect="item.collect"
:islike="item.isClick"
:iscllect="item.isCollect"
></list>
</div>
@ -45,7 +53,6 @@ export default {
};
},
methods: {
getlist() {
if (this.lock) {
return "lock";
@ -54,7 +61,8 @@ export default {
var t = this;
this.page += 1;
this.axios
.post("http://lawpro.earnest.pro/api/login_main/articleList", {
.post("http://lawpro.earnest.pro/api/Login_main/articleList", {
token: localStorage.getItem("token"),
page: t.page
})
.then(res => {
@ -66,7 +74,7 @@ export default {
}
});
},
todetail(e, type,userid) {
todetail(e, type, userid) {
window.console.log(e);
if (type == 2) {
this.$router.push({
@ -74,7 +82,7 @@ export default {
});
} else {
this.$router.push({
path: `/articledetail?id=` + e+`&userid=`+userid
path: `/articledetail?id=` + e + `&userid=` + userid
});
}
}
@ -86,8 +94,9 @@ export default {
mounted() {
var t = this;
this.axios
.post("http://lawpro.earnest.pro/api/login_main/articleList", {
page: t.page
.post("http://lawpro.earnest.pro/api/Login_main/articleList", {
page: t.page,
token: localStorage.getItem("token")
})
.then(res => {
window.console.log(res.data);
@ -110,11 +119,9 @@ export default {
}
});
},
beforeRouteLeave(a,b,c){
window.$(window).scroll(() => {
});
c()
beforeRouteLeave(a, b, c) {
window.$(window).scroll(() => {});
c();
}
};
</script>