Merge branch 'master' into xuebaoxin

src/IndexArticleDetail.vue

@@ -139,7 +139,7 @@ this.pinglu(this.pid);
       .post("http://lawpro.earnest.pro/api/login_main/mainDetails", {
         token: localStorage.getItem("token"),
         type: 2,
-        id: 17
+        id: this. $route.query.id
       })
       .then(res => {
         // window.console.log(res)

src/PersonalHomepage.vue

@@ -27,10 +27,10 @@
       <div class="list">
         <div v-for="(item,index) in dynamiclist" :key="index">
           <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" ></answer>
+          <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" ></answer>
-          <answer v-if="types==2" operation="发布了该问题" :day="item.time" :title="item.title" ></answer>
+          <answer 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>
         
@@ -187,6 +187,7 @@ export default {
     }
   },
   mounted(){
+    
     this.axios.post('http://lawpro.earnest.pro/api/login_main/getUserDetails',{
       token:localStorage.getItem("token")
     }).then((res)=>{

src/components/PersonalAnswer.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="PersonalAnswer">
+  <div class="PersonalAnswer" @click="tab">
     <div class="title">
       <p>{{operation}}</p>
       <p>{{day}}</p>
@@ -33,6 +33,17 @@ export default {
   data() {
     return {};
   },
-  props:['operation','day','title']
+  props:['operation','day','title',"types","id"],
+  methods:{
+    tab(){
+      window.console.log(this.types,"llk")
+      if(this.types=="1"){
+        this.$router.push({
+          path: '/sign'
+        });
+           window.console.log( this.$router)
+      }
+    }
+  }
 };
 </script>

src/router.js

@@ -20,7 +20,7 @@ import ArticleDetail from "./articledetail"
 const router=new Router({
   routes: [
     {
-      path: '/',
+      path: '/articledetail',
       component: ArticleDetail
     },
     {