From d5c3331268aa7f2d2ae90be7c6d6606914045baa Mon Sep 17 00:00:00 2001
From: pplokijuhyg <1162963624@qq.com>
Date: Fri, 29 Nov 2019 17:15:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/articledetail.vue           | 100 ++++++++++++++------------------
 src/components/indexFollow1.vue |  40 ++++++-------
 2 files changed, 60 insertions(+), 80 deletions(-)

diff --git a/src/articledetail.vue b/src/articledetail.vue
index 1268a68..b914ac2 100644
--- a/src/articledetail.vue
+++ b/src/articledetail.vue
@@ -2,14 +2,14 @@
   <div style="padding-top:0.88rem">
     <heads></heads>
     <div class="picbox">
-      <img src="./assets/logo.png" alt="" class="toppic">
+      <img :src=" 'http://lawpro.earnest.pro' +list.data.img" alt class="toppic" />
     </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>
     <!-- <follow :indexs="1" class="follow"></follow> -->
     <!-- <div class="line"></div> -->
-    <p class="title">相关推荐</p>
+    <!-- <p class="title">相关推荐</p>
     <privates></privates>
     <articles></articles>
 
@@ -18,7 +18,7 @@
     <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>
@@ -29,41 +29,14 @@
       </div>
       <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>
       </div>
       <div class="reply">
         <img @click="biaoqing = !biaoqing" src="./assets/baoqing.png" alt srcset />
         <textarea placeholder="写下你的评论..." v-model="content"></textarea>
         <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>
     </van-popup>
   </div>
@@ -71,40 +44,54 @@
 
 <script>
 import follow from "./components/indexFollow1";
-import privates from "./components/indexprivate";
-import articles from "./components/indexarticle";
-import privatets from "./components/indexprivatet";
+// import privates from "./components/indexprivate";
+// import articles from "./components/indexarticle";
+// import privatets from "./components/indexprivatet";
 import heads from "./components/indexhead";
 import comment from "./components/indexcomment";
-import Emotion from './components/Emotion/index'
+import Emotion from "./components/Emotion/index";
 export default {
   name: "ArticleDetail",
   data() {
     return {
       show: false,
-      content:"",
-      biaoqing:false
+      content: "",
+      biaoqing: false,
+      list:[]
     };
   },
   components: {
     follow,
-    privates,
-    articles,
-    privatets,
+    // privates,
+    // articles,
+    // privatets,
     heads,
     comment,
     Emotion
   },
-  methods:{
-    handleEmotion (i) {
-      this.content += i
+  methods: {
+    handleEmotion(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>
 
 <style lang="scss">
-.follow{
+.follow {
   padding: 23px;
 }
 .linshi {
@@ -171,12 +158,12 @@ export default {
     background-color: #fff;
     display: flex;
     align-items: center;
-    >img{
+    > img {
       width: 33px;
       height: 33px;
-      margin-left: 30px
+      margin-left: 30px;
     }
-    >textarea{
+    > textarea {
       margin-left: 21px;
       border: none;
       font-size: 30px;
@@ -185,12 +172,12 @@ export default {
       // word-break: break-all;
       // text-align: center;
     }
-    >p{
+    > p {
       margin-left: 30px;
       font-size: 30px;
-      color: #6B9147;
+      color: #6b9147;
     }
-    >div{
+    > div {
       position: absolute;
       bottom: 98px;
       background-color: #fff;
@@ -262,14 +249,13 @@ export default {
     }
   }
 }
-.picbox{
+.picbox {
   display: flex;
   justify-content: center;
-    .toppic{
+  .toppic {
     width: 640px;
     height: 322.12px;
     margin: 0 auto;
   }
 }
-
 </style>
\ No newline at end of file
diff --git a/src/components/indexFollow1.vue b/src/components/indexFollow1.vue
index 9ff1e37..424680c 100644
--- a/src/components/indexFollow1.vue
+++ b/src/components/indexFollow1.vue
@@ -3,10 +3,10 @@
     <div class="answer">
       <div class="user">
         <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">
-          <p>啦啦啦</p>
-          <p>律师</p>
+          <p>{{nickname}}</p>
+          <p>{{sole}}</p>
         </div>
         </div>
       
@@ -18,13 +18,12 @@
           </div>
       </div>
           <!-- <div class="line"></div> -->
-    <p class="question">有哪些击中你内心阴暗处的句子？</p>
+    <p class="question">{{title}}</p>
     <!-- <div class="line"></div> -->
       <!-- <div class="agree">1345人赞同了该回答</div> -->
-      <div class="agree">2019-05-05</div>
-      <div class="content">
-        <img src alt srcset />
-        <p>这取决于司法是否独立。舆论能影响司法判决结果的，只能说明司法肯定不仅仅收到舆论的影响，还会收到同样的来自其他多方面的强力的影响。这种情况只能说明这取决于司法是否独立。舆论能影响司法判决结果的，只能说明司法肯定不仅仅收到舆论的影响，还会收到同样的来自其他多方面的强力的影响。这种情况只能说明这取决于司法是否独立。舆论能影响司法判决结果的，只能说明司法肯定不仅仅收到舆论的影响，还会收到同样的来自其他多方面的强力的影响。这种情况只能说明这取决于司法是否独立。舆论能影响司法判决结果的，只能说明司法肯定不仅仅收到舆论的影响，还会收到同样的来自其他多方面的强力的影响。这种情况只能说明这取决于司法是否独立。舆论能影响司法判决结果的，只能说明司法肯定不仅仅收到舆论的影响，还会收到同样的来自其他多方面的强力的影响。这种情况只能说明这取决于司法是否独立。舆论能影响司法判决结果的，只能说明司法肯定不仅仅收到舆论的影响，还会收到同样的来自其他多方面的强力的影响。这种情况只能说明</p>
+      <div class="agree">{{date}}</div>
+      <div class="content" v-html="text">
+       <!-- <div v-ho></div> -->
         <!-- <div v-show="show" @click="shows">展开阅读全文</div> -->
       </div>
       <div class="operation">
@@ -32,11 +31,12 @@
           <img src="../assets/share.png" alt srcset />
           分享
         </div>
-        <div>
+        <div @click="$emit('pinglun')">
           <img src="../assets/share.png" alt srcset />
-          888评论
+          {{num}}评论
         </div>
-        <div v-show="!show && lang" @click="hadd">收起</div>
+        <div></div>
+        <!-- <div v-show="!show && lang" @click="hadd">收起</div> -->
       </div>
     </div>
   </div>
@@ -48,12 +48,13 @@
   background-color: #f6f6f6;
 }
 .question {
-  height: 1rem;
+  margin-top: 0.3rem;
+  height: auto;
   width: 100%;
   color: #333333;
   font-size: 0.36rem;
   text-indent: 0.3rem;
-  line-height: 1.5rem;
+  line-height: 0.45rem;
   font-weight: 500;
 }
 .title {
@@ -171,10 +172,7 @@
     background: rgba(247, 247, 247, 1);
     border-radius: 10px;
     margin: auto 0;
-    margin-right: 30px;
-    // float: right;
-    // text-align: center;
-    line-height: 68px;
+    margin-right: 30px; 
     display: flex!important;
     flex-direction: row!important;
     justify-content: center!important;
@@ -198,11 +196,6 @@ export default {
       lang: true
     };
   },
-  props: {
-    indexs: {
-      default: 0
-    }
-  },
 
   methods: {
     shows() {
@@ -231,6 +224,7 @@ export default {
         this.lang = false;
       }
     });
-  }
+  },
+  props:['img','nickname','sole','title','date','num','text']
 };
 </script>
\ No newline at end of file