From d66aab7bebff3fc66e26cfdf3d6954a5d3c0bea5 Mon Sep 17 00:00:00 2001
From: zmr900709 <1838875027@qq.com>
Date: Thu, 16 Jul 2020 08:43:55 +0800
Subject: [PATCH 1/2] vuex

---
 common/api/user.js | 2 +-
 main.js            | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/common/api/user.js b/common/api/user.js
index 5874937..3a69728 100644
--- a/common/api/user.js
+++ b/common/api/user.js
@@ -94,7 +94,7 @@ export default {
 				address,
 				true_name,
 				mobile_phone,
-				// longitude,
+				// longitude, 
 				// latitude,
 		 	}) {
 				return vm.$u.post('memberAddress/addressAdd', { 
diff --git a/main.js b/main.js
index 3312df3..04b237f 100644
--- a/main.js
+++ b/main.js
@@ -1,13 +1,15 @@
 import Vue from 'vue'
 import App from './App'
-import uView from "uview-ui";
+import uView from "uview-ui" 
+import Vuex from 'vuex'
+
 // import Vuex from 'vuex'
 Vue.config.productionTip = false
 Vue.use(uView);
-// Vue.use(Vuex);
+Vue.use(Vuex);
 App.mpType = 'app'
 
-// import store from '@/common/store/index.js'
+// import store from '@/common/store/index.js' 
 
 const app = new Vue({
 	...App,
-- 
2.47.2


From 750ff19690afb042da551b753dc36edf35a16063 Mon Sep 17 00:00:00 2001
From: zmr900709 <1838875027@qq.com>
Date: Fri, 17 Jul 2020 08:36:53 +0800
Subject: [PATCH 2/2] shouye xiugai

---
 components/index/video-item/index.vue |  22 +-
 pages/index/index.vue                 | 478 +++++++++++++-------------
 2 files changed, 268 insertions(+), 232 deletions(-)

diff --git a/components/index/video-item/index.vue b/components/index/video-item/index.vue
index 2d1c195..55e315e 100644
--- a/components/index/video-item/index.vue
+++ b/components/index/video-item/index.vue
@@ -1,6 +1,10 @@
 <template>
     <view class="video-item" v-if="item" @click="toDetailsPage">
-        <image class="head" :src="item.article_pic"></image>
+        <image class="head" :src="item.article_pic" v-if="item.type == 1" ></image>
+		<view class="header_fist"  v-else>
+			<view class="backes">111</view>
+			<image class="head" :src="item.article_pic" ></image>
+		</view>
         <view class="title" v-if="!isguanzhu">{{ item.article_title }}</view>
         <view class="jianjie">{{ item.article_content }}</view>
         <view class="user">
@@ -163,6 +167,16 @@
 			background-color: transparent;
 		}
     }
+	.header_fist{
+		position: relative;
+		.backes{
+			position: absolute;
+			top: 0;
+			background: #000000;
+			width: 100%;
+			height: 100%;
+		}
+	}
 }
 </style>
 <script>
@@ -186,6 +200,7 @@ export default {
 			this.$u.api.articleLike({
 				article_id: this.item.article_id,
 			}).then(res => {
+				console.log(res)
 				if(res.errCode == 0) {
 					this.$emit("getArticlelist");
 				}
@@ -195,6 +210,7 @@ export default {
 			this.$u.api.articleCollect({
 				article_id: this.item.article_id,
 			}).then(res => {
+				console.log(res)
 				if(res.errCode == 0) {
 					this.$emit("getArticlelist");
 				}
@@ -205,12 +221,16 @@ export default {
 				article_id: this.item.article_id,
 				member_id: this.item.member_id,
 			}).then(res => {
+				console.log(res)
 				if(res.errCode == 0) {
 					this.$emit("getArticlelist");
 				}
 			})
 		},
 		toDetailsPage() {
+			 uni.navigateTo({
+				url: '/pageB/photo/index',
+			});
 
 		},
 	},
diff --git a/pages/index/index.vue b/pages/index/index.vue
index de97073..3e0b6d9 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,253 +1,269 @@
 <template>
-    <view class="index">
-        <view class="top">
-            <view class="sosuo"></view>
-            <view class="tabs">
-                <u-tabs :is-scroll="false" bar-width="70" ref="tabs" :list="list" :current="num" :bar-style="{
+	<view class="index">
+		<view class="top">
+			<view class="sosuo"></view>
+			<view class="tabs">
+				<u-tabs :is-scroll="false" bar-width="70" ref="tabs" :list="list" :current="num" :bar-style="{
                     'background-color':'#FF780F',
                     'bottom':'10rpx'
                 }"
-                inactive-color="#333"
-                :active-item-style="{
+				 inactive-color="#333" :active-item-style="{
                     'color':'#333'
-                }"
-                :bold="false"
-                @change="dianji"></u-tabs>
-            </view>
-            <view class="sosuo"></view>
-        </view>
-        <swiper class="card" @change="dianji" :current="num">
-            <swiper-item>
-                <scroll-view style="width:100%;height:100%" scroll-y="true">
-                    <view class="box">
-                        <!-- <indexad style="width:690rpx"></indexad> -->
+                }" :bold="false"
+				 @change="dianji"></u-tabs>
+			</view>
+			<view class="sosuo"></view>
+		</view>
+		<swiper class="card" @change="dianji" :current="num">
+			<swiper-item>
+				<scroll-view style="width:100%;height:100%" scroll-y="true">
+					<view class="box">
+						<!-- <indexad style="width:690rpx"></indexad> -->
 						<u-swiper mode="dot" :list="indexImageSwiper" name="adv_code"></u-swiper>
-                        <view class="list">
-                            <view >
-                                <videoItem v-for="item in articleList.filter((_, index) => !(index&1))" :key="item.article_id" :item="item" @getArticlelist="getArticlelist"></videoItem>
-                            </view>
-                            <view style="margin-left:20rpx">
-                                <videoItem v-for="item in articleList.filter((_, index) => index&1)" :key="item.article_id" :item="item" @getArticlelist="getArticlelist"></videoItem>
-                            </view>
-                        </view>
-                    </view>
-                </scroll-view>
-            </swiper-item>
-            <swiper-item>
-                <scroll-view style="width:100%;height:100%" scroll-y="true">
-                    <view class="box">
-                        <u-swiper mode="dot" :list="zhiboImageSwiper" name="adv_code"></u-swiper>
-                        <view class="list">
-                            <view >
-                                <zhiboItem v-for="item in 10"></zhiboItem>
-                            </view>
-                            <view style="margin-left:20rpx">
-                                <zhiboItem v-for="item in 10"></zhiboItem>
-                            </view>
-                        </view>
-                    </view>
-                    
-                </scroll-view>
-            </swiper-item>
-            <swiper-item>
-                <scroll-view style="width:100%;height:100%" scroll-y="true">
-                    <view class="box">
-                        <view class="tuijian">
-                            <view class="title" @click="toSearchPage">
-                                <view class="left">
-                                    <view></view>
-                                    <text>推荐达人</text>
-                                </view>
-                                <image class="right" src="/static/image/common/1.png"></image>
-                            </view>
-                            <view class="tuijianlist">
-                                <!-- <darenItem style="margin-right:23rpx"></darenItem>
+						<view class="list">
+							<view>
+								<videoItem v-for="item in articleList.filter((_, index) => !(index&1))" :key="item.article_id" :item="item"
+								 @getArticlelist="getArticlelist"></videoItem>
+							</view>
+							<view style="margin-left:20rpx">
+								<videoItem v-for="item in articleList.filter((_, index) => index&1)" :key="item.article_id" :item="item"
+								 @getArticlelist="getArticlelist"></videoItem>
+							</view>
+						</view>
+					</view>
+				</scroll-view>
+			</swiper-item>
+			<swiper-item>
+				<scroll-view style="width:100%;height:100%" scroll-y="true">
+					<view class="box">
+						<u-swiper mode="dot" :list="zhiboImageSwiper" name="adv_code"></u-swiper>
+						<view class="list">
+							<view>
+								<zhiboItem v-for="item in 10"></zhiboItem>
+							</view>
+							<view style="margin-left:20rpx">
+								<zhiboItem v-for="item in 10"></zhiboItem>
+							</view>
+						</view>
+					</view>
+
+				</scroll-view>
+			</swiper-item>
+			<swiper-item>
+				<scroll-view style="width:100%;height:100%" scroll-y="true">
+					<view class="box">
+						<view class="tuijian">
+							<view class="title" @click="toSearchPage">
+								<view class="left">
+									<view></view>
+									<text>推荐达人</text>
+								</view>
+								<image class="right" src="/static/image/common/1.png"></image>
+							</view>
+							<view class="tuijianlist">
+								<!-- <darenItem style="margin-right:23rpx"></darenItem>
                                 <darenItem style="margin-right:23rpx"></darenItem> -->
-                                <darenItem v-for="item in recommendList.slice(0,3)" :key="item.id" :info="item"></darenItem>
-                            </view>
-                        </view>
-                        <view class="list">
-                            <view >
-                                <!-- <videoItem isguanzhu="true" v-for="item in 10"></videoItem> -->
-								<videoItem isguanzhu="true" v-for="item in articleList.filter((_, index) => !(index&1))" :key="item.article_id" :item="item" @getArticlelist="getArticlelist"></videoItem>
-                            </view>
-                            <view style="margin-left:20rpx">
-                                <!-- <videoItem isguanzhu="true" v-for="item in 10"></videoItem> -->
-								<videoItem isguanzhu="true" v-for="item in articleList.filter((_, index) => index&1)" :key="item.article_id" :item="item" @getArticlelist="getArticlelist"></videoItem>
-                            </view>
-                        </view>
-                    </view>
-                    
-                </scroll-view>
-            </swiper-item>
-        </swiper>
-    </view>
+								<darenItem v-for="item in recommendList.slice(0,3)" :key="item.id" :info="item"></darenItem>
+							</view>
+						</view>
+						<view class="list">
+							<view>
+								<!-- <videoItem isguanzhu="true" v-for="item in 10"></videoItem> -->
+								<videoItem isguanzhu="true" v-for="item in articleList.filter((_, index) => !(index&1))" :key="item.article_id"
+								 :item="item" @getArticlelist="getArticlelist"></videoItem>
+							</view>
+							<view style="margin-left:20rpx">
+								<!-- <videoItem isguanzhu="true" v-for="item in 10"></videoItem> -->
+								<videoItem isguanzhu="true" v-for="item in articleList.filter((_, index) => index&1)" :key="item.article_id"
+								 :item="item" @getArticlelist="getArticlelist"></videoItem>
+							</view>
+						</view>
+					</view>
+
+				</scroll-view>
+			</swiper-item>
+		</swiper>
+	</view>
 
 </template>
 <style lang="scss" scoped>
-.index{
-    width: 750rpx;
-    display: flex;
-    flex-direction: column;
-    height: 100vh;
-    .top{
-        padding: 0 30rpx;
-        display: flex;
-        justify-content: space-between;
-        width: 100%;
-        height: 88rpx;
-        align-items: center;
-        flex-shrink: 0;
-        .sosuo{
-            width: 32rpx;
-            height: 32rpx;
+	.index {
+		width: 750rpx;
+		display: flex;
+		flex-direction: column;
+		height: 100vh;
+
+		.top {
+			padding: 0 30rpx;
+			display: flex;
+			justify-content: space-between;
+			width: 100%;
+			height: 88rpx;
+			align-items: center;
+			flex-shrink: 0;
+
+			.sosuo {
+				width: 32rpx;
+				height: 32rpx;
 
-        }
-        .tabs{
-            width: 334rpx;
-            /deep/ .u-tab-item{
-                font-weight: bold;
-            }
-        }
-    }
-    .card{
-        height: 100%;
-        width: 100%;
-        .box{
-            width: 100%;
-            padding: 0 30rpx;
-        }
-        .list{
-            display: flex;
-        }
-    }
-    .tuijian{
-        width: 750rpx;
-        margin-left: -30rpx;
-        height: 400rpx;
-        background-color: #ececec;
-        padding: 30rpx;
-        .title{
-            width: 100%;
-            display: flex;
-            align-items: center;
-            justify-content: space-between;
-            .left{
-                display: flex;
-                align-items: center;
-                >view{
-                    width: 6rpx;
-                    height: 30rpx;
-                    background-color: #FF780F;
-                }
-                >text{
-                    font-size: 30rpx;
-                    color: 30rpx;
-                    margin-left: 14rpx;
-                }
-            }
-            .right{
-                width: 14rpx;
-                height: 24rpx;
-            }
-        }
-        .tuijianlist{
-            width: 100%;
-            height: 282rpx;
-            margin-top: 30rpx;
-            display: flex;
-			> view:not(:last-child) {
-				margin-right: 23rpx;
 			}
-        }
-    }
-}
+
+			.tabs {
+				width: 334rpx;
+
+				/deep/ .u-tab-item {
+					font-weight: bold;
+				}
+			}
+		}
+
+		.card {
+			height: 100%;
+			width: 100%;
+
+			.box {
+				width: 100%;
+				padding: 0 30rpx;
+			}
+
+			.list {
+				display: flex;
+			}
+		}
+
+		.tuijian {
+			width: 750rpx;
+			margin-left: -30rpx;
+			height: 400rpx;
+			background-color: #ececec;
+			padding: 30rpx;
+
+			.title {
+				width: 100%;
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+
+				.left {
+					display: flex;
+					align-items: center;
+
+					>view {
+						width: 6rpx;
+						height: 30rpx;
+						background-color: #FF780F;
+					}
+
+					>text {
+						font-size: 30rpx;
+						color: 30rpx;
+						margin-left: 14rpx;
+					}
+				}
+
+				.right {
+					width: 14rpx;
+					height: 24rpx;
+				}
+			}
+
+			.tuijianlist {
+				width: 100%;
+				height: 282rpx;
+				margin-top: 30rpx;
+				display: flex;
+
+				>view:not(:last-child) {
+					margin-right: 23rpx;
+				}
+			}
+		}
+	}
 </style>
 <script>
-import videoItem from "@/components/index/video-item/index" 
-import zhiboItem from "@/components/index/zhibo-item/index" 
-import indexad from "@/components/index/ad/index" 
-import darenItem from "@/components/index/daren-item/index" 
+	import videoItem from "@/components/index/video-item/index"
+	import zhiboItem from "@/components/index/zhibo-item/index"
+	import indexad from "@/components/index/ad/index"
+	import darenItem from "@/components/index/daren-item/index"
 
-export default {
-    name:"index",
-    data(){
-        return {
-            list:[
-                {
+	export default {
+		name: "index",
+		data() {
+			return {
+				list: [{
 					name: '发现'
 				}, {
 					name: '直播'
 				}, {
 					name: '关注'
+				}],
+				num: 0,
+				page: 0, // 0即第一页
+				articleList: [],
+				recommendList: [], // 推荐达人
+				indexImageSwiper: [],
+				zhiboImageSwiper: [],
+			}
+		},
+		components: {
+			videoItem,
+			zhiboItem,
+			indexad,
+			darenItem
+		},
+		onShow() {
+			this.getArticlelist();
+			this.getRecommendList();
+			this.getSwiper();
+			this.getZhiBoSwiper();
+		},
+		methods: {
+			getSwiper() {
+				this.$u.api.getIndexSwiper().then(res => {
+					if (res.errCode == 0) {
+						this.indexImageSwiper = res.data;
+					}
+				})
+			},
+			getZhiBoSwiper() {
+				this.$u.api.getZhiBoSwiper().then(res => {
+					if (res.errCode == 0) {
+						this.zhiboImageSwiper = res.data;
+					}
+				})
+			},
+			dianji(a) {
+				// console.log(a)
+				if (typeof a == "object") {
+					this.num = a.detail.current
+				} else {
+					this.num = a
 				}
-            ],
-			num:0,
-			page: 0, // 0即第一页
-			articleList: [],
-			recommendList: [], // 推荐达人
-			indexImageSwiper: [],
-			zhiboImageSwiper: [],
-        }
-    },
-    components:{
-        videoItem,
-        zhiboItem,
-        indexad,
-        darenItem
-    },
-    onShow(){
-	   this.getArticlelist();
-	   this.getRecommendList();
-	   this.getSwiper();
-	   this.getZhiBoSwiper();
-    },
-    methods:{
-		getSwiper() {
-			this.$u.api.getIndexSwiper().then(res => {
-				if(res.errCode == 0) {
-					this.indexImageSwiper = res.data;
-				}
-			})
+			},
+			getArticlelist() {
+				this.$u.api.getArticlelist({
+					page: this.page,
+					is_video_img: 0, // 查询视频1 图文2 都查0
+				}).then(res => {
+					console.log('37647744ghj',res)
+					if (res.errCode == 0) {
+						this.articleList = res.data.list;
+					}
+				})
+			},
+			getRecommendList() {
+				this.$u.api.getRecommendList().then(res => {
+					console.log(res)
+					if (res.errCode == 0) {
+						this.recommendList = res.data.list;
+					}
+				})
+			},
+			toSearchPage() {
+				uni.navigateTo({
+					url: '/pageB/follow/index'
+				})
+			},
 		},
-		getZhiBoSwiper() {
-			this.$u.api.getZhiBoSwiper().then(res => {
-				if(res.errCode == 0) {
-					this.zhiboImageSwiper = res.data;
-				}
-			})
-		},
-        dianji(a){
-            // console.log(a)
-            if(typeof a == "object"){
-                this.num = a.detail.current
-            }else{
-                this.num = a
-            }
-		},
-		getArticlelist () {
-			this.$u.api.getArticlelist({
-				page: this.page,
-				is_video_img: 0, // 查询视频1 图文2 都查0
-			}).then(res => {
-				if(res.errCode == 0) {
-					this.articleList = res.data.list;
-				}
-			})
-		},
-		getRecommendList() {
-			this.$u.api.getRecommendList().then(res => {
-                console.log(res)
-				if(res.errCode == 0) {
-					this.recommendList = res.data.list;
-				}
-			})
-		},
-		toSearchPage() {
-			uni.navigateTo({
-				url: '/pageB/follow/index'
-			})
-		},
-    },
-}
-</script>
\ No newline at end of file
+	}
+</script>
-- 
2.47.2