Merge branch 'xuebaoxin' of pplokijuhyg/falvpingtai into master

src/IndexArticleDetail.vue

@@ -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 />
@@ -100,26 +98,33 @@ export default {
   },
   methods: {
     pfb() {
-      window.console.log(this.content)
+      if (localStorage.getItem("token") == "") {
-      this.axios.post("http://lawpro.earnest.pro/api/login_main/appendComment",{
+        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'),
+              token: localStorage.getItem("token"),
               type_id: this.pid,
               type: 3
-      }).then((res)=>{
+            })
+            .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)
+          window.console.log(res);
-          this.plist = res.data.data.data
+          this.plist = res.data.data.data;
           // this.list = res.data.data;
-          this.show = true
+          this.show = true;
         });
     }
   },
@@ -320,5 +325,4 @@ this.pinglu(this.pid);
     }
   }
 }
-
 </style>

src/PersonalHomepage.vue

@@ -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>

src/articledetail.vue

@@ -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> -->
@@ -21,19 +29,19 @@
     <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(){
+    pfb() {
-      this.show = true
+      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", {
+    this.axios
+      .post("http://lawpro.earnest.pro/api/login_main/mainDetails", {
         token: localStorage.getItem("token"),
-      id: 1688,
+        id: this.$route.query.id,
         type: 1
-    }).then((res)=>{
-      window.console.log(res)
-      this.list = res.data.data
       })
+      .then(res => {
+        window.console.log(res);
+        this.list = res.data.data;
+      });
   }
 };
 </script>

src/components/IndexList.vue

@@ -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">

src/components/PersonafFollow.vue

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

src/components/PersonafFollows.vue

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

src/components/PersonalAnswer.vue

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

src/components/indexFollow.vue

@@ -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>

src/components/indexFollow1.vue

@@ -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;

src/components/indexfindall.vue

@@ -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>

src/components/indexfindhead.vue

@@ -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;

src/components/indexhead.vue

@@ -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;
       }

src/index.vue

@@ -2,16 +2,13 @@
   <div class="box">
     <heads></heads>
     <div class="list">
-      <div   v-for="(item,index) in list"  :key="index"  @click="todetail(item.id)">
+      <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>
 
@@ -49,10 +46,10 @@ export default {
   methods: {
     getlist() {
       if (this.lock) {
-        return 'lock'
+        return "lock";
       }
-      this.lock = true
+      this.lock = true;
-      var t = this
+      var t = this;
       this.page += 1;
       this.axios
         .post("http://lawpro.earnest.pro/api/login_main/articleList", {
@@ -61,18 +58,23 @@ export default {
         .then(res => {
           if (res.data.code == 200) {
             t.list = t.list.concat(res.data.data);
-        t.lock = false
+            t.lock = false;
           } else {
-          t.text = "暂无更多"
+            t.text = "暂无更多";
           }
-       
+        });
-      })
     },
-    todetail(e){
+    todetail(e, type) {
-      window.console.log(e)
+      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)
+              window.console.log(1);
-              t.getlist()
+              t.getlist();
             }
           });
         } else {
-          t.text = "暂无数据"
+          t.text = "暂无数据";
         }
       });
   }

src/login.vue

@@ -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>
@@ -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

src/router.js

@@ -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
     },
     {