theluyuan/falvpingtai
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'xuebaoxin' of pplokijuhyg/falvpingtai into master

Browse Source
This commit is contained in:
asd 2019-12-02 09:09:56 +08:00
commit a2092ac5be
19 changed files with 328 additions and 247 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

326
src/IndexArticleDetail.vue
View File

@ -14,7 +14,6 @@
:text="item.articlecontent"
:comment="item.comment"
:num="item.islike"
></follow>
</div>
@ -54,7 +53,6 @@
</div>
<div class="bodys">
<comment v-for="(item,index) in plist" :key="index"></comment>
</div>
<div class="reply">
<img @click="biaoqing = !biaoqing" src="./assets/baoqing.png" alt srcset />
@ -85,8 +83,8 @@ export default {
biaoqing: false,
list: {},
huida: [],
plist:[],
pid:0
plist: [],
pid: 0
};
},
components: {
@ -99,27 +97,34 @@ export default {
Emotion
},
methods: {
pfb(){
window.console.log(this.content)
this.axios.post("http://lawpro.earnest.pro/api/login_main/appendComment",{
text:this.content,
token:localStorage.getItem('token'),
type_id:this.pid,
type:3
}).then((res)=>{
if(res.data.code == 200){
this.pinglu(this.pid);
pfb() {
if (localStorage.getItem("token") == "") {
this.$router.push("/login");
} else {
window.console.log(this.content);
if (this.content != "") {
this.axios
.post("http://lawpro.earnest.pro/api/login_main/appendComment", {
text: this.content,
token: localStorage.getItem("token"),
type_id: this.pid,
type: 3
})
.then(res => {
if (res.data.code == 200) {
this.pinglu(this.pid);
this.content = ""
this.content = "";
}
});
}
})
}
},
handleEmotion(i) {
this.content += i;
},
pinglu(id) {
this.pid= id
this.pid = id;
this.axios
.post("http://lawpro.earnest.pro/api/login_main/CommentList", {
token: localStorage.getItem("token"),
@ -127,10 +132,10 @@ this.pinglu(this.pid);
type_id: id
})
.then(res => {
window.console.log(res)
this.plist = res.data.data.data
window.console.log(res);
this.plist = res.data.data.data;
// this.list = res.data.data;
this.show = true
this.show = true;
});
}
},
@ -139,7 +144,7 @@ this.pinglu(this.pid);
.post("http://lawpro.earnest.pro/api/login_main/mainDetails", {
token: localStorage.getItem("token"),
type: 2,
id: this. $route.query.id
id: this.$route.query.id
})
.then(res => {
// window.console.log(res)
@ -161,164 +166,163 @@ this.pinglu(this.pid);
</script>
<style lang="scss">
.box{
.linshi {
z-index: 999999 !important;
.top {
background-color: #fff;
position: absolute;
top: 0;
width: 100%;
height: 98px;
border-bottom: #f6f6f6 solid 1px;
display: flex;
align-items: center;
.tiao {
font-size: 30px;
color: #000;
font-weight: 500;
margin-left: 31px;
}
.qie {
font-size: 28px;
color: #95998f;
margin-left: 208px;
padding-right: 28px;
border-right: #f6f6f6 solid 2px;
height: 42px;
line-height: 42px;
.box {
.linshi {
z-index: 999999 !important;
.top {
background-color: #fff;
position: absolute;
top: 0;
width: 100%;
height: 98px;
border-bottom: #f6f6f6 solid 1px;
display: flex;
align-items: center;
.qiehuan {
width: 26px;
height: 22px;
display: block;
margin-right: 9px;
.tiao {
font-size: 30px;
color: #000;
font-weight: 500;
margin-left: 31px;
}
.qie {
font-size: 28px;
color: #95998f;
margin-left: 208px;
padding-right: 28px;
border-right: #f6f6f6 solid 2px;
height: 42px;
line-height: 42px;
display: flex;
align-items: center;
.qiehuan {
width: 26px;
height: 22px;
display: block;
margin-right: 9px;
}
}
.quit {
width: 28px;
height: 29px;
font-size: 29px;
margin-left: 34px;
display: flex;
> img {
width: 33px;
height: 33px;
}
// background-image: url("./assets/quit.png")
}
}
.quit {
width: 28px;
height: 29px;
font-size: 29px;
margin-left: 34px;
.bodys {
width: 100%;
height: 100%;
// background-color: #000;
overflow: hidden;
overflow-y: auto;
padding: 98px 0;
box-sizing: border-box;
}
.reply {
width: 100%;
height: 98px;
position: absolute;
bottom: 0;
background-color: #fff;
display: flex;
align-items: center;
> img {
width: 33px;
height: 33px;
margin-left: 30px;
}
> textarea {
margin-left: 21px;
border: none;
font-size: 30px;
height: 35px;
width: 550px;
// word-break: break-all;
// text-align: center;
}
> p {
margin-left: 30px;
font-size: 30px;
color: #6b9147;
}
> div {
position: absolute;
bottom: 98px;
background-color: #fff;
width: 100%;
}
// background-image: url("./assets/quit.png")
}
}
.bodys {
.line {
height: 0.2rem;
width: 100%;
height: 100%;
// background-color: #000;
overflow: hidden;
overflow-y: auto;
padding: 98px 0;
background-color: #f6f6f6;
}
.question {
height: auto;
width: 100%;
color: #333333;
font-size: 0.36rem;
text-indent: 0.3rem;
line-height: 0.5rem;
padding: 0.25rem;
box-sizing: border-box;
font-weight: 500;
}
.reply {
width: 100%;
height: 98px;
position: absolute;
bottom: 0;
background-color: #fff;
display: flex;
align-items: center;
> img {
width: 33px;
height: 33px;
margin-left: 30px;
}
> textarea {
margin-left: 21px;
border: none;
font-size: 30px;
height: 35px;
width: 550px;
// word-break: break-all;
// text-align: center;
}
> p {
margin-left: 30px;
font-size: 30px;
color: #6b9147;
}
> div {
position: absolute;
bottom: 98px;
background-color: #fff;
width: 100%;
}
}
}
.line {
height: 0.2rem;
width: 100%;
background-color: #f6f6f6;
}
.question {
height: auto;
width: 100%;
color: #333333;
font-size: 0.36rem;
text-indent: 0.3rem;
line-height: 0.5rem;
padding: 0.25rem;
box-sizing: border-box;
font-weight: 500;
}
.title {
color: #333333;
font-size: 0.34rem;
margin-top: 0.48rem;
text-indent: 0.31rem;
}
.recommend {
width: 6.9rem;
margin-top: 0.13rem;
margin: 0 auto;
border-bottom: 0.01rem solid #95998f;
display: flex;
justify-content: space-between;
.articlename {
.title {
color: #333333;
font-size: 0.3rem;
line-height: 0.4rem;
width: 4.65rem;
margin-top: 0.4rem;
font-size: 0.34rem;
margin-top: 0.48rem;
text-indent: 0.31rem;
}
.articlecontent {
color: #333333;
font-size: 0.26rem;
margin-top: 0.15rem;
margin-bottom: 0.14rem;
width: 6.74rem;
}
.author {
color: #999999;
font-size: 0.22rem;
.recommend {
width: 6.9rem;
margin-top: 0.13rem;
margin: 0 auto;
margin-top: 0.14rem;
margin-bottom: 0.35rem;
}
.pic {
width: 1.82rem;
height: 1.2rem;
margin: auto 0;
}
.pics {
border-bottom: 0.01rem solid #95998f;
display: flex;
justify-content: center;
margin-bottom: 0.31rem;
> img {
width: 2.23rem;
height: 1.47rem;
margin-right: 0.1rem;
justify-content: space-between;
.articlename {
color: #333333;
font-size: 0.3rem;
line-height: 0.4rem;
width: 4.65rem;
margin-top: 0.4rem;
}
.articlecontent {
color: #333333;
font-size: 0.26rem;
margin-top: 0.15rem;
margin-bottom: 0.14rem;
width: 6.74rem;
}
.author {
color: #999999;
font-size: 0.22rem;
margin: 0 auto;
margin-top: 0.14rem;
margin-bottom: 0.35rem;
}
.pic {
width: 1.82rem;
height: 1.2rem;
margin: auto 0;
}
.pics {
display: flex;
justify-content: center;
margin-bottom: 0.31rem;
> img {
width: 2.23rem;
height: 1.47rem;
margin-right: 0.1rem;
}
}
}
}
}
</style>

18
src/PersonalHomepage.vue
View File

@ -29,7 +29,7 @@
<follow v-if="item.status == 3 " :operation="type[item.type] + '了该' + status[item.status]" :day="item.time + '前'" :title="item.title" :nickname="item.nickname" :userimg="'http://lawpro.earnest.pro' + item.img" :num="item.islike" :img="'http://lawpro.earnest.pro' + item.avatar" :text="item.text" :comment="item.comment"></follow>
<answer v-if="item.status == 1 || item.status == 2" :operation="type[item.type] + '了该' + status[item.status]" :day="item.time + '前'" :title="item.title" :types="item.status" :id="item.id"></answer>
<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"></follow>
<answer v-if="types==1" operation="发布了该文章" :day="item.time" :title="item.title" types="1" :id="item.id"></answer>
<answer @wz="wzs" v-if="types==1" operation="发布了该文章" :day="item.time" :title="item.title" types="1" :id="item.id"></answer>
<answer v-if="types==2" operation="发布了该问题" :day="item.time" :title="item.title" types="2" :id="item.id"></answer>
</div>
@ -117,6 +117,7 @@
import follow from "./components/PersonafFollow"
// import follows from "./components/PersonafFollows"
import answer from "./components/PersonalAnswer"
// import { log } from 'util';
export default {
name: "Personal-homepage",
data() {
@ -138,6 +139,14 @@ export default {
answer
},
methods:{
wzs(a,b){
// console.log(a,b,12)
// this.$router.replace('/')
this.$router.push({
path:'/articledetail?id=' + b
})
},
getlist(){
if(this.lock){
return ;
@ -187,7 +196,9 @@ export default {
}
},
mounted(){
if(localStorage.getItem('token') == ""){
this.$router.push("/login")
}
this.axios.post('http://lawpro.earnest.pro/api/login_main/getUserDetails',{
token:localStorage.getItem("token")
}).then((res)=>{
@ -237,10 +248,11 @@ export default {
this.getlist()
}
},
beforeRouteLeave(){
beforeRouteLeave(a,b,c){
window.$(window).scroll(() => {
});
c()
}
};
</script>

78
src/articledetail.vue
View File

@ -5,7 +5,15 @@
<img :src=" 'http://lawpro.earnest.pro' +list.data.img" alt class="toppic" />
</div>
<follow class="follow" :img="'http://lawpro.earnest.pro' + list.user.avatar" :nickname="list.user.nickname" :sole="list.user.industry_name" :text="list.data.articlecontent" :title="list.data.title" @pinglun="pl"></follow>
<follow
class="follow"
:img="'http://lawpro.earnest.pro' + list.user.avatar"
:nickname="list.user.nickname"
:sole="list.user.industry_name"
:text="list.data.articlecontent"
:title="list.data.title"
@pinglun="pinglu"
></follow>
<div class="line"></div>
<!-- <follow :indexs="1" class="follow"></follow> -->
<!-- <div class="line"></div> -->
@ -18,22 +26,22 @@
<p class="title" @click="show = true">热门推荐</p>
<privatets></privatets>
<articles></articles>
<articles></articles> -->
<articles></articles>-->
<van-popup v-model="show" position="bottom" :style="{ height: '100%' }" class="linshi">
<div class="top">
<p class="tiao">389条评论</p>
<p class="tiao">{{plist.length}}条评论</p>
<p class="qie">
<img class="qiehuan" src="./assets/qiehuan.png" alt srcset /> 切换为时间排序
</p>
<img class="quit" src="./assets/quit.png" alt @click="show = !show" />
</div>
<div class="bodys">
<comment></comment>
<comment v-for="(item,index) in plist" :key="index"></comment>
</div>
<div class="reply">
<img @click="biaoqing = !biaoqing" src="./assets/baoqing.png" alt srcset />
<textarea placeholder="写下你的评论..." v-model="content"></textarea>
<p>发布</p>
<p @click="pfb">发布</p>
<div v-show="biaoqing">
<Emotion @emotion="handleEmotion" :height="4"></Emotion>
</div>
@ -57,7 +65,8 @@ export default {
show: false,
content: "",
biaoqing: false,
list:[]
list: [],
plist: []
};
},
components: {
@ -73,19 +82,56 @@ export default {
handleEmotion(i) {
this.content += i;
},
pl(){
this.show = true
pfb() {
if (localStorage.getItem("token") == "") {
this.$router.push("/login");
} else {
window.console.log(this.content);
if (this.content != "") {
this.axios
.post("http://lawpro.earnest.pro/api/login_main/appendComment", {
text: this.content,
token: localStorage.getItem("token"),
type_id: this.$route.query.id,
type: 3
})
.then(res => {
if (res.data.code == 200) {
this.pinglu(this.$route.query.id);
this.content = "";
}
});
}
}
},
pinglu() {
// this.pid = id;
this.axios
.post("http://lawpro.earnest.pro/api/login_main/CommentList", {
token: localStorage.getItem("token"),
type: 2,
type_id: this.$route.query.id
})
.then(res => {
window.console.log(res);
this.plist = res.data.data.data;
// this.list = res.data.data;
this.show = true;
});
}
},
mounted() {
this.axios.post("http://lawpro.earnest.pro/api/login_main/mainDetails", {
token: localStorage.getItem("token"),
id: 1688,
type: 1
}).then((res)=>{
window.console.log(res)
this.list = res.data.data
})
this.axios
.post("http://lawpro.earnest.pro/api/login_main/mainDetails", {
token: localStorage.getItem("token"),
id: this.$route.query.id,
type: 1
})
.then(res => {
window.console.log(res);
this.list = res.data.data;
});
}
};
</script>

BIN
src/assets/img.zip Normal file
View File

Binary file not shown.

BIN
src/assets/mine.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 803 B

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
src/assets/pl.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 496 B

BIN
src/assets/zoom.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 794 B

After

Width:  |  Height:  |  Size: 1.6 KiB

2
src/components/IndexList.vue
View File

@ -12,7 +12,7 @@
分享
</div>
<div>
<img src="../assets/share.png" alt srcset />
<img src="../assets/pl.png" alt srcset />
{{num}}评论
</div>
<div v-show="false" class="more" @click="show = !show">

2
src/components/PersonafFollow.vue
View File

@ -26,7 +26,7 @@
分享
</div>
<div>
<img src="../assets/share.png" alt="" srcset="">
<img src="../assets/pl.png" alt="" srcset="">
{{comment}}评论
</div>
<div>

2
src/components/PersonafFollows.vue
View File

@ -26,7 +26,7 @@
分享
</div>
<div>
<img src="../assets/share.png" alt="" srcset="">
<img src="../assets/pl.png" alt="" srcset="">
{{comment}}评论
</div>
<div>

7
src/components/PersonalAnswer.vue
View File

@ -37,13 +37,10 @@ export default {
methods:{
tab(){
window.console.log(this.types,"llk")
if(this.types=="1"){
this.$router.push({
path: '/sign'
});
this.$emit("wz",this.types,this.id)
window.console.log( this.$router)
}
}
}
};
</script>

2
src/components/indexFollow.vue
View File

@ -20,7 +20,7 @@
分享
</div>
<div @click="pinglun">
<img src="../assets/share.png" alt srcset />
<img src="../assets/pl.png" alt srcset />
{{comment}}评论
</div>
<div v-show="!show && lang" @click="hadd">收起</div>

3
src/components/indexFollow1.vue
View File

@ -32,7 +32,7 @@
分享
</div>
<div @click="$emit('pinglun')">
<img src="../assets/share.png" alt srcset />
<img src="../assets/pl.png" alt srcset />
{{num}}评论
</div>
<div></div>
@ -169,6 +169,7 @@
.right {
width: 143px;
height: 62px;
line-height: 62px;
background: rgba(247, 247, 247, 1);
border-radius: 10px;
margin: auto 0;

2
src/components/indexfindall.vue
View File

@ -11,7 +11,7 @@
<p>分享</p>
</div>
<div>
<img src="../assets/pinglun.png" alt class="icon" />
<img src="../assets/pl.png" alt class="icon" />
<p>{{num}}条评论</p>
</div>
</div>

8
src/components/indexfindhead.vue
View File

@ -9,9 +9,9 @@
</div>
</van-popup>
<div class="head">
<img class="logo" src alt srcset />
<img class="logo" src="../assets/logo1.png" alt srcset />
<div class="search">
<img src alt />
<img src="../assets/zoom.png" alt />
<input type="text" placeholder="搜索" v-on:change ="shuru" v-model="serch"/>
</div>
<div class="mnue" @click="isshow">
@ -46,7 +46,7 @@
.logo {
width: 115px;
height: 37px;
background-color: #000;
// background-color: #000;
display: block;
margin-left: 30px;
}
@ -64,7 +64,7 @@
margin-left: 23px;
width: 30px;
height: 30px;
background-color: #000;
// background-color: #000;
}
> input {
margin-left: 21px;

9
src/components/indexhead.vue
View File

@ -57,7 +57,7 @@
.logo {
width: 115px;
height: 37px;
background-color: #000;
// background-color: #000;
display: block;
margin-left: 30px;
}
@ -124,17 +124,18 @@ export default {
switch (e) {
case 0:
this.$router.push({
path: `/index`
path: '/'
});
break;
case 1:
this.$router.push({
path: `/PersonalHomepage`
path: '/PersonalHomepage'
});
break;
case 2:
localStorage.setItem("toekn","")
this.$router.push({
path: `/login`
path: '/login'
});
break;
}

82
src/index.vue
View File

@ -2,19 +2,16 @@
<div class="box">
<heads></heads>
<div class="list">
<div v-for="(item,index) in list" :key="index" @click="todetail(item.id)">
<list
:title="item.title"
:id="item.id"
:num="item.comment"
:img="item.img"
:text="item.text"
></list>
<div v-for="(item,index) in list" :key="index" @click="todetail(item.id,item.type)">
<list
:title="item.title"
:id="item.id"
:num="item.comment"
:img="item.img"
:text="item.text"
></list>
</div>
<div style="width:100%;height:0.5rem;text-align:center;line-height:0.3rem">{{text}}</div>
<!-- <list></list>
<list></list>-->
@ -42,37 +39,42 @@ export default {
return {
list: [],
page: 1,
lock:false,
text:"加载中"
lock: false,
text: "加载中"
};
},
methods: {
getlist(){
if(this.lock){
return 'lock'
getlist() {
if (this.lock) {
return "lock";
}
this.lock = true
var t = this
this.lock = true;
var t = this;
this.page += 1;
this.axios
.post("http://lawpro.earnest.pro/api/login_main/articleList", {
page: t.page
})
.then(res => {
if (res.data.code == 200) {
t.list = t.list.concat(res.data.data);
t.lock = false
}else{
t.text = "暂无更多"
}
})
.post("http://lawpro.earnest.pro/api/login_main/articleList", {
page: t.page
})
.then(res => {
if (res.data.code == 200) {
t.list = t.list.concat(res.data.data);
t.lock = false;
} else {
t.text = "暂无更多";
}
});
},
todetail(e){
window.console.log(e)
this.$router.push({
path: `/IndexArticleDetaill?id=`+e
});
todetail(e, type) {
window.console.log(e);
if (type == 2) {
this.$router.push({
path: `/IndexArticleDetaill?id=` + e
});
} else {
this.$router.push({
path: `/articledetail?id=` + e
});
}
}
},
components: {
@ -97,12 +99,12 @@ export default {
if (windowH + scrollH >= documentH) {
// do something
// alert(2);
window.console.log(1)
t.getlist()
window.console.log(1);
t.getlist();
}
});
}else{
t.text = "暂无数据"
} else {
t.text = "暂无数据";
}
});
}

27
src/login.vue
View File

@ -1,7 +1,7 @@
<template>
<div class="login">
<div class="logo">
<img src="./assets/quit.png" alt class="close" />
<!-- <img src="./assets/quit.png" alt class="close" /> -->
</div>
<div class="tel">
<p>+86</p>
@ -12,7 +12,7 @@
<div class="tel yzm">
<input type="text" class="shuru tel1" placeholder="输入6位验证码" v-model="yzm" />
<button class="getyzm" @click="yz">发送验证码</button>
<button class="getyzm" @click="yz">{{yzs}}</button>
</div>
<div class="ale">
<p class="alert">未注册手机验证后自动登录</p>
@ -37,8 +37,8 @@
<div>
<!-- <a
href="https://open.weixin.qq.com/connect/qrconnect?appid=wxfe6e5d36322af62f&redirect_uri=http%3a%2f%2fwww.lawpro.cn%2f&response_type=code&scope=snsapi_login&state=lawpro#wechat_redirect"
> -->
<a
>-->
<a
href="https://open.weixin.qq.com/connect/qrconnect?appid=wxfe6e5d36322af62f&redirect_uri=http%3a%2f%2fwww.lawpro.cn%2f&response_type=code&scope=snsapi_login&state=lawpro#wechat_redirect"
>
<!-- <i class="icon-wechatl"></i>微信 -->
@ -69,7 +69,9 @@ export default {
yzm: "",
yztoken: "",
Verification: "",
ifsign: false
ifsign: false,
yzs: "获取验证码",
miao: 60
};
},
methods: {
@ -86,7 +88,22 @@ export default {
},
yz() {
let yz = "";
if (this.tel != "") {
if (this.yzs != "获取验证码") {
return;
} else {
let t = this;
let a = setInterval(() => {
t.yzs = t.miao + "秒";
t.miao = t.miao - 1;
if (t.miao < 0) {
t.miao = 5;
t.yzs = "获取验证码";
clearInterval(a);
}
}, 1000);
}
window.console.log("aaaa");
var t = this;
this.axios

7
src/router.js
View File

@ -2,7 +2,6 @@ import Vue from 'vue'
//1.导入路由组件vue-router
import Router from 'vue-router'
//2.调用vue-router
Vue.use(Router)
import PersonalHomepage from "./PersonalHomepage"
import index from "./index"
// import PersonalHomepage from "./PersonalHomepage"
@ -16,8 +15,10 @@ import IndexReport1 from "./IndexReport1"
import IndexReport2 from "./IndexReport2"
import Answer from "./Answer"
import sign from "./sign"
import ArticleDetail from "./articledetail"
import ArticleDetail from "./articledetail.vue"
Vue.use(Router)
const router=new Router({
mode:'history',
routes: [
{
path: '/articledetail',
@ -52,7 +53,7 @@ const router=new Router({
component: login
},
{
path: '/index',
path: '/',
component: index
},
{