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:
pplokijuhyg 2019-11-29 17:15:27 +08:00
commit abf337c46d
2 changed files with 60 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
src/articledetail.vue
View File

@ -2,14 +2,14 @@
<div style="padding-top:0.88rem"> <div style="padding-top:0.88rem">
<heads></heads> <heads></heads>
<div class="picbox"> <div class="picbox">
<img src="./assets/logo.png" alt="" class="toppic"> <img :src=" 'http://lawpro.earnest.pro' +list.data.img" alt class="toppic" />
</div> </div>
<follow :indexs="0" class="follow"></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="pl"></follow>
<div class="line"></div> <div class="line"></div>
<!-- <follow :indexs="1" class="follow"></follow> --> <!-- <follow :indexs="1" class="follow"></follow> -->
<!-- <div class="line"></div> --> <!-- <div class="line"></div> -->
<p class="title">相关推荐</p> <!-- <p class="title">相关推荐</p>
<privates></privates> <privates></privates>
<articles></articles> <articles></articles>
@ -18,7 +18,7 @@
<p class="title" @click="show = true">热门推荐</p> <p class="title" @click="show = true">热门推荐</p>
<privatets></privatets> <privatets></privatets>
<articles></articles> <articles></articles>
<articles></articles> <articles></articles> -->
<van-popup v-model="show" position="bottom" :style="{ height: '100%' }" class="linshi"> <van-popup v-model="show" position="bottom" :style="{ height: '100%' }" class="linshi">
<div class="top"> <div class="top">
<p class="tiao">389条评论</p> <p class="tiao">389条评论</p>
@ -29,41 +29,14 @@
</div> </div>
<div class="bodys"> <div class="bodys">
<comment></comment> <comment></comment>
<comment></comment>
<comment></comment>
<comment></comment>
<comment></comment>
<comment></comment>
<comment></comment>
<comment></comment>
<comment></comment>
<comment></comment>
<comment></comment>
<comment></comment>
<comment></comment>
<comment></comment>
<comment></comment>
<comment></comment>
<comment></comment>
<comment></comment>
<comment></comment>
<comment></comment>
<comment></comment>
<comment></comment>
<comment></comment>
<comment></comment>
<comment></comment>
<comment></comment>
<comment></comment>
<comment></comment>
<comment></comment>
<comment></comment>
</div> </div>
<div class="reply"> <div class="reply">
<img @click="biaoqing = !biaoqing" src="./assets/baoqing.png" alt srcset /> <img @click="biaoqing = !biaoqing" src="./assets/baoqing.png" alt srcset />
<textarea placeholder="写下你的评论..." v-model="content"></textarea> <textarea placeholder="写下你的评论..." v-model="content"></textarea>
<p>发布</p> <p>发布</p>
<div v-show="biaoqing"><Emotion @emotion="handleEmotion" :height="4" ></Emotion></div> <div v-show="biaoqing">
<Emotion @emotion="handleEmotion" :height="4"></Emotion>
</div>
</div> </div>
</van-popup> </van-popup>
</div> </div>
@ -71,34 +44,48 @@
<script> <script>
import follow from "./components/indexFollow1"; import follow from "./components/indexFollow1";
import privates from "./components/indexprivate"; // import privates from "./components/indexprivate";
import articles from "./components/indexarticle"; // import articles from "./components/indexarticle";
import privatets from "./components/indexprivatet"; // import privatets from "./components/indexprivatet";
import heads from "./components/indexhead"; import heads from "./components/indexhead";
import comment from "./components/indexcomment"; import comment from "./components/indexcomment";
import Emotion from './components/Emotion/index' import Emotion from "./components/Emotion/index";
export default { export default {
name: "ArticleDetail", name: "ArticleDetail",
data() { data() {
return { return {
show: false, show: false,
content: "", content: "",
biaoqing:false biaoqing: false,
list:[]
}; };
}, },
components: { components: {
follow, follow,
privates, // privates,
articles, // articles,
privatets, // privatets,
heads, heads,
comment, comment,
Emotion Emotion
}, },
methods: { methods: {
handleEmotion(i) { handleEmotion(i) {
this.content += i this.content += i;
}, },
pl(){
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
})
} }
}; };
</script> </script>
@ -174,7 +161,7 @@ export default {
> img { > img {
width: 33px; width: 33px;
height: 33px; height: 33px;
margin-left: 30px margin-left: 30px;
} }
> textarea { > textarea {
margin-left: 21px; margin-left: 21px;
@ -188,7 +175,7 @@ export default {
> p { > p {
margin-left: 30px; margin-left: 30px;
font-size: 30px; font-size: 30px;
color: #6B9147; color: #6b9147;
} }
> div { > div {
position: absolute; position: absolute;
@ -271,5 +258,4 @@ export default {
margin: 0 auto; margin: 0 auto;
} }
} }
</style> </style>

38
src/components/indexFollow1.vue
View File

@ -3,10 +3,10 @@
<div class="answer"> <div class="answer">
<div class="user"> <div class="user">
<div class="left"> <div class="left">
<img src="http://q1.qlogo.cn/g?b=qq&nk=1162963624&s=5" alt srcset class="photo" /> <img :src="img" alt srcset class="photo" />
<div class="userinfo"> <div class="userinfo">
<p>啦啦啦</p> <p>{{nickname}}</p>
<p>律师</p> <p>{{sole}}</p>
</div> </div>
</div> </div>
@ -18,13 +18,12 @@
</div> </div>
</div> </div>
<!-- <div class="line"></div> --> <!-- <div class="line"></div> -->
<p class="question">有哪些击中你内心阴暗处的句子？</p> <p class="question">{{title}}</p>
<!-- <div class="line"></div> --> <!-- <div class="line"></div> -->
<!-- <div class="agree">1345人赞同了该回答</div> --> <!-- <div class="agree">1345人赞同了该回答</div> -->
<div class="agree">2019-05-05</div> <div class="agree">{{date}}</div>
<div class="content"> <div class="content" v-html="text">
<img src alt srcset /> <!-- <div v-ho></div> -->
<p>这取决于司法是否独立。舆论能影响司法判决结果的，只能说明司法肯定不仅仅收到舆论的影响，还会收到同样的来自其他多方面的强力的影响。这种情况只能说明这取决于司法是否独立。舆论能影响司法判决结果的，只能说明司法肯定不仅仅收到舆论的影响，还会收到同样的来自其他多方面的强力的影响。这种情况只能说明这取决于司法是否独立。舆论能影响司法判决结果的，只能说明司法肯定不仅仅收到舆论的影响，还会收到同样的来自其他多方面的强力的影响。这种情况只能说明这取决于司法是否独立。舆论能影响司法判决结果的，只能说明司法肯定不仅仅收到舆论的影响，还会收到同样的来自其他多方面的强力的影响。这种情况只能说明这取决于司法是否独立。舆论能影响司法判决结果的，只能说明司法肯定不仅仅收到舆论的影响，还会收到同样的来自其他多方面的强力的影响。这种情况只能说明这取决于司法是否独立。舆论能影响司法判决结果的，只能说明司法肯定不仅仅收到舆论的影响，还会收到同样的来自其他多方面的强力的影响。这种情况只能说明</p>
<!-- <div v-show="show" @click="shows">展开阅读全文</div> --> <!-- <div v-show="show" @click="shows">展开阅读全文</div> -->
</div> </div>
<div class="operation"> <div class="operation">
@ -32,11 +31,12 @@
<img src="../assets/share.png" alt srcset /> <img src="../assets/share.png" alt srcset />
分享 分享
</div> </div>
<div> <div @click="$emit('pinglun')">
<img src="../assets/share.png" alt srcset /> <img src="../assets/share.png" alt srcset />
888评论 {{num}}评论
</div> </div>
<div v-show="!show && lang" @click="hadd">收起</div> <div></div>
<!-- <div v-show="!show && lang" @click="hadd">收起</div> -->
</div> </div>
</div> </div>
</div> </div>
@ -48,12 +48,13 @@
background-color: #f6f6f6; background-color: #f6f6f6;
} }
.question { .question {
height: 1rem; margin-top: 0.3rem;
height: auto;
width: 100%; width: 100%;
color: #333333; color: #333333;
font-size: 0.36rem; font-size: 0.36rem;
text-indent: 0.3rem; text-indent: 0.3rem;
line-height: 1.5rem; line-height: 0.45rem;
font-weight: 500; font-weight: 500;
} }
.title { .title {
@ -172,9 +173,6 @@
border-radius: 10px; border-radius: 10px;
margin: auto 0; margin: auto 0;
margin-right: 30px; margin-right: 30px;
// float: right;
// text-align: center;
line-height: 68px;
display: flex!important; display: flex!important;
flex-direction: row!important; flex-direction: row!important;
justify-content: center!important; justify-content: center!important;
@ -198,11 +196,6 @@ export default {
lang: true lang: true
}; };
}, },
props: {
indexs: {
default: 0
}
},
methods: { methods: {
shows() { shows() {
@ -231,6 +224,7 @@ export default {
this.lang = false; this.lang = false;
} }
}); });
} },
props:['img','nickname','sole','title','date','num','text']
}; };
</script> </script>