From 4c70db7575abf0391d2f1a56701a1becf9c446dc Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Mon, 20 Jul 2020 08:43:13 +0800
Subject: [PATCH] 1

---
 common/api/shop.js                    |  6 +++++-
 components/index/video-item/index.vue |  6 +++---
 pageB/components/userinfo/index.vue   | 11 ++++++-----
 pageB/photo/index.vue                 | 25 +++++++++++++++++++++----
 4 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/common/api/shop.js b/common/api/shop.js
index c382d69..fa1017e 100644
--- a/common/api/shop.js
+++ b/common/api/shop.js
@@ -239,7 +239,11 @@ export default {
 			},
 			// 获取直播列表
 			tabLiveList(){
-				return vm.$u.post('api/Specialci/tabLiveList')
+				return vm.$u.post('Specialci/tabLiveList')
+			},
+			// 获取图文视频详情
+			articleInfo({article_id}){
+				return vm.$u.post('article/articleInfo',{article_id})
 			}
         }
     }
diff --git a/components/index/video-item/index.vue b/components/index/video-item/index.vue
index fe19e95..078cf21 100644
--- a/components/index/video-item/index.vue
+++ b/components/index/video-item/index.vue
@@ -1,5 +1,5 @@
 <template>
-    <view class="video-item" v-if="item" @click="toDetailsPage">
+    <view class="video-item" v-if="item" @click="toDetailsPage(item.article_id)">
         <image class="head" :src="item.article_pic" v-if="item.type == 1" ></image>
 		<view class="header_fist"  v-else>
 			<view class="backes">111</view>
@@ -227,9 +227,9 @@ export default {
 				}
 			})
 		},
-		toDetailsPage() {
+		toDetailsPage(id) {
 			 uni.navigateTo({
-				url: '/pageB/photo/index',
+				url: '/pageB/photo/index?id=' + id
 			});
 
 		},
diff --git a/pageB/components/userinfo/index.vue b/pageB/components/userinfo/index.vue
index 60ccbe1..a82a479 100644
--- a/pageB/components/userinfo/index.vue
+++ b/pageB/components/userinfo/index.vue
@@ -1,20 +1,20 @@
 <template>
     <view class="userinfo">
         <view class="userhead">
-            <image></image>
+            <image :src="list.member_avatar"></image>
             <text>+</text>
         </view>
         <view class="zan">
             <image></image>
-            <text>123</text>
+            <text>{{list.like_num}}</text>
         </view>
         <view class="shoucang">
             <image></image>
-            <text>123</text>
+            <text>{{list.collect_num}}</text>
         </view>
         <view class="pinglun">
             <image></image>
-            <text>123</text>
+            <text>{{list.comment_num}}</text>
         </view>
         <view class="gouwu">
             <image></image>
@@ -78,6 +78,7 @@ export default {
         return {
 
         }
-    }
+    },
+    props:['list']
 }
 </script>
\ No newline at end of file
diff --git a/pageB/photo/index.vue b/pageB/photo/index.vue
index eec5748..29e8ae9 100644
--- a/pageB/photo/index.vue
+++ b/pageB/photo/index.vue
@@ -5,11 +5,11 @@
         </view>
         <swiper class="swiper">
             <swiper-item>
-                <image></image>
+                <image :src="list.article_pic"></image>
             </swiper-item>
-            <swiper-item>
+            <!-- <swiper-item>
                 <image></image>
-            </swiper-item>
+            </swiper-item> -->
             
         </swiper>
         <view class="bottom">
@@ -21,7 +21,7 @@
             <view class="title">hasjdhajskhj</view>
             <view class="info u-line-2">asdjhasjdkasljdklasjkl</view>
         </view>
-        <userinfo class="userinfo"></userinfo>
+        <userinfo class="userinfo" :list="list"></userinfo>
         <shpoone class="shpoone"></shpoone>
         <shoplist></shoplist>
     </view>
@@ -117,6 +117,23 @@ export default {
         userinfo,
         shpoone,
         shoplist
+    },
+    data(){
+        return {
+            list:{}
+        }
+    },
+    methods:{
+        articleInfo(article_id){
+            this.$u.api.articleInfo({article_id}).then((res)=>{
+                console.log(res)
+                this.list = res.data.info
+            })
+        }
+    },
+    onLoad(o){
+        this.id = o.id
+        this.articleInfo(this.id)
     }
 }
 </script>
\ No newline at end of file