diff --git a/components/WaterfallsFlow/WaterfallsFlow.vue b/components/WaterfallsFlow/WaterfallsFlow.vue
index 103fcdf..9068f74 100644
--- a/components/WaterfallsFlow/WaterfallsFlow.vue
+++ b/components/WaterfallsFlow/WaterfallsFlow.vue
@@ -160,7 +160,7 @@ export default {
         },
         // item点击
         itemTap(item) {
-            this.$emit('itemTap', item)
+            // this.$emit('itemTap', item)
         },
 		// item点击
 		goShop(item) {
diff --git a/components/WaterfallsFlow/WaterfallsFlowo.vue b/components/WaterfallsFlow/WaterfallsFlowo.vue
new file mode 100644
index 0000000..5de9191
--- /dev/null
+++ b/components/WaterfallsFlow/WaterfallsFlowo.vue
@@ -0,0 +1,208 @@
+<template>
+    <view :class="'wf-page wf-page'+type">
+        <!--    left    -->
+		
+		
+        <view>
+		
+            <view id="left" v-if="leftList.length">
+                <view v-for="(item,index) in leftList" :key="index"
+                      class="wf-itema" @tap="itemTap(item)">
+                    <WaterfallsFlowItem :item="item" :isStore="isStore" :type="type" @goShop="goShop"/>
+                </view>
+            </view>
+        </view>
+        <!--    right    -->
+        <view>
+            <view id="right" v-if="rightList.length">
+                <view v-for="(item,index) in rightList" :key="index"
+                      class="wf-itemb" @tap="itemTap(item)">					  
+                    <WaterfallsFlowItem :item="item" :isStore="isStore" :type="type" @goShop="goShop"/>
+                </view>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+import WaterfallsFlowItem from '../WaterfallsFlowItem/WaterfallsFlowItemo.vue'
+
+export default {
+    components: {
+        WaterfallsFlowItem
+    },
+    props: {
+        // 瀑布流列表
+        wfList: {
+            type: Array,
+            require: true
+        },
+        updateNum: {
+            type: Number,
+            default: 10
+        },
+		type: {
+			type: Number,
+			default: 0			
+		},
+		isStore: {
+			type: [String, Number],
+			default: '1'
+		},
+    },
+    data() {
+        return {
+            allList: [],       // 全部列表
+            leftList: [],      // 左边列表
+            rightList: [],     // 右边列表
+            mark: 0,           // 列表标记
+            boxHeight: [],     // 下标0和1分别为左列和右列高度
+        };
+    },
+    watch: {
+        // 监听列表数据变化
+        wfList:  {
+			
+			handler(nVal,oVal){
+				
+				// 如果数据为空或新的列表数据少于旧的列表数据（通常为下拉刷新或切换排序或使用筛选器），初始化变量
+				if (!this.wfList.length ||
+				    (this.wfList.length === this.updateNum && this.wfList.length <= this.allList.length)) {
+				    this.allList = [];
+				    this.leftList = [];
+				    this.rightList = [];
+				    this.boxHeight = [];
+				    this.mark = 0;
+				}
+				
+				// 如果列表有值，调用waterfall方法
+				if (this.wfList.length) {
+				    this.allList = this.wfList;
+					this.leftList = [];
+					this.rightList = [];
+					this.boxHeight = [];
+					this.allList.forEach((v, i) => {
+						if(this.allList.length < 3 || (this.allList.length <= 7  && this.allList.length - i > 1) || (this.allList.length > 7 && this.allList.length - i > 2)) {
+							if(i % 2){
+								this.rightList.push(v);
+							}else{
+								this.leftList.push(v);
+							}
+						}
+					});
+					
+					if(this.allList.length < 3){
+						this.mark = this.allList.length+1;
+					}else if(this.allList.length <= 7){
+						this.mark = this.allList.length - 1;
+					}else{
+						this.mark = this.allList.length - 2;
+					}
+					if(this.mark < this.allList.length){
+						this.waterFall()
+					}
+					console.log(this.rightList,this.leftList)
+				}
+			},
+			immediate: true,
+			deep:true
+        },
+		mounted(){
+			
+		},
+
+        // 监听标记，当标记发生变化，则执行下一个item排序
+        mark() {
+            const len = this.allList.length;
+            if (this.mark < len && this.mark !== 0 && this.boxHeight.length) {
+                this.waterFall();
+            }
+        }
+    },
+    methods: {
+        // 瀑布流排序
+        waterFall() {
+            const i = this.mark;
+		
+            if (i == 0) {
+                // 初始化，从左边开始插入
+                this.leftList.push(this.allList[i]);
+                // 更新左边列表高度
+                this.getViewHeight(0);
+            } else if (i == 1) {
+                // 第二个item插入，默认为右边插入
+                this.rightList.push(this.allList[i]);
+                // 更新右边列表高度
+                this.getViewHeight(1);
+            } else {
+                // 根据左右列表高度判断下一个item应该插入哪边
+                if(!this.boxHeight.length){
+                	this.rightList.length < this.leftList.length 
+                	? this.rightList.push(this.allList[i])
+                	: this.leftList.push(this.allList[i]);
+                } else {
+                	const leftOrRight = this.boxHeight[0] > this.boxHeight[1] ? 1 : 0;
+                	if (leftOrRight) {
+                	    this.rightList.push(this.allList[i])
+                	} else {
+                	    this.leftList.push(this.allList[i])
+                	}
+                }
+				// 更新插入列表高度
+				this.getViewHeight();
+            }
+        },
+        // 获取列表高度
+        getViewHeight() {
+            // 使用nextTick，确保页面更新结束后，再请求高度
+            this.$nextTick(() => {
+            	setTimeout(()=>{
+            		uni.createSelectorQuery().in(this).select('#right').boundingClientRect(res => {
+            				res ? this.boxHeight[1] = res.height : '';
+            			uni.createSelectorQuery().in(this).select('#left').boundingClientRect(res => {
+            				res ? this.boxHeight[0] = res.height : '';	
+            				this.mark = this.mark + 1;				
+            			}).exec();
+            		}).exec();
+            	},100)               
+            })
+        },
+        // item点击
+        itemTap(item) {
+            this.$emit('itemTap', item)
+        },
+		// item点击
+		goShop(item) {
+		    this.$emit('goShop', item)
+		}
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+$page-padding: 10px;
+$grid-gap: 5px;
+
+.wf-page {
+    display: grid;
+    grid-template-columns: 1fr 1fr;
+    grid-gap: $grid-gap;
+}
+.wf-itema {
+   width: 356rpx;
+    padding-bottom: $grid-gap;
+}
+.wf-itemb {
+   width: 356rpx;
+  padding-bottom: $grid-gap;
+}
+.wf-page1 .wf-item{
+	margin-top: 20rpx;
+	background-color: #fff;
+	border-radius: 20rpx;
+	padding-bottom: 0;
+}
+.wf-item-page{
+	padding-bottom: 20rpx;
+}
+</style>
diff --git a/components/WaterfallsFlow/WaterfallsFlows.vue b/components/WaterfallsFlow/WaterfallsFlows.vue
new file mode 100644
index 0000000..17e1e39
--- /dev/null
+++ b/components/WaterfallsFlow/WaterfallsFlows.vue
@@ -0,0 +1,207 @@
+<template>
+    <view :class="'wf-page wf-page'+type">
+        <!--    left    -->
+		
+		
+        <view>
+		
+            <view id="left" v-if="leftList.length">
+                <view v-for="(item,index) in leftList" :key="index"
+                      class="wf-itema" @tap="itemTap(item)">
+                    <WaterfallsFlowItem :item="item" :isStore="isStore" :type="type" @goShop="goShop"/>
+                </view>
+            </view>
+        </view>
+        <!--    right    -->
+        <view>
+            <view id="right" v-if="rightList.length">
+                <view v-for="(item,index) in rightList" :key="index"
+                      class="wf-itemb" @tap="itemTap(item)">					  
+                    <WaterfallsFlowItem :item="item" :isStore="isStore" :type="type" @goShop="goShop"/>
+                </view>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+import WaterfallsFlowItem from '../WaterfallsFlowItem/WaterfallsFlowItems.vue'
+
+export default {
+    components: {
+        WaterfallsFlowItem
+    },
+    props: {
+        // 瀑布流列表
+        wfList: {
+            type: Array,
+            require: true
+        },
+        updateNum: {
+            type: Number,
+            default: 10
+        },
+		type: {
+			type: Number,
+			default: 0			
+		},
+		isStore: {
+			type: [String, Number],
+			default: '1'
+		},
+    },
+    data() {
+        return {
+            allList: [],       // 全部列表
+            leftList: [],      // 左边列表
+            rightList: [],     // 右边列表
+            mark: 0,           // 列表标记
+            boxHeight: [],     // 下标0和1分别为左列和右列高度
+        };
+    },
+    watch: {
+        // 监听列表数据变化
+        wfList:  {
+			
+			handler(nVal,oVal){
+				
+				// 如果数据为空或新的列表数据少于旧的列表数据（通常为下拉刷新或切换排序或使用筛选器），初始化变量
+				if (!this.wfList.length ||
+				    (this.wfList.length === this.updateNum && this.wfList.length <= this.allList.length)) {
+				    this.allList = [];
+				    this.leftList = [];
+				    this.rightList = [];
+				    this.boxHeight = [];
+				    this.mark = 0;
+				}
+				
+				// 如果列表有值，调用waterfall方法
+				if (this.wfList.length) {
+				    this.allList = this.wfList;
+					this.leftList = [];
+					this.rightList = [];
+					this.boxHeight = [];
+					this.allList.forEach((v, i) => {
+						if(this.allList.length < 3 || (this.allList.length <= 7  && this.allList.length - i > 1) || (this.allList.length > 7 && this.allList.length - i > 2)) {
+							if(i % 2){
+								this.rightList.push(v);
+							}else{
+								this.leftList.push(v);
+							}
+						}
+					});
+					
+					if(this.allList.length < 3){
+						this.mark = this.allList.length+1;
+					}else if(this.allList.length <= 7){
+						this.mark = this.allList.length - 1;
+					}else{
+						this.mark = this.allList.length - 2;
+					}
+					if(this.mark < this.allList.length){
+						this.waterFall()
+					}
+				
+				}
+			},
+			immediate: true,
+			deep:true
+        },
+		mounted(){
+			
+		},
+
+        // 监听标记，当标记发生变化，则执行下一个item排序
+        mark() {
+            const len = this.allList.length;
+            if (this.mark < len && this.mark !== 0 && this.boxHeight.length) {
+                this.waterFall();
+            }
+        }
+    },
+    methods: {
+        // 瀑布流排序
+        waterFall() {
+            const i = this.mark;
+            if (i == 0) {
+                // 初始化，从左边开始插入
+                this.leftList.push(this.allList[i]);
+                // 更新左边列表高度
+                this.getViewHeight(0);
+            } else if (i == 1) {
+                // 第二个item插入，默认为右边插入
+                this.rightList.push(this.allList[i]);
+                // 更新右边列表高度
+                this.getViewHeight(1);
+            } else {
+                // 根据左右列表高度判断下一个item应该插入哪边
+                if(!this.boxHeight.length){
+                	this.rightList.length < this.leftList.length 
+                	? this.rightList.push(this.allList[i])
+                	: this.leftList.push(this.allList[i]);
+                } else {
+                	const leftOrRight = this.boxHeight[0] > this.boxHeight[1] ? 1 : 0;
+                	if (leftOrRight) {
+                	    this.rightList.push(this.allList[i])
+                	} else {
+                	    this.leftList.push(this.allList[i])
+                	}
+                }
+				// 更新插入列表高度
+				this.getViewHeight();
+            }
+        },
+        // 获取列表高度
+        getViewHeight() {
+            // 使用nextTick，确保页面更新结束后，再请求高度
+            this.$nextTick(() => {
+            	setTimeout(()=>{
+            		uni.createSelectorQuery().in(this).select('#right').boundingClientRect(res => {
+            				res ? this.boxHeight[1] = res.height : '';
+            			uni.createSelectorQuery().in(this).select('#left').boundingClientRect(res => {
+            				res ? this.boxHeight[0] = res.height : '';	
+            				this.mark = this.mark + 1;				
+            			}).exec();
+            		}).exec();
+            	},100)               
+            })
+        },
+        // item点击
+        itemTap(item) {
+            // this.$emit('itemTap', item)
+        },
+		// item点击
+		goShop(item) {
+		    // this.$emit('goShop', item)
+		}
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+$page-padding: 10px;
+$grid-gap: 5px;
+
+.wf-page {
+    display: grid;
+    grid-template-columns: 1fr 1fr;
+    grid-gap: $grid-gap;
+}
+.wf-itema {
+   width: 356rpx;
+    padding-bottom: $grid-gap;
+}
+.wf-itemb {
+   width: 356rpx;
+  padding-bottom: $grid-gap;
+}
+.wf-page1 .wf-item{
+	margin-top: 20rpx;
+	background-color: #fff;
+	border-radius: 20rpx;
+	padding-bottom: 0;
+}
+.wf-item-page{
+	padding-bottom: 20rpx;
+}
+</style>
diff --git a/components/WaterfallsFlowItem/WaterfallsFlowItemo.vue b/components/WaterfallsFlowItem/WaterfallsFlowItemo.vue
new file mode 100644
index 0000000..88a0fd9
--- /dev/null
+++ b/components/WaterfallsFlowItem/WaterfallsFlowItemo.vue
@@ -0,0 +1,191 @@
+<template>
+	<view class="wf-item-page">
+
+		<image :src="item.image[0]" mode="widthFix" class="item-img" />
+	
+		<view class="title">{{item.title}}</view>
+		<view class="tag">
+			<view class="tag-one">
+				自营商品
+			</view>
+			<view class="tag-two">
+
+				<text class="tag-twoa">折</text>
+				<text class="tag-twob">满20包邮</text>
+			</view>
+
+		</view>
+		<view class="relase">
+			<view class="relase-one">
+				3.0
+			</view>
+			<view class="relase-two">
+				3000+评论
+			</view>
+		</view>
+		<view class="price">
+			<span>￥</span>10.<text>00</text>
+		</view>
+		<view class="item-info">
+			<view class="info-title">
+				通滩镇综合供销中心...
+			</view>
+			<view class="info-img">
+				<image src="@/static/images/you.png" mode="aspectFill"></image>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		props: {
+			item: {
+				type: Object,
+				require: true
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.wf-item-page {
+		background: #fff;
+		overflow: hidden;
+		border-radius: 5px;
+
+	}
+
+	.item-img {
+		width: 100%;
+	}
+
+	.item-info {}
+
+	.title {
+		font-size: 30rpx;
+		font-family: PingFang SC-Medium, PingFang SC;
+		font-weight: 500;
+		color: #333333;
+		margin: 12px 0;
+		width: 100%;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		display: -webkit-box;
+		-webkit-line-clamp: 2;
+		-webkit-box-orient: vertical;
+		padding: 0 5px;
+		margin-left: 21rpx;
+	}
+
+	.tag {
+		display: flex;
+		margin-left: 21rpx;
+
+		.tag-one {
+			
+			text-align: center;
+			padding: 2rpx 9rpx;
+			border-radius: 11rpx 11rpx 11rpx 11rpx;
+			border: 1px solid #3274F9;
+			font-size: 19rpx;
+			font-family: PingFang SC-Regular, PingFang SC;
+			font-weight: 400;
+			margin-right: 15rpx;
+		}
+
+		.tag-two {
+
+			.tag-twoa {
+				width: 130rpx;
+				text-align: center;
+				padding-left: 15rpx;
+				padding-right: 7rpx;
+				border-radius: 11rpx 0px 0px 0rpx;
+				border: 1px solid #F84221;
+				font-size: 19rpx;
+				font-family: PingFang SC-Regular, PingFang SC;
+				font-weight: 400;
+			}
+
+			.tag-twob {
+				width: 130rpx;
+				text-align: center;
+				padding: 2rpx 9rpx;
+				border-radius: 0px 11rpx 11rpx 0px;
+				border: 1px solid #F84221;
+				font-size: 19rpx;
+				font-family: PingFang SC-Regular, PingFang SC;
+				font-weight: 400;
+			}
+		}
+	}
+.relase {
+		display: flex;
+
+		margin-left: 21rpx;
+		margin-top: 12rpx;
+
+		.relase-one {
+			font-size: 26rpx;
+			font-family: SF Pro Display-Regular Italic, SF Pro Display;
+			font-weight: normal;
+			color: #FF6D20;
+		}
+
+		.relase-two {
+			font-size: 23rpx;
+			font-family: PingFang SC-Regular, PingFang SC;
+			font-weight: 400;
+			color: #B3B3B3;
+			margin-left: 13rpx;
+		}
+	}
+
+	.price {
+		margin-left: 21rpx;
+		margin-bottom: 10rpx;
+		color: #F84221;
+		font-size: 44rpx;
+
+		span {
+			color: #F84221;
+			font-size: 30rpx;
+		}
+
+		text {
+			color: #F84221;
+			font-size: 37rpx;
+		}
+	}
+
+	.item-info {
+		margin-left: 21rpx;
+		margin-bottom: 25rpx;
+		display: flex;
+		justify-content: space-between;
+		width: 280rpx;
+		height: 39rpx;
+		line-height: 39rpx;
+		background: #F4F7FE;
+		border-radius: 19rpx 19rpx;
+		opacity: 1;
+		font-size: 23rpx;
+		padding-left: 11rpx;
+		font-family: PingFang SC-Regular, PingFang SC;
+		font-weight: 400;
+		color: #737373;
+
+		.info-img {
+			width: 10rpx;
+			height: 21rpx;
+			margin-top: 5rpx;
+			margin-right: 11rpx;
+
+			image {
+				width: 100%;
+				height: 100%;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/components/WaterfallsFlowItem/WaterfallsFlowItems.vue b/components/WaterfallsFlowItem/WaterfallsFlowItems.vue
new file mode 100644
index 0000000..610937e
--- /dev/null
+++ b/components/WaterfallsFlowItem/WaterfallsFlowItems.vue
@@ -0,0 +1,129 @@
+<template>
+	<view class="wf-item-page" @click="gogogo(item)">
+
+
+
+		<image :src="item.image[0]" mode="widthFix" class="item-img" />
+
+		<view class="goods_item_img" v-if="item.video_link.length>0">
+			<image src="@/static/images/sp.png" mode="aspectFill"></image>
+		</view>
+		<view class="title">{{item.title}}</view>
+		<view class="item-info">
+			<image :src="(item.author && item.author.avatar) || '/static/images/f.png'" mode="aspectFill"
+				class="info-avatar" />
+			<view class="info-nickname">{{ item.author.nickname }}</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		props: {
+			item: {
+				type: Object,
+				require: true
+			}
+		},
+
+
+
+		data() {
+			return {}
+		},
+
+
+
+
+
+
+
+		methods: {
+
+			gogogo(item) {
+				if (item.video_link.length > 0) {
+
+					uni.navigateTo({
+					
+						// #ifdef MP || H5
+						url: `/pages/short_video/nvueSwiper/index?id=${item.community_id}` 
+						// #endif
+						// #ifdef APP
+						url: `/pages/short_video/appSwiper/index?id=${item.community_id}` 
+						// #endif
+
+					})
+
+				} else {
+					uni.navigateTo({
+						url: `/pages/plantGrass/plant_detail/index?id=${item.community_id}`
+					})
+				}
+			},
+
+		}
+
+	}
+</script>
+
+<style lang="scss" scoped>
+	.wf-item-page {
+		background: #fff;
+		overflow: hidden;
+		border-radius: 5px;
+
+		position: relative;
+	}
+
+	.item-img {
+		width: 100%;
+	}
+
+	.item-info {
+		display: flex;
+		align-items: center;
+		padding: 5px;
+	}
+
+	.goods_item_img {
+		position: absolute;
+		top: 20rpx;
+		right: 18rpx;
+		width: 52rpx;
+		height: 52rpx;
+		z-index: 1 !important;
+
+
+		image {
+			width: 100%;
+			height: 100%;
+		}
+	}
+
+	.title {
+		font-size: 30rpx;
+		font-family: PingFang SC-Medium, PingFang SC;
+		font-weight: 500;
+		color: #333333;
+		margin: 12px 0;
+		width: 100%;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		display: -webkit-box;
+		-webkit-line-clamp: 2;
+		-webkit-box-orient: vertical;
+		padding: 0 5px;
+	}
+
+	.info-avatar {
+		width: 49rpx;
+		height: 49rpx;
+		border-radius: 50%;
+		margin-right: 5px;
+	}
+
+	.info-nickname {
+		font-size: 12px;
+		color: #333;
+	}
+</style>
\ No newline at end of file
diff --git a/components/zbpSwiper.vue b/components/zbpSwiper.vue
index ab3fa6d..aa93d1f 100644
--- a/components/zbpSwiper.vue
+++ b/components/zbpSwiper.vue
@@ -5,16 +5,14 @@
 			<img :src="bgColor" alt="">
 		</view>
 
-		<view class="site-box flex_a_c_j_sb">
+		<view class="site-box flex_a_c_j_sb" >
 			<view class="place_wrapper flex_a_c" @click="selectLocation">
 				<view class="iconfont icon-weizhi"></view>
 				<view class="town_name">{{street}}</view>
 			</view>
-
 			<navigator url="/pages/chat/customer_list/index?type=0" hover-class="none">
 				<view class="iconfont icon-xiaoxi" style="color:#fff;"></view>
 			</navigator>
-
 		</view>
 		<!-- 搜索栏 -->
 		<navigator url="/pages/columnGoods/goods_search/index" hover-class="none" class="search_content flex_a_c_j_sb">
@@ -237,7 +235,7 @@
 	}
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
 	.zbp-head-wrapper {
 		position: relative;
 		padding-top: 78.95rpx;
diff --git a/pages/columnGoods/goods_list/index.vue b/pages/columnGoods/goods_list/index.vue
index ea0fbeb..def6ed8 100644
--- a/pages/columnGoods/goods_list/index.vue
+++ b/pages/columnGoods/goods_list/index.vue
@@ -77,6 +77,7 @@
 				<view v-else class='list'>
 					<WaterfallsFlow :wfList='productList' @itemTap="godDetail" :type="1" @goShop="goShop"/>
 				</view>
+				
 				<view class='noCommodity' v-if="productList.length==0 && where.page > 1">
 					<view class='pictrue' style="margin: 60rpx auto;">
 						<image src='/static/images/noCart.png'></image>
diff --git a/pages/gather/gather.vue b/pages/gather/gather.vue
index e5c2800..24d18c3 100644
--- a/pages/gather/gather.vue
+++ b/pages/gather/gather.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="gather">
-		<view class="site-box flex_a_c_j_sb">
+	<!-- 	<view class="site-box flex_a_c_j_sb">
 			<view class="place_wrapper flex_a_c" @click="selectLocation">
 				<view class="iconfont icon-weizhi" style="margin-left: 20rpx;"></view>
 				<view class="town_name">{{street}}</view>
@@ -12,7 +12,7 @@
 			<view class="bg-img" v-if="isFshow">
 				<img :src="bgColor" alt="">
 			</view>
-		</view>
+		</view> -->
 
 		<zbpSwiper :isSelectPlace="true" :location_Arr="locationArr" @kkchange='kkchange'></zbpSwiper>
 		<u-empty :show="jurisdiction" marginTop="260" mode="permission" :text="emptyText"
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 3271ce8..090216f 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,27 +1,25 @@
 <template>
 	<view class="Circle_friends">
 		<view class="circle_friends_wrapper">
-
-
-			<view class="">
+			<view v-if='ishshow'>
 				<view :class="['site-box ','flex_a_c_j_sb',isFshow?'sitbox':'']">
-					<view :class="['place_wrapper','flex_a_c',isFshow?'sitbox':'']" @click="selectLocation">
-						<view :class="['iconfont','icon-weizhi',isFshow?'sitbox':'']" style="margin-left: 20rpx;">
+					<view :class="['place_wrapper','flex_a_c',isFshow?'sitbox':'']" @click="selectLocation"
+						style="opacity: 0;">
+						<view class="iconfont icon-weizhi" style="margin-left: 20rpx;background-color: transparent;">
 						</view>
 						<view class="town_name">{{street}}</view>
 					</view>
-
-					<navigator url="/pages/chat/customer_list/index?type=0" hover-class="none">
-						<view :class="['iconfont','icon-xiaoxi',isFshow?'sitbox':'']" style="color:#fff;"></view>
+					<navigator url="/pages/chat/customer_list/index?type=0" hover-class="none"
+						style="opacity: 0;	transition: opacity 1s ease-in;transition-delay: 1.5s;"
+						:class="[isFshow?'sitbox':'']">
+						<view class="iconfont icon-xiaoxi" style="color:#fff;"></view>
 					</navigator>
-
 				</view>
-				<view :class="['site-box ','flex_a_c_j_sb',isFshow?'sistbox':'']" v-if="isFshow">
+				<!-- <view class="site-box ','flex_a_c_j_sb'" v-if="ishshow">
 					<view class="bg-img">
 						<img :src="bgColor" alt="">
 					</view>
-				</view>
-
+				</view> -->
 			</view>
 
 
@@ -37,9 +35,9 @@
 
 			</view>
 			<view class="goodslist">
+				<WaterfallsFlow :wfList='cateGoods' />
 
-
-				<view class="goods">
+				<!-- 	<view class="goods">
 					<view v-for="(item,index) in cateGoods" :key="index">
 
 						<view :class="[index%2==0?'goods_item':'goods_items']" @click="gogogo(item)">
@@ -72,7 +70,7 @@
 							</view>
 						</view>
 					</view>
-				</view>
+				</view> -->
 				<!--<view class="goods">
 					  <view v-for="(item,i) in  cateGoods" :key="i" v-if='i%2!=0'>
 						<view class="goods_item" @click="gogogo(item)">
@@ -143,6 +141,7 @@
 	import mTabbar from '@/components/m-tabbar/m-tabbar.vue'
 	import zbpSwiper from '@/components/zbpSwiper'
 	import easyLoadimage from '@/components/easy-loadimage/easy-loadimage.vue';
+	import WaterfallsFlow from '@/components/WaterfallsFlow/WaterfallsFlows.vue'
 	import Cache from '@/utils/cache';
 	import {
 		getSlideAPI
@@ -173,7 +172,8 @@
 		components: {
 			mTabbar,
 			zbpSwiper,
-			easyLoadimage
+			easyLoadimage,
+			WaterfallsFlow
 		},
 		data() {
 			return {
@@ -214,7 +214,9 @@
 				streeta_id: '',
 				street: '',
 				bgColor: '',
+				ishshow: true,
 				isFshow: false,
+				scrollTop: 0,
 			}
 		},
 		watch: {
@@ -222,14 +224,15 @@
 				handler(newVal, oldVal) {
 					this.street = newVal
 					let arr = Cache.get('ADRESS_LOCATION')
-					console.log(arr, '1')
+					// console.log(arr, '1')
 					if (arr.length > 0) {
 						this.street = arr.split(',')[0]
 
 
 					}
 				},
-			}
+			},
+
 		},
 		onPullDownRefresh() {
 			this.getCateList()
@@ -280,13 +283,20 @@
 		},
 		// #ifdef APP-PLUS
 		onPageScroll(e) {
-			// this.scrollTop = e.scrollTop;
-			console.log(e.scrollTop)
+
 			if (e.scrollTop > 0) {
+				this.ishshow = true
 				this.isFshow = true
+
+			} else if (e.scrollTop == 0) {
+				this.ishshow = false
+				this.isFshow = false
 			} else {
+				this.ishshow = false
 				this.isFshow = false
 			}
+			
+			
 
 		},
 		// #endif
@@ -301,7 +311,7 @@
 					document.body.scrollTop;
 				// 滚动条滚动的距离
 				let scrollStep = scrollTop - this.oldScrollTop;
-				console.log("header 滚动距离 ", scrollTop);
+				// console.log("header 滚动距离 ", scrollTop);
 				// 更新——滚动前，滚动条距文档顶部的距离
 				this.oldScrollTop = scrollTop;
 
@@ -315,19 +325,19 @@
 				//滚动条到底部的条件
 				if (scrollTop + windowHeight == scrollHeight) {
 					//你想做的事情
-					console.log("header  你已经到底部了");
+					// console.log("header  你已经到底部了");
 				}
 				if (scrollStep < 0) {
 					this.isFshow = false
-					console.log("header 滚动条向上滚动了！");
+					// console.log("header 滚动条向上滚动了！");
 				} else {
 					this.isFshow = true
-					console.log("header  滚动条向下滚动了！");
+					// console.log("header  滚动条向下滚动了！");
 				}
 				// 判断是否到了最顶部
 				if (scrollTop <= 0) {
 					this.isFshow = false
-					console.log("header 到了最顶部")
+					// console.log("header 到了最顶部")
 				}
 			},
 
@@ -633,10 +643,10 @@
 	}
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
 	page {
 		background-color: #F4F7FE;
-		;
+
 		// background: linear-gradient(180deg, #FFFFFF 0%, #F6F6F6 100%);
 	}
 
@@ -676,7 +686,7 @@
 
 
 	.sistbox {
-		opacity: 0;
+		transition: fadenum 3s;
 	}
 
 	@keyframes fadenum {
@@ -693,36 +703,40 @@
 		}
 	}
 
-	.bg-img {
-		position: absolute;
-		width: 100%;
-		height: 100%;
+	// .bg-img {
+	// 	position: absolute;
+	// 	width: 100%;
+	// 	height: 100%;
 
-		top: 0;
-		/* #ifdef MP || APP-PLUS */
-		z-index: -100;
-		/* #endif */
-		/* #ifdef H5 */
-		z-index: -100;
-		/* #endif */
-		z-index: -100;
-		filter: blur(0);
-		overflow: hidden;
-		transition: fadenum 3s linear;
+	// 	top: 0;
+	// 	/* #ifdef MP || APP-PLUS */
+	// 	z-index: -100;
+	// 	/* #endif */
+	// 	/* #ifdef H5 */
+	// 	z-index: -100;
+	// 	/* #endif */
+	// 	z-index: -100;
+	// 	filter: blur(0);
+	// 	overflow: hidden;
 
-		img {
-			width: 100%;
-			height: 100%;
-			filter: blur(30rpx);
-			transform: scale(1.5);
-		}
-	}
+
+	// 	img {
+	// 		width: 100%;
+	// 		height: 100%;
+	// 		filter: blur(30rpx);
+	// 		transform: scale(1.5);
+	// 	}
+	// }
 
 	.sitbox {
 		opacity: 1 !important;
-		background: #ac3525 !important;
+		// background: #F84221 !important;
+		background: linear-gradient(to bottom, #F84221, #F84221);
+		background-color: #F84221;
+
 	}
 
+
 	.site-box {
 		width: 100%;
 		/* #ifdef MP || APP-PLUS */
@@ -745,9 +759,10 @@
 		// background-color: #e5e5e5;
 		// opacity: 0;
 		/* 初始时设置元素不透明 */
-		transition: opacity 0.2s ease-in;
+		backdrop-filter: blur(5px) opacity(0);
+		transition: opacity 0.2s ease-in-out;
 		transition-delay: 1.5s;
-		transition: background 0.2s ease-in;
+		transition: background 0.2s ease-in-out;
 		padding-right: 20rpx;
 
 		// 位置
@@ -756,7 +771,7 @@
 			margin-right: 24.56rpx;
 			font-size: 30rpx;
 			opacity: 0;
-			transition: opacity 1s ease-in;
+			transition: opacity 1s ease-in-out;
 			transition-delay: 1.5s;
 
 			.town_name {
@@ -765,9 +780,8 @@
 		}
 
 		.iconfont {
+
 			font-size: 30rpx;
-		
-		
 			font-size: 35.09rpx;
 		}
 	}
diff --git a/pages/short_video/appSwiper/index.nvue b/pages/short_video/appSwiper/index.nvue
index efa92cc..0547433 100644
--- a/pages/short_video/appSwiper/index.nvue
+++ b/pages/short_video/appSwiper/index.nvue
@@ -1,6 +1,6 @@
 <template>
-  <view class="container">
-    <!--
+	<view class="container">
+		<!--
 		注意：这是 App 所用页面，请勿引入微信小程序或浏览器运行，最好运行在真机
 		 
 		1. new_index.nvue、index.nvue这两个是App页面
@@ -19,8 +19,8 @@
 			App、小程序、H5评论请参考插件：https://ext.dcloud.net.cn/plugin?id=7875
 		】
 		 -->
-    <!-- 头部导航 -->
-<!--    <view v-if="!isUser" class="header" :style="{backgroundColor:currentNav==1?'':'#000'}" >
+		<!-- 头部导航 -->
+		<!--    <view v-if="!isUser" class="header" :style="{backgroundColor:currentNav==1?'':'#000'}" >
        <view class="items" @click.stop="navTap(2)">
         <text class="tName" :class="currentNav==2?'on':''">关注</text>
       </view>
@@ -31,14 +31,14 @@
         <text class="tName" :class="currentNav==3?'on':''">列表</text>
       </view> 
     </view> -->
-  <!--  <view class="noVideo acea-row row-center-wrapper" v-if="!dataList.length && !loadVideo">
+		<!--  <view class="noVideo acea-row row-center-wrapper" v-if="!dataList.length && !loadVideo">
       <view>
         <image :src="imgHost+'/static/no-video.png'" class="pictrue"></image>
         <text class="tips">暂无短视频内容哦~</text>
       </view>
     </view> -->
-    <view v-if="currentNav !== 3" :style="'width: '+ windowWidth +'px; height: '+ boxStyle.height +'px;'">
-      <!-- 
+		<view v-if="currentNav !== 3" :style="'width: '+ windowWidth +'px; height: '+ boxStyle.height +'px;'">
+			<!-- 
 			 1.这里的 swiper 不是用来控制视频滑动的，而是用来控制左右滑动的，如果不需要的可以改成 view
 			 
 			 2.为了 视频无限加载，已经把 21 行的 appear 去掉了，加上了 loadmore 方法（第10行）
@@ -47,25 +47,25 @@
 			 （1）Mac：按住 option 键，然后点击方法名，即可跳转到方法
 			 （2）windows：按住 Alt 键，然后鼠标左击，即可跳转到方法
 			 -->
-      <list @loadmore="getData" @scroll="scrolls" :loadmoreoffset="wHeight*1" :show-scrollbar="false" ref="listBox"
-        :pagingEnabled="true" :scrollable="true">
-        
-        <refresh class="refresh" @refresh="onrefresh" @pullingdown="onpullingdown"
-          :display="refreshing ? 'show' : 'hide'">
-          <loading style="background-color: #FFFFFF;">
-            <image src="../static/img/index/logins.gif"
-              :style="'width: 80upx; height: 40upx; margin-top: 80upx; margin-bottom: 30upx; margin-left: '+ (windowWidth - 200) +'px;'">
-            </image>
-          </loading>
-        </refresh>
-        <!-- 循环数据 -->
-        <cell v-for="(item,i) in dataList" :key="i">
-          <!-- 用div把视频模组套起来 -->
-          <div :style="'width: '+ windowWidth +'px; height: '+ boxStyle.height +'px;'">
-            <!-- <view v-if="Math.abs(k-i)<=1"> -->
-            <view  v-if="Math.abs(k-i)<=1">
-              <view class="root">
-                <!-- 
+			<list @loadmore="getData" @scroll="scrolls" :loadmoreoffset="wHeight*1" :show-scrollbar="false"
+				ref="listBox" :pagingEnabled="true" :scrollable="true">
+
+				<refresh class="refresh" @refresh="onrefresh" @pullingdown="onpullingdown"
+					:display="refreshing ? 'show' : 'hide'">
+					<loading style="background-color: #FFFFFF;">
+						<image src="../static/img/index/logins.gif"
+							:style="'width: 80upx; height: 40upx; margin-top: 80upx; margin-bottom: 30upx; margin-left: '+ (windowWidth - 200) +'px;'">
+						</image>
+					</loading>
+				</refresh>
+				<!-- 循环数据 -->
+				<cell v-for="(item,i) in dataList" :key="i">
+					<!-- 用div把视频模组套起来 -->
+					<div :style="'width: '+ windowWidth +'px; height: '+ boxStyle.height +'px;'">
+						<!-- <view v-if="Math.abs(k-i)<=1"> -->
+						<view v-if="Math.abs(k-i)<=1">
+							<view class="root">
+								<!-- 
 								具体视频参数可以参考官方文档
 								说明：
 								1.v-if很关键，这里主要是为了减少 dom 元素【这样才不会加载视频多了闪退】，
@@ -94,1547 +94,1562 @@
 									（6）在 timeupdate 方法里加入，if(index == this.k){把里面的加一个总的判断}
 								3.其他的下面有详解
 								 -->
-                <video :ref="'item'+i" :id="item.community_id" :loop="true" :autoplay="i == k" :src="item.video_link"
-                  :muted="item.isplay" :enable-progress-gesture="false" :page-gesture="false" :controls="false"
-                  :show-loading="true" :show-fullscreen-btn="false" :show-center-play-btn="false" :style="boxStyle"
-                  :object-fit="object_fit" @timeupdate="timeupdate($event,i)"></video>
-              </view>
-              <!-- 直接用 view 就行了，一样是可以覆盖原生组件的 -->
-              <!-- 这个是暂停时出现的图标 -->
-              <view class="videoHover" @click="tapVideoHover(item.state,$event)" :style="boxStyle">
-                <image v-if="item.state=='pause'" class="playState" src="../static/img/index/play.png"></image>
-              </view>
-              <!--审核状态-->
-              <view v-if="item.status==-1 || item.status==0 || item.status==-2" class="video-status">
-                <view v-if="item.status == -1 || item.status == -2" class="status-title">
-                  <image class="image" src="../static/img/index/video-failed.png"></image>
-                  <text class="title">{{item.status == -1 ? '审核未通过' : '已下架'}}，内容仅自己可见</text>
-                </view>
-                <view v-else class="status-title">
-                  <image class="image" src="../static/img/index/video-review.png"></image>
-                  <text class="title">正在审核，内容仅自己可见</text>
-                </view>
-                <view class="status_info">
-                  <text
-                    class="refusal">{{(item.status == -1 || item.status == -2) ? item.refusal : '发布的内容审核通过后，将在首页展示！'}}</text>
-                </view>
-              </view>
-              <!-- 最底下的文字部分 -->
-              <view class="content" v-if="dataList.length !== 0">
-                <view class="cart">
-                  <text class="cartName">@{{item.author.nickname}}</text>
-                </view>
-                <view class="words" :style="'width: '+ (windowWidth - 120) +'px;'">
-                  <view v-if="item.isMore || item.content.length<=29">
-                    <text class="info">{{item.content}}</text>
-                    <view class="close">
-                      <text v-if="item.isMore" class="more" @click="moreTap(item)">收起</text>
-                    </view>
-                  </view>
-                  <view class="wordsCon" v-else>
-                    <text class="info">{{item.content.slice(0,29)}}...</text>
-                    <text class="more" @click="moreTap(item)">更多</text>
-                  </view>
-                </view>
-                <view v-if="item.relevance.length > 0 && k==i" class="product">
-                  <scroll-view class="scroll-view" scroll-x="true" style="white-space: nowrap; display: flex;"
-                    scroll-with-animation show-scrollbar="true">
-                    <view class="product-item" v-for="(goods,idx) in item.relevance" :key="idx">
-                      <view v-if="goods.spu" class="item-count acea-row" @click="goDetail(goods.spu)">
-                        <view class="picture">
-                          <image class="image" :src="goods.spu.image"></image>
-                        </view>
-                        <view class="product-text">
-                          <text class="name line1"
-                            v-if="goods.spu && goods.spu.store_name.length>=12">{{goods.spu.store_name.slice(0,12)}}...</text>
-                          <text class="name line1" v-else>{{goods.spu && goods.spu.store_name}}</text>
-                          <view class="product-price">
-                            <view class="price"><text class="sm">¥</text><text class="money">{{goods.spu.price}}</text>
-                            </view>
-                            <text class="buy-btn">购买</text>
-                          </view>
-                        </view>
-                      </view>
-                    </view>
-                  </scroll-view>
-                </view>
+								<video :ref="'item'+i" :id="item.community_id" :loop="true" :autoplay="i == k"
+									:src="item.video_link" :muted="item.isplay" :enable-progress-gesture="false"
+									:page-gesture="false" :controls="false" :show-loading="true"
+									:show-fullscreen-btn="false" :show-center-play-btn="false" :style="boxStyle"
+									:object-fit="object_fit" @timeupdate="timeupdate($event,i)"></video>
+							</view>
+							<!-- 直接用 view 就行了，一样是可以覆盖原生组件的 -->
+							<!-- 这个是暂停时出现的图标 -->
+							<view class="videoHover" @click="tapVideoHover(item.state,$event)" :style="boxStyle">
+								<image v-if="item.state=='pause'" class="playState" src="../static/img/index/play.png">
+								</image>
+							</view>
+							<!--审核状态-->
+							<view v-if="item.status==-1 || item.status==0 || item.status==-2" class="video-status">
+								<view v-if="item.status == -1 || item.status == -2" class="status-title">
+									<image class="image" src="../static/img/index/video-failed.png"></image>
+									<text class="title">{{item.status == -1 ? '审核未通过' : '已下架'}}，内容仅自己可见</text>
+								</view>
+								<view v-else class="status-title">
+									<image class="image" src="../static/img/index/video-review.png"></image>
+									<text class="title">正在审核，内容仅自己可见</text>
+								</view>
+								<view class="status_info">
+									<text
+										class="refusal">{{(item.status == -1 || item.status == -2) ? item.refusal : '发布的内容审核通过后，将在首页展示！'}}</text>
+								</view>
+							</view>
+							<!-- 最底下的文字部分 -->
+							<view class="content" v-if="dataList.length !== 0">
+								<view class="cart">
+									<text class="cartName">@{{item.author.nickname}}</text>
+								</view>
+								<view class="words" :style="'width: '+ (windowWidth - 120) +'px;'">
+									<view v-if="item.isMore || item.content.length<=29">
+										<text class="info">{{item.content}}</text>
+										<view class="close">
+											<text v-if="item.isMore" class="more" @click="moreTap(item)">收起</text>
+										</view>
+									</view>
+									<view class="wordsCon" v-else>
+										<text class="info">{{item.content.slice(0,29)}}...</text>
+										<text class="more" @click="moreTap(item)">更多</text>
+									</view>
+								</view>
+								<view v-if="item.relevance.length > 0 && k==i" class="product">
+									<scroll-view class="scroll-view" scroll-x="true"
+										style="white-space: nowrap; display: flex;" scroll-with-animation
+										show-scrollbar="true">
+										<view class="product-item" v-for="(goods,idx) in item.relevance" :key="idx">
+											<view v-if="goods.spu" class="item-count acea-row"
+												@click="goDetail(goods.spu)">
+												<view class="picture">
+													<image class="image" :src="goods.spu.image"></image>
+												</view>
+												<view class="product-text">
+													<text class="name line1"
+														v-if="goods.spu && goods.spu.store_name.length>=12">{{goods.spu.store_name.slice(0,12)}}...</text>
+													<text class="name line1"
+														v-else>{{goods.spu && goods.spu.store_name}}</text>
+													<view class="product-price">
+														<view class="price"><text class="sm">¥</text><text
+																class="money">{{goods.spu.price}}</text>
+														</view>
+														<text class="buy-btn">购买</text>
+													</view>
+												</view>
+											</view>
+										</view>
+									</scroll-view>
+								</view>
 
-                <navigator v-if="item.topic" hover-class="none" class="product_cate"
-                  :url="'/pages/plantGrass/plant_search_list/index?id='+item.topic.topic_id">
-                  <view class="pro-view">
-                    <text class="icon">#</text><text class="text">{{item.topic.topic_name}}</text>
-                  </view>
-                </navigator>
-              </view>
-              <view class="userInfo">
-                <!-- 1.头像 -->
-                <navigator v-if="userInfo.uid != item.author.uid" hover-class="none"
-                  :url="'/pages/plantGrass/plant_user/index?id='+item.uid" class="pictrue">
-                  <image class="userAvatar" :src="item.author.avatar || '/static/images/f.png'" mode="aspectFill">
-                  </image>
-                  <view v-if="!item.is_fans || userInfo.uid == 0" class="guanzhu" @click.stop="followAuthor(item)"><text
-                      class="iconfont icon-shangpinshuliang-jia">+</text></view>
-                  <view v-else class="yiguanzhu"><text class="iconfont"></text></view>
-                </navigator>
-                <!-- 2.点赞 -->
-                <view @click="cLike(item);" style="margin-top: 5px;" :class="{'likeNumActive':item.relevance_id}">
-                  <image v-if="item.relevance_id" src="../static/img/index/xin.png" style="width: 32px; height: 32px;">
-                  </image>
-                  <image v-if="!item.relevance_id" src="../static/img/index/xin-2.png"
-                    style="width: 32px; height: 32px;"></image>
-                  <text class="info-text">{{item.count_start > 0 ? item.count_start : '点赞'}}</text>
-                </view>
-                <!-- 3.评论 -->
-                <view v-if="community_reply_status == 1 && item.status == 1" class="comment" @click="toComment(item,i)"
-                  style="margin-top: 18px;">
-                  <image src="../static/img/index/evaluate.png" style="width: 54rpx; height: 50rpx;"></image>
-                  <text class="info-text">{{item.count_reply>0 ? item.count_reply : '评论'}}</text>
-                </view>
-                <!-- 4.分享 -->
-                <view v-if="item.status == 1" @click="appShare('WXSceneSession',item.community_id)"
-                  style="margin-top: 17px;">
-                  <image src="../static/img/index/share-fill.png" style="width: 40px; height: 40px;"></image>
-                  <text class="info-text">分享</text>
-                </view>
-                <!-- 5.自己的视频 -->
-                <view v-if="userInfo.uid == item.author.uid" style="margin-top: 17px;">
-                  <view class="video-my" @click="showManage = !showManage">
-                    <view class="video-dian">
-                      <text class="dian"></text>
-                      <text class="dian"></text>
-                      <text class="dian"></text>
-                    </view>
-                  </view>
-                </view>
-                <!-- 提到的商品 -->
-                <view v-if="item.relevance.length>0 && k==i" @click="openMore(item)" class="mention"
-                  style="opacity: 0.9; margin-top: 18px;">
-                  <image class="image" src="../static/img/index/collection.png"></image>
-                  <text class="count">{{item.relevance.length}}</text>
-                </view>
-              </view>
-              <view v-if="showManage" class="manage">
-                <view class="manage-gou"></view>
-                <navigator hover-class="none"
-                  :url="'/pages/plantGrass/plant_release/index?id='+item.community_id+'&type=2'" class="items">
-                  <image src="../static/img/index/video-edit.png" style="width: 16px; height: 16px;"></image>
-                  <text class="text">编辑</text>
-                </navigator>
-                <view class="items" @click.stop="deleteTopic(item)">
-                  <image src="../static/img/index/video-delete.png" style="width: 16px; height: 16px;"></image>
-                  <text class="text">删除</text>
-                </view>
-              </view>
-              <!-- 1.视频预览时的图片，currenttimes：就是获取当前滑块的时间点，如果不需要，可以注释掉 -->
-              <!-- 2.如果使用下面的视频预览的话要注意的是视频链接最好是阿里云上的，因为
+								<navigator v-if="item.topic" hover-class="none" class="product_cate"
+									:url="'/pages/plantGrass/plant_search_list/index?id='+item.topic.topic_id">
+									<view class="pro-view">
+										<text class="icon">#</text><text class="text">{{item.topic.topic_name}}</text>
+									</view>
+								</navigator>
+							</view>
+							<view class="userInfo">
+								<!-- 1.头像 -->
+								<navigator v-if="userInfo.uid != item.author.uid" hover-class="none"
+									:url="'/pages/plantGrass/plant_user/index?id='+item.uid" class="pictrue">
+									<image class="userAvatar" :src="item.author.avatar || '/static/images/f.png'"
+										mode="aspectFill">
+									</image>
+									<view v-if="!item.is_fans || userInfo.uid == 0" class="guanzhu"
+										@click.stop="followAuthor(item)"><text
+											class="iconfont icon-shangpinshuliang-jia">+</text></view>
+									<view v-else class="yiguanzhu"><text class="iconfont"></text></view>
+								</navigator>
+								<!-- 2.点赞 -->
+								<view @click="cLike(item);" style="margin-top: 5px;"
+									:class="{'likeNumActive':item.relevance_id}">
+									<image v-if="item.relevance_id" src="../static/img/index/xin.png"
+										style="width: 32px; height: 32px;">
+									</image>
+									<image v-if="!item.relevance_id" src="../static/img/index/xin-2.png"
+										style="width: 32px; height: 32px;"></image>
+									<text class="info-text">{{item.count_start > 0 ? item.count_start : '点赞'}}</text>
+								</view>
+								<!-- 3.评论 -->
+								<view v-if="community_reply_status == 1 && item.status == 1" class="comment"
+									@click="toComment(item,i)" style="margin-top: 18px;">
+									<image src="../static/img/index/evaluate.png" style="width: 54rpx; height: 50rpx;">
+									</image>
+									<text class="info-text">{{item.count_reply>0 ? item.count_reply : '评论'}}</text>
+								</view>
+								<!-- 4.分享 -->
+								<view v-if="item.status == 1" @click="appShare('WXSceneSession',item.community_id)"
+									style="margin-top: 17px;">
+									<image src="../static/img/index/share-fill.png" style="width: 40px; height: 40px;">
+									</image>
+									<text class="info-text">分享</text>
+								</view>
+								<!-- 5.自己的视频 -->
+								<view v-if="userInfo.uid == item.author.uid" style="margin-top: 17px;">
+									<view class="video-my" @click="showManage = !showManage">
+										<view class="video-dian">
+											<text class="dian"></text>
+											<text class="dian"></text>
+											<text class="dian"></text>
+										</view>
+									</view>
+								</view>
+								<!-- 提到的商品 -->
+								<view v-if="item.relevance.length>0 && k==i" @click="openMore(item)" class="mention"
+									style="opacity: 0.9; margin-top: 18px;">
+									<image class="image" src="../static/img/index/collection.png"></image>
+									<text class="count">{{item.relevance.length}}</text>
+								</view>
+							</view>
+							<view v-if="showManage" class="manage">
+								<view class="manage-gou"></view>
+								<navigator hover-class="none"
+									:url="'/pages/plantGrass/plant_release/index?id='+item.community_id+'&type=2'"
+									class="items">
+									<image src="../static/img/index/video-edit.png" style="width: 16px; height: 16px;">
+									</image>
+									<text class="text">编辑</text>
+								</navigator>
+								<view class="items" @click.stop="deleteTopic(item)">
+									<image src="../static/img/index/video-delete.png"
+										style="width: 16px; height: 16px;"></image>
+									<text class="text">删除</text>
+								</view>
+							</view>
+							<!-- 1.视频预览时的图片，currenttimes：就是获取当前滑块的时间点，如果不需要，可以注释掉 -->
+							<!-- 2.如果使用下面的视频预览的话要注意的是视频链接最好是阿里云上的，因为
 									https://xxxxxxxxx.mp4?x-oss-process=video/snapshot,t_1000,f_jpg
 									这个是阿里云的东西，至于其他的视频截帧我还没有试过。
 									-->
-              <!-- 3.阿里云视频截帧地址：https://help.aliyun.com/document_detail/64555.html -->
-              <image v-if="item.isShowimage == true"
-                :src="item.src+'?x-oss-process=video/snapshot,t_'+ currenttimes +'000,f_jpg'" mode="aspectFill"
-                :style="'width: 120upx; height: 160upx; border-radius: 10upx; position: absolute; bottom: '+ (ProgressBarBottom + 160) +'upx; left: '+ (currentPositions - 15) +'px;'">
-              </image>
-            </view>
-          </div>
-        </cell>
-      </list>
-    </view>
+							<!-- 3.阿里云视频截帧地址：https://help.aliyun.com/document_detail/64555.html -->
+							<image v-if="item.isShowimage == true"
+								:src="item.src+'?x-oss-process=video/snapshot,t_'+ currenttimes +'000,f_jpg'"
+								mode="aspectFill"
+								:style="'width: 120upx; height: 160upx; border-radius: 10upx; position: absolute; bottom: '+ (ProgressBarBottom + 160) +'upx; left: '+ (currentPositions - 15) +'px;'">
+							</image>
+						</view>
+					</div>
+				</cell>
+			</list>
+		</view>
 
-    <waterfall class="video-list" v-if="currentNav === 3" column-gap="6" column-count="2" :show-scrollbar="false" @loadmore="getGoods()"
-      column-width="195px" :style="'width: '+ windowWidth +'px; height: '+ boxStyle.height +'px;'" >
-      <cell class="goods_item" style="margin-bottom: 10px;" v-for="(item,index) in cateGoods" :key="item.uid"
-        @click="gogogo(item)" >
-        <image class="goods_img" :src="item.image[0]" mode="aspectFill"></image>
-        <view class="botm">
-          <text class="title">{{item.title}}</text>
-          <view class="goods_info">
-            <view class="l_info">
-              <image :src="(item.author && item.author.avatar) || '/static/images/f.png'" mode="aspectFill"
-                class="g_img"></image>
-              <text class="g_name">{{item.author && item.author.nickname}}</text>
-            </view>
-            <view class="nice_box flex_a_c" @click.stop="giveStart(item)">
-              <text class="iconfont" :class="item.relevance_id ? 'icon-shoucang1' : 'icon-dianzan'"></text>
-              <text class="collect">{{item.count_start}}</text>
+		<waterfall class="video-list" v-if="currentNav === 3" column-gap="6" column-count="2" :show-scrollbar="false"
+			@loadmore="getGoods()" column-width="195px"
+			:style="'width: '+ windowWidth +'px; height: '+ boxStyle.height +'px;'">
+			<cell class="goods_item" style="margin-bottom: 10px;" v-for="(item,index) in cateGoods" :key="item.uid"
+				@click="gogogo(item)">
+				<image class="goods_img" :src="item.image[0]" mode="aspectFill"></image>
+				<view class="botm">
+					<text class="title">{{item.title}}</text>
+					<view class="goods_info">
+						<view class="l_info">
+							<image :src="(item.author && item.author.avatar) || '/static/images/f.png'"
+								mode="aspectFill" class="g_img"></image>
+							<text class="g_name">{{item.author && item.author.nickname}}</text>
+						</view>
+						<view class="nice_box flex_a_c" @click.stop="giveStart(item)">
+							<text class="iconfont"
+								:class="item.relevance_id ? 'icon-shoucang1' : 'icon-dianzan'"></text>
+							<text class="collect">{{item.count_start}}</text>
 
-            </view>
-          </view>
-        </view>
-      </cell>
-	
-    </waterfall>
+						</view>
+					</view>
+				</view>
+			</cell>
 
-    <!-- <waterfall class="video-list" v-if="currentNav == 3" column-gap="6" column-count="2" column-width="auto"
+		</waterfall>
+
+		<!-- <waterfall class="video-list" v-if="currentNav == 3" column-gap="6" column-count="2" column-width="auto"
       :style="'width: '+ windowWidth +'px; height: '+ boxStyle.height +'px;'">
       <cell ref="cellRef" v-for="(item,index) in 10" :key="item.uid" class="goods_item" @click="gogogo(item)">
         哈哈哈{{index}}
       </cell>
     </waterfall> -->
-    <!--	
+		<!--	
 		请前往 douyin-scrollview.nvue 文件查看
 		已经全部注释
 		这里就是引入评论插件
 		-->
-    <uni-popup type="bottom" ref="pinglun" @touchmove.stop.prevent="moveHandle">
-      <view
-        :style="'width: '+ windowWidth +'px; height: '+ (boxStyle.height/heightNum) +'px; background-color: #fff; border-top-left-radius: 10px; border-top-right-radius: 10px;'">
-        <!-- 
+		<uni-popup type="bottom" ref="pinglun" @touchmove.stop.prevent="moveHandle">
+			<view
+				:style="'width: '+ windowWidth +'px; height: '+ (boxStyle.height/heightNum) +'px; background-color: #fff; border-top-left-radius: 10px; border-top-right-radius: 10px;'">
+				<!-- 
 				 注意：
 				 deleteIOSHeight
 				 deleteAndroidHeight
 				 这两个参数用于控制评论等的高度
 				 -->
-        <douyin-scrollview ref="comments" :deleteIOSHeight="36" :deleteAndroidHeight="15" :userInfo="userInfo"
-          @closeScrollview="closeScrollview" @successFul="pinlunFun"></douyin-scrollview>
-      </view>
-    </uni-popup>
-    <!-- 他提到的宝贝弹窗 -->
-    <uni-popup type="bottom" ref="pinglunMentioned">
-      <view
-        :style="'width: '+ windowWidth +'px;background-color: #F5F5F5; border-top-left-radius: 10px; border-top-right-radius: 10px;'">
-        <mentioned ref="mentioned" @close="closePopup" :list="moreList" :uid="authorUid"></mentioned>
-      </view>
-    </uni-popup>
-    <authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
-    <view class="fixed-head">
-      <view class="sys-head" :style="{height:statusBarHeight}"></view>
-      <view class="tool-bar" @click='goBack()'>
-		  
-        <image class="icon-xiangzuo" src="../static/img/index/icon-back.png"></image>
-      </view>
-    </view>
-  </view>
+				<douyin-scrollview ref="comments" :deleteIOSHeight="36" :deleteAndroidHeight="15" :userInfo="userInfo"
+					@closeScrollview="closeScrollview" @successFul="pinlunFun"></douyin-scrollview>
+			</view>
+		</uni-popup>
+		<!-- 他提到的宝贝弹窗 -->
+		<uni-popup type="bottom" ref="pinglunMentioned">
+			<view
+				:style="'width: '+ windowWidth +'px;background-color: #F5F5F5; border-top-left-radius: 10px; border-top-right-radius: 10px;'">
+				<mentioned ref="mentioned" @close="closePopup" :list="moreList" :uid="authorUid"></mentioned>
+			</view>
+		</uni-popup>
+		<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
+		<view class="fixed-head">
+			<view class="sys-head" :style="{height:statusBarHeight}"></view>
+			<view class="tool-bar" @click='goBack()'>
+
+				<image class="icon-xiangzuo" src="../static/img/index/icon-back.png"></image>
+			</view>
+		</view>
+	</view>
 </template>
 <script>
-  const app = getApp();
-  let sysHeight = uni.getSystemInfoSync().statusBarHeight
-  import { toLogin } from '@/libs/login.js';
-  import { mapGetters } from 'vuex';
-  import { configMap } from '@/utils';
-  /*
-  引入评论组件
-  */
-  import douyinScrollview from '../components/douyin-scrollview/douyin-scrollview.nvue'
-  import mentioned from '../components/mentioned/mentioned.vue'
-  import authorize from '@/components/Authorize';
-  import {
-    videoList,
-    myVideoList,
-    graphicStartApi,
-    followAuthorApi,
-    deletePlantApi,
-    focusArticleLst,
-    graphicLstApi
-  } from '@/api/community.js';
-  import { HTTP_REQUEST_URL } from '@/config/app.js';
-  import { getUserInfo } from '@/api/user.js';
-  export default {
-    computed: configMap({ statusBarHeight: 0, community_reply_status: 0 }, mapGetters(['isLogin', 'uid'])),
-    data() {
-      return {
-        imgHost: HTTP_REQUEST_URL,
-        //下面打🌟号的是必须要的基础字段
-        //下面打💗号的是拥有滑动条的必须字段
-        dataList: [], //用于数据循环的列表🌟💗
-        wHeight: 0, //获取的屏幕高度🌟💗
-        boxStyle: { //视频，图片封面样式🌟💗
-          'height': 0,
-          'width': 0,
-        },
-        k: 0, //默认为0🌟💗
-        max: 2,
-        playIngIds: [], //正在播放的视频id列队，列队用于处理滑动过快导致的跳频问题🌟💗
-        ready: false, //可忽略
-        isDragging: false, //false代表停止滑动🌟💗
-        refreshing: true, //用于下拉刷新🌟💗
-        windowWidth: 0, //获取屏幕宽度🌟💗
-        windowHeight: 0,
-        dex: [0, 0], //用于判断是上滑还是下滑，第一个存旧值，第二个存新值【目前在1.0.7已经废弃】
-        currents: 0, //用于左右滑动，0代表视频界面，1代表右滑界面🌟💗
-        platform: '', //用于获取操作系统：ios、android🌟💗
-        playIng: false, //用于视频初始化时是否播放，默认不播放🌟💗
-        videoTime: '', //视频总时长，这个主要用来截取时间数值💗
-        videoTimes: '', //视频时长，用这个来获取时间值，例如：00:30这个时间值💗
-        changeTime: '', //显示滑动进度条时变化的时间💗
-        isShowimage: false, //是否显示封面【1.0.4已废弃，但是意思需要记住】
-        currenttimes: 0, //当前时间💗
-        isShowProgressBarTime: false, //是否拖动进度条，如果拖动（true）则显示进度条时间，否则不显示（false）【1.0.4已废弃，但是意思需要记住】
-        ProgressBarOpacity: 0.7, //进度条不拖动时的默认值，就是透明的💗
-        dotWidth: 0, //播放的小圆点，默认没有💗
-        deleteHeight: 0, //测试高度🌟💗
-        percent: 0, //百分小数💗
-        currentPosition: 0, //滑块当前位置💗//2.0已弃用，现已用于后端参数
-        currentPositions: 0, //滑块当前位置的副本💗//2.0已弃用，现已用于后端参数
-        newTime: 0, //跟手滑动后的最新时间💗
-        timeNumber: 0, //🌟💗
-        ProgressBarBottom: 20, //进度条离底部的距离💗
-        object_fit: 'cover', //视频样式默认包含🌟💗
-        mode: 'aspectFit', //图片封面样式🌟💗
-        timeout: "", //🌟用来阻止 setTimeout()方法
-        voice: "", //🌟用来阻止 setTimeout()方法
-        oldVideo: "",
-        isAutoplay: false, //是否开启自动播放(默认不开启)
-        autoplayText: "开启自动播放",
-        timers: "",
-        // 引入评论 - 参数
-        heightNum: 1.8,
-        // 双击点赞参数
-        touchNum: 0,
-        aixinLeft: 0,
-        aixinTop: 0,
-        showComment: false,
-        loadVideo: true,
-        Rotate: 0,
-        currentNav: 1,
-        limit: 6,
-        page: 1,
-        userInfo: { uid: 0 },
-        moreList: [],
-        isShowAuth: false, //是否隐藏授权
-        isAuto: false, //没有授权的不会自动授权
-        authorUid: 0,
-        showManage: false,
-        isUser: false,
-        isSatrt: 0,
-        userUid: 0,
-        sysHeight: sysHeight,
-        cateGoods: [],
-        where: {
-          category_id: -1,
-          page: 1,
-          limit: 6
-        },
-      }
-    },
-    components: {
-      douyinScrollview,
-      mentioned,
-      authorize
-    },
-    watch: {
-      async k(new_k, old_k) { //监听 k 值的变化，可以控制视频的播放与暂停
-        const max = new_k + 2;
-        if (this.max < max) {
-          this.max = max;
-        }
-        // if (this.oldCurrent != this.currentNav) {
-        // 	this.oldCurrent = this.currentNav
-        // 	return false
-        // }
-        this.dataList[old_k].playIng = false //如果视频暂停，就加载封面
-        this.dataList[old_k].isplay = true
-        this.dataList[old_k].state = 'pause'
-        // console.log('预留第' + (old_k) + '个视频：' + this.dataList[old_k].community_id)
-        // 2.0版本已经去掉了下面这一句，视频不用暂停，只需要把声音禁止就行
-        uni.createVideoContext(this.dataList[old_k].community_id, this)
-          .pause() //如果视频暂停，那么旧视频停止，这里的this.dataList[old_k].id + '' + old_k，后面加 old_k 是为了每一个视频的 id 值不同，这样就可以大程度的避免串音问题
-        // console.log('已经暂停 --> 第' + (old_k) + '个视频～') //提示
-        this.dataList[new_k].state = 'play'
-        this.dataList[new_k].isplay = false
-        this.dataList[new_k].playIng = true
-        uni.createVideoContext(this.dataList[new_k].community_id, this).play()
-      }
-    },
-    onShow() {
-      uni.hideLoading();
-      // console.log('回到前台' + this.dataList.length);
-      if (this.dataList.length !== 0) {
-        this.dataList[this.k].state = 'play';
-        setTimeout(() => {
-          uni.createVideoContext(this.dataList[this.k].community_id, this).play()
-        }, 250)
-      }
-    },
-    onHide() {
-      this.dataList[this.k].state = 'pause'; //界面隐藏也要停止播放视频
-      setTimeout(() => {
-        uni.createVideoContext(this.dataList[this.k].community_id, this).pause(); //暂停以后继续播放
-      }, 250)
-      // console.log('到后台');
-    },
-    onLoad(options) {
-		console.log(options);
-      this.videoID = options.id || 0;
-      this.isUser = options.user == 1 ? true : false;
-      this.userUid = options.uid ? options.uid : 0;
-      this.isSatrt = options.tab == 1 ? 1 : 0;
-      if (options.pid) app.globalData.spid = options.pid;
-      // console.log('到后台');
-      this.platform = uni.getSystemInfoSync().platform
-      this.windowWidth = uni.getSystemInfoSync().screenWidth //获取屏幕宽度
-      this.boxStyle.width = this.windowWidth + 'px' //给宽度加px
-      this.wHeight = uni.getSystemInfoSync().screenHeight; //获取屏幕高度
-      this.boxStyle.height = this.wHeight; //改变视频高度
-      this.get() //这一步，加载视频数据
-      if (this.isLogin) this.getUserInfo()
-    },
-    onReady() {},
-    methods: {
-      giveStart(item) {
-        let status = item.relevance_id ? 0 : 1
-        graphicStartApi(item.community_id, {
-          status: status
-        }).then(res => {
-          if (item.relevance_id) {
-            item.count_start--;
-            item.count_start = item.count_start == 0 ? 0 : item.count_start
-            item.relevance_id = false
-          } else {
-            item.count_start++;
-            item.relevance_id = true
-          }
-        })
-      },
-      gogogo(item) {
-        this.videoID = item.community_id
-        this.navTap(1)
-      },
-      async getGoods(index) {
-		  console.log(index);
-       const {
-       	data
-       } = await graphicLstApi(this.where)
-       this.cateGoods.push(...data.list)
-       this.where.page++
-	   console.log(this.where.page);
-   
-      },
-      goBack: function() {
-        uni.navigateBack();
-      },
-      navTap(n) {
-        this.currentNav = n;
-        this.oldVideo = "";
-        this.k = 0;
-        this.page = 1;
-        this.dataList = [];
-        switch (n) {
-          case 1:
-            this.get()
-            break;
-          case 2:
-            this.getFocusList()
-            break;
-          case 3:
-            this.getGoods()
-            break;
-        }
-      },
-      pinlunFun(e) {
-        this.dataList[e]['count_reply']++
-      },
-      // #ifdef APP-PLUS
-      appShare(scene, id) {
-        let that = this
-        uni.showLoading({
-          title: '加载中',
-          mask: true
-        });
-        let uid = this.uid ? this.uid : 0;
-        let data = this.dataList[this.k];
-        let routes = getCurrentPages(); // 获取当前打开过的页面路由数组
-        let curRoute = routes[routes.length - 1].$page.fullPath // 获取当前页面路由，也就是最后一个打开的页面路由
-        uni.share({
-          provider: "weixin",
-          scene: scene,
-          type: 0,
-          href: `${HTTP_REQUEST_URL}/pages/short_video/nvueSwiper/index?&id=${id}`,
-          title: data.title || '',
-          summary: data.content || '',
-          imageUrl: data.image[0] || '',
-          success: function(res) {
-            uni.showToast({
-              title: '分享成功',
-              icon: 'success'
-            })
-            uni.hideLoading();
-          },
-          fail: function(err) {
-            uni.hideLoading();
-            uni.showToast({
-              title: '分享失败',
-              icon: 'none',
-              duration: 2000
-            })
-          }
-        });
-      },
-      // #endif
-      /**
-       * 获取个人用户信息
-       */
-      getUserInfo: function() {
-        let that = this;
-        getUserInfo().then(res => {
-          that.userInfo = res.data;
-        });
-      },
-      // 关注作者
-      followAuthor: function(item) {
-        if (this.isLogin === false) {
-          this.isAuto = true;
-          this.isShowAuth = true
-        } else {
-          let status = 1
-          followAuthorApi(item.uid, { status: status }).then(res => {
-            if (res.status === 200) {
-              item.is_fans = true
-            }
-            this.$util.Tips({
-              title: res.message
-            });
-          }).catch(err => {
-            return uni.showToast({
-              title: err,
-              icon: 'none',
-              duration: 2000
-            });
-          });
-        }
-      },
-      // 删除话题
-      deleteTopic(item) {
-        let that = this;
-        uni.showModal({
-          content: '确定要删除该话题么？',
-          success: function(res) {
-            if (res.confirm) {
-              deletePlantApi(item.community_id).then(res => {
-                if (res.status === 200) {
-                  that.$util.Tips({
-                    title: res.message
-                  });
-                  setTimeout(function() {
-                    uni.redirectTo({
-                      url: '/pages/plantGrass/plant_user/index?id=' + item.uid
-                    })
-                  }, 1000);
-                }
-              })
-            } else if (res.cancel) {
-              // console.log('用户点击取消');
-            }
-          }
-        });
-      },
-      // 授权回调
-      onLoadFun() {
-        this.isShowAuth = false
-        this.getUserInfo()
-      },
-      // 授权关闭
-      authColse: function(e) {
-        this.isShowAuth = e
-      },
-      moreTap(item) {
-        item.isMore = !item.isMore;
-      },
-      autoPlay() {
-        this.isAutoplay = !this.isAutoplay;
-        if (!this.isAutoplay) {
-          this.autoplayText = "开启自动播放"
-          uni.showToast({
-            title: "关闭自动播放",
-            icon: 'none',
-            duration: 3000
-          })
-        } else {
-          this.autoplayText = "关闭自动播放"
-          uni.showToast({
-            title: "开启自动播放",
-            icon: 'none',
-            duration: 3000
-          })
-        }
-      },
-      getData() {
-        // 这里就是数据加载完以后再向后端发送数据的地方,
-        let that = this;
-        if (!that.loadVideo) return
-        that.loadVideo = true
-        that.isUser ?
-          myVideoList(that.userUid, {
-            page: that.page,
-            limit: that.limit,
-            is_star: that.isSatrt,
-            community_id: that.videoID
-          }).then(res => {
-            that.loadVideo = false
-            that.getVideoData(res.data.list);
-          }).catch(err => {
-            return uni.showToast({
-              title: err,
-              icon: 'none',
-              duration: 2000
-            });
-          }) :
-          graphicLstApi({
-            page: that.page,
-            limit: that.limit,
-            category_id: -1
-          }).then(res => {
-            that.getVideoData(res.data.list);
-          }).catch(err => {
-            return uni.showToast({
-              title: err,
-              icon: 'none',
-              duration: 2000
-            });
-          })
-      },
-      getFocusList() {
-        let that = this;
-        focusArticleLst({
-          page: that.page,
-          limit: that.limit,
-        }).then(res => {
-          that.loadVideo = false
-          that.getVideoData(res.data.list)
-        }).catch(err => {
-          return uni.showToast({
-            title: err,
-            icon: 'none',
-            duration: 2000
-          });
-        })
-      },
-      getVideoData(list) {
-        if (list.length == 0) return
-        let that = this;
-        that.loadVideo = list.length == that.limit
-        that.page = that.page + 1;
-        var msg = list
-        for (let i = 0; i < msg.length; i++) {
-          msg[i]['isMore'] = false
-          msg[i]['community_id'] = msg[i]['community_id'].toString()
-          that.dataList.push(msg[i])
-        }
-        if (that.dataList.length !== 0) {
-          that.dataList[that.k].state = 'play';
-          setTimeout(function() {
-            uni.createVideoContext(that.dataList[that.k].community_id, that).play()
-          }, 10);
-        }
-      },
-      touchstart(event) {
-        this.dataList[this.k].isShowimage = true //刚触摸的时候就要显示预览视频图片了
-        this.dataList[this.k].isShowProgressBarTime = true //显示时间线
-        this.ProgressBarOpacity = 1 //让滑块显示起来更明显一点
-        this.dotWidth = 10 //让点显示起来更明显一点
-      },
-      touchend() { //当手松开后，跳到最新时间
-        uni.createVideoContext(this.dataList[this.k].community_id, this).seek(this.newTime)
-        if (this.dataList[this.k].state == 'pause') {
-          this.dataList[this.k].state = 'play'
-          uni.createVideoContext(this.dataList[this.k].community_id, this).play()
-        }
-        this.dataList[this.k].isShowProgressBarTime = false //触摸结束后，隐藏时间线
-        this.dataList[this.k].isShowimage = false //触摸结束后，隐藏时间预览
-        this.ProgressBarOpacity = 0.5 //隐藏起来进度条，不那么明显了
-        this.dotWidth = 0 //隐藏起来进度条，不那么明显了
-      },
-      touchmove(event) { //当手移动滑块时，计算位置、百分小数、新的时间
-        var msg = []
-        if (this.videoTime !== '') {
-          msg = this.videoTime.split(':')
-        }
-        var timeNumber = Number(msg[0]) * 60 + Number(msg[1])
-        this.currentPositions = event.changedTouches[0].screenX
-        this.percent = this.currentPositions / this.windowWidth
-        this.newTime = this.percent * timeNumber
-        this.currenttimes = parseInt(this.newTime)
-        let theTime = this.newTime
-        let middle = 0; // 分
-        if (theTime > 60) {
-          middle = parseInt(theTime / 60);
-          theTime = parseInt(theTime % 60);
-        }
-        this.changeTime =
-          `${Math.round(middle)>9?Math.round(middle):'0'+Math.round(middle)}:${Math.round(theTime)>9?Math.round(theTime):'0'+Math.round(theTime)}`
-      },
-      timeupdate(event, index) { //计算滑块当前位置，计算当前百分小数
-        if (index == this.k) {
-          var currenttime = event.detail.currentTime
-          this.timeNumber = Math.round(event.detail.duration)
-          this.getTime()
-          this.percent = currenttime / this.timeNumber
-          this.currentPosition = this.windowWidth * this.percent
-          let theTime = currenttime
-          let middle = 0; // 分
-          if (theTime > 60) {
-            middle = parseInt(theTime / 60);
-            theTime = parseInt(theTime % 60);
-          }
-          this.changeTime =
-            `${Math.round(middle)>9?Math.round(middle):'0'+Math.round(middle)}:${Math.round(theTime)>9?Math.round(theTime):'0'+Math.round(theTime)}`
-          //自动切换视频
-          if (this.isAutoplay) { //true,代表自动播放
-            if (Math.round(currenttime) == this.timeNumber - 1) {
-              const dom = uni.requireNativePlugin('dom')
-              let doms = 'item' + (this.k + 1)
-              setTimeout(() => {
-                let el = this.$refs[doms][0]
-                dom.scrollToElement(el, {
-                  offset: 0,
-                  animated: true
-                })
-              }, 500)
-            }
-          }
-        }
-      },
-      getTime() { //得到时间函数
-        this.videoTime = this.formatSeconds(this.timeNumber);
-        var msg = []
-        if (this.videoTime !== '') {
-          msg = this.videoTime.split(':')
-        }
-        this.videoTimes = `${msg[0]>9?msg[0]:'0'+msg[0]}:${msg[1]>9?msg[1]:'0'+msg[1]}`;
-      },
-      formatSeconds(value) { //获取时间函数
-        let theTime = parseInt(value); // 秒
-        let middle = 0; // 分
-        if (theTime > 60) {
-          middle = parseInt(theTime / 60);
-          theTime = parseInt(theTime % 60);
-        }
-        return `${middle>9?middle:middle}:${theTime>9?theTime:theTime}`;
-      },
-      moreVideo(index) {
+	const app = getApp();
+	let sysHeight = uni.getSystemInfoSync().statusBarHeight
+	import {
+		toLogin
+	} from '@/libs/login.js';
+	import {
+		mapGetters
+	} from 'vuex';
+	import {
+		configMap
+	} from '@/utils';
+	/*
+	引入评论组件
+	*/
+	import douyinScrollview from '../components/douyin-scrollview/douyin-scrollview.nvue'
+	import mentioned from '../components/mentioned/mentioned.vue'
+	import authorize from '@/components/Authorize';
+	import {
+		videoList,
+		myVideoList,
+		graphicStartApi,
+		followAuthorApi,
+		deletePlantApi,
+		focusArticleLst,
+		graphicLstApi
+	} from '@/api/community.js';
+	import {
+		HTTP_REQUEST_URL
+	} from '@/config/app.js';
+	import {
+		getUserInfo
+	} from '@/api/user.js';
+	export default {
+		computed: configMap({
+			statusBarHeight: 0,
+			community_reply_status: 0
+		}, mapGetters(['isLogin', 'uid'])),
+		data() {
+			return {
+				imgHost: HTTP_REQUEST_URL,
+				//下面打🌟号的是必须要的基础字段
+				//下面打💗号的是拥有滑动条的必须字段
+				dataList: [], //用于数据循环的列表🌟💗
+				wHeight: 0, //获取的屏幕高度🌟💗
+				boxStyle: { //视频，图片封面样式🌟💗
+					'height': 0,
+					'width': 0,
+				},
+				k: 0, //默认为0🌟💗
+				max: 2,
+				playIngIds: [], //正在播放的视频id列队，列队用于处理滑动过快导致的跳频问题🌟💗
+				ready: false, //可忽略
+				isDragging: false, //false代表停止滑动🌟💗
+				refreshing: true, //用于下拉刷新🌟💗
+				windowWidth: 0, //获取屏幕宽度🌟💗
+				windowHeight: 0,
+				dex: [0, 0], //用于判断是上滑还是下滑，第一个存旧值，第二个存新值【目前在1.0.7已经废弃】
+				currents: 0, //用于左右滑动，0代表视频界面，1代表右滑界面🌟💗
+				platform: '', //用于获取操作系统：ios、android🌟💗
+				playIng: false, //用于视频初始化时是否播放，默认不播放🌟💗
+				videoTime: '', //视频总时长，这个主要用来截取时间数值💗
+				videoTimes: '', //视频时长，用这个来获取时间值，例如：00:30这个时间值💗
+				changeTime: '', //显示滑动进度条时变化的时间💗
+				isShowimage: false, //是否显示封面【1.0.4已废弃，但是意思需要记住】
+				currenttimes: 0, //当前时间💗
+				isShowProgressBarTime: false, //是否拖动进度条，如果拖动（true）则显示进度条时间，否则不显示（false）【1.0.4已废弃，但是意思需要记住】
+				ProgressBarOpacity: 0.7, //进度条不拖动时的默认值，就是透明的💗
+				dotWidth: 0, //播放的小圆点，默认没有💗
+				deleteHeight: 0, //测试高度🌟💗
+				percent: 0, //百分小数💗
+				currentPosition: 0, //滑块当前位置💗//2.0已弃用，现已用于后端参数
+				currentPositions: 0, //滑块当前位置的副本💗//2.0已弃用，现已用于后端参数
+				newTime: 0, //跟手滑动后的最新时间💗
+				timeNumber: 0, //🌟💗
+				ProgressBarBottom: 20, //进度条离底部的距离💗
+				object_fit: 'cover', //视频样式默认包含🌟💗
+				mode: 'aspectFit', //图片封面样式🌟💗
+				timeout: "", //🌟用来阻止 setTimeout()方法
+				voice: "", //🌟用来阻止 setTimeout()方法
+				oldVideo: "",
+				isAutoplay: false, //是否开启自动播放(默认不开启)
+				autoplayText: "开启自动播放",
+				timers: "",
+				// 引入评论 - 参数
+				heightNum: 1.8,
+				// 双击点赞参数
+				touchNum: 0,
+				aixinLeft: 0,
+				aixinTop: 0,
+				showComment: false,
+				loadVideo: true,
+				Rotate: 0,
+				currentNav: 1,
+				limit: 6,
+				page: 1,
+				userInfo: {
+					uid: 0
+				},
+				moreList: [],
+				isShowAuth: false, //是否隐藏授权
+				isAuto: false, //没有授权的不会自动授权
+				authorUid: 0,
+				showManage: false,
+				isUser: false,
+				isSatrt: 0,
+				userUid: 0,
+				sysHeight: sysHeight,
+				cateGoods: [],
+				where: {
+					category_id: -1,
+					page: 1,
+					limit: 6
+				},
+			}
+		},
+		components: {
+			douyinScrollview,
+			mentioned,
+			authorize
+		},
+		watch: {
+			async k(new_k, old_k) { //监听 k 值的变化，可以控制视频的播放与暂停
+				const max = new_k + 2;
+				if (this.max < max) {
+					this.max = max;
+				}
+				// if (this.oldCurrent != this.currentNav) {
+				// 	this.oldCurrent = this.currentNav
+				// 	return false
+				// }
+				this.dataList[old_k].playIng = false //如果视频暂停，就加载封面
+				this.dataList[old_k].isplay = true
+				this.dataList[old_k].state = 'pause'
+				// console.log('预留第' + (old_k) + '个视频：' + this.dataList[old_k].community_id)
+				// 2.0版本已经去掉了下面这一句，视频不用暂停，只需要把声音禁止就行
+				uni.createVideoContext(this.dataList[old_k].community_id, this)
+					.pause() //如果视频暂停，那么旧视频停止，这里的this.dataList[old_k].id + '' + old_k，后面加 old_k 是为了每一个视频的 id 值不同，这样就可以大程度的避免串音问题
+				// console.log('已经暂停 --> 第' + (old_k) + '个视频～') //提示
+				this.dataList[new_k].state = 'play'
+				this.dataList[new_k].isplay = false
+				this.dataList[new_k].playIng = true
+				uni.createVideoContext(this.dataList[new_k].community_id, this).play()
+			}
+		},
+		onShow() {
+			uni.hideLoading();
+			// console.log('回到前台' + this.dataList.length);
+			if (this.dataList.length !== 0) {
+				this.dataList[this.k].state = 'play';
+				setTimeout(() => {
+					uni.createVideoContext(this.dataList[this.k].community_id, this).play()
+				}, 250)
+			}
+		},
+		onHide() {
+			this.dataList[this.k].state = 'pause'; //界面隐藏也要停止播放视频
+			setTimeout(() => {
+				uni.createVideoContext(this.dataList[this.k].community_id, this).pause(); //暂停以后继续播放
+			}, 250)
+			// console.log('到后台');
+		},
+		onLoad(options) {
+			console.log(options);
+			this.videoID = options.id || 0;
+			this.isUser = options.user == 1 ? true : false;
+			this.userUid = options.uid ? options.uid : 0;
+			this.isSatrt = options.tab == 1 ? 1 : 0;
+			if (options.pid) app.globalData.spid = options.pid;
+			// console.log('到后台');
+			this.platform = uni.getSystemInfoSync().platform
+			this.windowWidth = uni.getSystemInfoSync().screenWidth //获取屏幕宽度
+			this.boxStyle.width = this.windowWidth + 'px' //给宽度加px
+			this.wHeight = uni.getSystemInfoSync().screenHeight; //获取屏幕高度
+			this.boxStyle.height = this.wHeight; //改变视频高度
+			this.get() //这一步，加载视频数据
+			if (this.isLogin) this.getUserInfo()
+		},
+		onReady() {},
+		methods: {
+			giveStart(item) {
+				let status = item.relevance_id ? 0 : 1
+				graphicStartApi(item.community_id, {
+					status: status
+				}).then(res => {
+					if (item.relevance_id) {
+						item.count_start--;
+						item.count_start = item.count_start == 0 ? 0 : item.count_start
+						item.relevance_id = false
+					} else {
+						item.count_start++;
+						item.relevance_id = true
+					}
+				})
+			},
+			gogogo(item) {
+				this.videoID = item.community_id
+				this.navTap(1)
+			},
+			async getGoods(index) {
+				console.log(index);
+				const {
+					data
+				} = await graphicLstApi(this.where)
+				this.cateGoods.push(...data.list)
+				this.where.page++
+				console.log(this.where.page);
 
-      },
-      toVideo(index) {
+			},
+			goBack: function() {
+				uni.navigateBack();
+			},
+			navTap(n) {
+				this.currentNav = n;
+				this.oldVideo = "";
+				this.k = 0;
+				this.page = 1;
+				this.dataList = [];
+				switch (n) {
+					case 1:
+						this.get()
+						break;
+					case 2:
+						this.getFocusList()
+						break;
+					case 3:
+						this.getGoods()
+						break;
+				}
+			},
+			pinlunFun(e) {
+				this.dataList[e]['count_reply']++
+			},
+			// #ifdef APP-PLUS
+			appShare(scene, id) {
+				let that = this
+				uni.showLoading({
+					title: '加载中',
+					mask: true
+				});
+				let uid = this.uid ? this.uid : 0;
+				let data = this.dataList[this.k];
+				let routes = getCurrentPages(); // 获取当前打开过的页面路由数组
+				let curRoute = routes[routes.length - 1].$page.fullPath // 获取当前页面路由，也就是最后一个打开的页面路由
+				uni.share({
+					provider: "weixin",
+					scene: scene,
+					type: 0,
+					href: `${HTTP_REQUEST_URL}/pages/short_video/nvueSwiper/index?&id=${id}`,
+					title: data.title || '',
+					summary: data.content || '',
+					imageUrl: data.image[0] || '',
+					success: function(res) {
+						uni.showToast({
+							title: '分享成功',
+							icon: 'success'
+						})
+						uni.hideLoading();
+					},
+					fail: function(err) {
+						uni.hideLoading();
+						uni.showToast({
+							title: '分享失败',
+							icon: 'none',
+							duration: 2000
+						})
+					}
+				});
+			},
+			// #endif
+			/**
+			 * 获取个人用户信息
+			 */
+			getUserInfo: function() {
+				let that = this;
+				getUserInfo().then(res => {
+					that.userInfo = res.data;
+				});
+			},
+			// 关注作者
+			followAuthor: function(item) {
+				if (this.isLogin === false) {
+					this.isAuto = true;
+					this.isShowAuth = true
+				} else {
+					let status = 1
+					followAuthorApi(item.uid, {
+						status: status
+					}).then(res => {
+						if (res.status === 200) {
+							item.is_fans = true
+						}
+						this.$util.Tips({
+							title: res.message
+						});
+					}).catch(err => {
+						return uni.showToast({
+							title: err,
+							icon: 'none',
+							duration: 2000
+						});
+					});
+				}
+			},
+			// 删除话题
+			deleteTopic(item) {
+				let that = this;
+				uni.showModal({
+					content: '确定要删除该话题么？',
+					success: function(res) {
+						if (res.confirm) {
+							deletePlantApi(item.community_id).then(res => {
+								if (res.status === 200) {
+									that.$util.Tips({
+										title: res.message
+									});
+									setTimeout(function() {
+										uni.redirectTo({
+											url: '/pages/plantGrass/plant_user/index?id=' +
+												item.uid
+										})
+									}, 1000);
+								}
+							})
+						} else if (res.cancel) {
+							// console.log('用户点击取消');
+						}
+					}
+				});
+			},
+			// 授权回调
+			onLoadFun() {
+				this.isShowAuth = false
+				this.getUserInfo()
+			},
+			// 授权关闭
+			authColse: function(e) {
+				this.isShowAuth = e
+			},
+			moreTap(item) {
+				item.isMore = !item.isMore;
+			},
+			autoPlay() {
+				this.isAutoplay = !this.isAutoplay;
+				if (!this.isAutoplay) {
+					this.autoplayText = "开启自动播放"
+					uni.showToast({
+						title: "关闭自动播放",
+						icon: 'none',
+						duration: 3000
+					})
+				} else {
+					this.autoplayText = "关闭自动播放"
+					uni.showToast({
+						title: "开启自动播放",
+						icon: 'none',
+						duration: 3000
+					})
+				}
+			},
+			getData() {
+				// 这里就是数据加载完以后再向后端发送数据的地方,
+				let that = this;
+				if (!that.loadVideo) return
+				that.loadVideo = true
+				that.isUser ?
+					myVideoList(that.userUid, {
+						page: that.page,
+						limit: that.limit,
+						is_star: that.isSatrt,
+						community_id: that.videoID
+					}).then(res => {
+						that.loadVideo = false
+						that.getVideoData(res.data.list);
+					}).catch(err => {
+						return uni.showToast({
+							title: err,
+							icon: 'none',
+							duration: 2000
+						});
+					}) :
+					graphicLstApi({
+						page: that.page,
+						limit: that.limit,
+						category_id: -1
+					}).then(res => {
+						that.getVideoData(res.data.list);
+					}).catch(err => {
+						return uni.showToast({
+							title: err,
+							icon: 'none',
+							duration: 2000
+						});
+					})
+			},
+			getFocusList() {
+				let that = this;
+				focusArticleLst({
+					page: that.page,
+					limit: that.limit,
+				}).then(res => {
+					that.loadVideo = false
+					that.getVideoData(res.data.list)
+				}).catch(err => {
+					return uni.showToast({
+						title: err,
+						icon: 'none',
+						duration: 2000
+					});
+				})
+			},
+			getVideoData(list) {
+				if (list.length == 0) return
+				let that = this;
+				that.loadVideo = list.length == that.limit
+				that.page = that.page + 1;
+				var msg = list
+				for (let i = 0; i < msg.length; i++) {
+					msg[i]['isMore'] = false
+					msg[i]['community_id'] = msg[i]['community_id'].toString()
+					that.dataList.push(msg[i])
+				}
+				if (that.dataList.length !== 0) {
+					that.dataList[that.k].state = 'play';
+					setTimeout(function() {
+						uni.createVideoContext(that.dataList[that.k].community_id, that).play()
+					}, 10);
+				}
+			},
+			touchstart(event) {
+				this.dataList[this.k].isShowimage = true //刚触摸的时候就要显示预览视频图片了
+				this.dataList[this.k].isShowProgressBarTime = true //显示时间线
+				this.ProgressBarOpacity = 1 //让滑块显示起来更明显一点
+				this.dotWidth = 10 //让点显示起来更明显一点
+			},
+			touchend() { //当手松开后，跳到最新时间
+				uni.createVideoContext(this.dataList[this.k].community_id, this).seek(this.newTime)
+				if (this.dataList[this.k].state == 'pause') {
+					this.dataList[this.k].state = 'play'
+					uni.createVideoContext(this.dataList[this.k].community_id, this).play()
+				}
+				this.dataList[this.k].isShowProgressBarTime = false //触摸结束后，隐藏时间线
+				this.dataList[this.k].isShowimage = false //触摸结束后，隐藏时间预览
+				this.ProgressBarOpacity = 0.5 //隐藏起来进度条，不那么明显了
+				this.dotWidth = 0 //隐藏起来进度条，不那么明显了
+			},
+			touchmove(event) { //当手移动滑块时，计算位置、百分小数、新的时间
+				var msg = []
+				if (this.videoTime !== '') {
+					msg = this.videoTime.split(':')
+				}
+				var timeNumber = Number(msg[0]) * 60 + Number(msg[1])
+				this.currentPositions = event.changedTouches[0].screenX
+				this.percent = this.currentPositions / this.windowWidth
+				this.newTime = this.percent * timeNumber
+				this.currenttimes = parseInt(this.newTime)
+				let theTime = this.newTime
+				let middle = 0; // 分
+				if (theTime > 60) {
+					middle = parseInt(theTime / 60);
+					theTime = parseInt(theTime % 60);
+				}
+				this.changeTime =
+					`${Math.round(middle)>9?Math.round(middle):'0'+Math.round(middle)}:${Math.round(theTime)>9?Math.round(theTime):'0'+Math.round(theTime)}`
+			},
+			timeupdate(event, index) { //计算滑块当前位置，计算当前百分小数
+				if (index == this.k) {
+					var currenttime = event.detail.currentTime
+					this.timeNumber = Math.round(event.detail.duration)
+					this.getTime()
+					this.percent = currenttime / this.timeNumber
+					this.currentPosition = this.windowWidth * this.percent
+					let theTime = currenttime
+					let middle = 0; // 分
+					if (theTime > 60) {
+						middle = parseInt(theTime / 60);
+						theTime = parseInt(theTime % 60);
+					}
+					this.changeTime =
+						`${Math.round(middle)>9?Math.round(middle):'0'+Math.round(middle)}:${Math.round(theTime)>9?Math.round(theTime):'0'+Math.round(theTime)}`
+					//自动切换视频
+					if (this.isAutoplay) { //true,代表自动播放
+						if (Math.round(currenttime) == this.timeNumber - 1) {
+							const dom = uni.requireNativePlugin('dom')
+							let doms = 'item' + (this.k + 1)
+							setTimeout(() => {
+								let el = this.$refs[doms][0]
+								dom.scrollToElement(el, {
+									offset: 0,
+									animated: true
+								})
+							}, 500)
+						}
+					}
+				}
+			},
+			getTime() { //得到时间函数
+				this.videoTime = this.formatSeconds(this.timeNumber);
+				var msg = []
+				if (this.videoTime !== '') {
+					msg = this.videoTime.split(':')
+				}
+				this.videoTimes = `${msg[0]>9?msg[0]:'0'+msg[0]}:${msg[1]>9?msg[1]:'0'+msg[1]}`;
+			},
+			formatSeconds(value) { //获取时间函数
+				let theTime = parseInt(value); // 秒
+				let middle = 0; // 分
+				if (theTime > 60) {
+					middle = parseInt(theTime / 60);
+					theTime = parseInt(theTime % 60);
+				}
+				return `${middle>9?middle:middle}:${theTime>9?theTime:theTime}`;
+			},
+			moreVideo(index) {
 
-      },
-      scrolls(event) {
-        this.showManage = false;
-        this.isDragging = event.isDragging;
-        if (!event.isDragging) { //isDragging：判断用户是不是在滑动，滑动：true，停止滑动：false。我们要用户停止滑动时才给 k 赋值，这样就可以避免很多麻烦
-          var i = Math.round(Math.abs(event.contentOffset.y) / (this.wHeight - this.deleteHeight +
-            1)) //先用绝对值取出滑动的距离，然后除以屏幕高度，取一个整，就知道你现在滑动到哪一个视频了
-          if (i !== this.k) { //这里加判断是因为这个方法会执行很多次，会造成重复请求，所以这里写一个限制
-            if (uni.getSystemInfoSync().platform == 'ios') {
-              this.k = i //判断了用户没有滑动，确认了用户的确是在看这个视频，然后就赋值啦
-              this.dataList[this.k].state = 'play'
-              // console.log('正在播放 --> 第' + (this.k + 1) + '个视频～')
-            } else {
-              clearTimeout(this.timers);
-              this.timers = setTimeout(() => {
-                this.k = i //判断了用户没有滑动，确认了用户的确是在看这个视频，然后就赋值啦
-                this.dataList[this.k].state = 'play'
-                // console.log('正在播放 --> 第' + (this.k + 1) + '个视频～')
-              }, 80)
-            }
-          }
-        }
-      },
-      get() {
-        // if(!this.loadVideo) return
-        this.loadVideo = true
-        // 这个方法主要就是用来第一次进入视频播放时用来处理的
-        this.isUser ?
-          myVideoList(this.userUid, {
-            page: this.page,
-            limit: this.limit,
-            is_star: this.isSatrt,
-            community_id: this.videoID
-          }).then(async (res) => {
-            this.loadVideo = false
-            this.page = this.page + 1;
-            var msg = res.data.list;
-            for (let i = 0; i < msg.length; i++) {
-              msg[i]['isMore'] = false
-              msg[i]['playIng'] = false
-              msg[i]['state'] = false
-              msg[i]['isplay'] = false
-              msg[i]['loading'] = false
-              msg[i]['community_id'] = msg[i]['community_id'].toString()
-            }
-            this.dataList = msg;
-            if (this.dataList.length !== 0) {
-              this.dataList[this.k].state = 'play';
-              uni.createVideoContext(this.dataList[this.k].community_id, this).play()
-            }
-          }).catch(err => {
-            return uni.showToast({
-              title: err,
-              icon: 'none',
-              duration: 2000
-            });
-          }) :
-          graphicLstApi({
-            page: this.page,
-            limit: this.limit,
-            category_id: -1
-          }).then(async (res) => {
-            this.page = this.page + 1;
-            var msg = res.data.list;
-            for (let i = 0; i < msg.length; i++) {
-              msg[i]['isMore'] = false
-              msg[i]['playIng'] = false
-              msg[i]['state'] = false
-              msg[i]['isplay'] = false
-              msg[i]['community_id'] = msg[i]['community_id'].toString()
-            }
-            this.dataList = msg;
-          }).catch(err => {
-            return uni.showToast({
-              title: err,
-              icon: 'none',
-              duration: 2000
-            });
-          })
-      },
-      onpullingdown() {
-        this.refreshing = true
-      },
-      onrefresh() {
-        setTimeout(() => {
-          this.refreshing = false
-        }, 1000)
-      },
-      //点击播放&&暂停
-      tapVideoHover(state, event) {
-        this.dataList[this.k].isShowimage = false
-        this.dataList[this.k].isShowProgressBarTime = false
-        this.ProgressBarOpacity = 0.5
-        this.dotWidth = 0
-        this.touchNum++;
-        setTimeout(() => {
-          if (this.touchNum == 1) {
-            if (state == 'play' || state == 'continue') {
-              this.dataList[this.k].state = 'pause';
-            } else {
-              this.dataList[this.k].state = 'continue';
-            }
-            if (this.dataList[this.k].state == 'continue') {
-              uni.createVideoContext(this.dataList[this.k].community_id, this).play(); //暂停以后继续播放
-            }
-            if (this.dataList[this.k].state == 'pause') {
-              uni.createVideoContext(this.dataList[this.k].community_id, this).pause(); //暂停以后继续播放
-            }
-          }
-          this.touchNum = 0;
-        }, 200)
-      },
-      toComment(item, index) {
-        // 注意点击评论之后会执行这里
-        /*
-        （1）先加载缓冲
-        （2）获取当前视频 ID 信息
-        （3）🌟🌟🌟🌟重要🌟🌟🌟🌟
-        	- 一定要记得看 index.vue 里面
-        	 uni.setStorageSync("user",this.peopleList[i]);
-        	 这个东西，用于存储当前用户信息。在 插件里面会使用到这个东西，
-        	 记得写一下。
-        	 
-        （4）打开评论
-        */
-        uni.setStorageSync("videoList", item);
-        uni.setStorageSync("videoIndex", index);
-        this.$refs.pinglun.open('bottom')
-      },
-      cLike(item) {
-        if (this.isLogin === false) {
-          this.isAuto = true;
-          this.isShowAuth = true
-        } else {
-          let status = item.relevance_id ? 0 : 1
-          graphicStartApi(item.community_id, { status: status }).then(res => {
-            if (item.relevance_id) {
-              item.count_start--;
-              item.count_start = item.count_start == 0 ? 0 : item.count_start
-              item.relevance_id = false
-            } else {
-              item.count_start++;
-              item.relevance_id = true
-            }
-          }).catch(err => {
-            return uni.showToast({
-              title: err,
-              icon: 'none',
-              duration: 2000
-            });
-          })
-        }
-      },
-      /*
-      收藏
-      */
-      cCollect(item) {
-        markeVideo('collect', item.community_id).then(res => {
-          this.dataList[this.k].is_collect = !this.dataList[this.k].is_collect
-          const video = this.dataList[this.k];
-          item.is_collect ? video.collect_num += 1 : video.collect_num -= 1;
-        }).catch(err => {
-          return uni.showToast({
-            title: err,
-            icon: 'none',
-            duration: 2000
-          });
-        })
-      },
-      moveHandle() {},
-      closeScrollview() {
-        // 点击评论里面的叉叉，就会关闭评论 
-        this.$refs.pinglun.close();
-      },
-      /*查看提到的宝贝*/
-      openMore(item) {
-        this.$refs.pinglunMentioned.open('bottom');
-        this.moreList = item.relevance;
-        this.authorUid = item.uid
-      },
-      closePopup() {
-        this.$refs.pinglunMentioned.close();
-      },
-      goDetail(item) {
-        if (item.product_type === 1) {
-          uni.navigateTo({
-            url: `/pages/activity/goods_seckill_details/index?id=${item.product_id}&time=${item.stop_time}&spid=${this.uid}`
-          })
-        } else if (item.product_type === 2) {
-          uni.navigateTo({
-            url: `/pages/activity/presell_details/index?id=${item.activity_id}&spid=${this.uid}`
-          })
-        } else if (item.product_type === 0) {
-          uni.navigateTo({
-            url: `/pages/goods_details/index?id=${item.product_id}&spid=${this.uid}`
-          })
-        } else if (item.product_type === 4) {
-          uni.navigateTo({
-            url: `/pages/activity/combination_details/index?id=${item.activity_id}&spid=${this.uid}`
-          })
-        } else if (item.product_type === 40) {
-          uni.navigateTo({
-            url: `/pages/activity/combination_status/index?id=${item.activity_id}&spid=${this.uid}`
-          })
-        }
-      }
-    },
-    onReachBottom() {
-      uni.$emit('onReachBottom');
-    },
-  }
+			},
+			toVideo(index) {
+
+			},
+			scrolls(event) {
+				this.showManage = false;
+				this.isDragging = event.isDragging;
+				if (!event.isDragging) { //isDragging：判断用户是不是在滑动，滑动：true，停止滑动：false。我们要用户停止滑动时才给 k 赋值，这样就可以避免很多麻烦
+					var i = Math.round(Math.abs(event.contentOffset.y) / (this.wHeight - this.deleteHeight +
+						1)) //先用绝对值取出滑动的距离，然后除以屏幕高度，取一个整，就知道你现在滑动到哪一个视频了
+					if (i !== this.k) { //这里加判断是因为这个方法会执行很多次，会造成重复请求，所以这里写一个限制
+						if (uni.getSystemInfoSync().platform == 'ios') {
+							this.k = i //判断了用户没有滑动，确认了用户的确是在看这个视频，然后就赋值啦
+							this.dataList[this.k].state = 'play'
+							// console.log('正在播放 --> 第' + (this.k + 1) + '个视频～')
+						} else {
+							clearTimeout(this.timers);
+							this.timers = setTimeout(() => {
+								this.k = i //判断了用户没有滑动，确认了用户的确是在看这个视频，然后就赋值啦
+								this.dataList[this.k].state = 'play'
+								// console.log('正在播放 --> 第' + (this.k + 1) + '个视频～')
+							}, 80)
+						}
+					}
+				}
+			},
+			get() {
+				// if(!this.loadVideo) return
+				this.loadVideo = true
+				// 这个方法主要就是用来第一次进入视频播放时用来处理的
+
+				myVideoList(this.userUid, {
+					page: this.page,
+					limit: this.limit,
+					is_star: this.isSatrt,
+					community_id: this.videoID
+				}).then(async (res) => {
+					this.loadVideo = false
+					this.page = this.page + 1;
+					var msg = res.data.list;
+					for (let i = 0; i < msg.length; i++) {
+						msg[i]['isMore'] = false
+						msg[i]['playIng'] = false
+						msg[i]['state'] = false
+						msg[i]['isplay'] = false
+						msg[i]['loading'] = false
+						msg[i]['community_id'] = msg[i]['community_id'].toString()
+					}
+					this.dataList = msg;
+					if (this.dataList.length !== 0) {
+						this.dataList[this.k].state = 'play';
+						uni.createVideoContext(this.dataList[this.k].community_id, this).play()
+					}
+				}).catch(err => {
+					return uni.showToast({
+						title: err,
+						icon: 'none',
+						duration: 2000
+					});
+				})
+			},
+			onpullingdown() {
+				this.refreshing = true
+			},
+			onrefresh() {
+				setTimeout(() => {
+					this.refreshing = false
+				}, 1000)
+			},
+			//点击播放&&暂停
+			tapVideoHover(state, event) {
+				this.dataList[this.k].isShowimage = false
+				this.dataList[this.k].isShowProgressBarTime = false
+				this.ProgressBarOpacity = 0.5
+				this.dotWidth = 0
+				this.touchNum++;
+				setTimeout(() => {
+					if (this.touchNum == 1) {
+						if (state == 'play' || state == 'continue') {
+							this.dataList[this.k].state = 'pause';
+						} else {
+							this.dataList[this.k].state = 'continue';
+						}
+						if (this.dataList[this.k].state == 'continue') {
+							uni.createVideoContext(this.dataList[this.k].community_id, this).play(); //暂停以后继续播放
+						}
+						if (this.dataList[this.k].state == 'pause') {
+							uni.createVideoContext(this.dataList[this.k].community_id, this).pause(); //暂停以后继续播放
+						}
+					}
+					this.touchNum = 0;
+				}, 200)
+			},
+			toComment(item, index) {
+				// 注意点击评论之后会执行这里
+				/*
+				（1）先加载缓冲
+				（2）获取当前视频 ID 信息
+				（3）🌟🌟🌟🌟重要🌟🌟🌟🌟
+					- 一定要记得看 index.vue 里面
+					 uni.setStorageSync("user",this.peopleList[i]);
+					 这个东西，用于存储当前用户信息。在 插件里面会使用到这个东西，
+					 记得写一下。
+					 
+				（4）打开评论
+				*/
+				uni.setStorageSync("videoList", item);
+				uni.setStorageSync("videoIndex", index);
+				this.$refs.pinglun.open('bottom')
+			},
+			cLike(item) {
+				if (this.isLogin === false) {
+					this.isAuto = true;
+					this.isShowAuth = true
+				} else {
+					let status = item.relevance_id ? 0 : 1
+					graphicStartApi(item.community_id, {
+						status: status
+					}).then(res => {
+						if (item.relevance_id) {
+							item.count_start--;
+							item.count_start = item.count_start == 0 ? 0 : item.count_start
+							item.relevance_id = false
+						} else {
+							item.count_start++;
+							item.relevance_id = true
+						}
+					}).catch(err => {
+						return uni.showToast({
+							title: err,
+							icon: 'none',
+							duration: 2000
+						});
+					})
+				}
+			},
+			/*
+			收藏
+			*/
+			cCollect(item) {
+				markeVideo('collect', item.community_id).then(res => {
+					this.dataList[this.k].is_collect = !this.dataList[this.k].is_collect
+					const video = this.dataList[this.k];
+					item.is_collect ? video.collect_num += 1 : video.collect_num -= 1;
+				}).catch(err => {
+					return uni.showToast({
+						title: err,
+						icon: 'none',
+						duration: 2000
+					});
+				})
+			},
+			moveHandle() {},
+			closeScrollview() {
+				// 点击评论里面的叉叉，就会关闭评论 
+				this.$refs.pinglun.close();
+			},
+			/*查看提到的宝贝*/
+			openMore(item) {
+				this.$refs.pinglunMentioned.open('bottom');
+				this.moreList = item.relevance;
+				this.authorUid = item.uid
+			},
+			closePopup() {
+				this.$refs.pinglunMentioned.close();
+			},
+			goDetail(item) {
+				if (item.product_type === 1) {
+					uni.navigateTo({
+						url: `/pages/activity/goods_seckill_details/index?id=${item.product_id}&time=${item.stop_time}&spid=${this.uid}`
+					})
+				} else if (item.product_type === 2) {
+					uni.navigateTo({
+						url: `/pages/activity/presell_details/index?id=${item.activity_id}&spid=${this.uid}`
+					})
+				} else if (item.product_type === 0) {
+					uni.navigateTo({
+						url: `/pages/goods_details/index?id=${item.product_id}&spid=${this.uid}`
+					})
+				} else if (item.product_type === 4) {
+					uni.navigateTo({
+						url: `/pages/activity/combination_details/index?id=${item.activity_id}&spid=${this.uid}`
+					})
+				} else if (item.product_type === 40) {
+					uni.navigateTo({
+						url: `/pages/activity/combination_status/index?id=${item.activity_id}&spid=${this.uid}`
+					})
+				}
+			}
+		},
+		onReachBottom() {
+			uni.$emit('onReachBottom');
+		},
+	}
 </script>
 <style lang="scss" scoped>
-  // .video-list{
-  //   padding: 200rpx 28.07rpx 0 28.07rpx;
-  //   display: flex;
-  //   flex-direction: row; // 可以生效
-  //   direction: ltr;
-  //   flex-wrap: wrap;
-  //   justify-content: space-between;
-  //   .goods_item{
-  //     height: 87.72upx;
-  //     background-color: #999;
-  //   }
-  // }
-  .video-list {
-    // margin: 0 auto;
-    // width: 750rpx;
-    padding: 200rpx 28.07rpx 0 28.07rpx;
-    /* #ifdef MP */
-    padding-top: 200rpx;
-    /* #endif */
-    // background-color: #000000;
-	background-color: #F5F5F5;
-
-    .goods_item {
-      width: 342.11rpx;
-      height: 491.23rpx;
-      border-radius: 8px;
-      overflow: hidden;
-      // background-color: #000;
-      display: flex;
-      flex-direction: column;
-      padding-bottom: 10px;
-
-      .goods_img {
-        width: 342.11rpx;
-        border-top-left-radius: 8px;
-        border-top-right-radius: 8px;
-        height: 294.74rpx;
-      }
-
-      .botm {
-        flex: 1;
-        padding: 0 14.04rpx;
-        padding-bottom: 21.05rpx;
-        display: flex;
-        flex-direction: column;
-        justify-content: space-between;
-        background-color: #fff;
-        border-radius: 0 0 8px 8px;
-
-        .title {
-          font-size: 26.32rpx !important;
-          margin: 12px 0;
-          width: 342.11rpx;
-          overflow: hidden;
-          text-overflow: ellipsis;
-          lines: 2;
-        }
-
-        .goods_info {
-          display: flex;
-          flex-direction: row;
-          direction: ltr;
-          justify-content: space-between;
-
-          .l_info {
-            flex-direction: row; // 可以生效
-            direction: ltr;
-            display: flex;
-            align-items: center;
-          }
-
-          .g_img {
-            width: 60rpx;
-            height: 60rpx;
-            border-radius: 50%;
-          }
-
-          .g_name {
-            font-size: 26.32rpx !important;
-            margin-left: 8.77rpx;
-            width: 100.63rpx;
-            text-overflow: ellipsis;
-            lines: 1;
-          }
-
-          .nice_box {
-            flex-direction: row; // 可以生效
-            direction: ltr;
-            align-items: center;
-
-            .isshow {
-              color: #FE3530 !important;
-            }
-
-            .iconfont {
-              font-size: 30rpx;
-            }
-
-            .icon-shoucang1 {
-              color: #F84221;
-            }
-
-            .collect {
-              font-size: 24rpx;
-              margin-left: 5rpx;
-            }
-          }
-        }
-      }
-    }
-  }
-
-  .noVideo {
-    position: fixed;
-    top: 400rpx;
-    z-index: 9;
-    width: 750rpx;
-    flex-direction: row;
-    justify-content: center;
-
-    .pictrue {
-      width: 414rpx;
-      height: 256rpx;
-    }
-
-    .tips {
-      text-align: center;
-      margin-top: 14rpx;
-      font-size: 26rpx;
-      color: #999;
-    }
-  }
-
-  .fixed-head {
-    flex-direction: row;
-    justify-content: center;
-    align-items: center;
-    position: fixed;
-    left: 0;
-    top: 70rpx;
-    height: 86rpx;
-
-    .icon-xiangzuo {
-      margin-left: 10px;
-      width: 20px;
-      height: 20px;
-      color: #ffffff;
-    }
-  }
-
-  .header {
-    position: fixed;
-    z-index: 9;
-    width: 750rpx;
-    height: 186rpx;
-    flex-direction: row;
-    justify-content: center;
-    align-items: center;
-    padding-top: 70rpx;
-
-    .items {
-      margin: 0 30rpx;
-
-      .tName {
-        color: #000;
-        font-size: 32rpx;
-
-        &.on {
-          font-size: 38rpx;
-        }
-      }
-    }
-  }
-
-  .container {
-    background-color: #F5F5F5;
-  }
-
-  .item {
-    position: relative;
-  }
-
-  .videoHover {
-    position: absolute;
-    top: 0;
-    left: 0;
-    flex: 1;
-    background-color: rgba(0, 0, 0, 0.1);
-    justify-content: center;
-    align-items: center;
-  }
-
-  .playState {
-    width: 160rpx;
-    height: 160rpx;
-    opacity: 0.2;
-  }
-
-  .video-status {
-    width: 690rpx;
-    position: absolute;
-    left: 30rpx;
-    background: #000;
-    border-radius: 10rpx;
-    top: 150rpx;
-    padding: 30rpx;
-
-    .status-title {
-      flex-direction: row;
-      align-items: center;
-
-      .title {
-        margin-left: 20rpx;
-        color: #ffffff;
-        font-size: 28rpx;
-      }
-    }
-
-    .refusal {
-      color: #ffffff;
-      font-size: 22rpx;
-      margin: 15rpx 0 0 48rpx;
-    }
-
-    .image {
-      width: 28rpx;
-      height: 28rpx;
-    }
-  }
-
-  .userInfo {
-    position: absolute;
-    bottom: 30px;
-    right: 10px;
-    display: flex;
-    align-items: center;
-    flex-direction: column;
-
-    .pictrue {
-      flex-direction: column;
-      justify-content: center;
-      align-items: center;
-      position: relative;
-
-      // margin-bottom: 18rpx;
-      .guanzhu {
-        width: 42rpx;
-        height: 42rpx;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        color: #fff;
-        background: #E93323;
-        border-radius: 100%;
-        position: relative;
-        top: -20rpx;
-        left: 3rpx;
-
-        .iconfont {
-          font-size: 30rpx;
-          color: #fff;
-        }
-      }
-
-      .yiguanzhu {
-        width: 42rpx;
-        height: 42rpx;
-      }
-    }
-  }
-
-  .video-my {
-    position: relative;
-    align-items: center;
-    justify-content: center;
-    flex-direction: row;
-
-  }
-
-  .video-dian {
-    position: relative;
-    width: 33px;
-    height: 33px;
-    align-items: center;
-    justify-content: center;
-    flex-direction: row;
-    left: 3px;
-
-    .dian {
-      width: 7px;
-      height: 7px;
-      background-color: #fff;
-      border-radius: 100%;
-      margin-right: 3px;
-
-      &:last-child {
-        margin-right: 0;
-      }
-    }
-  }
-
-  .manage {
-    width: 115px;
-    background: #ffffff;
-    box-shadow: 0 1px 8px rgba(0, 0, 0, 0.1);
-    padding: 0 8px;
-    position: absolute;
-    bottom: 10px;
-    right: 60px;
-    border-radius: 8px;
-
-    .manage-gou {
-      display: flex;
-      width: 13px;
-      height: 13px;
-      background: #ffffff;
-      transform: rotate(140deg);
-      position: absolute;
-      top: 30px;
-      right: -6px;
-      box-shadow: -1px -1px 1px rgba(0, 0, 0, 0.05);
-    }
-
-    .items {
-      border-bottom: 1px solid #EEEEEE;
-      padding: 10px 0;
-      display: flex;
-      align-items: center;
-      flex-direction: row;
-
-      .text {
-        color: #282828;
-        font-size: 13px;
-      }
-
-      &:last-child {
-        border-bottom-color: transparent;
-      }
-
-      .image {
-        width: 32rpx;
-        height: 32rpx;
-        margin: 0 16rpx 0;
-      }
-    }
-  }
-
-  .userAvatar {
-    border-radius: 500%;
-    border-style: solid;
-    border-width: 2px;
-    border-color: #ffffff;
-    width: 80rpx;
-    height: 80rpx;
-  }
-
-  .info-text {
-    display: flex;
-    margin-top: 10rpx;
-    color: #ffffff;
-    font-size: 22rpx;
-    text-align: center;
-
-    &.likeNumActive {
-      color: #E93323;
-    }
-  }
-
-  .likeIco,
-  .shareIco,
-  .commentIco {
-    width: 60rpx;
-    height: 60rpx;
-    margin-top: 15px;
-  }
-
-  .likeNum,
-  .commentNum,
-  .shareTex {
-    color: #ffffff;
-    font-size: 30rpx;
-    text-align: center;
-    margin: 5px;
-  }
-
-  .mention {
-    width: 46px;
-    height: 46px;
-    position: relative;
-
-    .image {
-      width: 30px;
-      height: 30px;
-      position: absolute;
-      right: 8px;
-    }
-
-    .count {
-      padding: 2px 6px;
-      background: #fff;
-      border-radius: 100%;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      color: #E93323;
-      position: absolute;
-      right: 6px;
-      top: 0;
-      font-size: 10px;
-    }
-  }
-
-  .content {
-    width: 325px;
-    position: absolute;
-    bottom: 15px;
-    /* justify-content: center; */
-    padding: 15rpx;
-    flex-direction: column;
-    justify-content: flex-start;
-    color: #ffffff;
-
-    .cart {
-      height: 48rpx;
-      flex-direction: row;
-
-      .cartName {
-        font-size: 24rpx;
-        color: #fff;
-      }
-    }
-
-    .product {
-      flex-direction: row;
-      margin-top: 27rpx;
-
-      .scroll-view {
-        flex-direction: row;
-      }
-
-      .product-item {
-        width: 444rpx;
-        height: 136rpx;
-        background: rgba(0, 0, 0, .55);
-        border-radius: 12rpx;
-        padding: 16rpx 15rpx;
-        margin-right: 30rpx;
-      }
-
-      .swiper {
-        width: 500rpx !important;
-        height: 136rpx !important;
-
-        .swiper-count {
-          width: 444rpx !important;
-          height: 136rpx !important;
-          background: rgba(0, 0, 0, .55);
-          border-radius: 12rpx;
-          padding: 16rpx 15rpx;
-        }
-
-        .swiper-item {
-          flex-direction: row;
-        }
-      }
-
-      .item-count {
-        flex-direction: row;
-        justify-content: space-between;
-
-        .picture {
-          width: 104rpx;
-          height: 104rpx;
-          border-radius: 10rpx;
-
-          .image {
-            width: 104rpx;
-            height: 104rpx;
-            border-radius: 10rpx;
-          }
-        }
-
-        .product-text {
-          width: 286rpx;
-          justify-content: space-between;
-
-          .name {
-            font-size: 24rpx;
-            width: 286rpx;
-            color: #fff;
-          }
-
-          .product-price {
-            display: flex;
-            flex-direction: row;
-            justify-content: space-between;
-            align-items: center;
-
-            .price {
-              display: flex;
-              flex-direction: row;
-
-              .sm,
-              .money {
-                color: #ffffff;
-                font-size: 24rpx;
-              }
-            }
-
-            .buy-btn {
-              padding: 6rpx 20rpx;
-              display: flex;
-              align-items: center;
-              justify-content: center;
-              color: #fff;
-              border-radius: 26rpx;
-              background: #E93323;
-              font-size: 20rpx;
-            }
-          }
-        }
-      }
-    }
-  }
-
-  .product_cate {
-    margin: 20rpx 0;
-    flex-direction: row;
-
-    .pro-view {
-      flex-direction: row;
-      align-items: center;
-      border-radius: 30rpx;
-      padding: 0 25rpx;
-      line-height: 40rpx;
-      border-radius: 29rpx;
-      border: 1rpx solid #ffffff;
-
-      .text {
-        color: #ffffff;
-        font-size: 24rpx;
-      }
-
-      .icon {
-        font-size: 26rpx;
-        font-weight: bold;
-        margin-right: 8rpx;
-        color: #ffffff;
-      }
-    }
-  }
-
-  .timeCon {
-    flex-direction: row;
-    align-items: center;
-
-    .userName {
-      font-size: 30rpx;
-      color: #ffffff;
-    }
-  }
-
-  .words {
-    margin-top: 20rpx;
-
-    .close {
-      display: flex;
-      flex-direction: row;
-      align-items: center;
-      justify-content: flex-end;
-      margin-right: 20rpx;
-
-      .imgClose {
-        width: 18rpx;
-        height: 10rpx;
-        margin-left: 10rpx;
-      }
-    }
-
-    .wordsCon {
-      position: relative;
-
-      .more {
-        position: absolute;
-        bottom: 0;
-        right: 40rpx;
-        font-size: 26rpx;
-        color: #ffffff;
-        font-weight: bold;
-      }
-
-      .img {
-        width: 18rpx;
-        height: 10rpx;
-        margin-left: 4rpx;
-        position: absolute;
-        bottom: 7rpx;
-        right: 20rpx;
-      }
-    }
-
-    .info {
-      color: #fff;
-      font-size: 28rpx;
-    }
-
-    .more {
-      font-size: 26rpx;
-      color: #ffffff;
-      font-weight: bold;
-    }
-  }
-
-  .root {
-    background-color: #000000;
-	
-  }
-</style>
-
+	// .video-list{
+	//   padding: 200rpx 28.07rpx 0 28.07rpx;
+	//   display: flex;
+	//   flex-direction: row; // 可以生效
+	//   direction: ltr;
+	//   flex-wrap: wrap;
+	//   justify-content: space-between;
+	//   .goods_item{
+	//     height: 87.72upx;
+	//     background-color: #999;
+	//   }
+	// }
+	.video-list {
+		// margin: 0 auto;
+		// width: 750rpx;
+		padding: 200rpx 28.07rpx 0 28.07rpx;
+		/* #ifdef MP */
+		padding-top: 200rpx;
+		/* #endif */
+		// background-color: #000000;
+		background-color: #F5F5F5;
+
+		.goods_item {
+			width: 342.11rpx;
+			height: 491.23rpx;
+			border-radius: 8px;
+			overflow: hidden;
+			// background-color: #000;
+			display: flex;
+			flex-direction: column;
+			padding-bottom: 10px;
+
+			.goods_img {
+				width: 342.11rpx;
+				border-top-left-radius: 8px;
+				border-top-right-radius: 8px;
+				height: 294.74rpx;
+			}
+
+			.botm {
+				flex: 1;
+				padding: 0 14.04rpx;
+				padding-bottom: 21.05rpx;
+				display: flex;
+				flex-direction: column;
+				justify-content: space-between;
+				background-color: #fff;
+				border-radius: 0 0 8px 8px;
+
+				.title {
+					font-size: 26.32rpx !important;
+					margin: 12px 0;
+					width: 342.11rpx;
+					overflow: hidden;
+					text-overflow: ellipsis;
+					lines: 2;
+				}
+
+				.goods_info {
+					display: flex;
+					flex-direction: row;
+					direction: ltr;
+					justify-content: space-between;
+
+					.l_info {
+						flex-direction: row; // 可以生效
+						direction: ltr;
+						display: flex;
+						align-items: center;
+					}
+
+					.g_img {
+						width: 60rpx;
+						height: 60rpx;
+						border-radius: 50%;
+					}
+
+					.g_name {
+						font-size: 26.32rpx !important;
+						margin-left: 8.77rpx;
+						width: 100.63rpx;
+						text-overflow: ellipsis;
+						lines: 1;
+					}
+
+					.nice_box {
+						flex-direction: row; // 可以生效
+						direction: ltr;
+						align-items: center;
+
+						.isshow {
+							color: #FE3530 !important;
+						}
+
+						.iconfont {
+							font-size: 30rpx;
+						}
+
+						.icon-shoucang1 {
+							color: #F84221;
+						}
+
+						.collect {
+							font-size: 24rpx;
+							margin-left: 5rpx;
+						}
+					}
+				}
+			}
+		}
+	}
+
+	.noVideo {
+		position: fixed;
+		top: 400rpx;
+		z-index: 9;
+		width: 750rpx;
+		flex-direction: row;
+		justify-content: center;
+
+		.pictrue {
+			width: 414rpx;
+			height: 256rpx;
+		}
+
+		.tips {
+			text-align: center;
+			margin-top: 14rpx;
+			font-size: 26rpx;
+			color: #999;
+		}
+	}
+
+	.fixed-head {
+		flex-direction: row;
+		justify-content: center;
+		align-items: center;
+		position: fixed;
+		left: 0;
+		top: 70rpx;
+		height: 86rpx;
+
+		.icon-xiangzuo {
+			margin-left: 10px;
+			width: 20px;
+			height: 20px;
+			color: #ffffff;
+		}
+	}
+
+	.header {
+		position: fixed;
+		z-index: 9;
+		width: 750rpx;
+		height: 186rpx;
+		flex-direction: row;
+		justify-content: center;
+		align-items: center;
+		padding-top: 70rpx;
+
+		.items {
+			margin: 0 30rpx;
+
+			.tName {
+				color: #000;
+				font-size: 32rpx;
+
+				&.on {
+					font-size: 38rpx;
+				}
+			}
+		}
+	}
+
+	.container {
+		background-color: #F5F5F5;
+	}
+
+	.item {
+		position: relative;
+	}
+
+	.videoHover {
+		position: absolute;
+		top: 0;
+		left: 0;
+		flex: 1;
+		background-color: rgba(0, 0, 0, 0.1);
+		justify-content: center;
+		align-items: center;
+	}
+
+	.playState {
+		width: 160rpx;
+		height: 160rpx;
+		opacity: 0.2;
+	}
+
+	.video-status {
+		width: 690rpx;
+		position: absolute;
+		left: 30rpx;
+		background: #000;
+		border-radius: 10rpx;
+		top: 150rpx;
+		padding: 30rpx;
+
+		.status-title {
+			flex-direction: row;
+			align-items: center;
+
+			.title {
+				margin-left: 20rpx;
+				color: #ffffff;
+				font-size: 28rpx;
+			}
+		}
+
+		.refusal {
+			color: #ffffff;
+			font-size: 22rpx;
+			margin: 15rpx 0 0 48rpx;
+		}
+
+		.image {
+			width: 28rpx;
+			height: 28rpx;
+		}
+	}
+
+	.userInfo {
+		position: absolute;
+		bottom: 120px;
+		right: 10px;
+		display: flex;
+		align-items: center;
+		flex-direction: column;
+
+		.pictrue {
+			flex-direction: column;
+			justify-content: center;
+			align-items: center;
+			position: relative;
+
+			// margin-bottom: 18rpx;
+			.guanzhu {
+				width: 42rpx;
+				height: 42rpx;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				color: #fff;
+				background: #E93323;
+				border-radius: 100%;
+				position: relative;
+				top: -20rpx;
+				left: 3rpx;
+
+				.iconfont {
+					font-size: 30rpx;
+					color: #fff;
+				}
+			}
+
+			.yiguanzhu {
+				width: 42rpx;
+				height: 42rpx;
+			}
+		}
+	}
+
+	.video-my {
+		position: relative;
+		align-items: center;
+		justify-content: center;
+		flex-direction: row;
+
+	}
+
+	.video-dian {
+		position: relative;
+		width: 33px;
+		height: 33px;
+		align-items: center;
+		justify-content: center;
+		flex-direction: row;
+		left: 3px;
+
+		.dian {
+			width: 7px;
+			height: 7px;
+			background-color: #fff;
+			border-radius: 100%;
+			margin-right: 3px;
+
+			&:last-child {
+				margin-right: 0;
+			}
+		}
+	}
+
+	.manage {
+		width: 115px;
+		background: #ffffff;
+		box-shadow: 0 1px 8px rgba(0, 0, 0, 0.1);
+		padding: 0 8px;
+		position: absolute;
+		bottom: 10px;
+		right: 60px;
+		border-radius: 8px;
+
+		.manage-gou {
+			display: flex;
+			width: 13px;
+			height: 13px;
+			background: #ffffff;
+			transform: rotate(140deg);
+			position: absolute;
+			top: 30px;
+			right: -6px;
+			box-shadow: -1px -1px 1px rgba(0, 0, 0, 0.05);
+		}
+
+		.items {
+			border-bottom: 1px solid #EEEEEE;
+			padding: 10px 0;
+			display: flex;
+			align-items: center;
+			flex-direction: row;
+
+			.text {
+				color: #282828;
+				font-size: 13px;
+			}
+
+			&:last-child {
+				border-bottom-color: transparent;
+			}
+
+			.image {
+				width: 32rpx;
+				height: 32rpx;
+				margin: 0 16rpx 0;
+			}
+		}
+	}
+
+	.userAvatar {
+		border-radius: 500%;
+		border-style: solid;
+		border-width: 2px;
+		border-color: #ffffff;
+		width: 80rpx;
+		height: 80rpx;
+	}
+
+	.info-text {
+		display: flex;
+		margin-top: 10rpx;
+		color: #ffffff;
+		font-size: 22rpx;
+		text-align: center;
+
+		&.likeNumActive {
+			color: #E93323;
+		}
+	}
+
+	.likeIco,
+	.shareIco,
+	.commentIco {
+		width: 60rpx;
+		height: 60rpx;
+		margin-top: 15px;
+	}
+
+	.likeNum,
+	.commentNum,
+	.shareTex {
+		color: #ffffff;
+		font-size: 30rpx;
+		text-align: center;
+		margin: 5px;
+	}
+
+	.mention {
+		width: 46px;
+		height: 46px;
+		position: relative;
+
+		.image {
+			width: 30px;
+			height: 30px;
+			position: absolute;
+			right: 8px;
+		}
+
+		.count {
+			padding: 2px 6px;
+			background: #fff;
+			border-radius: 100%;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			color: #E93323;
+			position: absolute;
+			right: 6px;
+			top: 0;
+			font-size: 10px;
+		}
+	}
+
+	.content {
+		width: 325px;
+		position: absolute;
+		bottom: 15px;
+		/* justify-content: center; */
+		padding: 15rpx;
+		flex-direction: column;
+		justify-content: flex-start;
+		color: #ffffff;
+
+		.cart {
+			height: 48rpx;
+			flex-direction: row;
+
+			.cartName {
+				font-size: 24rpx;
+				color: #fff;
+			}
+		}
+
+		.product {
+			flex-direction: row;
+			margin-top: 27rpx;
+
+			.scroll-view {
+				flex-direction: row;
+			}
+
+			.product-item {
+				width: 444rpx;
+				height: 136rpx;
+				background: rgba(0, 0, 0, .55);
+				border-radius: 12rpx;
+				padding: 16rpx 15rpx;
+				margin-right: 30rpx;
+			}
+
+			.swiper {
+				width: 500rpx !important;
+				height: 136rpx !important;
+
+				.swiper-count {
+					width: 444rpx !important;
+					height: 136rpx !important;
+					background: rgba(0, 0, 0, .55);
+					border-radius: 12rpx;
+					padding: 16rpx 15rpx;
+				}
+
+				.swiper-item {
+					flex-direction: row;
+				}
+			}
+
+			.item-count {
+				flex-direction: row;
+				justify-content: space-between;
+
+				.picture {
+					width: 104rpx;
+					height: 104rpx;
+					border-radius: 10rpx;
+
+					.image {
+						width: 104rpx;
+						height: 104rpx;
+						border-radius: 10rpx;
+					}
+				}
+
+				.product-text {
+					width: 286rpx;
+					justify-content: space-between;
+
+					.name {
+						font-size: 24rpx;
+						width: 286rpx;
+						color: #fff;
+					}
+
+					.product-price {
+						display: flex;
+						flex-direction: row;
+						justify-content: space-between;
+						align-items: center;
+
+						.price {
+							display: flex;
+							flex-direction: row;
+
+							.sm,
+							.money {
+								color: #ffffff;
+								font-size: 24rpx;
+							}
+						}
+
+						.buy-btn {
+							padding: 6rpx 20rpx;
+							display: flex;
+							align-items: center;
+							justify-content: center;
+							color: #fff;
+							border-radius: 26rpx;
+							background: #E93323;
+							font-size: 20rpx;
+						}
+					}
+				}
+			}
+		}
+	}
+
+	.product_cate {
+		margin: 20rpx 0;
+		flex-direction: row;
+
+		.pro-view {
+			flex-direction: row;
+			align-items: center;
+			border-radius: 30rpx;
+			padding: 0 25rpx;
+			line-height: 40rpx;
+			border-radius: 29rpx;
+			border: 1rpx solid #ffffff;
+
+			.text {
+				color: #ffffff;
+				font-size: 24rpx;
+			}
+
+			.icon {
+				font-size: 26rpx;
+				font-weight: bold;
+				margin-right: 8rpx;
+				color: #ffffff;
+			}
+		}
+	}
+
+	.timeCon {
+		flex-direction: row;
+		align-items: center;
+
+		.userName {
+			font-size: 30rpx;
+			color: #ffffff;
+		}
+	}
+
+	.words {
+		margin-top: 20rpx;
+
+		.close {
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			justify-content: flex-end;
+			margin-right: 20rpx;
+
+			.imgClose {
+				width: 18rpx;
+				height: 10rpx;
+				margin-left: 10rpx;
+			}
+		}
+
+		.wordsCon {
+			position: relative;
+
+			.more {
+				position: absolute;
+				bottom: 0;
+				right: 40rpx;
+				font-size: 26rpx;
+				color: #ffffff;
+				font-weight: bold;
+			}
+
+			.img {
+				width: 18rpx;
+				height: 10rpx;
+				margin-left: 4rpx;
+				position: absolute;
+				bottom: 7rpx;
+				right: 20rpx;
+			}
+		}
+
+		.info {
+			color: #fff;
+			font-size: 28rpx;
+		}
+
+		.more {
+			font-size: 26rpx;
+			color: #ffffff;
+			font-weight: bold;
+		}
+	}
+
+	.root {
+		background-color: #000000;
+
+	}
+</style>
\ No newline at end of file
diff --git a/pages/short_video/nvueSwiper/index.nvue b/pages/short_video/nvueSwiper/index.nvue
index 496f981..e561cc7 100644
--- a/pages/short_video/nvueSwiper/index.nvue
+++ b/pages/short_video/nvueSwiper/index.nvue
@@ -447,6 +447,7 @@
 			}
 		},
 		onLoad(options) {
+			console.log( options)
 			this.getOptions(options);
 			this.videoID = options.id;
 			this.isUser = options.user == 1 ? true : false;
@@ -732,7 +733,7 @@
 			get() {
 				let that = this
 				// 1.这里引入后端请求数据
-				that.isUser ?
+				
 					myVideoList(that.userUid, {
 						page: that.page,
 						limit: that.limit,
@@ -749,23 +750,7 @@
 							icon: 'none',
 							duration: 2000
 						});
-					}) :
-					graphicLstApi({
-						page: that.page,
-						limit: that.limit,
-						category_id: -1
-					}).then(res => {
-						that.videoData(res.data.list)
-						if (res.data.list.length < that.limit) {
-							this.loadMore = false;
-						}
-					}).catch(err => {
-						return uni.showToast({
-							title: err,
-							icon: 'none',
-							duration: 2000
-						});
-					})
+					}) 
 				that.loadVideo = true
 			},
 			getFocusList() {
@@ -1371,7 +1356,7 @@
 
 	.userInfo {
 		position: absolute;
-		bottom: 60rpx;
+		bottom: 120px;
 		right: 20rpx;
 		flex-direction: column;
 		text-align: center;
diff --git a/pages/supply_chains/supply_chains.vue b/pages/supply_chains/supply_chains.vue
index 28fdfa0..f743662 100644
--- a/pages/supply_chains/supply_chains.vue
+++ b/pages/supply_chains/supply_chains.vue
@@ -1,179 +1,287 @@
 <template>
-
 	<view class="Circle_friends">
 		<view class="circle_friends_wrapper">
-			<view class="site-box flex_a_c_j_sb">
-				<view class="place_wrapper flex_a_c" @click="selectLocation">
-					<view class="iconfont icon-weizhi" style="margin-left: 20rpx;"></view>
-					<view class="town_name">{{street}}</view>
-				</view>
 
-				<navigator url="/pages/chat/customer_list/index?type=0" hover-class="none">
-					<view class="iconfont icon-xiaoxi" style="color:#fff;"></view>
-				</navigator>
-				<view class="bg-img" v-if="isFshow">
-					<img :src="bgColor" alt="">
-				</view>
-			</view>
 
-			<zbpSwiper :isSelectPlace="true" @kkchange='kkchange' :location_Arr="locationArr">
-			</zbpSwiper>
-			<view class="shop_wrapper">
-				<!-- locationArr.address_reference.town.id -->
-				<navigator class="l_yun" hover-class="none"
-					:url="`/pages/nongKe/supply_chain/supplier?type_id=10&street_id=${street_id}`"
-					:style=" {'background-image': `url(${bgData[0].pic})`}">
-					<view class=" text-name">
-						<text>{{town}}</text>
-						<view class="name_town">-供销综合云市场-</view>
+			<view class="">
+				<view :class="['site-box ','flex_a_c_j_sb',isFshow?'sitbox':'']">
+					<view :class="['place_wrapper','flex_a_c',isFshow?'sitbox':'']" @click="selectLocation"
+						style="opacity: 0;">
+						<view class="iconfont icon-weizhi" style="margin-left: 20rpx;">
+						</view>
+						<view class="town_name">{{street}}</view>
 					</view>
-				</navigator>
-				<view class="r_lihai" @click="go_shop" :style=" {'background-image': `url(${bgData[1].pic})`}">
-					<view class="title">里海云仓</view>
-				</view>
-			</view>
-			<view class="tabs_wrapper flex_a_c_j_sb">
-				<view class="title flex_a_c">热点资讯</view>
-				<navigator class="flex_a_c" hover-class="none" url="/pages/news_list/index">
-					更多
-					<view class="iconfont icon-gengduo3"></view>
-				</navigator>
-			</view>
-			<view class="article_box">
-				<block v-for="(item, index) in recoList.slice(0,2)" :key="index">
-					<navigator :url='"/pages/news_details/index?id="+item.article_id' hover-class='none'
-						class='article-item'>
-						<view class='text'>
-							<view class='name'>{{item.title}}</view>
-							<view class="time">{{item.create_time}}</view>
-						</view>
-						<view class='pictrue'>
-							<image :src='item.image_input'></image>
-						</view>
+					<navigator url="/pages/chat/customer_list/index?type=0" hover-class="none"
+						style="opacity: 0;	transition: opacity 1s ease-in;transition-delay: 1.5s;"
+						:class="[isFshow?'sitbox':'']">
+						<view class="iconfont icon-xiaoxi" style="color:#fff;"></view>
 					</navigator>
-				</block>
+
+				</view>
+				<view class="site-box ','flex_a_c_j_sb'" v-if="ishshow">
+					<view class="bg-img">
+						<img :src="bgColor" alt="">
+					</view>
+				</view>
+
 			</view>
 
-			<view class="tabs_wrapper">
-				<u-tabs :list="tabsData.list" @click="tabsChange" keyName="title" lineColor="#F84221"></u-tabs>
-			</view>
 
-			<view class="goods">
-				<block v-for="(item,index) in articleList" :key="index">
-					<view class="goods_item" @click="gogogo(item)">
-						<image class="goods_img" :src="item.image_input" mode="aspectFill"></image>
-						<view class="botm">
-							<view class="title">{{item.title}}</view>
-							<view class="goods_info flex_a_c">
-								<view class="l_info flex_a_c">
-									<image :src="(item.author && item.author.avatar) || '/static/images/f.png'"
-										mode="aspectFill" class="g_img"></image>
-									<view class="g_name">{{item.author}}</view>
+			<zbpSwiper :isSelectPlace="true" :location_Arr="locationArr" @kkchange='kkchange'></zbpSwiper>
+
+			<view class="list">
+				<view class="list-m">
+					<image src="@/static/images/f6.png" mode="aspectFill"></image>
+					<view class="list-title">
+						<view class="list-titlea">
+							<image src="@/static/images/p9.png" mode="aspectFill"></image>
+							<view class="titlea-con">
+								<view class="titlea">september</view>
+								<view class="titleb">
+									9月
 								</view>
-								<!-- <view class="nice_box" @click.stop="giveStart(item)">
-                  <text class="iconfont" :class="item.relevance_id ? 'icon-shoucang1' : 'icon-dianzan'"></text>
-                  <text class="collect">{{item.count_start}}</text>
-                </view> -->
+							</view>
+						</view>
+						<view class="list-titleb">
+							<view class="titlea">
+								通滩镇
+							</view>
+							<view class="titleb">
+								综合供销云市场
+							</view>
+						</view>
+
+					</view>
+					<view class="list-title-info"  style="color:#3A7331 ;">
+						<view class="" >
+							点击查看
+						</view>
+						<text class="iconfont icon-xiangyou"></text>
+					</view>
+				</view>
+				<view class="list-m">
+					<image src="@/static/images/f1.png" mode=""></image>
+					<view class="list-title">
+						<view class="list-titlea">
+							<image src="@/static/images/p8.png" mode="aspectFill"></image>
+						</view>
+						<view class="list-titleb">
+							<view class="titlea">
+								里海云仓
+							</view>
+							<view class="titleb">
+								行业分类市场
 							</view>
 						</view>
 					</view>
-				</block>
+					<view class="list-title-info" style="color:#3A7331 ;">
+						<view class="" >
+							点击查看
+						</view>
+						<text class="iconfont icon-xiangyou"></text>
+					</view>
+				</view>
+			</view>
+
+			<view class="list-con">
+				<view class="list-con-left">
+					<view class="list-con-title">
+						<view class="con-titlea">
+							名优特产
+						</view>
+						<view class="con-titleb">
+							精选当地特色特产
+						</view>
+					</view>
+					<image src="@/static/images/f5.png" mode=""></image>
+				</view>
+				<view class="list-con-right">
+					<view class="con-right" style="margin-bottom: 20rpx;">
+						<view class="list-con-title">
+							<view class="con-titlea">
+								当地美食
+							</view>
+							<view class="con-titleb">
+								美食线上一条街
+							</view>
+						</view>
+						<image src="@/static/images/f7.png" mode=""></image>
+					</view>
+					<view class="con-right">
+						<view class="list-con-title">
+							<view class="con-titlea">
+								特色文旅
+							</view>
+							<view class="con-titleb">
+								热门景区，当地文化
+							</view>
+						</view>
+						<image src="@/static/images/f2.png" mode=""></image>
+					</view>
+
+				</view>
+			</view>
+			<view class="list-bon">
+				<image src="@/static/images/f4.png" mode=""></image>
+			</view>
+			<view class="goodslist">
+				<WaterfallsFlow :wfList='cateGoods' @itemTap="itemTap" />
+
 			</view>
 			<view class="empty_wrapper" v-if="emptyShow">
 				<u-empty :show="emptyShow" mode="list" icon="http://cdn.uviewui.com/uview/empty/list.png"></u-empty>
 			</view>
 		</view>
-		<u-picker :defaultIndex="defaInd" :show="showPicker" ref="uPicker" :columns="columnData" @confirm="confirm"
-			@cancel="showPicker = false" @change="changeHandler" keyName="name"></u-picker>
-		<!-- <view class="bg_color"></view> -->
 
-		<!-- <m-tabbar native>
-      <template v-slot:tabbar_index_2>
-        <view class="custom_style">
-          <view class="custom_style_icon"></view>
-        </view>
-      </template>
-    </m-tabbar> -->
+		<u-picker :defaultIndex="[0,0]" :show="showPicker" ref="uPicker" :columns="columnData" @confirm="confirm"
+			@cancel="showPicker = false" @change="changeHandler" keyName="name"></u-picker>
+		<u-loadmore :status="status" v-if="cateGoods.length>=where.limit" />
+
+		<view class="location" v-if='isshow'>
+			<view class="locationa">
+				位置权限使用说明
+			</view>
+			<view class="locationb">
+				用于向你推荐最近门店
+			</view>
+		</view>
 	</view>
 </template>
 
 <script>
-	import Cache from '@/utils/cache';
+	import mTabbar from '@/components/m-tabbar/m-tabbar.vue'
 	import zbpSwiper from '@/components/zbpSwiper'
+	import easyLoadimage from '@/components/easy-loadimage/easy-loadimage.vue';
+	import WaterfallsFlow from '@/components/WaterfallsFlow/WaterfallsFlowo.vue'
+	import Cache from '@/utils/cache';
+	import {
+		getSlideAPI
+	} from '@/api/lihai.js'
+	import {
+		graphicLstApi,
+		getTopicList,
+		graphicStartApi
+	} from '@/api/community.js'
+	import {
+		getIndexData,
+		getDiy,
+		getArticleList,
+		getArticleCategoryLists
+	} from '@/api/api.js'
+	import {
+		getGeocoder,
+		merClassifly
+	} from '@/api/store.js';
 	import {
 		getArea,
 		getStreet
 	} from '@/api/article.js';
-	import {
-		mapGetters
-	} from 'vuex'
-	import mTabbar from '@/components/m-tabbar/m-tabbar.vue'
-	import {
-		graphicStartApi
-	} from '@/api/community.js'
-	import {
-		getArticleList,
-		getArticleCategoryList,
-		get_cloud_shop
-	} from '@/api/api.js'
-	import {
-		getHotBanner
-	} from '@/api/store.js'
 	import {
 		Toast
 	} from '@/libs/uniApi'
-	import {
-		getGeocoder
-	} from '@/api/store.js';
 	export default {
 		components: {
 			mTabbar,
-			zbpSwiper
+			zbpSwiper,
+			easyLoadimage,
+			WaterfallsFlow
 		},
 		data() {
 			return {
-				defaInd: [0, 0],
+				activeStyle: {
+
+					color: '#333333',
+					fontWeight: 'bold',
+					transform: 'scale(1.04)'
+				},
+				isshow: false,
+				locationArr: ({}),
+				status: 'loadmore',
+				bgColor: '',
+				showPicker: false,
+				columnData: [],
+				show: false,
 				tabsData: {
 					list: [],
 					tabsActive: 0
 				},
-				town: '',
-				street_id: '',
+				tabsData1: {
+					list: [],
+					tabsActive: 0
+				},
+				where: {
+					category_id: 0,
+					page: 1,
+					limit: 6
+				},
+				currentItemId: 69, // 默认获取 社区的数据 0 表示推荐 || 69 社区
+				keyword: '',
+				location: '',
 				emptyShow: false,
-				articleList: [],
-				recoList: [],
-				columnData: [],
-				bgData: [{
-					pic: ''
-				}, {
-					pic: ''
-				}],
-				store_id: '',
-				locationArr: ({}),
-				setrecommend_address: "",
-				isYunCang: 0,
-				bgColor: '',
-				isFshow: false,
 				street: '',
-				showPicker: false,
+				cateGoods: [],
+				recoList: [],
+				articleList: [],
+				streeta_id: '',
+				street: '',
+				bgColor: '',
+				ishshow: false,
+				isFshow: false,
 			}
 		},
-		onLoad() {
+		watch: {
+			street: {
+				handler(newVal, oldVal) {
+					this.street = newVal
+					let arr = Cache.get('ADRESS_LOCATION')
+					console.log(arr, '1')
+					if (arr.length > 0) {
+						this.street = arr.split(',')[0]
+
+
+					}
+				},
+			}
+		},
+		onPullDownRefresh() {
+			this.getCateList()
+			this.cateGoods = []
+			this.getGoods()
+
 			this.Area()
-			this.appLocation()
-			getHotBanner('good').then(res => {
-				// console.log(res);
-				this.bgData = res.data
-			})
+			uni.stopPullDownRefresh()
+		},
+
+		onLoad() {
+
+			this.getCateList()
 			this.getArticle()
-			getArticleList(19).then(res => {
-				this.recoList = res.data.list
+			this.getGoods()
+			this.selfLocation()
+			this.Area()
+			this.setPermissions()
+
+			// this.openTongZhi()
+			uni.$on('connectstatusChange', (connectstatus) => {
+				var connectstr = ''
+				if (connectstatus == true) {
+					connectstr = '已连接'
+					this.getRegistrationID()
+				} else {
+					connectstr = '未连接'
+				}
+				this.connectstatus = connectStr
 			})
-			// this.getTownAndStoreId()
 
 		},
-		onShow() {},
-		// computed: mapGetters(['location']),
+
+		onReachBottom() {
+			if (this.status == 'nomore') return;
+			this.status = 'loading';
+			this.where.limit = 2
+			this.where.page = ++this.where.page;
+			this.getGoods()
+		},
 		mounted() {
 			// #ifdef  H5
 			// 监听页面滚动事件
@@ -181,47 +289,129 @@
 			// #endif
 
 
-		},
-		watch: {
-			street: {
-				handler(newVal, oldVal) {
-					this.street = newVal
-					let arr = Cache.get('ADRESS_LOCATION')
-						console.log(arr,'3')
-					if (arr.length > 0) {
-						this.street=arr.split(',')[0]
-						this.town = arr.split(',')[1]
-						this.street_id =arr.split(',')[2]
-						this.getCloudShopMerId(this.street_id)
-					}
-				},
-			}
 		},
 		// #ifdef APP-PLUS
 		onPageScroll(e) {
 			// this.scrollTop = e.scrollTop;
 			console.log(e.scrollTop)
 			if (e.scrollTop > 0) {
-				this.isFshow = true
+
+				this.ishshow = true
+				setTimeout(() => {
+					this.ishshow = false
+					this.isFshow = true
+				}, 3000)
 			} else {
 				this.isFshow = false
 			}
 
 		},
 		// #endif
+
 		methods: {
+
+			scrolling() {
+				// 滚动条距文档顶部的距离
+				let scrollTop =
+					window.pageYOffset ||
+					document.documentElement.scrollTop ||
+					document.body.scrollTop;
+				// 滚动条滚动的距离
+				let scrollStep = scrollTop - this.oldScrollTop;
+				// console.log("header 滚动距离 ", scrollTop);
+				// 更新——滚动前，滚动条距文档顶部的距离
+				this.oldScrollTop = scrollTop;
+
+				//变量windowHeight是可视区的高度
+				let windowHeight =
+					document.documentElement.clientHeight || document.body.clientHeight;
+				//变量scrollHeight是滚动条的总高度
+				let scrollHeight =
+					document.documentElement.scrollHeight || document.body.scrollHeight;
+
+				//滚动条到底部的条件
+				if (scrollTop + windowHeight == scrollHeight) {
+					//你想做的事情
+					// console.log("header  你已经到底部了");
+				}
+				if (scrollStep < 0) {
+					this.isFshow = false
+					// console.log("header 滚动条向上滚动了！");
+				} else {
+					this.isFshow = true
+					// console.log("header  滚动条向下滚动了！");
+				}
+				// 判断是否到了最顶部
+				if (scrollTop <= 0) {
+					this.isFshow = false
+					// console.log("header 到了最顶部")
+				}
+			},
+
+			kkchange(e) {
+				this.bgColor = e
+			},
+
+
+			tabsChange1(item) {
+				this.getArticleList(item.article_category_id)
+				this.streeta_id = item.id
+				this.tabsData1.tabsActive = item.index
+			},
+			async getArticle() {
+				let list = []
+
+				const {
+					data
+				} = await getArticleCategoryLists()
+				data.map((item, index) => {
+					if (item.title !== '首页推荐') {
+						list.push(item)
+					} else {
+						getArticleList(item.article_category_id).then(res => {
+							this.recoList = res.data.list
+						})
+					}
+				})
+
+				this.tabsData1.list = list
+				this.getArticleList(list[0].article_category_id)
+			},
+			async getArticleList(id) {
+				let obj = {
+					is_home: 1
+				}
+				const {
+					data
+				} = await getArticleList(id)
+				this.articleList = data.list
+			},
+			article(item) {
+				uni.navigateTo({
+					url: '/pages/news_details/index?id=' + item.article_id
+				})
+			},
+			selectPlce(e) {
+				this.street_id = e.value[1].code
+				this.town = e.value[1].name
+				this.getCloudShopMerId(e.value[1].code)
+			},
+			getCloudShopMerId(id) {
+				get_cloud_shop(id).then(res => {
+					res.data.length > 0 ? this.isYunCang = 1 : this.isYunCang = 0
+				})
+			},
+			selectLocation() {
+				this.showPicker = true
+			},
 			confirm(e) {
 				this.street = e.value[1].name
-				this.town = e.value[1].name
-				this.showPicker = false
-				this.street_id = e.value[1].code
-				this.getCloudShopMerId(e.value[1].code)
-
 				Cache.set('ADRESS_LOCATION',
-					this.street  + ','+ this.town+','+
-					
-					this.street_id
+					e.value[1].name + ',' + e.value[1].name + ',' +
+
+					e.value[1].code
 				)
+				this.showPicker = false
 			},
 			changeHandler(e) {
 				const {
@@ -235,7 +425,7 @@
 					getStreet({
 						area_code: value[0]['code']
 					}).then(res => {
-						picker.setColumnValues(1, res.data);
+						this.$refs.uPicker.setColumnValues(1, res.data);
 					});
 				}
 			},
@@ -254,70 +444,97 @@
 					this.$refs.uPicker.setColumnValues(1, res.data);
 				});
 			},
+			gogogo(item) {
+				if (item.video_link.length > 0) {
 
-			swiperChange(e) {
-				let {
-					current,
-					source
-				} = e.detail;
-				if (source === 'autoplay' || source === 'touch') {
-					this.bgColor = this.swiper.url[e.detail.current]['img']
-					this.$emit('kkchange', this.bgColor)
-				}
-			},
+					uni.navigateTo({
+						// #ifdef MP || H5
+						url: `/pages/short_video/nvueSwiper/index?id=${item.community_id}`
+						// #endif
+						// #ifdef APP
+						url: `/pages/short_video/appSwiper/index?id=${item.community_id}`
+						// #endif
+					})
 
-			selectLocation() {
-				this.showPicker = true
-
-			},
-			scrolling() {
-				// 滚动条距文档顶部的距离
-				let scrollTop =
-					window.pageYOffset ||
-					document.documentElement.scrollTop ||
-					document.body.scrollTop;
-				// 滚动条滚动的距离
-				let scrollStep = scrollTop - this.oldScrollTop;
-				console.log("header 滚动距离 ", scrollTop);
-				// 更新——滚动前，滚动条距文档顶部的距离
-				this.oldScrollTop = scrollTop;
-
-				//变量windowHeight是可视区的高度
-				let windowHeight =
-					document.documentElement.clientHeight || document.body.clientHeight;
-				//变量scrollHeight是滚动条的总高度
-				let scrollHeight =
-					document.documentElement.scrollHeight || document.body.scrollHeight;
-
-				//滚动条到底部的条件
-				if (scrollTop + windowHeight == scrollHeight) {
-					//你想做的事情
-					console.log("header  你已经到底部了");
-				}
-				if (scrollStep < 0) {
-					this.isFshow = false
-					console.log("header 滚动条向上滚动了！");
 				} else {
-					this.isFshow = true
-					console.log("header  滚动条向下滚动了！");
-				}
-				// 判断是否到了最顶部
-				if (scrollTop <= 0) {
-					this.isFshow = false
-					console.log("header 到了最顶部")
+					uni.navigateTo({
+
+						url: `/pages/plantGrass/plant_detail/index?id=${item.community_id}`
+					})
 				}
 			},
-			kkchange(e) {
-				this.bgColor = e
+			giveStart(item) {
+				let status = item.relevance_id ? 0 : 1
+				graphicStartApi(item.community_id, {
+					status: status
+				}).then(res => {
+					if (item.relevance_id) {
+						item.count_start--;
+						item.count_start = item.count_start == 0 ? 0 : item.count_start
+						item.relevance_id = false
+					} else {
+						item.count_start++;
+						item.relevance_id = true
+					}
+				})
 			},
+			getGoods: function(item) {
 
-			async appLocation() {
+				graphicLstApi(this.where).then(res => {
+					this.cateGoods.push(...res.data.list)
+					if (res.data.list.length < this.where.limit) this.status = 'nomore'
 
+					if (this.where.page == 1 && res.data.list.length <= 0) this.emptyShow = true
+
+					if (item) {
+
+						if (item.index == 1 && this.cateGoods[0]) {
+							uni.navigateTo({
+								// #ifdef MP || H5
+								url: `/pages/short_video/nvueSwiper/index?id=${this.cateGoods[0].community_id}`
+								// #endif
+								// #ifdef APP
+								url: `/pages/short_video/appSwiper/index?id=${this.cateGoods[0].community_id}`
+								// #endif
+							})
+						}
+					}
+
+				})
+			},
+			/*获取分类列表*/
+			async getCateList() {
+				const {
+					data
+				} = await getTopicList()
+				this.tabsData.list = [{
+					cate_name: "推荐",
+					category_id: 0
+				}, ...data]
+			},
+			tabsChange(item) {
+				this.cateGoods = []
+				this.where.category_id = item.category_id
+				this.emptyShow = false
+				this.where.page = 1
+				this.getGoods(item)
+				this.street_id = item.id
+				this.tabsData.tabsActive = item.index
+
+			},
+			selfLocation() {
+				if (uni.getStorageSync('loction') == true) {
+					this.isshow = false
+				} else {
+					this.isshow = true
+					uni.setStorageSync('loction', true);
+				}
 				uni.getLocation({
 					type: 'wgs84',
 					timeout: '10',
 					success: (res) => {
-
+						// console.log(res)
+						this.isshow = false
 						let latitude, longitude;
 						latitude = res.latitude.toString();
 						longitude = res.longitude.toString();
@@ -325,16 +542,11 @@
 							lat: latitude,
 							long: longitude
 						}).then(res => {
+							uni.setStorageSync('adress_location', res.data.address)
+							// that.$store.dispatch('setLocation', res.data)
+
 							this.street = res.data.address_component.street
-							this.town = res.data.address_reference.town.title
-							this.street_id = res.data.address_reference.town.id
-
-							Cache.set('ADRESS_LOCATION',
-								this.street + ','+ this.town+','+
-								this.street_id
-							)
-
-							this.getCloudShopMerId(this.street_id)
+							Cache.set('ADRESS_LOCATION', this.street)
 						}).catch(err => {
 							uni.showToast({
 								title: err,
@@ -343,7 +555,7 @@
 						})
 					},
 					fail: (err) => {
-
+						this.isshow = false
 						uni.showToast({
 							title: "获取定位超时",
 							icon: 'none',
@@ -353,90 +565,160 @@
 				});
 			},
 
-			selectPlce(e) {
-				this.street_id = e.value[1].code
-				this.town = e.value[1].name
-				this.getCloudShopMerId(e.value[1].code)
-
-			},
-			getCloudShopMerId(id) {
-				get_cloud_shop(id).then(res => {
-					res.data.length > 0 ? this.isYunCang = 1 : this.isYunCang = 0
-				})
-			},
-			navigat() {
-				uni.navigateTo({
-					url: '/pages/store/settledApply/settledApply'
-				})
-			},
-			gogogo(item) {
-				uni.navigateTo({
-					url: '/pages/news_details/index?id=' + item.article_id
-				})
-			},
-			go_shop() {
-				if (this.isYunCang == 0) {
-					return Toast('当前区域没有云仓库')
-				}
-				uni.navigateTo({
-					url: `/pages/nongKe/cloud_entrepot/index?street=${this.street_id}&town=${this.town}`
-				})
-				// uni.navigateTo({
-				//   url: '/pages/store/home/index?id=' + this.mer_id + '&LihaiYun=Lihai'
-				// })
-			},
-			async getArticle() {
-				let list = []
-				const {
-					data
-				} = await getArticleCategoryList()
-				data.map((item, index) => {
-					if (item.title !== '推荐') {
-						list.push(item)
+			/**
+			 * 设置手机通知权限
+			 */
+			setPermissions() {
+				// #ifdef APP-PLUS  
+				if (plus.os.name == 'Android') { // 判断是Android
+					var main = plus.android.runtimeMainActivity();
+					var pkName = main.getPackageName();
+					var uid = main.getApplicationInfo().plusGetAttribute("uid");
+					var NotificationManagerCompat = plus.android.importClass(
+						"android.support.v4.app.NotificationManagerCompat");
+					//android.support.v4升级为androidx
+					if (NotificationManagerCompat == null) {
+						NotificationManagerCompat = plus.android.importClass(
+							"androidx.core.app.NotificationManagerCompat");
 					}
-				})
-				this.tabsData.list = list
-				this.getArticleList(list[0].article_category_id)
-			},
-			async getArticleList(id) {
-				const {
-					data
-				} = await getArticleList(id)
-				this.articleList = data.list
-			},
-			// 点赞
-			giveStart(item) {
-				let status = item.status ? 0 : 1
-				// console.log('item', item);
-				graphicStartApi(item.community_id, {
-					status: status
-				}).then(res => {
-					Toast(res.message)
-					this.getArticleList()
-				})
-			},
-			tabsChange(item) {
-
-				this.getArticleList(item.article_category_id)
-				this.street_id = item.id
-				this.tabsData.tabsActive = item.index
-			},
-		},
-		onPullDownRefresh() {
-			uni.stopPullDownRefresh()
+					var areNotificationsEnabled = NotificationManagerCompat.from(main).areNotificationsEnabled();
+					// 未开通‘允许通知’权限，则弹窗提醒开通，并点击确认后，跳转到系统设置页面进行设置  
+					if (!areNotificationsEnabled) {
+						uni.showModal({
+							title: '通知权限开启提醒',
+							content: '您还没有开启通知权限，无法接受到消息通知，请前往设置！',
+							showCancel: false,
+							confirmText: '去设置',
+							success: function(res) {
+								if (res.confirm) {
+									var Intent = plus.android.importClass('android.content.Intent');
+									var Build = plus.android.importClass("android.os.Build");
+									//android 8.0引导  
+									if (Build.VERSION.SDK_INT >= 26) {
+										var intent = new Intent('android.settings.APP_NOTIFICATION_SETTINGS');
+										intent.putExtra('android.provider.extra.APP_PACKAGE', pkName);
+									} else if (Build.VERSION.SDK_INT >= 21) { //android 5.0-7.0  
+										var intent = new Intent('android.settings.APP_NOTIFICATION_SETTINGS');
+										intent.putExtra("app_package", pkName);
+										intent.putExtra("app_uid", uid);
+									} else { //(<21)其他--跳转到该应用管理的详情页  
+										intent.setAction(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
+										var uri = Uri.fromParts("package", mainActivity.getPackageName(),
+											null);
+										intent.setData(uri);
+									}
+									// 跳转到该应用的系统通知设置页  
+									main.startActivity(intent);
+								}
+							}
+						});
+					}
+				} else if (plus.os.name == 'iOS') { // 判断是ISO
+					var isOn = undefined;
+					var types = 0;
+					var app = plus.ios.invoke('UIApplication', 'sharedApplication');
+					var settings = plus.ios.invoke(app, 'currentUserNotificationSettings');
+					if (settings) {
+						types = settings.plusGetAttribute('types');
+						plus.ios.deleteObject(settings);
+					} else {
+						types = plus.ios.invoke(app, 'enabledRemoteNotificationTypes');
+					}
+					plus.ios.deleteObject(app);
+					isOn = (0 != types);
+					if (isOn == false) {
+						uni.showModal({
+							title: '通知权限开启提醒',
+							content: '您还没有开启通知权限，无法接受到消息通知，请前往设置！',
+							showCancel: false,
+							confirmText: '去设置',
+							success: function(res) {
+								if (res.confirm) {
+									var app = plus.ios.invoke('UIApplication', 'sharedApplication');
+									var setting = plus.ios.invoke('NSURL', 'URLWithString:', 'app-settings:');
+									plus.ios.invoke(app, 'openURL:', setting);
+									plus.ios.deleteObject(setting);
+									plus.ios.deleteObject(app);
+								}
+							}
+						});
+					}
+				}
+				// #endif  
+			}
 		}
 	}
 </script>
 
-<style lang="scss" scoped>
+<style lang="scss">
+	/deep/.color-lump {
+		display: none;
+	}
+
+	page {
+		background-color: #F4F7FE;
+
+		// background: linear-gradient(180deg, #FFFFFF 0%, #F6F6F6 100%);
+	}
+
+	.location {
+		background-color: #F6F6F6;
+		width: 680rpx;
+		height: 150rpx;
+		position: absolute;
+		top: 0;
+		z-index: 9999;
+		border-radius: 20rpx;
+		left: 50%;
+		margin-left: -340rpx;
+		margin-top: 80rpx;
+		padding-left: 20rpx;
+
+		.locationa {
+			font-size: 28rpx;
+			color: #000;
+			font-weight: 500;
+			margin-top: 30rpx;
+			margin-bottom: 15rpx;
+		}
+
+		.locationb {
+			font-size: 20rpx;
+			color: #5a5a5a;
+		}
+	}
+
 	.Circle_friends {
+		position: relative;
+		padding: 0 0 87.72rpx 0;
+
 		background: linear-gradient(180deg, #FFFFFF 0%, #F6F6F6 100%);
 	}
 
+
+	.sistbox {
+		transition: fadenum 3s;
+	}
+
+	@keyframes fadenum {
+		0% {
+			opacity: 0;
+		}
+
+		50% {
+			opacity: 1;
+		}
+
+		100% {
+			opacity: 0;
+		}
+	}
+
 	.bg-img {
 		position: absolute;
 		width: 100%;
 		height: 100%;
+
 		top: 0;
 		/* #ifdef MP || APP-PLUS */
 		z-index: -100;
@@ -457,20 +739,36 @@
 		}
 	}
 
+	.sitbox {
+		opacity: 1 !important;
+		background: #F84221 !important;
+	}
+
 	.site-box {
 		width: 100%;
-	/* #ifdef MP || APP-PLUS */
-	height: 170rpx;
-	/* #endif */
-	/* #ifdef H5 */
-	height: 120rpx;
+		/* #ifdef MP || APP-PLUS */
+		height: 160rpx;
+		/* #endif */
+		/* #ifdef H5 */
+		height: 120rpx;
 		/* #endif */
 		margin-bottom: 26.32rpx;
 		position: absolute;
 		top: 0rpx;
 		position: fixed;
 		z-index: 999;
-		padding-top: 30rpx;
+		/* #ifdef MP || APP-PLUS */
+		padding-top: 75rpx;
+		/* #endif */
+		/* #ifdef H5 */
+		padding-top: 25rpx;
+		/* #endif */
+		// background-color: #e5e5e5;
+		// opacity: 0;
+		/* 初始时设置元素不透明 */
+		transition: opacity 0.2s ease-in;
+		transition-delay: 1.5s;
+		transition: background 0.2s ease-in;
 		padding-right: 20rpx;
 
 		// 位置
@@ -478,6 +776,9 @@
 			color: #fff;
 			margin-right: 24.56rpx;
 			font-size: 30rpx;
+			opacity: 0;
+			transition: opacity 1s ease-in;
+			transition-delay: 1.5s;
 
 			.town_name {
 				margin-left: 21rpx;
@@ -485,108 +786,46 @@
 		}
 
 		.iconfont {
+
+			font-size: 30rpx;
 			font-size: 35.09rpx;
 		}
 	}
 
-	.shop_wrapper {
-		height: 192.98rpx;
+	.circle_friends_wrapper {
+		position: relative;
+
+		z-index: 2;
+	}
+
+	/deep/.u-tabs__wrapper__nav__line {
+		width: 46rpx;
+
+
+	}
+
+	/deep/.u-tabs__wrapper__nav__item {
+		padding: 0 0px;
+		padding-right: 10rpx;
+	}
+
+	.search_wrapper {
 		width: 694.74rpx;
 		margin: 0 auto;
-		display: flex;
-		justify-content: space-between;
-		margin-top: 0;
-
-		.l_yun {
-			width: 456.14rpx;
-			border-radius: 16rpx;
-			background-repeat: no-repeat;
-			background-size: cover;
-			overflow: hidden;
-			position: relative;
-			display: flex;
-			flex-direction: column;
-			align-items: center;
-
-			.text-name {
-				margin-top: 14.04rpx;
-				text-align: center;
-				color: #fff;
-				font-weight: bold;
-				font-size: 29.82rpx;
-
-				text {
-					font-size: 40.35rpx;
-				}
-			}
-
-			.yun_title {
-				color: #B24322;
-				background-color: #ffad99;
-				height: 56.14rpx;
-				clip-path: polygon(0% 0, 100% 0, 90% 100%, 0 100%);
-				text-align: center;
-				line-height: 56.14rpx;
-				padding: 0 31.58rpx 0 21.05rpx;
-				width: max-content;
-
-				.iconlihai {
-					font-size: 24.56rpx;
-					margin-left: 16rpx;
-				}
-			}
-
-			.text_cont {
-				position: absolute;
-				left: 21.05rpx;
-				bottom: 47.37rpx;
-				color: #7F1616;
-				font-weight: 700;
-				font-size: 31.58rpx;
-
-				.name_town {
-					font-size: 49.12rpx;
-				}
-			}
-		}
-
-		.r_lihai {
-			width: 217.54rpx;
-			height: 100%;
-			font-size: 35.09rpx;
-			padding-top: 28.07rpx;
-			text-align: center;
-			background-repeat: no-repeat;
-			background-size: cover;
-			box-sizing: border-box;
-			border-radius: 16rpx;
-			color: #fff;
-			font-weight: bold;
-
-			.title {
-				margin-top: 105.26rpx;
-			}
-		}
 	}
 
 	.tabs_wrapper {
-		width: 694.74rpx;
-		margin: 38.6rpx auto;
+		width: 720rpx;
+		margin: 0 auto;
 		margin-bottom: 21.05rpx;
+		// margin-left: -20rpx;
 
-		.title {
-			font-size: 31.58rpx;
-			font-weight: bold;
+	}
 
-			&::before {
-				content: '';
-				display: inline-block;
-				width: 3px;
-				height: 31.58rpx;
-				background-color: #F84221;
-				margin-right: 7.02rpx;
-			}
-		}
+	.empty_wrapper {
+		display: flex;
+		align-items: center;
+		justify-content: center;
 	}
 
 	.article_box {
@@ -642,90 +881,214 @@
 		}
 	}
 
-	.goods {
-		margin: 0 auto;
-		width: 694.74rpx;
-		display: flex;
-		flex-wrap: wrap;
-		justify-content: space-between;
+	.tabs_wrapper {
+		width: 723rpx;
+		margin: 0rpx auto;
+		margin-bottom: 21.05rpx;
 
-		.goods_item {
-			width: 342.11rpx;
-			height: 491.23rpx;
-			border-radius: 8px;
-			overflow: hidden;
-			background-color: #fff;
-			display: flex;
-			flex-direction: column;
-			margin-bottom: 10.53rpx;
+		.title {
+			font-size: 31.58rpx;
+			font-weight: bold;
 
-			.goods_img {
-				width: 100%;
-				height: 294.74rpx;
+			&::before {
+				content: '';
+				display: inline-block;
+				width: 3px;
+				height: 31.58rpx;
+				background-color: #F84221;
+				margin-right: 7.02rpx;
 			}
-
-			.botm {
-				flex: 1;
-				padding: 0 14.04rpx;
-				padding-bottom: 21.05rpx;
-				display: flex;
-				flex-direction: column;
-				justify-content: space-between;
-
-				.title {
-					margin: 12px 0;
-					width: 100%;
-					overflow: hidden;
-					text-overflow: ellipsis;
-					display: -webkit-box;
-					-webkit-line-clamp: 2;
-					-webkit-box-orient: vertical;
-				}
-
-				.goods_info {
-					justify-content: space-between;
-
-					.g_img {
-						width: 60rpx;
-						height: 60rpx;
-						border-radius: 50%;
-					}
-
-					.g_name {
-						margin-left: 8.77rpx;
-						width: 100.63rpx;
-						text-overflow: ellipsis;
-						/* 溢出显示省略号 */
-						overflow: hidden;
-						/* 溢出隐藏 */
-						white-space: nowrap;
-						/* 强制不换行 */
-					}
-
-					.nice_box {
-						display: flex;
-						align-items: center;
-
-						.isshow {
-							color: #FE3530 !important;
-						}
-
-						.iconfont {
-							font-size: 30rpx;
-						}
-
-						.icon-shoucang1 {
-							color: #F84221;
-						}
-
-						.collect {
-							font-size: 24rpx;
-							margin-left: 5rpx;
-						}
-					}
-				}
-			}
-
 		}
 	}
+
+	.list {
+		display: flex;
+		padding: 12rpx;
+		justify-content: space-between;
+
+		.list-m {
+			width: 356rpx;
+			height: 235rpx;
+			position: relative;
+
+			.list-title {
+				display: flex;
+				position: absolute;
+				top: 0;
+
+				.list-titlea {
+					margin-top: 10rpx;
+					margin-left: 14rpx;
+					width: 96rpx;
+					height: 117rpx;
+					margin-right: 11rpx;
+					position: relative;
+
+					.titlea-con {
+						position: absolute;
+						top: 20rpx;
+						color: #F4F7FE;
+
+						.titlea {
+							font-size: 5rpx;
+							font-family: PingFang SC-Semibold, PingFang SC;
+						}
+
+						.titleb {
+							margin-top: 10rpx;
+							font-size: 37rpx;
+							font-family: PingFang SC-Semibold, PingFang SC;
+							font-weight: 600;
+							color: #FFFFFF;
+							margin-left: 15rpx;
+						}
+					}
+
+
+					image {
+						width: 100%;
+						height: 100%;
+					}
+				}
+
+				.list-titleb {
+
+					.titlea {
+
+						font-size: 37rpx;
+						font-family: PingFang SC-Semibold, PingFang SC;
+						font-weight: 600;
+						color: #FFFFFF;
+						margin-top: 10rpx;
+
+					}
+
+					.titleb {
+						margin-top: 5rpx;
+						font-size: 33rpx;
+						font-family: PingFang SC-Medium, PingFang SC;
+						font-weight: 500;
+						color: #FFFFFF;
+
+					}
+				}
+			}
+
+			.list-title-info {
+				
+				padding: 2rpx 2rpx;
+				display: flex;
+				font-size: 10rpx;
+				background: #FFFFFF;
+				border-radius: 19rpx 19rpx 19rpx 19rpx;
+				position: absolute;
+				bottom: 14rpx;
+				left:100rpx ;
+				padding-left:15rpx ;
+			}
+
+			image {
+				width: 100%;
+				height: 100%;
+			}
+		}
+	}
+
+	.list-con {
+		display: flex;
+		justify-content: space-between;
+		margin-top: -10rpx;
+		padding: 12rpx;
+
+		.list-con-left {
+			width: 356rpx;
+			height: 482rpx;
+			position: relative;
+
+			.list-con-title {
+				position: absolute;
+				top: 0;
+				z-index: 10;
+				padding-left: 14rpx;
+
+				.con-titlea {
+					font-size: 37rpx;
+					font-family: PingFang SC-Semibold, PingFang SC;
+					font-weight: 600;
+					color: #FFFFFF;
+					margin-top: 10rpx;
+
+				}
+
+				.con-titleb {
+					margin-top: 5rpx;
+					font-size: 33rpx;
+					font-family: PingFang SC-Medium, PingFang SC;
+					font-weight: 500;
+					color: #FFFFFF;
+				}
+			}
+
+			image {
+				width: 100%;
+				height: 100%;
+			}
+		}
+
+		.list-con-right {
+			width: 356rpx;
+
+			.con-right {
+				width: 356rpx;
+				height: 235rpx;
+				position: relative;
+
+				.list-con-title {
+					position: absolute;
+					top: 0;
+					z-index: 10;
+					padding-left: 14rpx;
+
+					.con-titlea {
+						font-size: 37rpx;
+						font-family: PingFang SC-Semibold, PingFang SC;
+						font-weight: 600;
+						color: #FFFFFF;
+						margin-top: 10rpx;
+
+					}
+
+					.con-titleb {
+						margin-top: 5rpx;
+						font-size: 33rpx;
+						font-family: PingFang SC-Medium, PingFang SC;
+						font-weight: 500;
+						color: #FFFFFF;
+					}
+				}
+
+				image {
+					width: 100%;
+					height: 100%;
+				}
+			}
+		}
+	}
+
+	.list-bon {
+		width: 724rpx;
+		height: 128rpx;
+		margin: 0 auto;
+		margin-bottom: 12rpx;
+
+		image {
+			width: 100%;
+			height: 100%;
+		}
+	}
+
+	.goodslist {
+		margin: 0 auto;
+		width: 725rpx;
+	}
 </style>
\ No newline at end of file
diff --git a/static/images/f1.png b/static/images/f1.png
new file mode 100644
index 0000000..36f6686
Binary files /dev/null and b/static/images/f1.png differ
diff --git a/static/images/f2.png b/static/images/f2.png
new file mode 100644
index 0000000..73b7c43
Binary files /dev/null and b/static/images/f2.png differ
diff --git a/static/images/f3.png b/static/images/f3.png
new file mode 100644
index 0000000..7aa79f3
Binary files /dev/null and b/static/images/f3.png differ
diff --git a/static/images/f4.png b/static/images/f4.png
new file mode 100644
index 0000000..5745107
Binary files /dev/null and b/static/images/f4.png differ
diff --git a/static/images/f5.png b/static/images/f5.png
new file mode 100644
index 0000000..2bb8854
Binary files /dev/null and b/static/images/f5.png differ
diff --git a/static/images/f6.png b/static/images/f6.png
new file mode 100644
index 0000000..c61178a
Binary files /dev/null and b/static/images/f6.png differ
diff --git a/static/images/f7.png b/static/images/f7.png
new file mode 100644
index 0000000..3e8545c
Binary files /dev/null and b/static/images/f7.png differ
diff --git a/static/images/p8.png b/static/images/p8.png
new file mode 100644
index 0000000..fc71d4a
Binary files /dev/null and b/static/images/p8.png differ
diff --git a/static/images/p9.png b/static/images/p9.png
new file mode 100644
index 0000000..ca1eeb2
Binary files /dev/null and b/static/images/p9.png differ
diff --git a/static/images/you.png b/static/images/you.png
new file mode 100644
index 0000000..7dddb9b
Binary files /dev/null and b/static/images/you.png differ