Merge branch 'master' into xuebaoxin

src/IndexFind.vue

@@ -5,7 +5,7 @@
     <indexfindtab @changeno="getno"></indexfindtab>
   </div>
 <div class="all" v-if="no==0">
-  <div class="all1" v-for="(i,j) in list" :key="j">
+  <div class="all1" v-for="(i,j) in list" :key="j" @click="todetail(i.id,i.type)">
     <indexfindall :title="i.title"  :num="i.comment"  :right="i.avatar" :content="i.text"></indexfindall>
   </div>
   <!-- <div class="all1">
@@ -91,6 +91,18 @@ methods:{
      window.console.log(e)
      this.no=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
+        });
+      }
+    },
   serch(e){
     let t=this;
     window.console.log(e)

src/loginpwd.vue

@@ -64,6 +64,7 @@ export default {
     off(){
       this.ifshow=false
     },
+
     sub(){
       let t=this;
       this.axios.post("http://lawpro.earnest.pro/api/Main/login",{uname:t.username,password:t.pwd}).then((res)=>{