个人中心页/我的动态/列表解决没有显示我的动态

4727b2dc · yanju · 9612777f · 4727b2dc · 4727b2dc · 4727b2dc
Commit 4727b2dc authored Feb 08, 2020 by yanju
Hide whitespace changes
Inline Side-by-side

Showing with 48 additions and 25 deletions

components/pc/answerCard.vue
+1 -6

components/pc/socialContactCard.vue
+46 -18

pages/personal-center/home/answer.vue
+1 -1

No files found.
--- a/components/pc/answerCard.vue
+++ b/components/pc/answerCard.vue
@@ -49,12 +49,7 @@
    info:{
      type:Object,
      default: () => ({})
-    },
+    }
-    isAnswer:{
-      type:Boolean,
-      default: false
-    },
  },
  data() {
    return{

--- a/components/pc/socialContactCard.vue
+++ b/components/pc/socialContactCard.vue
@@ -6,15 +6,14 @@
          <yun-avatar :src="src"></yun-avatar>
          <div class="header-l__info">
            <div class="header-l__info-top">
-              <p class="name">爱你一万年</p>
+              <p class="name">{{name}}</p>
-              <p class="nickname">(爱你一万年)</p>
              <p class="follow">
                +关注
              </p>
            </div>
            <div class="header-l__info-bottom">
-              <p class="date">今天 14:12</p>
+              <p class="date">{{createTime}}</p>
              <p class="limits">该动态仅自己可见</p>
            </div>
          </div>
@@ -27,8 +26,8 @@
      <p class="card-content__word">{{content}}</p>
-      <div class="card-content__img1" v-if="imgArr.length>1&&imgArr.length<=4&&!showBanner">
+      <div class="card-content__img1" v-if="pictures.length>1&&pictures.length<=4&&!showBanner">
-        <div class="img-box" @click="clickToOpenBanner(index)" v-for="(value,index) in imgArr"
+        <div class="img-box" @click="clickToOpenBanner(index)" v-for="(value,index) in pictures"
             :style="{marginRight:(index+1)===4?'0':'16px'}">
          <img :src="value" alt="">
      </div>
@@ -38,7 +37,7 @@
      <div class="card-content__img2" v-if="imgArr2.length>4&&!showBanner">
        <div class="img-box" @click="clickToOpenBanner(index)" v-for="(value,index) in imgArr2" :style="{marginRight:(index+1)%3===0?'0':'16px'}">
          <img :src="value" alt="">
-          <p class="abs" v-if="index===8&&imgArr.length>9">+{{imgArr.length-imgArr2.length}}</p>
+          <p class="abs" v-if="index===8&&pictures.length>9">+{{pictures.length-imgArr2.length}}</p>
        </div>
      </div>
@@ -61,6 +60,8 @@
      </p>
      <banner v-if="showBanner" :currentImg2="currentImg" style="padding-top: 16px"  :autoPlay=false :bannerType=2 :imgArr="imgArr"></banner>
+      <video controls v-if="video" class="dynamic-video" src="http://clips.vorwaerts-gmbh.de/big_buck_bunny.mp4"></video>
      <div class="card-footer">
        <div class="footer-item">
@@ -88,6 +89,7 @@
 <script>
  import Banner from './banner';
+  import {dateConvert} from "../../action/utils/dataConvert";
  export default {
    name:'socialContactCard',
@@ -95,17 +97,24 @@
    components:{
      Banner
    },
+    props:{
+      info:{
+        type:Object,
+        default: () => ({})
+      },
+    },
    data(){
      //return
      return {
        src:'https://s2.ax1x.com/2020/01/15/lO2kIf.png',
        name:'我我欸',
-        floor:6,
+        postId:'',
        content:'这个是二级评论的内容这个是二级评论的内容这个是二级评论的内容这个是二级评论的内容这个是二级评论的内容这个是二级评论的内容这个是二级评论的内容这个是二级评论的内容这个是二级评论的内容这个是二级评论的内容这个是二级评论的内容这个是二级评论的内容这个是二级评论的内容这个是二级评论的内容这个是二级评论的内容',
-        time:'3小时前',
+        createTime:'3小时前',
-        likeNum:10,
+        pictures:[
-        imgArr:[
          'https://yundingweb.oss-cn-beijing.aliyuncs.com/yunding/20190828/22e2d91201a2478683044f116d1d8186-file',
          'https://yundingweb.oss-cn-beijing.aliyuncs.com/yunding/20190828/161fecb3d8b441c5b340319c62508513-file',
          'https://s2.ax1x.com/2020/01/13/lHpvY4.png',
@@ -118,6 +127,8 @@
          // 'https://s2.ax1x.com/2020/01/13/lHpvY4.png',
          // 'https://s2.ax1x.com/2020/01/13/lHpvY4.png',
        ],
+        video:'',
+        userId:'',
        showBanner:false,
        currentImg:0,
@@ -128,7 +139,7 @@
    computed:{
      imgArr2(){
-        let imgArr = this.imgArr;
+        let imgArr = this.pictures;
        let imgArrL = imgArr.length;
        if(imgArrL<=9){
          return imgArr
@@ -137,9 +148,9 @@
        }
      },
      longImg(){
-        if(this.imgArr.length===1){
+        if(this.pictures.length===1){
          if(process.browser){
-            let src = this.imgArr[0];
+            let src = this.pictures[0];
            let img = new this.$Image();
            img.src = src;
            return img.height / img.width > 1.33;
@@ -147,18 +158,30 @@
          else{
            return false
          }
-       //   console.log(this.$Image)
        }
      }
    },
+    created(){
+      this.dateGet2Info();
+    },
    methods:{
      clickToOpenBanner(index){
        this.showBanner = true;
        this.currentImg = index
-      }
+      },
+      dateGet2Info(){
+        let info = this.info;
+        if(this.info.postId){
+          this.content = info.content;
+          this.postId = info.postId;
+          this.pictures = info.pictures;
+          this.video = info.video;
+          this.createTime = dateConvert(info.createTime);
+          this.userId = info.userId;
+        }
+      },
    },
  }
@@ -339,6 +362,12 @@
        @extend %cursorPointer;
        @include fontStyle(14,90,500,#00AAE6,left)
      }
+      .dynamic-video{
+        margin-top: 16*$length;
+        width:100%;
+        height:auto;
+      }
      .card-footer{
        margin-top:24*$length;
@@ -353,7 +382,6 @@
            margin-left:8*$length;
            @include fontStyle(12,16,500,#666,center);
          }
        }
      }
    }

--- a/pages/personal-center/home/answer.vue
+++ b/pages/personal-center/home/answer.vue
@@ -31,7 +31,7 @@
      }
    },
    computed:{
-      rightConTitle(){ return this.$route.query.type==="1"?'我创建的问题':'我参与的问题'},
+      rightConTitle(){ return this.$route.query.type==="my"?'我创建的问题':'我参与的问题'},
    },
    components:{
      ProjectCard,CardContainer,AnswerCard,Pagination,EmptyCard