diff --git a/App.vue b/App.vue
index 05c6e1a..088d48f 100644
--- a/App.vue
+++ b/App.vue
@@ -10,7 +10,7 @@
 	// +----------------------------------------------------------------------
 	// #ifdef APP-PLUS
 	let jpushModule = uni.requireNativePlugin("JG-JPush");
-  const mp = uni.requireNativePlugin('uniMP');
+    const mp = uni.requireNativePlugin('uniMP');
 	// #endif  
 	import {
 		checkLogin
diff --git a/api/community.js b/api/community.js
index 53e01e5..fe9ec77 100644
--- a/api/community.js
+++ b/api/community.js
@@ -82,11 +82,16 @@ export function videoList(data) {
 	});
 }
 /**自己的视频列表*/
+export function deoList(id) {
+	return request.get(`community/show/${id}`);
+}
+
 export function myVideoList(id,data) {
 	return request.get(`community/user/community_video/${id}`, data, {
 		noAuth: true
 	});
 }
+
 /**文章点赞*/
 export function graphicStartApi(id, status) {
 	return request.post(`community/start/${id}`, status);
diff --git a/api/product.js b/api/product.js
index 002e2d7..547c66e 100644
--- a/api/product.js
+++ b/api/product.js
@@ -13,6 +13,13 @@ import request from "@/utils/request.js";
  * 获取商品详情
  */
 export const getProductDetailsAPI = (data) => request.get('micro/product_details', data)
+
+/**
+ *商品列表
+ */
+export const spuInfo = (id,data) => request.get('product/spu/street/'+id, data)
+
+
 /**
  * 线下导入
  */
diff --git a/api/store.js b/api/store.js
index 59a5c06..73d54da 100644
--- a/api/store.js
+++ b/api/store.js
@@ -5,14 +5,14 @@ import request from "@/utils/request.js";
  * 
  */
 export function microSeachBarCode(data) {
-  return request.get('micro/seach_bar_code', data);
+	return request.get('micro/seach_bar_code', data);
 }
 /**
  * 获取收款二维码
  * @returns {*}
  */
 export function createtApi(data) {
-  return request.post('v2/micropay/create', data);
+	return request.post('v2/micropay/create', data);
 }
 
 /**
@@ -20,7 +20,7 @@ export function createtApi(data) {
  * @returns {*}
  */
 export function addCartApi(data) {
-  return request.post('v2/micropay/addCart', data);
+	return request.post('v2/micropay/addCart', data);
 }
 /**
  * 获取产品详情
@@ -28,9 +28,9 @@ export function addCartApi(data) {
  * 
  */
 export function getProductDetail(id, data) {
-  return request.get('store/product/detail/' + id, data, {
-    noAuth: true
-  });
+	return request.get('store/product/detail/' + id, data, {
+		noAuth: true
+	});
 }
 /**
  * 获取预览商品详情
@@ -38,16 +38,16 @@ export function getProductDetail(id, data) {
  * 
  */
 export function getPreviewProDetail(data) {
-  return request.get('store/product/preview', data, {
-    noAuth: true
-  });
+	return request.get('store/product/preview', data, {
+		noAuth: true
+	});
 }
 /**
  * 产品分享二维码 推广员
  * @param int id
  */
 export function getProductCode(id, data) {
-  return request.get('store/product/qrcode/' + id, data);
+	return request.get('store/product/qrcode/' + id, data);
 }
 /**
  * 添加收藏
@@ -55,7 +55,7 @@ export function getProductCode(id, data) {
  * @param string category product=普通产品,product_seckill=秒杀产品
  */
 export function collectAdd(data) {
-  return request.post('user/relation/create', data);
+	return request.post('user/relation/create', data);
 }
 /**
  * 删除收藏产品
@@ -63,14 +63,14 @@ export function collectAdd(data) {
  * @param string category product=普通产品,product_seckill=秒杀产品
  */
 export function collectDel(data) {
-  return request.post('user/relation/delete', data);
+	return request.post('user/relation/delete', data);
 }
 /**
  * 购车添加
  * 
  */
 export function postCartAdd(data) {
-  return request.post('user/cart/create', data);
+	return request.post('user/cart/create', data);
 }
 
 /**
@@ -78,73 +78,73 @@ export function postCartAdd(data) {
  * 
  */
 export function getCategoryList() {
-  return request.get('store/product/category/lst', {}, {
-    noAuth: true
-  });
+	return request.get('store/product/category/lst', {}, {
+		noAuth: true
+	});
 }
 /**
  * 获取产品列表
  * @param object data
  */
 export function getProductslist(data) {
-  if (data.brand_id && Array.isArray(data.brand_id)) {
-    data = {
-      ...data
-    }
-    data.brand_id = data.brand_id.toString()
-  }
-  return request.get('product/spu/lst', data, {
-    noAuth: true
-  });
+	if (data.brand_id && Array.isArray(data.brand_id)) {
+		data = {
+			...data
+		}
+		data.brand_id = data.brand_id.toString()
+	}
+	return request.get('product/spu/lst', data, {
+		noAuth: true
+	});
 }
 /**
  * 获取优惠券商品列表
  * @param object data
  */
 export function getCouponProductlist(data) {
-  if (data.brand_id && Array.isArray(data.brand_id)) {
-    data = {
-      ...data
-    }
-    data.brand_id = data.brand_id.toString()
-  }
-  return request.get('product/spu/coupon_product', data, {
-    noAuth: true
-  });
+	if (data.brand_id && Array.isArray(data.brand_id)) {
+		data = {
+			...data
+		}
+		data.brand_id = data.brand_id.toString()
+	}
+	return request.get('product/spu/coupon_product', data, {
+		noAuth: true
+	});
 }
 /**
  * 获取品牌列表
  * @param object data
  */
 export function getBrandlist(data) {
-  return request.get('store/product/brand/lst', data, {
-    noAuth: true
-  });
+	return request.get('store/product/brand/lst', data, {
+		noAuth: true
+	});
 }
 /**
  * 获取推荐产品
  * 
  */
 export function getProductHot(page, limit) {
-  return request.get("product/spu/recommend", {
-    page: page === undefined ? 1 : page,
-    limit: limit === undefined ? 10 : limit
-  }, {
-    noAuth: true
-  });
+	return request.get("product/spu/recommend", {
+		page: page === undefined ? 1 : page,
+		limit: limit === undefined ? 10 : limit
+	}, {
+		noAuth: true
+	});
 }
 /**
  * 获取商户推荐产品
  * 
  */
 export function getMerProductHot(id, data) {
-  return request.get(`product/spu/recommend`, {
-    page: data.page === undefined ? 1 : data.page,
-    limit: data.limit === undefined ? 10 : data.limit,
-    mer_id: id || ''
-  }, {
-    noAuth: true
-  });
+	return request.get(`product/spu/recommend`, {
+		page: data.page === undefined ? 1 : data.page,
+		limit: data.limit === undefined ? 10 : data.limit,
+		mer_id: id || ''
+	}, {
+		noAuth: true
+	});
 }
 /**
  * 批量收藏
@@ -153,7 +153,7 @@ export function getMerProductHot(id, data) {
  * @param string category 
  */
 export function collectAll(data) {
-  return request.post('user/relation/batch/create', data);
+	return request.post('user/relation/batch/create', data);
 }
 /**
  * 首页产品的轮播图和产品信息
@@ -161,23 +161,23 @@ export function collectAll(data) {
  * 
  */
 export function getGroomList(type, data) {
-  return request.get('product/spu/hot/' + type, data, {
-    noAuth: true
-  });
+	return request.get('product/spu/hot/' + type, data, {
+		noAuth: true
+	});
 }
 /**
  * 获取商品收藏列表
  * @param object data
  */
-export function getCollectUserList(data) {				
-  return request.get('user/relation/product/lst', data)
+export function getCollectUserList(data) {
+	return request.get('user/relation/product/lst', data)
 }
 /**
  * 获取商品收藏列表 -- 删除
  * @param object data
  */
 export function userCollectDel(data) {
-  return request.post('user/relation/batch/delete', data)
+	return request.post('user/relation/batch/delete', data)
 }
 /**
  * 获取产品评论
@@ -186,43 +186,43 @@ export function userCollectDel(data) {
  * 
  */
 export function getReplyList(id, data) {
-  return request.get('store/product/reply/lst/' + id, data, {
-    noAuth: true
-  })
+	return request.get('store/product/reply/lst/' + id, data, {
+		noAuth: true
+	})
 }
 /**
  * 产品评价数量和好评度
  * @param int id
  */
 export function getReplyConfig(id) {
-  return request.get('reply/config/' + id);
+	return request.get('reply/config/' + id);
 }
 /**
  * 获取搜索关键字获取
  * 
  */
 export function getSearchKeyword() {
-  return request.get('common/hot_keyword', {}, {
-    noAuth: true
-  });
+	return request.get('common/hot_keyword', {}, {
+		noAuth: true
+	});
 }
 /**
  * 门店列表
  * @returns {*}
  */
 export function storeListApi(data) {
-  return request.get("store_list", data, {
-    noAuth: true
-  });
+	return request.get("store_list", data, {
+		noAuth: true
+	});
 }
 /**
  * 商户列表
  * @returns {*}
  */
 export function storeMerchantList(data) {
-  return request.get("store/merchant/lst", data, {
-    noAuth: true
-  });
+	return request.get("store/merchant/lst", data, {
+		noAuth: true
+	});
 }
 /**
  * 获取商铺详情
@@ -230,9 +230,9 @@ export function storeMerchantList(data) {
  * @param {Object} data 商铺数据
  */
 export function getStoreDetail(id, data) {
-  return request.get("store/merchant/detail/" + id, data, {
-    noAuth: true
-  });
+	return request.get("store/merchant/detail/" + id, data, {
+		noAuth: true
+	});
 }
 /**
  * 获取商铺商品列表
@@ -240,9 +240,9 @@ export function getStoreDetail(id, data) {
  * @param {Object} data 商铺商品列表数据
  */
 export function getStoreGoods(id, data) {
-  return request.get("product/spu/merchant/" + id, data, {
-    noAuth: true
-  });
+	return request.get("product/spu/merchant/" + id, data, {
+		noAuth: true
+	});
 }
 /**
  * 获取商铺分类列表
@@ -250,77 +250,77 @@ export function getStoreGoods(id, data) {
  * @param {Object} data
  */
 export function getStoreCategory(id, data) {
-  return request.get("store/merchant/category/lst/" + id, data, {
-    noAuth: true
-  });
+	return request.get("store/merchant/category/lst/" + id, data, {
+		noAuth: true
+	});
 }
 /**
  * 关注商铺
  * @param {Object} type_id 商铺 id
  */
 export function followStore(type_id) {
-  return request.post("user/relation/create", {
-    type: 10,
-    type_id: type_id
-  });
+	return request.post("user/relation/create", {
+		type: 10,
+		type_id: type_id
+	});
 }
 /**
  * 取消商铺关注
  * @param {Object} type_id 商铺 id
  */
 export function unfollowStore(type_id) {
-  return request.post("user/relation/delete", {
-    type: 10,
-    type_id: type_id
-  });
+	return request.post("user/relation/delete", {
+		type: 10,
+		type_id: type_id
+	});
 }
 /**
  * 获取商铺优惠券
  * @param {Object} id
  */
 export function getStoreCoupon(id) {
-  return request.get("coupon/store/" + id, {
-    noAuth: true
-  });
+	return request.get("coupon/store/" + id, {
+		noAuth: true
+	});
 }
 /**
  * 获取商铺优惠券
  */
 export function getMerchantLst(data) {
-  return request.get("user/relation/merchant/lst", data, {
-    noAuth: true
-  });
+	return request.get("user/relation/merchant/lst", data, {
+		noAuth: true
+	});
 }
 /**
  * 物流信息
  */
 export function express(id) {
-  return request.post("ordero/express/" + id, {
-    noAuth: true
-  });
+	return request.post("ordero/express/" + id, {
+		noAuth: true
+	});
 }
 /**
  * 子集分类
  * @returns {*}
  */
 export function storeCategory(pid) {
-  return request.get("store/product/category", pid, {
-    noAuth: true
-  });
+	return request.get("store/product/category", pid, {
+		noAuth: true
+	});
 }
 /**
  * 分销说明
  * @returns {*}
  */
 export function bagExplain() {
-  return request.get("store/product/bag/explain");
+	return request.get("store/product/bag/explain");
 }
 /**
  * 分销礼包推荐列表
  * @returns {*}
  */
 export function bagRecommend() {
-  return request.get("product/spu/bag/recommend");
+	return request.get("product/spu/bag/recommend");
 }
 /**
  * 分销礼包列表
@@ -328,56 +328,56 @@ export function bagRecommend() {
  */
 export function productBag(data) {
 
-  return request.get("product/spu/bag", data, {
-    noAuth: true
-  });
+	return request.get("product/spu/bag", data, {
+		noAuth: true
+	});
 }
 /**
  * 商铺二维码
  * @returns {*}
  */
 export function merchantQrcode(id, data) {
-  return request.get("store/merchant/qrcode/" + id, data, {
-    noAuth: true
-  });
+	return request.get("store/merchant/qrcode/" + id, data, {
+		noAuth: true
+	});
 }
 /**
  * 推荐商品
  * @returns {*}
  */
 export function merchantProduct(id, data) {
-  if (data.brand_id && Array.isArray(data.brand_id)) {
-    data = {
-      ...data
-    }
-    data.brand_id = data.brand_id.toString()
-  }
-  return request.get("product/spu/merchant/" + id, data, {
-    noAuth: true
-  });
+	if (data.brand_id && Array.isArray(data.brand_id)) {
+		data = {
+			...data
+		}
+		data.brand_id = data.brand_id.toString()
+	}
+	return request.get("product/spu/merchant/" + id, data, {
+		noAuth: true
+	});
 }
 /**
  * 推荐商品banner
  * @returns {*}
  */
 export function getHotBanner(type) {
-  return request.get("common/hot_banner/" + type, {}, {
-    noAuth: true
-  });
+	return request.get("common/hot_banner/" + type, {}, {
+		noAuth: true
+	});
 }
 /**
  * 商户入驻表单
  * @returns {*}
  */
 export function create(data) {
-  return request.post("intention/create", data);
+	return request.post("intention/create", data);
 }
 /**
  * 商户入驻短信验证码
  * @returns {*}
  */
 export function verify(data) {
-  return request.post("auth/verify", data);
+	return request.post("auth/verify", data);
 }
 /**
  * 获取秒杀商品详情
@@ -385,36 +385,36 @@ export function verify(data) {
  * 
  */
 export function getSeckillProductDetail(id) {
-  return request.get('store/product/seckill/detail/' + id, {}, {
-    noAuth: true
-  });
+	return request.get('store/product/seckill/detail/' + id, {}, {
+		noAuth: true
+	});
 }
 /**
  * 直播推荐列表
  * @returns {*}
  */
 export function getLiveList(data) {
-  return request.get(`broadcast/hot`, data, {
-    noAuth: true
-  });
+	return request.get(`broadcast/hot`, data, {
+		noAuth: true
+	});
 }
 /**
  * 直播列表
  * @returns {*}
  */
 export function getBroadcastListApi(data) {
-  return request.get("broadcast/lst", data, {
-    noAuth: true
-  });
+	return request.get("broadcast/lst", data, {
+		noAuth: true
+	});
 }
 /**
  * 商户分类
  * @returns {*}
  */
 export function merClassifly() {
-  return request.get("intention/cate", {}, {
-    noAuth: true
-  });
+	return request.get("intention/cate", {}, {
+		noAuth: true
+	});
 }
 /**
  * 获取预售商品详情
@@ -422,9 +422,9 @@ export function merClassifly() {
  * 
  */
 export function getPresellProductDetail(id) {
-  return request.get('store/product/presell/detail/' + id, {}, {
-    noAuth: true
-  });
+	return request.get('store/product/presell/detail/' + id, {}, {
+		noAuth: true
+	});
 }
 /**
  * 获取商户申请记录
@@ -432,7 +432,7 @@ export function getPresellProductDetail(id) {
  * 
  */
 export function getApplicationRecordList(data) {
-  return request.get('intention/lst', data);
+	return request.get('intention/lst', data);
 }
 /**
  * 获取商户申请详情
@@ -440,7 +440,7 @@ export function getApplicationRecordList(data) {
  * 
  */
 export function getGoodsDetails(id) {
-  return request.get('intention/detail/' + id, {});
+	return request.get('intention/detail/' + id, {});
 }
 
 /**
@@ -449,7 +449,7 @@ export function getGoodsDetails(id) {
  * 
  */
 export function updateGoodsRecord(id, data) {
-  return request.post('intention/update/' + id, data);
+	return request.post('intention/update/' + id, data);
 }
 /**
  * 获取定位详细地址
@@ -457,9 +457,9 @@ export function updateGoodsRecord(id, data) {
  * 
  */
 export function getGeocoder(data) {
-  return request.get(`lbs/geocoder?location=${data.lat},${data.long}`, {}, {
-    noAuth: true
-  });
+	return request.get(`lbs/geocoder?location=${data.lat},${data.long}`, {}, {
+		noAuth: true
+	});
 }
 /**
  * 获取店铺类型
@@ -467,80 +467,109 @@ export function getGeocoder(data) {
  * 
  */
 export function getStoreTypeApi() {
-  return request.get('intention/type', {sift_store:0}, {
-    noAuth: true
-  });
+	return request.get('intention/type', {
+		sift_store: 0
+	}, {
+		noAuth: true
+	});
 }
 /**
  * 到货通知
  * 
  */
 export function arrivalNoticeApi(data) {
-  return request.post('store/product/increase_take', data);
+	return request.post('store/product/increase_take', data);
 }
 
 /*
   获取图片验证码
 */
 export function getCaptcha() {
-  return request.get('captcha');
+	return request.get('captcha');
 }
 
 /*
 	获取店铺资质
 */
 export function storeCertificate(data) {
-  return request.post(`store/certificate/${data.merId}`, data)
+	return request.post(`store/certificate/${data.merId}`, data)
 }
 /**
  * 本地服务列表
  * @returns {*}
  */
 export function storeServiceList(id, data) {
-  return request.get(`product/spu/local/${id}`, data, {
-    noAuth: true
-  });
+	return request.get(`product/spu/local/${id}`, data, {
+		noAuth: true
+	});
 }
 /**
  * 复制口令
  * @returns {*}
  */
 export function copyPasswordApi(data) {
-  return request.get(`product/spu/copy`, data, {
-    noAuth: true
-  });
+	return request.get(`product/spu/copy`, data, {
+		noAuth: true
+	});
 }
 /**
  * 口令搜索
  * @returns {*}
  */
 export function copyPasswordSearch(data) {
-  return request.get(`command/copy`, data, {
-    noAuth: true
-  });
+	return request.get(`command/copy`, data, {
+		noAuth: true
+	});
 }
 /**
  * 套餐列表
  * @returns {*}
  */
 export function getDiscountsLst(data) {
-  return request.get(`discounts/lst`, data, {
-    noAuth: true
-  });
+	return request.get(`discounts/lst`, data, {
+		noAuth: true
+	});
 }
 /**
  * 套餐--立即购买
  * @returns {*}
  */
 export function discountsCartAdd(data) {
-  return request.post('user/cart/batchCreate', data);
+	return request.post('user/cart/batchCreate', data);
 }
 /**
  * 商品--价格说明
  * @returns {*}
  */
 export function priceRuleApi(id) {
-  return request.get(`store/product/price_rule/${id}`, {}, {
-    noAuth: true
-  });
+	return request.get(`store/product/price_rule/${id}`, {}, {
+		noAuth: true
+	});
+}
+/**
+ * 供销市场标签
+ * @returns {*}
+ */
+export function supMenuApi(data) {
+	return request.get('intention/cate', data);
+}
+/**
+ * 供销市场标签
+ * @returns {*}
+ */
+export function supAgoodsApi(data) {
+	return request.get('store/merchant/lst', data);
+}
+// /api/store / merchant / lst ? page = 1 & limit = 10 & order = & category_id = 22 & type_id = 10 & street_id = &
+// 	credit_buy =
+// /api/region/:street_id/merchant
+/**
+ * 附近商家
+ * @returns {*}
+ */
+// export function supAgoodsApi(data) {
+// 	return request.get('store/merchant/lst', data);
+// }
+export function vicinityStoreApi(data) {
+	return request.get(`region/${data}/merchant`);
 }
\ No newline at end of file
diff --git a/components/WaterfallsFlow/WaterfallsFlowo.vue b/components/WaterfallsFlow/WaterfallsFlowo.vue
new file mode 100644
index 0000000..561592e
--- /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()
+					}
+					
+				}
+			},
+			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..17461f6
--- /dev/null
+++ b/components/WaterfallsFlow/WaterfallsFlows.vue
@@ -0,0 +1,210 @@
+<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(){
+			
+			this.getUserInfo()
+		},
+
+        // 监听标记，当标记发生变化，则执行下一个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..d48faf1
--- /dev/null
+++ b/components/WaterfallsFlowItem/WaterfallsFlowItemo.vue
@@ -0,0 +1,206 @@
+<template>
+	<view class="wf-item-page" @click="gogogo(item)">
+
+		<image :src="item.image" mode="widthFix" class="item-img" />
+
+		<view class="title">{{item.store_name}}</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">
+				{{item.rate}}
+			</view>
+			<view class="relase-two">
+				{{item.reply_count}}评论
+			</view>
+		</view>
+		<view class="price">
+			<span>￥</span>{{item.price.split('.')[0]}}.<text>{{item.price.split('.')[1]}}</text>
+		</view>
+		<view class="item-info">
+			<view class="info-title" style="margin-right: 10rpx;">
+				{{item.merchant.mer_name}}
+			</view>
+			<view class="info-img">
+				<image src="@/static/images/you.png" mode="aspectFit"></image>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		props: {
+			item: {
+				type: Object,
+				require: true
+			}
+		},
+
+		methods: {
+			gogogo(item) {
+
+				uni.navigateTo({
+					url: '/pages/goods_details/index?id=' + item.product_id
+				})
+			},
+
+		}
+	}
+</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;
+		
+		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;
+		height: 26rpx;
+		line-height: 26rpx;
+		.relase-one {
+			// font-style: italic;
+			transform: skewX(-15deg);
+			font-size: 26rpx;
+			font-family: SF Pro Display-Regular Italic, SF Pro Display;
+			font-weight: 600;
+			color: #FF6D20;
+			
+		}
+
+		.relase-two {
+			font-size: 23rpx;
+			font-family: PingFang SC-Regular, PingFang SC;
+			font-weight: 500;
+			color: #B3B3B3;
+			margin-left: 13rpx;
+		}
+	}
+
+	.price {
+		margin-left: 21rpx;
+		margin-bottom: 10rpx;
+		color: #F84221;
+		font-size: 44rpx;
+		font-weight: 600;
+
+		span {
+			color: #F84221;
+			font-size: 30rpx;
+			font-weight: 500;
+		}
+
+		text {
+			color: #F84221;
+			font-size: 37rpx;
+			font-weight: 400;
+		}
+	}
+
+	.item-info {
+		margin-left: 21rpx;
+		margin-bottom: 25rpx;
+		display: flex;
+
+		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: 21rpx;
+			height: 21rpx;
+			margin-top: 5rpx;
+
+			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..7e8b621
--- /dev/null
+++ b/components/WaterfallsFlowItem/WaterfallsFlowItems.vue
@@ -0,0 +1,138 @@
+<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>
+	import {
+		getUserInfo
+	} from '@/api/user.js';
+	export default {
+		props: {
+			item: {
+				type: Object,
+				require: true
+			}
+		},
+
+
+
+		data() {
+			return {
+				user_id: ''
+			}
+		},
+
+		mounted() {
+			this.getUserInfo()
+		},
+
+
+		methods: {
+			/**
+			 * 获取个人用户信息
+			 */
+			getUserInfo: function() {
+				let that = this;
+				getUserInfo().then(res => {
+					this.user_id = res.data.uid
+				});
+			},
+			gogogo(item) {
+				if (item.video_link.length > 0) {
+					uni.navigateTo({
+						// #ifdef MP || H5
+						url: `/pages/short_video/nvueSwiper/index?id=${item.community_id}&uid=${this.user_id}&user=1`
+						// #endif
+						// #ifdef APP
+						url: `/pages/short_video/appSwiper/index?id=${item.community_id}&uid=${this.user_id}&user=1`
+						// #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/checkDelivery/index.vue b/components/checkDelivery/index.vue
index 706c71c..f906f0b 100644
--- a/components/checkDelivery/index.vue
+++ b/components/checkDelivery/index.vue
@@ -9,9 +9,10 @@
 					<view class="close" @click="closeShowBox"><text class="iconfont icon-guanbi"></text></view>
 				</view>
 				<view class="box">
-					<view class="check-item" v-for="(item,index) in radioList" :key="index" :class="{on:index == radioIndex}">
+					<view class="check-item" v-for="(item,index) in radioList" :key="index"
+						:class="{on:index == radioIndex}">
 						<view>{{item.title}}</view>
-						<view class="radio" @click="bindCheck(item,index)"> 
+						<view class="radio" @click="bindCheck(item,index)">
 							<block v-if="index == newData.order.isTake">
 								<view class="iconfont icon-xuanzhong1"></view>
 							</block>
@@ -39,77 +40,79 @@
 	// +----------------------------------------------------------------------
 	// | Author: CRMEB Team <admin@crmeb.com>
 	// +----------------------------------------------------------------------
-	import { mapGetters } from "vuex";
-	export default{
-		name:'checkDelivery',
-		props:{
-			isShowBox:{
-				type:Boolean,
-				default:false
+	import {
+		mapGetters
+	} from "vuex";
+	export default {
+		name: 'checkDelivery',
+		props: {
+			isShowBox: {
+				type: Boolean,
+				default: false
 			},
-			activeObj:{
-				type:Object,
-				default:function(){
+			activeObj: {
+				type: Object,
+				default: function() {
 					return {}
 				}
 			},
-			deliveryName:{
-				type:String,
-				default:'快递配送'
+			deliveryName: {
+				type: String,
+				default: '快递配送'
 			},
-			radioList:{
-				type:Array,
-				default: [
-					{
-						title:'快递配送',
-						check:true
+			radioList: {
+				type: Array,
+				default: [{
+						title: '快递配送',
+						check: true
 					},
 					{
-						title:'到店核销',
-						check:false
+						title: '到店核销',
+						check: false
 					}
 				],
 			},
 		},
 		computed: mapGetters(['viewColor']),
-		data(){
+		data() {
 			return {
-				radioIndex:0,
-				oldRadioIndex:'', //旧的索引
-				newData:{}
+				radioIndex: 0,
+				oldRadioIndex: '', //旧的索引
+				newData: {}
 			}
 		},
 		created() {
 			this.newData = JSON.parse(JSON.stringify(this.activeObj))
 		},
-		methods:{
+		methods: {
 			// 关闭配送方式弹窗
-			closeShowBox(){
+			closeShowBox() {
 				this.$emit('close')
 			},
 			// 选择配送方式
-			bindCheck(item,index){
+			bindCheck(item, index) {
 				this.newData.order.isTake = index
 			},
-			confirmBtn(){
-				this.$emit('confirmBtn',this.newData)
+			confirmBtn() {
+				this.$emit('confirmBtn', this.newData)
 			}
 		}
 	}
 </script>
 
 <style lang="scss">
-	.mask-box{
-		.bg{
+	.mask-box {
+		.bg {
 			z-index: 30;
 			position: fixed;
 			left: 0;
 			bottom: 0;
 			width: 100%;
 			height: 100%;
-			background: rgba(0,0,0,0.5);
+			background: rgba(0, 0, 0, 0.5);
 		}
-		.mask-content{
+
+		.mask-content {
 			z-index: 40;
 			position: fixed;
 			left: 0;
@@ -119,45 +122,54 @@
 			border-radius: 16rpx 16rpx 0 0;
 			transform: translate3d(0, 100%, 0);
 			transition: all .3s cubic-bezier(.25, .5, .5, .9);
-			.title-bar{
+
+			.title-bar {
 				position: relative;
 				text-align: center;
 				padding: 30rpx 0;
 				margin-bottom: 20rpx;
 				font-size: 32rpx;
 				color: #282828;
-				.close{
+
+				.close {
 					position: absolute;
 					right: 30rpx;
 					top: 50%;
 					transform: translateY(-50%);
-					.iconfont{
+
+					.iconfont {
 						color: #8A8A8A;
 					}
 				}
 			}
-			.box{
+
+			.box {
 				padding: 0 30rpx;
-				.check-item{
+
+				.check-item {
 					display: flex;
 					align-items: center;
 					justify-content: space-between;
 					height: 40rpx;
 					margin-bottom: 50rpx;
 					font-size: 28rpx;
-					.iconfont{
+
+					.iconfont {
 						font-size: 38rpx;
 						color: #CCCCCC;
-						&.icon-xuanzhong1{
+
+						&.icon-xuanzhong1 {
 							color: var(--view-theme);
 						}
 					}
 				}
 			}
-			.foot{
+
+			.foot {
 				padding: 15rpx 30rpx;
 				border-top: 1px solid #F5F5F5;
-				.btn{
+
+				.btn {
 					width: 100%;
 					height: 70rpx;
 					line-height: 70rpx;
@@ -168,9 +180,10 @@
 					background: var(--view-theme);
 				}
 			}
-		}	
+		}
 	}
+
 	.animated {
 		animation-duration: .3s
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/components/orderGoods/index.vue b/components/orderGoods/index.vue
index d670711..f1c4653 100644
--- a/components/orderGoods/index.vue
+++ b/components/orderGoods/index.vue
@@ -45,6 +45,7 @@
 										{{item.product_num - item.refund_num}}</view>
 									<view class='btn-item err' v-if="item.is_refund >1">已退款 x
 										{{item.product_num - item.refund_num}}</view>
+									
 									<view class='btn-item' v-if='item.is_reply==0 && evaluate==2 && item.is_refund==0'
 										@click.stop="evaluateTap(item.order_product_id,orderId)">去评价</view>
 									<view class='btn-item on' v-else-if="item.is_reply==1 && evaluate==2">已评价</view>
@@ -114,9 +115,8 @@
 						<view class="btn-item"
 							v-if="(item.is_refund ==0 && (evaluate != 10 && evaluate != 11) && orderData.refund_status || item.refund_num > 0)&& evaluate!=9 &&evaluate != 1&&evaluate !=4&& evaluate!=3 || evaluate==2"
 							@click.stop="refund(item)">申请退款</view>
-					
 						<view class='btn-item'
-							v-if='item.is_reply==0 && evaluate!=2&& evaluate!=3 && evaluate!=8&& evaluate!=9&& item.refund_num > 0'
+							v-if='item.is_reply==0 && evaluate!=2&& evaluate!=3&& evaluate!=7&& evaluate!=8&& evaluate!=9&& item.refund_num > 0'
 							@click.stop="evaluateTap(item.order_product_id,orderId)">去评价</view>
 						<view class='btn-item on' v-else-if="item.is_reply==1 && evaluate==2">已评价</view>
 					</view>
diff --git a/components/zbpSwiper.vue b/components/zbpSwiper.vue
index e9d0feb..dc15f5e 100644
--- a/components/zbpSwiper.vue
+++ b/components/zbpSwiper.vue
@@ -4,25 +4,23 @@
 		<view class="bg-img">
 			<img :src="bgColor" alt="">
 		</view>
-		<view class="" style="height: 40rpx;">
-			
-		</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> -->
+		</view>
 		<!-- 搜索栏 -->
 		<navigator url="/pages/columnGoods/goods_search/index" hover-class="none" class="search_content flex_a_c_j_sb">
 			<view class="flex_a_c">
 				<view class="iconfont icon-sousuo" style="font-size: 39rpx;"></view>
-				<input type="text" v-model="keyword" placeholder="搜索产品或店铺"  placeholder-style="font-size: 30rpx;" disabled>
+				<input type="text" v-model="keyword" placeholder="搜索产品或店铺" placeholder-style="font-size: 30rpx;"
+					disabled>
 			</view>
 			<button class="search_btn">搜索</button>
 		</navigator>
@@ -33,8 +31,7 @@
 				indicator-active-color="#fff">
 				<block v-for="(item,index) in swiper['url']" :key="index">
 					<swiper-item class="swi_item" @click="swiperClick(item)">
-						<u--image :showLoading="true" :src="item.img" width="724rpx" height="259rpx"
-							mode="aspectFill">
+						<u--image :showLoading="true" :src="item.img" width="724rpx" height="259rpx" mode="aspectFit">
 						</u--image>
 					</swiper-item>
 				</block>
@@ -73,12 +70,18 @@
 			location_Arr: {
 				type: Object,
 				default: () => ({})
-			}
+			},
+			town: {
+				type: String,
+				default: false
+			},
+
 		},
 		data() {
 			return {
 				defaInd: [0, 0],
 				street: '',
+
 				showPicker: false,
 				styleConfig: [],
 				columnData: [],
@@ -95,28 +98,29 @@
 					interval: 2000, // 自动切换时间间隔
 					duration: 400 // 滑动动画时长
 				},
+
 			}
 		},
 		watch: {
-			street: {
-				handler(newVal, oldVal) {
-					this.street = newVal
-				},
+			street(nval, val) {
+				this.street = nval
 			}
 		},
 
 		created() {
 
-
 			this.getBanner()
 			this.Area()
 
 		},
 
 		mounted() {
-			this.appLocation()
+			this.$bus.$on('value-updated', (newValue) => {
+				// 更新组件的值 
+				this.street = newValue.split(',')[0]
+			});
 		},
-	
+
 		methods: {
 			swiperClick(item) {
 				const url = item.info[1].value
@@ -128,44 +132,20 @@
 				this.isSelectPlace ? this.showPicker = true : ''
 
 			},
-			appLocation() {
-				uni.getLocation({
-					type: 'wgs84',
-					timeout: '10',
-					success: (res) => {
-						// console.log(res)
 
-						let latitude, longitude;
-						latitude = res.latitude.toString();
-						longitude = res.longitude.toString();
-						getGeocoder({
-							lat: latitude,
-							long: longitude
-						}).then(res => {
-							this.street = res.data.address_component.street
-							Cache.set('ADRESS_LOCATION', this.street)
-						}).catch(err => {
-							uni.showToast({
-								title: err,
-								icon: 'none'
-							})
-						})
-					},
-					fail: (err) => {
-
-						uni.showToast({
-							title: "获取定位超时",
-							icon: 'none',
-							duration: 2000
-						});
-					}
-				});
-			},
 			confirm(e) {
-				this.street = e.value[1].name
+
 				this.showPicker = false
 				this.$emit('selectPlce', e)
-				Cache.set('ADRESS_LOCATION', e.value[1].name)
+				this.$emit('change', e)
+				this.street = e.value[1].name
+				this.$nextTick(() => {
+				this.$bus.$emit('value-updated',e.value[1].name + ',' +e.value[1].code);
+				
+				})
+		
+					
+	
 			},
 			changeHandler(e) {
 				const {
@@ -206,9 +186,11 @@
 				} = e.detail;
 				if (source === 'autoplay' || source === 'touch') {
 					this.bgColor = this.swiper.url[e.detail.current]['img']
-					this.$emit('kkchange',this.bgColor)
+					this.$emit('kkchange', this.bgColor)
 				}
 			},
+
+
 			// 对象转数组
 			objToArr(data) {
 				let obj = Object.keys(data).sort();
@@ -237,7 +219,7 @@
 	}
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
 	.zbp-head-wrapper {
 		position: relative;
 		padding-top: 78.95rpx;
@@ -251,7 +233,7 @@
 			transform: translate(-50%, 0);
 			width: 102%;
 			height: 133px;
-		   border-radius: 30px 30px 0 0;
+			border-radius: 30px 30px 0 0;
 			background-color: #fff;
 		}
 
@@ -284,6 +266,8 @@
 			height: 66.67rpx;
 			margin-bottom: 26.32rpx;
 			position: relative;
+			z-index: 9999;
+
 
 			// 位置
 			.place_wrapper {
diff --git a/config/app.js b/config/app.js
index d98a31e..adddc06 100644
--- a/config/app.js
+++ b/config/app.js
@@ -9,11 +9,11 @@ let httpApiThree
 // 网络接口修改此字符 小程序域名要求https
 // let httpApi = 'http://192.168.31.110:8324' // 测试
 if (process.env.NODE_ENV === "development") {
-	   // httpApi = 'https://shop.lihaink.cn' // 生产
-       httpApi = "https://crmeb-test.shop.lihaink.cn"
+	// httpApi = 'https://shop.lihaink.cn' // 生产
+	httpApi = "https://crmeb-test.shop.lihaink.cn"
 	// httpApi = "http://192.168.0.222"
-	  // httpApi = "http://192.168.0.108:8325"
-	  // httpApi = 'http://192.168.0.108:8325'
+	// httpApi = "http://192.168.0.108:8325"
+	// httpApi = 'http://192.168.0.108:8325'
 	// #ifdef MP-WEIXIN
 	httpApiTwo = "https://nk.lihaink.cn"
 	httpApiThree = 'http://ceshi-oa.lihaink.cn'
diff --git a/main.js b/main.js
index 755bfea..304c9fe 100644
--- a/main.js
+++ b/main.js
@@ -23,7 +23,7 @@ Vue.prototype.$util = util;
 Vue.prototype.$Cache = Cache;
 Vue.prototype.$eventHub = new Vue();
 Vue.config.productionTip = false
-
+Vue.prototype.$bus = new Vue(); 
 // #ifdef H5
 import { parseQuery } from "./utils";
 import Auth from './libs/wechat';
diff --git a/manifest.json b/manifest.json
index a7ebb6d..43987aa 100644
--- a/manifest.json
+++ b/manifest.json
@@ -30,7 +30,8 @@
             "OAuth" : {},
             "UniMP" : {
                 "description" : "uni小程序"
-            }
+            },
+            "Maps" : {}
         },
         "safearea" : {
             "bottom" : {
@@ -94,8 +95,8 @@
             "sdkConfigs" : {
                 "maps" : {
                     "amap" : {
-                        "appkey_ios" : "",
-                        "appkey_android" : ""
+                        "appkey_ios" : "048d9f3f323eea894b49c3a7edbc8d87",
+                        "appkey_android" : "048d9f3f323eea894b49c3a7edbc8d87"
                     }
                 },
                 "payment" : {
diff --git a/pages.json b/pages.json
index 917f31d..1142d9f 100644
--- a/pages.json
+++ b/pages.json
@@ -95,15 +95,14 @@
 			}
 
 		}, {
-      "path" : "pages/moreProject/moreProject",
-      "style" :                                                                                    
-      {
-          "navigationBarTitleText": "更多功能",
-          "enablePullDownRefresh": false
-      }
-        
-    }
-    ],
+			"path": "pages/moreProject/moreProject",
+			"style": {
+				"navigationBarTitleText": "更多功能",
+				"enablePullDownRefresh": false
+			}
+
+		}
+	],
 	"subPackages": [{
 			"root": "pages/goods_cate",
 			"name": "goods_cate",
@@ -208,6 +207,33 @@
 						"navigationStyle": "custom"
 					}
 
+				}, {
+					"path": "supply_chain/supplierA",
+					"style": {
+						"enablePullDownRefresh": true,
+						"navigationBarTitleText": "",
+						"navigationBarBackgroundColor": "#e93323",
+						"navigationStyle": "custom"
+					}
+
+				}, 
+				{
+					"path": "supply_chain/suppliers",
+					"style": {
+						"enablePullDownRefresh": true,
+						"navigationBarTitleText": "",
+						"navigationBarBackgroundColor": "#e93323",
+						"navigationStyle": "custom"
+					}
+
+				}, {
+					"path": "supply_chain/maps",
+					"style": {
+						"navigationBarTitleText": "",
+						"navigationBarBackgroundColor": "#e93323",
+						"navigationStyle": "custom"
+					}
+
 				}, {
 					"path": "supply_chain/merchant",
 					"style": {
@@ -244,6 +270,14 @@
 						"navigationStyle": "custom"
 					}
 
+				}, {
+					"path": "specialty/index",
+					"style": {
+						"navigationBarTitleText": "名优特产",
+						"enablePullDownRefresh": false,
+						"navigationStyle": "custom"
+					}
+
 				}
 			]
 		},
@@ -713,13 +747,13 @@
 			"root": "pages/releaseManagement",
 			"name": "releaseManagement",
 			"pages": [{
-				"path": "index",
-				"style": {
-					"navigationBarTitleText": "发布管理",
-					"enablePullDownRefresh": false
-				}
+					"path": "index",
+					"style": {
+						"navigationBarTitleText": "发布管理",
+						"enablePullDownRefresh": false
+					}
 
-			},
+				},
 				{
 					"path": "details/index",
 					"style": {
@@ -727,7 +761,8 @@
 						"enablePullDownRefresh": false
 					}
 
-				}]
+				}
+			]
 		},
 		{
 			"root": "pages/commissionedSales",
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/columnGoods/goods_search_con/index.vue b/pages/columnGoods/goods_search_con/index.vue
index 9cf093b..cdd6ad6 100644
--- a/pages/columnGoods/goods_search_con/index.vue
+++ b/pages/columnGoods/goods_search_con/index.vue
@@ -559,9 +559,10 @@
 					limit: this.sotreParam.limit,
 					order: this.sotreParam.order,
 					category_id: this.sotreParam.category_id,
-					type_id: 10
+					type_id: this.sotreParam.type_id
 
 				}
+				console.log(this.sotreParam.category_id)
 				if (this.latitude) {
 					serachData.location = this.latitude + ',' + this.longitude
 				}
@@ -576,7 +577,7 @@
 					this.storeList = this.storeList.concat(res.data.list)
 					this.count = res.data.count
 					this.loading = false
-					console.log(this.storeList);
+				
 				})
 			},
 			// 店铺排序
@@ -682,6 +683,7 @@
 			},
 			// 组件确定
 			confirm2(data) {
+				
 				let arr1 = [],
 					arr2 = []
 				if (data.storeTypeArr.length == 0) {
diff --git a/pages/gather/gather.vue b/pages/gather/gather.vue
index 854967f..de3ef4b 100644
--- a/pages/gather/gather.vue
+++ b/pages/gather/gather.vue
@@ -1,497 +1,646 @@
 <template>
-	<view class="gather">
-		<view class="site-box flex_a_c_j_sb">
-			<view class="place_wrapper flex_a_c" >
-				<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" :location_Arr="locationArr" @kkchange='kkchange'></zbpSwiper>
-		<u-empty :show="jurisdiction" marginTop="80" mode="permission" :text="emptyText"
-			icon="http://cdn.uviewui.com/uview/empty/permission.png"></u-empty>
-    <block v-if="!jurisdiction">
-      <view class="business com special_work">
-        <view class="title project">
-          <view>更多功能</view>
-          <view class="edit" @click="editFlag = !editFlag">{{editFlag?'完成':'编辑'}}</view>
-        </view>
-        <view class="content">
-          <block v-if="nowMenuList.length>0">
-            <u-transition v-for="(item, index) in nowMenuList" :key="item.name" show>
-              <view class="examine" @click="editFlag?removeMenu(item):clickMenu(item.type, item.data)">
-                <image class="icon_img" :src="`${prefix}${item.icon}`" mode="aspectFill">
-                </image>
-                <u-icon v-if="editFlag" class="icon" name="minus-circle-fill" color="red"></u-icon>
-                <text class="text">{{item.name}}</text>
-              </view>
-            </u-transition>
-          </block>
-          <view v-else-if="!editFlag" @click="editFlag = true" style="text-align: center;width: 100%;color: #aaa;">还没有应用,点我添加应用</view>
+  <view class="gather">
+    <view @click="selectLocation" v-if="isFshow">
+      <view
+        class="site-box flex_a_c_j_sb"
+        :style="{ 'background-color': backColor }"
+      >
+        <view :class="['place_wrapper', 'flex_a_c', isFshow ? 'sitebox' : '']">
+          <view
+            :class="['iconfont', 'icon-weizhi', isFshow ? 'sitebox' : '']"
+            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', isFshow ? 'sitebox' : '']"
+            style="color: #fff"
+          ></view>
+        </navigator>
       </view>
-      <view v-if="editFlag" class="business com special_work edit_card">
-        <view class="title project" style="padding: 0 28rpx;">
-          <view>编辑功能</view>
-          <view class="edit2" @click="editComfirm">完成</view>
-        </view>
-        <view class="content">
-          <u-transition v-for="(item, index) in AllMenuList" :key="item.name" show>
-            <view class="examine" @click="pushMenu(item)">
-            	<image class="icon_img" :src="`${prefix}${item.icon}`" mode="aspectFill">
-            	</image>
-              <u-icon class="icon" name="plus-circle-fill"></u-icon>
-            	<text class="text">{{item.name}}</text>
+    </view>
+
+    <zbpSwiper
+      :isSelectPlace="true"
+      :location_Arr="locationArr"
+      :town="street"
+      @kkchange="kkchange"
+    ></zbpSwiper>
+    <u-empty
+      :show="jurisdiction"
+      mode="permission"
+      :text="emptyText"
+      icon="http://cdn.uviewui.com/uview/empty/permission.png"
+    ></u-empty>
+    <view class="business com special_work" v-if="jurisdiction == false">
+      <view class="title project">
+        <view>更多功能</view>
+        <view class="edit" @click="editFlag = !editFlag">{{
+          editFlag ? "完成" : "编辑"
+        }}</view>
+      </view>
+      <view class="content">
+        <block v-if="nowMenuList.length > 0">
+          <u-transition
+            v-for="(item, index) in nowMenuList"
+            :key="item.name"
+            show
+          >
+            <view
+              class="examine"
+              @click="
+                editFlag ? removeMenu(item) : clickMenu(item.type, item.data)
+              "
+            >
+              <image
+                class="icon_img"
+                :src="`${prefix}${item.icon}`"
+                mode="aspectFit"
+              >
+              </image>
+              <u-icon
+                v-if="editFlag"
+                class="icon"
+                name="minus-circle-fill"
+                color="red"
+              ></u-icon>
+              <text class="text">{{ item.name }}</text>
             </view>
           </u-transition>
-        </view>
+        </block>
+        <view
+          v-else-if="!editFlag"
+          @click="editFlag = true"
+          style="text-align: center; width: 100%; color: #aaa"
+          >还没有应用,点我添加应用</view
+        >
       </view>
-    </block>
-    
-		<view class="" v-if='jurisdiction==false&&isShow==false'>
-			<emptyPage title="暂无信息"></emptyPage>
-		</view>
+    </view>
+    <view v-if="editFlag" class="business com special_work edit_card">
+      <view class="title project" style="padding: 0 28rpx">
+        <view>编辑功能</view>
+        <view class="edit2" @click="editComfirm">完成</view>
+      </view>
+      <view class="content">
+        <u-transition
+          v-for="(item, index) in AllMenuList"
+          :key="item.name"
+          show
+        >
+          <view class="examine" @click="pushMenu(item)">
+            <image
+              class="icon_img"
+              :src="`${prefix}${item.icon}`"
+              mode="aspectFit"
+            >
+            </image>
+            <u-icon class="icon" name="plus-circle-fill"></u-icon>
+            <text class="text">{{ item.name }}</text>
+          </view>
+        </u-transition>
+      </view>
+    </view>
 
-	</view>
+    <view class="" v-if="jurisdiction == false && isShow == false">
+      <emptyPage title="暂无信息"></emptyPage>
+    </view>
+  </view>
 </template>
 
 <script>
-	import mTabbar from '@/components/m-tabbar/m-tabbar.vue'
-	import emptyPage from '@/components/emptyPage.vue';
-	import zbpSwiper from '@/components/zbpSwiper'
-	import {
-		mapState,
-		mapGetters
-	} from 'vuex'
-	import {
-		getWorkArticleCount,
-		getSlideAPI
-	} from '@/api/article.js'
-	import {
-		getStoreList,
-		getUserInfo
-	} from '@/api/user.js'
-	import {
-		getGeocoder,
-		microSeachBarCode,
-		microEadtProduct
-	} from '@/api/store.js'
-	import {
-		Toast
-	} from '@/libs/uniApi';
-	import {
-		getDiy
-	} from '@/api/api.js';
-  import uniMP from '@/utils/uniMP.js';
-	
-	export default {
-		components: {
-			mTabbar,
-			zbpSwiper,
-			emptyPage
-		},
-		data() {
-			return {
-				locationArr: ({}),
-				emptyText: '暂无可用应用',
-				jurisdiction: false, // 是否有权限
-				mer_id: '',
-				userInfoData: {
-					mer_info: {
-						type_id: 0
-					}
-				},
-				prefix: 'https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/11/',
-				isShow: false,
-				bgColor: '',
-				isFshow: false,
-				street:'',
-        // 编辑中标记
-        editFlag: false,
-        // 所有菜单的按钮
-        AllMenuList: [
-          {
-            name: '商户平台',
-            icon: 'spgl.png',
-            data: '/pages/moreProject/moreProject',
-            type: 2,
-          },
-          {
-            name: '供销平台',
-            icon: 'shsz.png',
-            data: '__UNI__B5B1EDD',
-            type: 1,
-          },
-        ],
-        nowMenuList: []
-			};
-		},
-		computed: {
-			...mapGetters(['userInfo', 'location', 'isLogin'])
-		},
-		created() {},
-		onLoad() {
-      this.initMenu();
+import Cache from '@/utils/cache';
+import mTabbar from '@/components/m-tabbar/m-tabbar.vue'
+import emptyPage from '@/components/emptyPage.vue';
+import zbpSwiper from '@/components/zbpSwiper'
+import {
+  getArea,
+  getStreet
+} from '@/api/article.js';
+import {
+  mapState,
+  mapGetters
+} from 'vuex'
+import {
+  getWorkArticleCount,
+  getSlideAPI
+} from '@/api/article.js'
+import {
+  getStoreList,
+  getUserInfo
+} from '@/api/user.js'
+import {
+  getGeocoder,
+  microSeachBarCode,
+  microEadtProduct
+} from '@/api/store.js'
+import {
+  Toast
+} from '@/libs/uniApi';
+import {
+  getDiy
+} from '@/api/api.js';
+import uniMP from '@/utils/uniMP.js';
+
+export default {
+  components: {
+    mTabbar,
+    zbpSwiper,
+    emptyPage
+  },
+  data () {
+    return {
+      locationArr: ({}),
+      emptyText: '暂无可用应用',
+      jurisdiction: false, // 是否有权限
+      mer_id: '',
+      userInfoData: {
+        mer_info: {
+          type_id: 0
+        }
+      },
+      prefix: 'https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/11/',
+      isShow: false,
+      bgColor: '',
+      isFshow: false,
+      street: '',
+      // 编辑中标记
+      editFlag: false,
+      // 所有菜单的按钮
+      AllMenuList: [{
+        name: '商户平台',
+        icon: 'spgl.png',
+        data: '/pages/moreProject/moreProject',
+        type: 2,
+      },
+      {
+        name: '供销平台',
+        icon: 'shsz.png',
+        data: '__UNI__B5B1EDD',
+        type: 1,
+      },
+      ],
+      nowMenuList: [],
+      street: '',
+      showPicker: false,
+      columnData: [],
+      bgColor: '',
+      isFshow: false,
+      backColor: 'rgba(248, 66, 33, 0)'
+    };
+  },
+  computed: {
+    ...mapGetters(['userInfo', 'location', 'isLogin'])
+  },
+  created () { },
+  onLoad () {
+    this.Area()
+    this.initMenu();
+  },
+
+  onShow () {
+    if (this.isLogin) {
+      this.emptyText = '暂无可用应用'
+      this.jurisdiction = false
+    } else {
+      this.emptyText = '请登录'
+      this.jurisdiction = true
+    }
+    this.getUserInfo()
+
+  },
+
+  onPullDownRefresh () {
+    this.getUserInfo()
+    uni.stopPullDownRefresh()
+  },
+  beforeDestroy () {
+    // 销毁监听事件
+    this.$bus.$off('value-updated')
+  },
+  mounted () {
+    if (this.street.length <= 0) {
+      this.appLocation()
+    }
+    // #ifdef  H5
+    // 监听页面滚动事件
+    window.addEventListener("scroll", this.scrolling);
+    // #endif
+
+    this.$bus.$on('value-updated', (newValue) => {
+      // 更新父组件的值 
+      this.street = newValue.split(',')[0]
+    });
+
+  },
+  // #ifdef APP-PLUS
+  onPageScroll (e) {
+    const scrollTop = e.scrollTop;
+    if (scrollTop <= 20) {
+      this.backColor = 'rgba(248, 66, 33, 0)'
+      this.isFshow = false
+    } else if (20 < scrollTop && scrollTop <= 100) {
+      this.backColor = 'rgba(248, 66, 33, .5)'
+      this.isFshow = true
+    } else if (scrollTop > 100) {
+      this.backColor = 'rgba(248, 66, 33, 1)'
+      this.isFshow = true
+
+
+    }
+
+  },
+  // #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 (scrollTop <= 20) {
+        this.backColor = 'rgba(248, 66, 33, 0)'
+        this.isFshow = false
+      } else if (20 < scrollTop && scrollTop <= 100) {
+        this.backColor = 'rgba(248, 66, 33, .5)'
+        this.isFshow = true
+      } else if (scrollTop > 100) {
+        this.backColor = 'rgba(248, 66, 33, 1)'
+        this.isFshow = true
+
+
+      }
+
+
+    },
+    // 初始化菜单
+    initMenu () {
+      let all = uni.getStorageSync('gatherAllMenuList');
+      let now = uni.getStorageSync('gatherNowMenuList');
+      if (all) {
+        this.AllMenuList = JSON.parse(all);
+      }
+      if (now) {
+        this.nowMenuList = JSON.parse(now);
+      }
+    },
+    clickMenu (e, data) {
+      switch (e) {
+        case 1:
+          this.getUniMp(data);
+          break;
+        case 2:
+          this.navigator(data);
+          break;
+      }
+    },
+    // 添加菜单
+    pushMenu (data) {
+      this.nowMenuList.push(data);
+      this.AllMenuList = this.AllMenuList.filter((item) => {
+        return item.name != data.name;
+      })
+    },
+    // 移除菜单
+    removeMenu (data) {
+      this.AllMenuList.push(data);
+      this.nowMenuList = this.nowMenuList.filter((item) => {
+        return item.name != data.name;
+      })
+    },
+    // 编辑完成
+    editComfirm () {
+      this.editFlag = false;
+      uni.setStorageSync('gatherAllMenuList', JSON.stringify(this.AllMenuList));
+      uni.setStorageSync('gatherNowMenuList', JSON.stringify(this.nowMenuList));
+    },
+    getUniMp (appid) {
+      console.log('点击供销平台');
+      // #ifdef APP-PLUS
+      uniMP.loadMP(appid);
+      return;
+      // #endif
+      uni.showToast({
+        icon: 'none',
+        title: 'H5不支持打开小程序'
+      })
+    },
+    changeHandler (e) {
+      const {
+        columnIndex,
+        value,
+        values,
+        index,
+        picker = this.$refs.uPicker
+      } = e;
+      if (columnIndex === 0) {
+        getStreet({
+          area_code: value[0]['code']
+        }).then(res => {
+          this.$refs.uPicker.setColumnValues(1, res.data);
+        });
+      }
     },
-		onShow() {
-			if (this.isLogin) {
-				this.emptyText = '暂无可用应用'
-				this.jurisdiction = false
-			} else {
-				this.emptyText = '请登录'
-				this.jurisdiction = true
-			}
-			this.getUserInfo()
-			this.appLocation()
-		},
-		onPullDownRefresh() {
-			this.getUserInfo()
-			uni.stopPullDownRefresh()
-		},
-		mounted() {
-			this.appLocation()
-			// #ifdef  H5
-// 监听页面滚动事件
-			window.addEventListener("scroll", this.scrolling);
-			// #endif
-		},
-		// #ifdef APP-PLUS
-		onPageScroll(e) {
-			// this.scrollTop = e.scrollTop;
-			console.log(e.scrollTop)
-			if (e.scrollTop > 0) {
-				this.isFshow = true
-			} else {
-				this.isFshow = false
-			}
 
-		},
-		// #endif
+    Area () {
+      getArea({
+        city_code: 510500
+      }).then(res => {
+        this.$refs.uPicker.setColumnValues(0, res.data);
+        this.Street(res.data[0]['code']);
+      });
+    },
+    Street (code) {
+      getStreet({
+        area_code: code
+      }).then(res => {
+        this.$refs.uPicker.setColumnValues(1, res.data);
+      });
+    },
+    selectLocation () {
+      this.showPicker = true
+    },
+    confirm (e) {
+      this.street = e.value[1].name
 
-		methods: {
-      // 初始化菜单
-      initMenu(){
-        let all = uni.getStorageSync('gatherAllMenuList');
-        let now = uni.getStorageSync('gatherNowMenuList');
-        if(all){
-          this.AllMenuList = JSON.parse(all);
+      this.$nextTick(() => {
+        this.$bus.$emit('value-updated', e.value[1].name + ',' + e.value[1].code);
+
+      })
+      this.showPicker = false
+    },
+    appLocation () {
+      uni.getLocation({
+        type: 'wgs84',
+        timeout: '10',
+        success: (res) => {
+          // console.log(res)
+
+          let latitude, longitude;
+          latitude = res.latitude.toString();
+          longitude = res.longitude.toString();
+          getGeocoder({
+            lat: latitude,
+            long: longitude
+          }).then(res => {
+            let town = res.data.address_reference.town.title
+            let street_id = res.data.address_reference.town.id
+            this.street = res.data.address_component.street
+            this.$nextTick(() => {
+              this.$bus.$emit('value-updated', this.street + ',' + street_id);
+
+            })
+
+          }).catch(err => {
+            uni.showToast({
+              title: err,
+              icon: 'none'
+            })
+          })
+        },
+        fail: (err) => {
+
+          uni.showToast({
+            title: "获取定位超时",
+            icon: 'none',
+            duration: 2000
+          });
         }
-        if(now){
-          this.nowMenuList = JSON.parse(now);
+      });
+    },
+
+
+    kkchange (e) {
+      this.bgColor = e
+    },
+
+    navigator (url, t) {
+      // if (this.userInfoData.is_wsxx === 0 && t != '商户设置') return Toast("请完善商户信息");
+      uni.navigateTo({
+        url: url
+      })
+    },
+    getUserInfo: function () {
+      let that = this;
+      getUserInfo().then(res => {
+        that.userInfoData = res.data;
+        // console.log(res.data.service);
+        if (res.data.service == null) {
+          // console.log('123');
+          this.isShow = false
+        } else {
+          this.isShow = true
+          this.mer_id = res.data.service.mer_id
         }
-      },
-      clickMenu(e, data){
-        switch(e){
-          case 1: this.getUniMp(data);break;
-          case 2: this.navigator(data);break;
+
+        if (!res.data.mer_info) {
+          that.$set(this, 'jurisdiction', false);
         }
-      },
-      // 添加菜单
-      pushMenu(data){
-        this.nowMenuList.push(data);
-        this.AllMenuList = this.AllMenuList.filter((item)=>{
-          return item.name!=data.name;
-        })
-      },
-      // 移除菜单
-      removeMenu(data){
-        this.AllMenuList.push(data);
-        this.nowMenuList = this.nowMenuList.filter((item)=>{
-          return item.name!=data.name;
-        })
-      },
-      // 编辑完成
-      editComfirm(){
-        this.editFlag = false;
-        uni.setStorageSync('gatherAllMenuList', JSON.stringify(this.AllMenuList));
-        uni.setStorageSync('gatherNowMenuList', JSON.stringify(this.nowMenuList));
-      },
-      getUniMp(appid){
-        console.log('点击供销平台');
-        // #ifdef APP-PLUS
-        uniMP.loadMP(appid);
-        return ;
-        // #endif
-        uni.showToast({
-          icon: 'none',
-          title: 'H5不支持打开小程序'
-        })
-      },
-      appLocation() {
-				uni.getLocation({
-					type: 'wgs84',
-					timeout: '10',
-					success: (res) => {
-						// console.log(res)
-
-						let latitude, longitude;
-						latitude = res.latitude.toString();
-						longitude = res.longitude.toString();
-						getGeocoder({
-							lat: latitude,
-							long: longitude
-						}).then(res => {
-							this.street = res.data.address_component.street
-							Cache.set('ADRESS_LOCATION', this.street)
-						}).catch(err => {
-							uni.showToast({
-								title: err,
-								icon: 'none'
-							})
-						})
-					},
-					fail: (err) => {
-
-						uni.showToast({
-							title: "获取定位超时",
-							icon: 'none',
-							duration: 2000
-						});
-					}
-				});
-			},
-			
-			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
-			},
-
-			navigator(url, t) {
-				// if (this.userInfoData.is_wsxx === 0 && t != '商户设置') return Toast("请完善商户信息");
-				uni.navigateTo({
-					url: url
-				})
-			},
-			getUserInfo: function() {
-				let that = this;
-				getUserInfo().then(res => {
-					that.userInfoData = res.data;
-					// console.log(res.data.service);
-					if (res.data.service == null) {
-						// console.log('123');
-						this.isShow = false
-					} else {
-						this.isShow = true
-						this.mer_id = res.data.service.mer_id
-					}
-
-					if (!res.data.mer_info) {
-						that.$set(this, 'jurisdiction', false);
-					}
-					// console.log(that.userInfoData);
-				});
-			}
-		}
-	};
+        // console.log(that.userInfoData);
+      });
+    }
+  }
+};
 </script>
 <style lang="scss" scoped>
-	.gather {
-		padding-bottom: 164.91rpx;
-		background: linear-gradient(180deg, #FFFFFF 0%, #F6F6F6 100%);
-	}
+.gather {
+  padding-bottom: 164.91rpx;
+  background: linear-gradient(180deg, #ffffff 0%, #f6f6f6 100%);
+  position: relative;
+}
 
-	.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;
+.sitebox {
+  animation-name: fadeIn;
+  animation-duration: 3s;
+  animation-fill-mode: forwards;
+}
 
+@keyframes fadeIn {
+  from {
+    opacity: 0;
+  }
 
-		img {
-			width: 100%;
-			height: 100%;
-			filter: blur(30rpx);
-			transform: scale(1.5);
-		}
-	}
+  to {
+    opacity: 1;
+  }
+}
 
-	.site-box {
-		width: 100%;
-		height: 120rpx;
-		margin-bottom: 26.32rpx;
-		position: absolute;
-		top: 0rpx;
-		position: fixed;
-		z-index: 999;
-		padding-top: 30rpx;
-		padding-right: 20rpx;
+.site-box {
+  width: 100%;
+  /* #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;
+  /* #ifdef MP || APP-PLUS */
+  padding-top: 75rpx;
+  /* #endif */
+  /* #ifdef H5 */
+  padding-top: 25rpx;
+  /* #endif */
 
-		// 位置
-		.place_wrapper {
-			color: #fff;
-			margin-right: 24.56rpx;
-			font-size: 30rpx;
+  padding-right: 20rpx;
 
-			.town_name {
-				margin-left: 21rpx;
-			}
-		}
+  // 位置
+  .place_wrapper {
+    color: #fff;
+    margin-right: 24.56rpx;
+    font-size: 30rpx;
 
-		.iconfont {
-			font-size: 35.09rpx;
-		}
-	}
+    opacity: 0;
 
+    .town_name {
+      margin-left: 21rpx;
+    }
+  }
 
-	.top_box {
-		// padding-top: 180rpx;
-		background: linear-gradient(#36A2FF, #fff);
-	}
+  .iconfont {
+    opacity: 0;
+    font-size: 30rpx;
+    font-size: 35.09rpx;
+  }
+}
 
-	.com {
-		margin-left: 50%;
-		transform: translate(-50%);
-	}
+.top_box {
+  // padding-top: 180rpx;
+  background: linear-gradient(#36a2ff, #fff);
+}
 
-	.business {
-		width: 694.74rpx;
-		// margin-bottom: 175rpx;
-	}
+.com {
+  margin-left: 50%;
+  transform: translate(-50%);
+}
 
-	.special_work {
-		// padding: 17.54rpx;
-		width: 694.74rpx;
-		margin-top: 52.63rpx;
-		border-radius: 17.54rpx;
-		// box-shadow: 0px 0px 6px 1px rgba(0, 0, 0, 0.16);
+.business {
+  width: 694.74rpx;
+  // margin-bottom: 175rpx;
+}
 
-		.title {
-			font-size: 31.58rpx;
-			font-weight: 700;
-			margin-bottom: 38.6rpx;
-		}
-    
-    .project{
-      display: flex;
-      justify-content: space-between;
-      align-items: flex-end;
-      .edit{
-        font-size: 26rpx;
-        font-weight: 400;
-        &::after{
-          content: '>';
-          margin-left: 10rpx;
-        }
-      }
-      .edit2{
-        font-size: 26rpx;
-        font-weight: 400;
+.special_work {
+  // padding: 17.54rpx;
+  width: 694.74rpx;
+  margin-top: 52.63rpx;
+  border-radius: 17.54rpx;
+  // box-shadow: 0px 0px 6px 1px rgba(0, 0, 0, 0.16);
+
+  .title {
+    font-size: 31.58rpx;
+    font-weight: 700;
+    margin-bottom: 38.6rpx;
+  }
+
+  .project {
+    display: flex;
+    justify-content: space-between;
+    align-items: flex-end;
+
+    .edit {
+      font-size: 26rpx;
+      font-weight: 400;
+
+      &::after {
+        content: ">";
+        margin-left: 10rpx;
       }
     }
 
-		.content {
-			display: flex;
-			align-content: center;
-			flex-wrap: wrap;
-			// justify-content: space-between;
-
-			.examine {
-				margin-bottom: 35rpx;
-				width: 173.68rpx;
-				display: flex;
-				flex-direction: column;
-				justify-content: center;
-				align-items: center;
-        position: relative;
-				// margin: 0 0 33.33rpx 33.33rpx !important;
-
-				.icon_img {
-					width: 63.16rpx;
-					height: 63.16rpx;
-				}
-        
-        .icon{
-          position: absolute;
-          top: 0rpx;
-          right: 25rpx;
-        }
-
-				.text {
-					font-size: 26.32rpx;
-					margin-top: 21.05rpx;
-					color: #000;
-				}
-			}
-
-			.text {
-				font-size: 29.82rpx;
-				color: #a4a4a4;
-			}
-		}
-
-		.cont_jus {
-			margin-top: 56.14rpx;
-			justify-content: flex-start;
-
-			&:first-child {
-				// margin-right: 33rpx;
-			}
-
-			.examine {
-				margin-right: 48rpx;
-
-				&:first-child {
-					margin-right: 48rpx;
-				}
-			}
-		}
-	}
-  
-  .edit_card{
-    background-color: #fff;
-    padding-top: 28rpx;
+    .edit2 {
+      font-size: 26rpx;
+      font-weight: 400;
+    }
   }
+
+  .content {
+    display: flex;
+    align-content: center;
+    flex-wrap: wrap;
+    // justify-content: space-between;
+
+    .examine {
+      margin-bottom: 35rpx;
+      width: 173.68rpx;
+      display: flex;
+      flex-direction: column;
+      justify-content: center;
+      align-items: center;
+      position: relative;
+      // margin: 0 0 33.33rpx 33.33rpx !important;
+
+      .icon_img {
+        width: 63.16rpx;
+        height: 63.16rpx;
+      }
+
+      .icon {
+        position: absolute;
+        top: 0rpx;
+        right: 25rpx;
+      }
+
+      .text {
+        font-size: 26.32rpx;
+        margin-top: 21.05rpx;
+        color: #000;
+      }
+    }
+
+    .text {
+      font-size: 29.82rpx;
+      color: #a4a4a4;
+    }
+  }
+
+  .cont_jus {
+    margin-top: 56.14rpx;
+    justify-content: flex-start;
+
+    &:first-child {
+      // margin-right: 33rpx;
+    }
+
+    .examine {
+      margin-right: 48rpx;
+
+      &:first-child {
+        margin-right: 48rpx;
+      }
+    }
+  }
+}
+
+.edit_card {
+  background-color: #fff;
+  padding-top: 28rpx;
+}
 </style>
\ No newline at end of file
diff --git a/pages/home/index.vue b/pages/home/index.vue
index b869105..ec0df30 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -1,364 +1,377 @@
 <template>
-  <view class="Circle_friends">
-    <view class="circle_friends_wrapper">
+	<view class="Circle_friends">
+		<view class="circle_friends_wrapper">
 
-      <zbpSwiper></zbpSwiper>
+			<zbpSwiper></zbpSwiper>
 
-      <view class="tabs_wrapper">
-        <u-tabs :list="tabsData.list" @click="tabsChange" lineColor="#F84221" keyName="cate_name"></u-tabs>
-      </view>
+			<view class="tabs_wrapper">
+				<u-tabs :list="tabsData.list" @click="tabsChange" lineColor="#F84221" keyName="cate_name"></u-tabs>
+			</view>
 
-      <view class="goods">
-        <block v-for="(item,index) in cateGoods" :key="index">
-          <view class="goods_item" @click="gogogo(item)">
-            <image class="goods_img" :src="item.image[0]" 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 && item.author.nickname}}</view>
-                </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>
-        </block>
-      </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>
+			<view class="goods">
+				<block v-for="(item,index) in cateGoods" :key="index">
+					<view class="goods_item" @click="gogogo(item)">
+						<image class="goods_img" :src="item.image[0]" mode="aspectFit"></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="aspectFit" class="g_img"></image>
+									<view class="g_name">{{item.author && item.author.nickname}}</view>
+								</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>
+				</block>
+			</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="[0,0]" :show="showPicker" ref="uPicker" :columns="columnData" @confirm="confirm"
-      @cancel="showPicker = false" @change="changeHandler" keyName="name"></u-picker>
+		<u-picker :defaultIndex="[0,0]" :show="showPicker" ref="uPicker" :columns="columnData" @confirm="confirm"
+			@cancel="showPicker = false" @change="changeHandler" keyName="name"></u-picker>
 
-    <!-- <view class="bg_color"></view> -->
+		<!-- <view class="bg_color"></view> -->
 
-    <!-- <m-tabbar native>
+		<!-- <m-tabbar native>
       <template v-slot:tabbar_index_2>
         <view class="custom_style">
           <view class="custom_style_icon"></view>
         </view>
       </template>
     </m-tabbar> -->
-  </view>
+	</view>
 </template>
 
 <script>
-  import mTabbar from '@/components/m-tabbar/m-tabbar.vue'
-  import zbpSwiper from '@/components/zbpSwiper'
-  import { getSlideAPI } from '@/api/lihai.js'
-  import { graphicLstApi, getTopicList, graphicStartApi } from '@/api/community.js'
-  import { getIndexData, getDiy } from '@/api/api.js'
-  import { getGeocoder, merClassifly } from '@/api/store.js';
-  import { getArea, getStreet } from '@/api/article.js';
-  import { Toast } from '@/libs/uniApi'
-  export default {
-    components: {
-      mTabbar,
-      zbpSwiper
-    },
-    data() {
-      return {
-        bgColor: '',
-        showPicker: false,
-        columnData: [],
-        show: false,
-        swiper: {
-          url: [{
-            img: ''
-          }],
-          indicatorDots: true, // 显示面板指示点
-          vertical: false, // 滑动方向是否为纵向
-          autoplay: true, // 是否自动切换
-          interval: 2000, // 自动切换时间间隔
-          duration: 500 // 滑动动画时长
-        },
-        tabsData: {
-          list: [],
-          tabsActive: 0
-        },
-        where: {
-          category_id: 0,
-          page: 1,
-          limit: 30
-        },
-        currentItemId: 69, // 默认获取 社区的数据 0 表示推荐 || 69 社区
-        keyword: '',
-        location: '',
-        emptyShow: false,
-        street: '',
-        cateGoods: []
-      }
-    },
-    onPullDownRefresh() {
-      this.getCateList()
-      this.getGoods()
-      this.selfLocation()
-      this.Area()
-      uni.stopPullDownRefresh()
-    },
-    onLoad() {
-      this.getCateList()
-      this.getGoods()
-      this.selfLocation()
-      this.Area()
-    },
-    onShow() {},
-    methods: {
-      confirm(e) {
-        this.where.street_id = e.value[1].code
-        this.showPicker = false
-      },
-      changeHandler(e) {
-        const {
-          columnIndex,
-          value,
-          values,
-          index,
-          picker = this.$refs.uPicker
-        } = e;
-        if (columnIndex === 0) {
-          getStreet({
-            area_code: value[0]['code']
-          }).then(res => {
-            this.$refs.uPicker.setColumnValues(1, res.data);
-          });
-        }
-      },
-      Area() {
-        getArea({
-          city_code: 510500
-        }).then(res => {
-          this.$refs.uPicker.setColumnValues(0, res.data);
-          this.Street(res.data[0]['code']);
-        });
-      },
-      Street(code) {
-        getStreet({
-          area_code: code
-        }).then(res => {
-          this.$refs.uPicker.setColumnValues(1, res.data);
-        });
-      },
-      gogogo(item) {
-        if (this.tabsData.tabsActive == 1) {
-          uni.navigateTo({
-            //#ifdef APP
-            url: '/pages/short_video/appSwiper/index?id=' + item.community_id
-            //#endif
-            //#ifndef APP
-            url: '/pages/short_video/nvueSwiper/index?id=' + item.community_id
-            //#endif
-          })
-        } else {
-          uni.navigateTo({
-            url: '/pages/plantGrass/plant_detail/index?id=' + item.community_id
-          })
-        }
-      },
-      giveStart(item) {
-        let status = item.relevance_id ? 0 : 1
-        graphicStartApi(item.community_id, {
-          status: status
-        }).then(res => {
-          Toast(res.message)
-          this.getGoods()
-        })
-      },
-      dianji() {
-        this.show = !this.show
-      },
-      // 获取发现商品
-      getGoods: function() {
-        // 数据写死：默认社区数据 category_id=69&page=1&limit=30
-        graphicLstApi(this.where).then(res => {
-          this.cateGoods = res.data.list
-          res.data.list.length <= 0 ? this.emptyShow = true : this.emptyShow = false
-        })
-      },
-      /*获取分类列表*/
-      async getCateList() {
-        const {
-          data
-        } = await getTopicList()
-        this.tabsData.list = [{
-          cate_name: "推荐",
-          category_id: 0
-        }, {
-          cate_name: "视频",
-          category_id: -1,
-          children: []
-        }, ...data]
-      },
-      tabsChange(item) {
-        this.where.category_id = item.category_id
-        this.getGoods()
-        this.street_id = item.id
-        this.tabsData.tabsActive = item.index
-        if (item.index == 1) {
-          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
-          })
-        }
-      },
-      selfLocation() {
-        uni.getLocation({
-          type: 'gcj02',
-          success: (res) => {
-            let latitude, longitude;
-            latitude = res.latitude.toString();
-            longitude = res.longitude.toString();
-            getGeocoder({ lat: latitude, long: longitude }).then(res => {
-              this.$store.commit('setLocation', res.data)
-              this.street = res.data.address_component.street
-            }).catch(err => {
-              uni.showToast({
-                title: err,
-                icon: 'none'
-              })
-            })
-          },
-          fail: (err) => {
-            uni.showToast({
-              title: err.errMsg,
-              icon: 'none',
-              duration: 1000
-            });
-          }
-        });
-      },
-    }
-  }
+	import mTabbar from '@/components/m-tabbar/m-tabbar.vue'
+	import zbpSwiper from '@/components/zbpSwiper'
+	import {
+		getSlideAPI
+	} from '@/api/lihai.js'
+	import {
+		graphicLstApi,
+		getTopicList,
+		graphicStartApi
+	} from '@/api/community.js'
+	import {
+		getIndexData,
+		getDiy
+	} from '@/api/api.js'
+	import {
+		getGeocoder,
+		merClassifly
+	} from '@/api/store.js';
+	import {
+		getArea,
+		getStreet
+	} from '@/api/article.js';
+	import {
+		Toast
+	} from '@/libs/uniApi'
+	export default {
+		components: {
+			mTabbar,
+			zbpSwiper
+		},
+		data() {
+			return {
+				bgColor: '',
+				showPicker: false,
+				columnData: [],
+				show: false,
+				swiper: {
+					url: [{
+						img: ''
+					}],
+					indicatorDots: true, // 显示面板指示点
+					vertical: false, // 滑动方向是否为纵向
+					autoplay: true, // 是否自动切换
+					interval: 2000, // 自动切换时间间隔
+					duration: 500 // 滑动动画时长
+				},
+				tabsData: {
+					list: [],
+					tabsActive: 0
+				},
+				where: {
+					category_id: 0,
+					page: 1,
+					limit: 30
+				},
+				currentItemId: 69, // 默认获取 社区的数据 0 表示推荐 || 69 社区
+				keyword: '',
+				location: '',
+				emptyShow: false,
+				street: '',
+				cateGoods: []
+			}
+		},
+		onPullDownRefresh() {
+			this.getCateList()
+			this.getGoods()
+			this.selfLocation()
+			this.Area()
+			uni.stopPullDownRefresh()
+		},
+		onLoad() {
+			this.getCateList()
+			this.getGoods()
+			this.selfLocation()
+			this.Area()
+		},
+		onShow() {},
+		methods: {
+			confirm(e) {
+				this.where.street_id = e.value[1].code
+				this.showPicker = false
+			},
+			
+			changeHandler(e) {
+				const {
+					columnIndex,
+					value,
+					values,
+					index,
+					picker = this.$refs.uPicker
+				} = e;
+				if (columnIndex === 0) {
+					getStreet({
+						area_code: value[0]['code']
+					}).then(res => {
+						this.$refs.uPicker.setColumnValues(1, res.data);
+					});
+				}
+			},
+			Area() {
+				getArea({
+					city_code: 510500
+				}).then(res => {
+					this.$refs.uPicker.setColumnValues(0, res.data);
+					this.Street(res.data[0]['code']);
+				});
+			},
+			Street(code) {
+				getStreet({
+					area_code: code
+				}).then(res => {
+					this.$refs.uPicker.setColumnValues(1, res.data);
+				});
+			},
+			gogogo(item) {
+				if (this.tabsData.tabsActive == 1) {
+					uni.navigateTo({
+						url: `/pages/short_video/appSwiper/index?id=${this.cateGoods[0].community_id}`
+					})
+					
+				} else {
+					uni.navigateTo({
+						url: '/pages/plantGrass/plant_detail/index?id=' + item.community_id
+					})
+				}
+			},
+			giveStart(item) {
+				let status = item.relevance_id ? 0 : 1
+				graphicStartApi(item.community_id, {
+					status: status
+				}).then(res => {
+					Toast(res.message)
+					this.getGoods()
+				})
+			},
+			dianji() {
+				this.show = !this.show
+			},
+			// 获取发现商品
+			getGoods: function() {
+				// 数据写死：默认社区数据 category_id=69&page=1&limit=30
+				graphicLstApi(this.where).then(res => {
+					this.cateGoods = res.data.list
+					res.data.list.length <= 0 ? this.emptyShow = true : this.emptyShow = false
+				})
+			},
+			/*获取分类列表*/
+			async getCateList() {
+				const {
+					data
+				} = await getTopicList()
+				this.tabsData.list = [{
+					cate_name: "推荐",
+					category_id: 0
+				}, {
+					cate_name: "视频",
+					category_id: -1,
+					children: []
+				}, ...data]
+			},
+			tabsChange(item) {
+				this.where.category_id = item.category_id
+				this.getGoods()
+				this.street_id = item.id
+				this.tabsData.tabsActive = item.index
+				if (item.index == 1) {
+					uni.navigateTo({
+						url: `/pages/short_video/appSwiper/index?id=${this.cateGoods[0].community_id}`
+					})
+				}
+			},
+			selfLocation() {
+				uni.getLocation({
+					type: 'gcj02',
+					success: (res) => {
+						let latitude, longitude;
+						latitude = res.latitude.toString();
+						longitude = res.longitude.toString();
+						getGeocoder({
+							lat: latitude,
+							long: longitude
+						}).then(res => {
+							this.$store.commit('setLocation', res.data)
+							this.street = res.data.address_component.street
+						}).catch(err => {
+							uni.showToast({
+								title: err,
+								icon: 'none'
+							})
+						})
+					},
+					fail: (err) => {
+						uni.showToast({
+							title: err.errMsg,
+							icon: 'none',
+							duration: 1000
+						});
+					}
+				});
+			},
+		}
+	}
 </script>
 
 <style lang="scss">
-  page {
-    // background: linear-gradient(180deg, #FFFFFF 0%, #F6F6F6 100%);
-  }
+	page {
+		// background: linear-gradient(180deg, #FFFFFF 0%, #F6F6F6 100%);
+	}
 
-  .Circle_friends {
-    position: relative;
-    padding: 0 0 87.72rpx 0;
-    background: linear-gradient(180deg, #FFFFFF 0%, #F6F6F6 100%);
-  }
+	.Circle_friends {
+		position: relative;
+		padding: 0 0 87.72rpx 0;
+		background: linear-gradient(180deg, #FFFFFF 0%, #F6F6F6 100%);
+	}
 
-  .circle_friends_wrapper {
-    position: relative;
-    z-index: 2;
-  }
+	.circle_friends_wrapper {
+		position: relative;
+		z-index: 2;
+	}
 
 
-  .search_wrapper {
-    width: 694.74rpx;
-    margin: 0 auto;
-  }
+	.search_wrapper {
+		width: 694.74rpx;
+		margin: 0 auto;
+	}
 
-  .tabs_wrapper {
-    width: 694.74rpx;
-    margin: 0 auto;
-    margin-bottom: 21.05rpx;
-  }
+	.tabs_wrapper {
+		width: 694.74rpx;
+		margin: 0 auto;
+		margin-bottom: 21.05rpx;
+	}
 
-  .empty_wrapper {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-  }
+	.empty_wrapper {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
 
-  .goods {
-    margin: 0 auto;
-    width: 694.74rpx;
-    display: flex;
-    flex-wrap: wrap;
-    justify-content: space-between;
+	.goods {
+		margin: 0 auto;
+		width: 694.74rpx;
+		display: flex;
+		flex-wrap: wrap;
+		justify-content: space-between;
 
-    .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;
+		.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;
 
-      .goods_img {
-        width: 100%;
-        height: 294.74rpx;
-      }
+			.goods_img {
+				width: 100%;
+				height: 294.74rpx;
+			}
 
-      .botm {
-        flex: 1;
-        padding: 0 14.04rpx;
-        padding-bottom: 21.05rpx;
-        display: flex;
-        flex-direction: column;
-        justify-content: space-between;
+			.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;
-        }
+				.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;
+				.goods_info {
+					justify-content: space-between;
 
-          .g_img {
-            width: 60rpx;
-            height: 60rpx;
-            border-radius: 50%;
-          }
+					.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;
-            /* 强制不换行 */
-          }
+					.g_name {
+						margin-left: 8.77rpx;
+						width: 100.63rpx;
+						text-overflow: ellipsis;
+						/* 溢出显示省略号 */
+						overflow: hidden;
+						/* 溢出隐藏 */
+						white-space: nowrap;
+						/* 强制不换行 */
+					}
 
-          .nice_box {
-            display: flex;
-            align-items: center;
+					.nice_box {
+						display: flex;
+						align-items: center;
 
-            .isshow {
-              color: #FE3530 !important;
-            }
+						.isshow {
+							color: #FE3530 !important;
+						}
 
-            .iconfont {
-              font-size: 30rpx;
-            }
+						.iconfont {
+							font-size: 30rpx;
+						}
 
-            .icon-shoucang1 {
-              color: #F84221;
-            }
+						.icon-shoucang1 {
+							color: #F84221;
+						}
 
-            .collect {
-              font-size: 24rpx;
-              margin-left: 5rpx;
-            }
-          }
-        }
-      }
-    }
-  }
+						.collect {
+							font-size: 24rpx;
+							margin-left: 5rpx;
+						}
+					}
+				}
+			}
+		}
+	}
 </style>
\ No newline at end of file
diff --git a/pages/index/component/pictureCube.vue b/pages/index/component/pictureCube.vue
index 6538d07..5840f27 100644
--- a/pages/index/component/pictureCube.vue
+++ b/pages/index/component/pictureCube.vue
@@ -28,7 +28,7 @@
 		</view>
 		<view class="advertItem02 advertItem05 acea-row" v-if="style==4">
 			<view class="item" v-for="(item,index) in picList" :key="index" @click="goDetail(item)">
-				<image :src="item.image" mode="aspectFill" :style="'height:'+ imageH +'rpx;'"></image>
+				<image :src="item.image" mode="aspectFit" :style="'height:'+ imageH +'rpx;'"></image>
 			</view>
 		</view>
 		<view class="advertItem02 advertItem06 acea-row" v-if="style==5">
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 7007b87..7f25d1b 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,36 +1,79 @@
 <template>
 	<view class="Circle_friends">
 		<view class="circle_friends_wrapper">
+			<view v-if="isFshow">
+				<view class="site-box flex_a_c_j_sb" :style="{'background-color':backColor}">
 
-			<view class="site-box flex_a_c_j_sb">
-				<view class="place_wrapper flex_a_c" >
-					<view class="iconfont icon-weizhi" style="margin-left: 20rpx;"></view>
-					<view class="town_name">{{street}}</view>
+					<view :class="['place_wrapper','flex_a_c',isFshow?'sitebox':'']" @click="selectLocation">
+						<view :class="['iconfont','icon-weizhi',isFshow?'sitebox':'']" 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',isFshow?'sitebox':'']" style="color:#fff;"></view>
+					</navigator>
 				</view>
+				<!-- <view class="site-box ','flex_a_c_j_sb'" v-if="ishshow">
+					<view class="bg-img">
+						<img :src="bgColor" alt="">
+					</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" :location_Arr="locationArr" @kkchange='kkchange'></zbpSwiper>
+			<zbpSwiper ref='list' :isSelectPlace="true" :town='street' :show='show' :location_Arr="locationArr" @kkchange='kkchange'
+				@change='dchange'>
+			</zbpSwiper>
 
 
 
 			<view class="tabs_wrapper">
 				<u-tabs :list="tabsData.list" @click="tabsChange" lineColor="#F84221" keyName="cate_name"
-					:activeStyle="activeStyle"     itemStyle="padding-left: 0px;  height: 33px;"></u-tabs>
+					:activeStyle="activeStyle" itemStyle="padding-left: 0px;  height: 33px;"></u-tabs>
 			</view>
 			<view class="">
 
 			</view>
 			<view class="goodslist">
-				<view class="goods">
-					<view v-for="(item,index) in cateGoods" :key="index" v-if='index%2!=0'>
+				<WaterfallsFlow :wfList='cateGoods' />
+
+				<!-- 	<view class="goods">
+					<view v-for="(item,index) in cateGoods" :key="index">
+
+						<view :class="[index%2==0?'goods_item':'goods_items']" @click="gogogo(item)">
+							<view class="kk" v-if="index%2==0">
+
+								<image :src="item.image[0]" mode="aspectFit" style="width:'365rpx';height:251rpx">
+								</image>
+							</view>
+							<view style="width:'365rpx';height:336rpx" v-else>
+								<image :src="item.image[0]" mode="aspectFit" style="width:'365rpx';height:336rpx">
+								</image>
+							</view>
+							<view class="goods_item_img" v-if="item.video_link.length>0">
+								<image src="@/static/images/sp.png" mode="aspectFit"></image>
+							</view>
+							<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="aspectFit" class="g_img"></image>
+										<view class="g_name">{{item.author && item.author.nickname}}</view>
+									</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>
+					</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)">
 							<view style="height: 251rpx;">
 								<u--image :src="item.image[0]" width="356rpx" height="251rpx" :showLoading="true"
@@ -42,48 +85,14 @@
 							</view>
 
 							<view class="goods_item_img" v-if="item.video_link.length>0">
-								<image src="@/static/images/sp.png" mode="aspectFill"></image>
+								<image src="@/static/images/sp.png" mode="aspectFit"></image>
 							</view>
 							<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 && item.author.nickname}}</view>
-									</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>
-					</view>
-				</view>
-				<view class="goods">
-					<view v-for="(item,index) in cateGoods" :key="index" v-if='index%2==0'>
-						<view class="goods_items" @click="gogogo(item)">
-
-							<view style="height: 336rpx;">
-								<u--image :src="item.image[0]" width="356rpx" height="336rpx" :showLoading="true"
-									lazyLoad fade duration="450">
-									<template v-slot:loading>
-										<u-loading-icon color="#f5f5f5"></u-loading-icon>
-									</template>
-								</u--image>
-							</view>
-
-							<view class="goods_item_img" v-if="item.video_link.length>0">
-								<image src="@/static/images/sp.png" mode="aspectFill"></image>
-							</view>
-							<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>
+											mode="aspectFit" class="g_img"></image>
 										<view class="g_name">{{item.author && item.author.nickname}}</view>
 									</view>
 									<view class="nice_box" @click.stop="giveStart(item)">
@@ -96,6 +105,7 @@
 						</view>
 					</view>
 				</view>
+				 -->
 
 
 
@@ -132,6 +142,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 {
 		getSlideAPI
@@ -162,7 +173,8 @@
 		components: {
 			mTabbar,
 			zbpSwiper,
-			easyLoadimage
+			easyLoadimage,
+			WaterfallsFlow
 		},
 		data() {
 			return {
@@ -190,7 +202,7 @@
 				where: {
 					category_id: 0,
 					page: 1,
-					limit: 15
+					limit: 6
 				},
 				currentItemId: 69, // 默认获取 社区的数据 0 表示推荐 || 69 社区
 				keyword: '',
@@ -203,23 +215,28 @@
 				streeta_id: '',
 				street: '',
 				bgColor: '',
+				backColor: 'rgba(248, 66, 33, 0)',
 				isFshow: false,
+				scrollTop: 0,
+				show: true
 			}
 		},
+
 		onPullDownRefresh() {
 			this.getCateList()
 			this.cateGoods = []
 			this.getGoods()
-			this.selfLocation()
+
 			this.Area()
 			uni.stopPullDownRefresh()
 		},
+
 		onLoad() {
 
 			this.getCateList()
 			this.getArticle()
 			this.getGoods()
-			this.selfLocation()
+			
 			this.Area()
 			this.setPermissions()
 
@@ -236,36 +253,54 @@
 			})
 
 		},
-		onShow() {},
+
 		onReachBottom() {
 			if (this.status == 'nomore') return;
 			this.status = 'loading';
+			
 			this.where.page = ++this.where.page;
 			this.getGoods()
 		},
 		mounted() {
+			this.selfLocation()
 			// #ifdef  H5
-			
-			// #endif
 			// 监听页面滚动事件
 			window.addEventListener("scroll", this.scrolling);
+			// #endif
 
+			this.$bus.$on('value-updated', (newValue) => {
+				// 更新父组件的值 
+				this.street = newValue.split(',')[0]
+				
+			});
 		},
 		// #ifdef APP-PLUS
 		onPageScroll(e) {
-			// this.scrollTop = e.scrollTop;
-			console.log(e.scrollTop)
-			if(e.scrollTop>0){
-				this.isFshow=true
-			}else{
-			this.isFshow=false
+
+			const scrollTop = e.scrollTop;
+
+			// 导航条颜色透明渐变
+
+			if (scrollTop <= 20) {
+				this.backColor = 'rgba(248, 66, 33, 0)'
+				this.isFshow = false
+				this.show = true
+			} else if (20 < scrollTop && scrollTop <= 100) {
+				this.backColor = 'rgba(248, 66, 33, .5)'
+				this.isFshow = true
+				this.show = false
+			} else if (scrollTop > 100) {
+				this.backColor = 'rgba(248, 66, 33, 1)'
+				this.isFshow = true
+				this.show = false
 			}
-			
+
+
 		},
 		// #endif
-		
+
 		methods: {
-			
+
 			scrolling() {
 				// 滚动条距文档顶部的距离
 				let scrollTop =
@@ -274,7 +309,7 @@
 					document.body.scrollTop;
 				// 滚动条滚动的距离
 				let scrollStep = scrollTop - this.oldScrollTop;
-				console.log("header 滚动距离 ", scrollTop);
+				// console.log("header 滚动距离 ", scrollTop);
 				// 更新——滚动前，滚动条距文档顶部的距离
 				this.oldScrollTop = scrollTop;
 
@@ -288,20 +323,23 @@
 				//滚动条到底部的条件
 				if (scrollTop + windowHeight == scrollHeight) {
 					//你想做的事情
-					console.log("header  你已经到底部了");
+					// console.log("header  你已经到底部了");
 				}
-				if (scrollStep < 0) {
+
+				if (scrollTop <= 20) {
+					this.backColor = 'rgba(248, 66, 33, 0)'
 					this.isFshow = false
-					console.log("header 滚动条向上滚动了！");
-				} else {
+				} else if (20 < scrollTop && scrollTop <= 100) {
+					this.backColor = 'rgba(248, 66, 33, .5)'
 					this.isFshow = true
-					console.log("header  滚动条向下滚动了！");
-				}
-				// 判断是否到了最顶部
-				if (scrollTop <= 0) {
-					this.isFshow = false
-					console.log("header 到了最顶部")
+				} else if (scrollTop > 100) {
+					this.backColor = 'rgba(248, 66, 33, 1)'
+					this.isFshow = true
+
+
 				}
+
+
 			},
 
 			kkchange(e) {
@@ -357,8 +395,17 @@
 					res.data.length > 0 ? this.isYunCang = 1 : this.isYunCang = 0
 				})
 			},
+			selectLocation() {
+				this.showPicker = true
+			},
 			confirm(e) {
-				this.where.street_id = e.value[1].code
+
+				this.street = e.value[1].name
+		
+	this.$nextTick(() => {
+				this.$bus.$emit('value-updated',e.value[1].name + ',' +e.value[1].code);
+				
+				})
 				this.showPicker = false
 			},
 			changeHandler(e) {
@@ -392,9 +439,13 @@
 					this.$refs.uPicker.setColumnValues(1, res.data);
 				});
 			},
+			dchange(e) {
+
+				this.$refs.list.street = e.value[1].name
+				this.street = e.value[1].name
+			},
 			gogogo(item) {
 				if (item.video_link.length > 0) {
-
 					uni.navigateTo({
 						// #ifdef MP || H5
 						url: `/pages/short_video/nvueSwiper/index?id=${item.community_id}`
@@ -458,10 +509,6 @@
 				this.tabsData.list = [{
 					cate_name: "推荐",
 					category_id: 0
-				}, {
-					cate_name: "视频",
-					category_id: -1,
-					children: []
 				}, ...data]
 			},
 			tabsChange(item) {
@@ -485,7 +532,7 @@
 					type: 'wgs84',
 					timeout: '10',
 					success: (res) => {
-						// console.log(res)
+						
 						this.isshow = false
 						let latitude, longitude;
 						latitude = res.latitude.toString();
@@ -494,11 +541,14 @@
 							lat: latitude,
 							long: longitude
 						}).then(res => {
-							uni.setStorageSync('adress_location', res.data.address)
-							// that.$store.dispatch('setLocation', res.data)
-
+							let town = res.data.address_reference.town.title
+							let street_id = res.data.address_reference.town.id
 							this.street = res.data.address_component.street
-							Cache.set('ADRESS_LOCATION', this.street)
+							
+							this.$nextTick(() => {
+										this.$bus.$emit('value-updated',this.street + ',' +street_id);
+										
+										})
 						}).catch(err => {
 							uni.showToast({
 								title: err,
@@ -547,15 +597,18 @@
 									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');
+										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');
+										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(),
+										var uri = Uri.fromParts("package", mainActivity
+											.getPackageName(),
 											null);
 										intent.setData(uri);
 									}
@@ -587,7 +640,8 @@
 							success: function(res) {
 								if (res.confirm) {
 									var app = plus.ios.invoke('UIApplication', 'sharedApplication');
-									var setting = plus.ios.invoke('NSURL', 'URLWithString:', 'app-settings:');
+									var setting = plus.ios.invoke('NSURL', 'URLWithString:',
+										'app-settings:');
 									plus.ios.invoke(app, 'openURL:', setting);
 									plus.ios.deleteObject(setting);
 									plus.ios.deleteObject(app);
@@ -602,10 +656,10 @@
 	}
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
 	page {
 		background-color: #F4F7FE;
-		;
+
 		// background: linear-gradient(180deg, #FFFFFF 0%, #F6F6F6 100%);
 	}
 
@@ -643,39 +697,72 @@
 		background: linear-gradient(180deg, #FFFFFF 0%, #F6F6F6 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;
 
 
-		img {
-			width: 100%;
-			height: 100%;
-			filter: blur(30rpx);
-			transform: scale(1.5);
+	// .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;
+
+
+	// 	img {
+	// 		width: 100%;
+	// 		height: 100%;
+	// 		filter: blur(30rpx);
+	// 		transform: scale(1.5);
+	// 	}
+	// }
+
+
+	.sitebox {
+		animation-name: fadeIn;
+		animation-duration: 3s;
+		animation-fill-mode: forwards;
+	}
+
+	@keyframes fadeIn {
+		from {
+			opacity: 0;
+		}
+
+		to {
+			opacity: 1;
 		}
 	}
 
+
 	.site-box {
 		width: 100%;
-	    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;
+
 		padding-right: 20rpx;
 
 		// 位置
@@ -684,16 +771,22 @@
 			margin-right: 24.56rpx;
 			font-size: 30rpx;
 
+			opacity: 0;
+
 			.town_name {
 				margin-left: 21rpx;
 			}
 		}
 
 		.iconfont {
+			opacity: 0;
+			font-size: 30rpx;
 			font-size: 35.09rpx;
 		}
 	}
 
+
+
 	.circle_friends_wrapper {
 		position: relative;
 
@@ -804,7 +897,7 @@
 	}
 
 	.goodslist {
-		display: flex;
+		// display: flex;
 		margin: 0 auto;
 		width: 725rpx;
 	}
@@ -813,9 +906,13 @@
 		margin: 0 auto;
 		width: 725rpx;
 
+		display: flex;
+		flex-wrap: wrap;
+		justify-content: space-between;
+
 		.goods_item {
 			width: 356rpx;
-			height: 450rpx;
+			border: 1px solid;
 			border-radius: 8px;
 			overflow: hidden;
 			background-color: #fff;
@@ -823,6 +920,12 @@
 			flex-direction: column;
 			margin-bottom: 10.53rpx;
 			position: relative;
+			margin-top: -40rpx;
+
+			.kk {
+				width: 365rpx;
+				height: 251rpx;
+			}
 
 			.goods_item_img {
 				position: absolute;
@@ -919,7 +1022,7 @@
 
 		.goods_items {
 			width: 356rpx;
-			height: 536rpx;
+
 
 			border-radius: 8px;
 			overflow: hidden;
diff --git a/pages/moreProject/moreProject.vue b/pages/moreProject/moreProject.vue
index 112e06f..666b762 100644
--- a/pages/moreProject/moreProject.vue
+++ b/pages/moreProject/moreProject.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="gather">
 		<block v-if="isShow">
-			<view class="special_work com" v-if="userInfoData.mer_info.type_id === 12">
+			<view class="special_work com" v-if="userInfoData.mer_info.type_code === 'TypeSupplyChain'">
 				<view class="special_work com" v-if="true">
 					<view class="title">市级供应链</view>
 					<view class="content">
@@ -62,7 +62,7 @@
 				</view>
 			</view>
 
-			<view class="business com" v-if="userInfoData.mer_info.type_id === 10">
+			<view class="business com" v-if="userInfoData.mer_info.type_code === 'TypeStore'">
 				<view class="business com" v-if="true">
 					<view class="special_work com">
 						<view class="title">我的店铺</view>
@@ -155,7 +155,7 @@
 				</view>
 			</view>
 
-			<view class="business com" v-if="userInfoData.mer_info.type_id!=null&&userInfoData.mer_info.type_id === 11">
+			<view class="business com" v-if="userInfoData.mer_info.type_code === 'TypeCloudWarehouse'">
 				<view class="business com" v-if="true">
 					<view class="special_work com">
 						<view class="title">里海云仓</view>
@@ -226,8 +226,53 @@
 				</view>
 			</view>
 
+<view class="business com" v-if="userInfoData.mer_info.type_code === 'TypeFeaturedCultural'|| userInfoData.mer_info.type_code === 'TypeFamousSpecialties'|| userInfoData.mer_info.type_code === 'TypeLocalCuisine' ">
+				<view class="business com" v-if="true">
+					<view class="special_work com">
+						<view class="title">我的店铺</view>
+						<view class="content ">
+						
+							<view class="examine" @click="navigator(`/pages/users/embody/embody?mer_id=${mer_id}`)">
+								<image class="icon_img" :src="`${prefix}txgl.png`" mode="aspectFill">
+								</image>
+								<text class="text">提现管理</text>
+							</view>
 
+							<view class="examine"
+								@click="navigator(`/pages/chat/customer_list/index?type=1&mer_id=${mer_id}`)">
+								<image class="icon_img" :src="`${prefix}kfjl.png`" mode="aspectFill">
+								</image>
+								<text class="text">客服记录</text>
+							</view>
+							<view class="examine"
+								@click="navigator(`/pages/admin/order_cancellation/index?mer_id=${mer_id}`)">
+								<image class="icon_img" :src="`${prefix}ddhx.png`" mode="aspectFill">
+								</image>
+								<text class="text">订单核销</text>
+							</view>
+							<view class="examine"
+								@click="navigator(`/pages/admin/order/index?mer_id=${mer_id}&type_id=${userInfoData.mer_info.type_id}`)">
+								<image class="icon_img" :src="`${prefix}ddgl.png`" mode="aspectFill">
+								</image>
+								<text class="text">订单管理</text>
+							</view>
+							<view class="examine" @click="navigator(`/pages/product/list/index?mer_id=${mer_id}`)">
+								<image class="icon_img" :src="`${prefix}spgl.png`" mode="aspectFill">
+								</image>
+								<text class="text">商品管理</text>
+							</view>
+							<view class="examine"
+								@click="navigator(`/pages/product/basicSet?mer_id=${mer_id}`, '商户设置')">
+								<image class="icon_img" :src="`${prefix}shsz.png`" mode="aspectFill">
+								</image>
+								<text class="text">商户设置</text>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
 
+  
 		</block>
 		<!-- <m-tabbar native>
       <template v-slot:tabbar_index_2>
@@ -270,7 +315,7 @@
 	import {
 		getDiy
 	} from '@/api/api.js'
-	
+
 	export default {
 		components: {
 			mTabbar,
@@ -292,7 +337,7 @@
 				isShow: false,
 				bgColor: '',
 				isFshow: false,
-				street:''
+				street: ''
 			};
 		},
 		computed: {
@@ -317,30 +362,15 @@
 		},
 		mounted() {
 			this.appLocation()
-			// #ifdef  H5
-// 监听页面滚动事件
-			window.addEventListener("scroll", this.scrolling);
-			// #endif
 			
 
-		},
-		// #ifdef APP-PLUS
-		onPageScroll(e) {
-			// this.scrollTop = e.scrollTop;
-			console.log(e.scrollTop)
-			if (e.scrollTop > 0) {
-				this.isFshow = true
-			} else {
-				this.isFshow = false
-			}
 
 		},
-		// #endif
 
 		methods: {
-      
-      
-      appLocation() {
+
+
+			appLocation() {
 				uni.getLocation({
 					type: 'wgs84',
 					timeout: '10',
@@ -373,7 +403,7 @@
 					}
 				});
 			},
-			
+
 			scrolling() {
 				// 滚动条距文档顶部的距离
 				let scrollTop =
@@ -521,7 +551,7 @@
 		// padding: 17.54rpx;
 		width: 694.74rpx;
 		// margin-top: 52.63rpx;
-    padding-top: 32rpx;
+		padding-top: 32rpx;
 		border-radius: 17.54rpx;
 		// box-shadow: 0px 0px 6px 1px rgba(0, 0, 0, 0.16);
 
diff --git a/pages/nongKe/specialty/index.vue b/pages/nongKe/specialty/index.vue
new file mode 100644
index 0000000..6b49b9b
--- /dev/null
+++ b/pages/nongKe/specialty/index.vue
@@ -0,0 +1,299 @@
+<template>
+	<view class="box">
+		<view class="head">
+			<view style="height: var(--status-bar-height);"></view>
+			<!-- <u--image style="position: absolute;" :showLoading="true" src="/static/images/MYTC/BG.png" width="750rpx"
+				height="748.25rpx" @click="click"></u--image> -->
+			<view class="head_tit">
+				<view class="head_tit_l">
+					<view class="iconfont icon-xiangzuo"></view>
+					<view
+						style="font-size: 40rpx;font-weight: 700;margin-left: 30rpx; transform: skewX(-10deg);color:white;">
+						名优特产
+					</view>
+				</view>
+				<view class="head_tit_r" style="font-size: 29.79rpx;">
+					江阳区 <text style="margin-left: 10rpx;" class="iconfont icon-xiangxia"></text>
+					<view class="" style="font-size: 22.78rpx;">
+						晴天30
+					</view>
+				</view>
+			</view>
+
+			<view class="head_serch">
+				<view style="position: relative;">
+					<u-search borderColor="#FF6D20" bgColor="white" :showAction="false" placeholder="搜索店铺名称"
+						v-model="keyword" class="serch_cls"></u-search>
+					<u--image class="img_cls" style="position: absolute; top: 3px;right: 3px;" :showLoading="true"
+						src="/static/images/MYTC/SS.png" width="115.65rpx" height="56.82rpx"></u--image>
+				</view>
+			</view>
+
+			<view class="head_content">
+				<view style="font-size: 40rpx;font-weight: 700;color:white; margin-bottom: 10rpx;">
+					精选特产
+				</view>
+				<view class="head_content_card">
+
+					<u-scroll-list>
+						<view v-for="(item, index) in list" :key="index" class="goods_card">
+							<u--image :showLoading="true" src="https://cdn.uviewui.com/uview/album/1.jpg"
+								width="210.28rpx" height="210.28rpx" @click="click"></u--image>
+							<view class="goods_tit">
+								笑口常开地方就是的开发建设的开发建设的,v空间和客户可怜见立刻就
+							</view>
+							<view class="goods_price">
+								$10.00
+							</view>
+
+							<!-- <image :src="item.thumb"></image> -->
+						</view>
+					</u-scroll-list>
+
+				</view>
+			</view>
+		</view>
+
+		<view class="store">
+			<view class="goods_list">
+				<view class="goods_cards" @click="goStore(item.mer_id)" v-for="(item,index) in storeList" :key="index">
+					<view class="left">
+						<u--image :showLoading="true" :src="item.mer_avatar" width="157.71rpx"
+							height="157.71rpx"></u--image>
+					</view>
+					<view class="right">
+						<view class="li heads" style="display: flex;">
+							<text class="flag">特产</text>
+							<text class="com_name">{{item.mer_name}}</text>
+							<text
+								style="font-weight: normal; font-size: 10rpx;color: red;padding:0 10rpx; border-radius: 10rpx; border: 1px solid red;">{{item.type_name}}</text>
+						</view>
+						<view class="li">
+							<u--image v-for="item,index in [1,1,,1,1,1]" :key="index" :showLoading="true"
+								src="/static/images/GXSC/PF.png" width="20.85rpx" height="19.85rpx"></u--image>
+							<text style="margin-left: 10rpx;color: #FF6D20; ">5.0</text>
+							<text>月销2000+</text>
+							<text>20分钟</text>
+							<text>1.1KM</text>
+						</view>
+						<view class="li" style="align-items: center;">
+							<u--image :showLoading="true" src="/static/images/GXSC/DH.png" width="33.85rpx"
+								height="33.85rpx"></u--image>
+							<text> {{item.service_phone}}</text>
+						</view>
+						<view class="li" style="align-items: center;">
+							<u--image :showLoading="true" src="/static/images/GXSC/SJ.png" width="33.85rpx"
+								height="33.85rpx"></u--image>
+							<text>{{item.mer_take_time[0]}}-{{item.mer_take_time[1]}}</text>
+						</view>
+						<view class="li" style="align-items: center;">
+							<u--image :showLoading="true" src="/static/images/GXSC/DW.png" width="33.85rpx"
+								height="33.85rpx"></u--image>
+							<text class="address">{{item.mer_address}}</text>
+						</view>
+
+						<view class="">
+							assa
+						</view>
+						<!-- <view class="">
+							<u-scroll-list>
+								<view v-for="(item, index) in list" :key="index" class="goods_card_a">
+									<u--image :showLoading="true" src="https://cdn.uviewui.com/uview/album/1.jpg"
+										width="164.72rpx" height="164.72rpx" @click="click"></u--image>
+									<view class="goods_tit_a">
+										笑口常开地方就是的开发建设的开发建设的,v空间和客户可怜见立刻就
+									</view>
+									<view class="goods_price">
+										$10.00
+									</view>
+								</view>
+							</u-scroll-list>
+						</view>
+ -->
+
+
+					</view>
+
+				</view>
+
+			</view>
+
+
+
+		</view>
+
+	</view>
+</template>
+
+<script>
+	import {
+		storeMerchantList,
+	} from '@/api/store.js';
+	export default {
+		data() {
+			return {
+				keyword: "",
+				list: [1, 1, 1, 1, 1, 1, 1, 1, ],
+				storeList: [1, 1, 1, 1, 1, 1, 1, 1, 1]
+			}
+		},
+		onLaunch() {
+			console.log(46545)
+			// storeMerchantList().then(res => {
+			// 	// this.count = res.data.count
+			// 	// this.storeList = this.storeList.concat(res.data.list)
+			// 	// this.loading = false
+			// 	// this.loadingIcon = false
+			// 	console.log(res)
+			// })
+
+		},
+		onShow() {
+			// console.log(46545)
+			storeMerchantList().then(res => {
+				// this.count = res.data.count
+				this.storeList = res.data.list
+				// this.loading = false
+				// this.loadingIcon = false
+				// console.log(res)
+			})
+		},
+		methods: {},
+		onPullDownRefresh() {
+			uni.stopPullDownRefresh()
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.head {
+		// background-color: #F94621;
+		background: url('/static/images/MYTC/BG.png') no-repeat;
+		padding: 20rpx;
+		border-radius: 0rpx 0rpx 31.54rpx 31.54rpx;
+
+		.head_tit {
+			display: flex;
+			justify-content: space-between;
+			color: white;
+			// margin-bottom: 20rpx;
+
+			.head_tit_l {
+				display: flex;
+				align-items: center;
+			}
+
+			.head_tit_r {
+				// display: flex;
+				// align-items: center;
+			}
+		}
+
+		.head_serch {
+			margin: 20rpx 0;
+		}
+
+		.head_content {
+			.head_content_card {
+				background: linear-gradient(to bottom, #FCB9AD, #FFFBF9, #FFFFFF);
+				border-radius: 21.03rpx 21.03rpx 21.03rpx 21.03rpx;
+				overflow: hidden;
+				padding: 20rpx 10rpx;
+
+				.goods_card {
+					margin-right: 20rpx;
+				}
+
+				.goods_tit {
+					overflow: hidden;
+					text-overflow: ellipsis;
+					display: -webkit-box;
+					-webkit-line-clamp: 2;
+					-webkit-box-orient: vertical;
+				}
+
+				.goods_price {
+					color: #F84221;
+					font-size: 29.79rpx;
+				}
+
+			}
+		}
+	}
+
+	.store {
+		.goods_list {
+			margin-top: 20rpx;
+
+			.goods_cards {
+				margin-top: 20rpx;
+				height: auto;
+				background-color: white;
+				padding: 20rpx;
+				border-radius: 20rpx;
+				display: flex;
+				// align-items: center;
+
+				.left {
+					margin-right: 20rpx;
+					width: 158rpx;
+					height: 158rpx;
+					background-color: red;
+					border-radius: 20rpx;
+					overflow: hidden;
+				}
+
+				.right {
+					.heads {
+						font-weight: bold;
+
+						.flag {
+							background: linear-gradient(to bottom, #F84221, #FF6D20);
+							width: 66.59rpx;
+							height: 36.8rpx;
+							text-align: center;
+							font-size: 22.78rpx;
+							color: white;
+							border-radius: 10.51rpx 10.51rpx 10.51rpx 10.51rpx;
+						}
+
+					}
+
+					.goods_card_a {
+						margin-right: 20rpx;
+					}
+
+					.goods_tit_a {
+						overflow: hidden;
+						text-overflow: ellipsis;
+						display: -webkit-box;
+						-webkit-line-clamp: 1;
+						-webkit-box-orient: vertical;
+					}
+
+					.li {
+						display: flex;
+						font-size: 26.29rpx;
+						margin-bottom: 10rpx;
+
+						align-items: center;
+						color: #737373;
+
+						text {
+							margin: 0 10rpx 0;
+						}
+					}
+				}
+			}
+		}
+
+		.address {
+			white-space: nowrap;
+			overflow: hidden;
+			text-overflow: ellipsis;
+			width: 200px;
+		}
+
+
+	}
+</style>
\ No newline at end of file
diff --git a/pages/nongKe/supply_chain/component/shop_card.vue b/pages/nongKe/supply_chain/component/shop_card.vue
index 21c6271..cec9e10 100644
--- a/pages/nongKe/supply_chain/component/shop_card.vue
+++ b/pages/nongKe/supply_chain/component/shop_card.vue
@@ -11,7 +11,7 @@
               <view class="store_site flex_a_c" v-if="store_item.street_name">{{ store_item.street_name }}</view>
               <view class="name">{{ store_item.mer_name }}</view>
             </view>
-            <image class="high_img" :src="youZhiImg" mode="aspectFill"></image>
+            <image class="high_img" :src="youZhiImg" mode="aspectFit"></image>
           </view>
           <view class="mct_msg_detail flex_a_c">
             <view class="product_score">{{ store_item.product_score }}分</view>
@@ -32,7 +32,7 @@
       <scroll-view scroll-x="true" class="goods_info">
         <view v-for="(itemn,indexn) in store_item.recommend" :key="indexn" class="goods_info_item"
           @click.stop="navTogoodsDetail(itemn.product_id)">
-          <image class="goods_info_img" :src="itemn.image" mode="aspectFill"></image>
+          <image class="goods_info_img" :src="itemn.image" mode="aspectFit"></image>
           <view class="goods_info_name">{{itemn.store_name}}</view>
           <view class="goods_info_price">￥{{itemn.price}}</view>
         </view>
diff --git a/pages/nongKe/supply_chain/goods_list.vue b/pages/nongKe/supply_chain/goods_list.vue
index 85065f4..cda2a3d 100644
--- a/pages/nongKe/supply_chain/goods_list.vue
+++ b/pages/nongKe/supply_chain/goods_list.vue
@@ -11,7 +11,7 @@
 		</view>
 		<block v-for="(item,i) in goodsList" :key="i">
 			<view class="list_item flex_a_c">
-				<image class="goods_img" :src="item.image" mode="aspectFill"></image>
+				<image class="goods_img" :src="item.image" mode="aspectFit"></image>
 				<view class="r_box flex_a_c_j_sb">
 					<view class="message">
 						<view class="goodstitle">{{item.store_name}}</view>
@@ -43,7 +43,7 @@
 				</view>
 				<view class="sub_title">订货价</view>
 				<input class="input" type="text" placeholder="请输入价格" v-model="goodsPrive">
-			<!-- 	<view class="sub_title">库存量</view>
+				<!-- 	<view class="sub_title">库存量</view>
 				<input class="input" type="number" placeholder="请输入库存数量" v-model="goodsNum"> -->
 				<view class="btns_box">
 					<view class="cancel" @click="popupClose">取消</view>
@@ -53,7 +53,6 @@
 		</u-popup>
 	</view>
 </template>
-
 <script>
 	import {
 		getStorage,
@@ -151,7 +150,7 @@
 				const res = await productUpdate(this.merId, this.product_id, this.particulars)
 				// Toast(message)
 				this.getGoodsList()
-				this.goodsList=[]
+				this.goodsList = []
 				this.popupShow = false
 				this.goodsPrive = ''
 				this.goodsNum = ''
diff --git a/pages/nongKe/supply_chain/maps.vue b/pages/nongKe/supply_chain/maps.vue
new file mode 100644
index 0000000..f089327
--- /dev/null
+++ b/pages/nongKe/supply_chain/maps.vue
@@ -0,0 +1,67 @@
+<template>
+	<view class="">
+		<map id="map" :enable-zoom="true" :markers="markers" :scale="19" :latitude="28.908447" :enable-scroll="true"
+			:longitude="105.439304" style="width: 100vw;height: 100vh;">
+			<!-- <cover-image class="map_btn" @tap="test" src="../../static/img/logistics/DH.png">
+			</cover-image> -->
+		</map>
+	</view>
+</template>
+
+<script>
+	import {
+		vicinityStoreApi,
+		supAgoodsApi
+	} from '@/api/store.js';
+	export default {
+		data() {
+			return {
+				markers: [{
+					id: 1,
+					latitude: 28.908447,
+					longitude: 105.439304,
+					title: "测试商家名称",
+					iconPath: "/static/images/GXSC/SJicon.png"
+				}, {
+					id: 2,
+					latitude: 28.909447,
+					longitude: 105.439304,
+					title: "测试商家名称",
+					iconPath: "/static/images/GXSC/SJicon.png"
+				}, {
+					id: 3,
+					latitude: 28.908447,
+					longitude: 105.459304,
+					title: "测试商家名称",
+					iconPath: "/static/images/GXSC/SJicon.png"
+				}, ]
+			}
+		}
+
+		,
+		onLoad(options) {
+			let that = this
+			// supAgoodsApi()
+			vicinityStoreApi(options.street_id).then(res => {
+				// console.log(res.data.list)
+				res.data.list.forEach(item => {
+					if (!item.lat) return
+					this.markers = []
+					// console.log(item)
+					that.markers.push({
+						id: item.mer_id,
+						latitude: item.lat,
+						longitude: item.long,
+						title: item.mer_name,
+						iconPath: "/static/images/GXSC/SJicon.png"
+
+					})
+				})
+			})
+		}
+
+	}
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/pages/nongKe/supply_chain/merchant.vue b/pages/nongKe/supply_chain/merchant.vue
index b7e13a5..e137b68 100644
--- a/pages/nongKe/supply_chain/merchant.vue
+++ b/pages/nongKe/supply_chain/merchant.vue
@@ -20,7 +20,7 @@
     <block v-for="(item,index) in list" :key="index">
       <view class="item_list flex">
         <view>
-          <image class="goods_image" :src="item.image" mode="aspectFill"></image>
+          <image class="goods_image" :src="item.image" mode="aspectFit"></image>
         </view>
         <view class="left_goods_msg">
           <view class="name">{{ item.store_name }}</view>
diff --git a/pages/nongKe/supply_chain/supplier-copy.vue b/pages/nongKe/supply_chain/supplier-copy.vue
index 2abb398..728e9ae 100644
--- a/pages/nongKe/supply_chain/supplier-copy.vue
+++ b/pages/nongKe/supply_chain/supplier-copy.vue
@@ -33,7 +33,7 @@
       <view class="right_storee">
         <scroll-view scroll-y="true" style="height: 100%; overflow: hidden;" scroll-with-animation='true'
           @scrolltolower="scrolltolower" class="my-scroll-view">
-          <image class="banner" :src="src" mode="aspectFill"></image>
+          <image class="banner" :src="src" mode="aspectFit"></image>
           <view style="background-color: #fff;width: 100%;">
             <view class="tabs_box flex_a_c_j_sb">
               <view v-for="(item,index) in tabsList" :key="index" class="flex_a_c" :class="active==index?'active':''">
diff --git a/pages/nongKe/supply_chain/supplier.vue b/pages/nongKe/supply_chain/supplier.vue
index dff372f..ed7a850 100644
--- a/pages/nongKe/supply_chain/supplier.vue
+++ b/pages/nongKe/supply_chain/supplier.vue
@@ -1,27 +1,108 @@
 <template>
-	<view>
-	
+	<view style="background-color: #F0F2F5;">
+		<!-- <view style="height: var(--status-bar-height);background-color: red;height: 10vh;">dsfdsfsdfds</view> -->
 		<view class='productList' :style="viewColor">
-			<view class='search acea-row row-between-wrapper' :class="'styleType'+store_street_theme">
-			
-				<view class="back" @click='backjJump()'>
-					<view class="iconfont icon-xiangzuo"></view>
+			<!-- 顶部 -->
+			<view class="top">
+				<view style="height: 10px;">
+
 				</view>
-	
-				<view class='input acea-row row-between-wrapper'><text class='iconfont icon-sousuo'></text>
-					<input placeholder='搜索店铺名称' placeholder-class='placeholder' confirm-type='search' name="search"
-						:value='sotreParam.keyword' @confirm="searchSubmit"></input>
-				</view>
-		<!-- 		<view v-if="mer_location == 1" :class="'styleType'+store_street_theme" style="text-align: right;"
-					class='iconfont search-right' @click='showMaoLocation(latitude,longitude)'>
-					<view class="iconfont icon-dingwei"></view>
-					<view class="right-text" v-if="recommend_address">
-						{{recommend_address}}
+				<view style="display: flex;justify-content: space-around; align-items: center;">
+					<view class="back" @click='backjJump()'>
+						<view class="iconfont icon-xiangzuo" style="color: #333333;"></view>
+					</view>
+					<view class="" style="font-size: 40rpx;font-weight: 700;transform: skewX(-10deg);">
+						供销综合云市场
+					</view>
+					<view style="position: relative;width: 289.14rpx;">
+						<!-- <text class='iconfont icon-sousuo'></text>
+			<input placeholder='搜索店铺名称' placeholder-class='placeholder' confirm-type='search' name="search"
+				:value='sotreParam.keyword' @confirm="searchSubmit"></input> -->
+						<u-search borderColor="#FF6D20" bgColor="white" @change="test" :showAction="false"
+							placeholder="请输入..." v-model="sotreParam.keyword" class="serch_cls"></u-search>
+						<u--image @tap="searchSubmit" class="img_cls" style="position: absolute; top: 3px;right: 3px;"
+							:showLoading="true" src="/static/images/GXSC/SS.png" width="115.65rpx"
+							height="56.82rpx"></u--image>
+					</view>
+					<view class='iconfont search-right'
+						@click="goMap(`/pages/nongKe/supply_chain/maps?street_id=${street_id}`)">
+						<u--image :showLoading="true" src="/static/images/GXSC/DW.png" width="50.82rpx"
+							height="50.82rpx"></u--image>
 					</view>
-					<view class="iconfont icon-xiangyou" v-if="recommend_address"></view>
 				</view>
-		 -->	</view>
-			<view class="nav-wrapper" :class="'styleType'+store_street_theme">
+			</view>
+			<view class="content">
+				<view style="background-color: red;height: 10px">
+					asdasd
+				</view>
+				<view class="hot_serch">
+					<text>热搜:</text> <text @click="hotSerchFn('小张副食')">小张副食</text> <text
+						@click="hotSerchFn('正新酒店')">正新酒店</text>
+					<text @click="hotSerchFn('麻辣鸡')">麻辣鸡</text>
+					<text @click="hotSerchFn('手撕椒麻鸡')">手撕椒麻鸡</text>
+				</view>
+
+				<view class="menu_cls">
+					<u-scroll-list indicatorActiveColor='#FF6D20'>
+						<view class="menu_li" @click="navGo(item.merchant_category_id)" v-for="item,index in menuList"
+							:key="index">
+							<!-- {{item.merchant_category_id}} -->
+							<u--image :showLoading="true" :src="imgList[index]" width="94.63rpx" height="99.63rpx"
+								style="margin-bottom: 20rpx;"></u--image>
+							<text
+								style="display: block;font-size: 26.29rpx;  width: 15vw;">{{item.category_name}}</text>
+						</view>
+					</u-scroll-list>
+				</view>
+
+				<view class="goods_list">
+					<view class="goods_card" @click="goStore(item.mer_id)" v-for="(item,index) in storeList"
+						:key="index">
+						<view class="left">
+							<u--image :showLoading="true" :src="item.mer_avatar" width="157.71rpx"
+								height="157.71rpx"></u--image>
+						</view>
+						<view class="right">
+							<view class="li head">
+								<text class="com_name">{{item.mer_name}}</text>
+								<text
+									style="font-weight: normal;font-size: 19.28rpx;color: red;padding:0 10rpx; border-radius: 10rpx; border: 1px solid red;">{{item.type_name}}</text>
+							</view>
+							<view class="li">
+								<u--image v-for="item,index in [1,1,,1,1,1]" :key="index" :showLoading="true"
+									src="/static/images/GXSC/PF.png" width="20.85rpx" height="19.85rpx"></u--image>
+								<text style="margin-left: 20rpx;color: #FF6D20; ">5.0</text>
+								<text>月销{{item.sales}}</text>
+							</view>
+							<view class="li" style="align-items: center;">
+								<u--image :showLoading="true" src="/static/images/GXSC/DH.png" width="33.85rpx"
+									height="33.85rpx"></u--image>
+								<text> {{item.service_phone}}</text>
+							</view>
+							<view class="li" style="align-items: center;">
+								<u--image :showLoading="true" src="/static/images/GXSC/SJ.png" width="33.85rpx"
+									height="33.85rpx"></u--image>
+								<text>{{item.mer_take_time[0]}}-{{item.mer_take_time[1]}}</text>
+							</view>
+							<view class="li" style="align-items: center;">
+								<u--image :showLoading="true" src="/static/images/GXSC/DW.png" width="33.85rpx"
+									height="33.85rpx"></u--image>
+								<text class="address">{{item.mer_address}}</text>
+							</view>
+						</view>
+
+					</view>
+
+				</view>
+
+
+			</view>
+
+			<!-- 热搜 -->
+
+
+
+			<!-- <view class="nav-wrapper" :class="'styleType'+store_street_theme">
 				<view class='nav acea-row row-middle' :class="'styleType'+store_street_theme">
 					<view v-for="item in downMenus" :key="item.key" class='item'
 						:class="{'font-colors':firstKey == item.key}" @click='set_where(item.key)'>
@@ -31,10 +112,14 @@
 						<view class="line" :class="{'font-line':firstKey == item.key}">
 						</view>
 					</view>
-					
+
 				</view>
 			</view>
+			
+			 -->
+
 			<!-- 店铺 -->
+			<!-- 
 			<block>
 				<view class="store-wrapper">
 					<view class="store-item" v-for="(item,index) in storeList" :key="index">
@@ -43,7 +128,7 @@
 							</view>
 							<view class="zhezhao">
 							</view>
-							<view class="zhezhao1"  @click="goStore(item.mer_id)">
+							<view class="zhezhao1" @click="goStore(item.mer_id)">
 								<view class="title">
 									<view>{{item.mer_name}}
 									</view>
@@ -170,9 +255,12 @@
 			<view class='loadingicon acea-row row-center-wrapper' v-if="loading">
 				<text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>{{loadTitle}}
 			</view>
+		 -->
+
+
 		</view>
 		<view class='no-shop' v-if="!storeList.length && !loading && !loadingIcon" v-cloak>
-			<view class='pictrue' style="margin: 0 auto;">
+			<view class='pictrue' style="margin: 0 auto;background-color: #F5F5F5;">
 				<image src='../../../static/images/noCart.png'></image>
 				<text>暂无店铺，快去搜索其他店铺吧</text>
 			</view>
@@ -183,14 +271,15 @@
 			<image src="@/static/images/guanbi.png" class="guanbi" @click="close"></image>
 		</u-popup>
 	</view>
-	
+
 	</view>
 </template>
 
 <script>
 	import {
 		storeMerchantList,
-		getGeocoder
+		getGeocoder,
+		supMenuApi
 	} from '@/api/store.js';
 	import recommend from './component/recommend';
 	import rightSlider from './component/rightSlider';
@@ -217,6 +306,25 @@
 		},
 		data() {
 			return {
+				imgList: [
+					"/static/images/GXSC/BBY.png",
+					"/static/images/GXSC/NYSC.png",
+					"/static/images/GXSC/SHFW.png",
+					"/static/images/GXSC/SCFW.png",
+					"/static/images/GXSC/NFCP.png",
+					"/static/images/GXSC/WLSY.png",
+					"/static/images/GXSC/WYLY.png",
+					"/static/images/GXSC/MSGY.png",
+					"/static/images/GXSC/YLBJ.png",
+					"/static/images/GXSC/JYPX.png",
+					"/static/images/GXSC/JJRB.png",
+					"/static/images/GXSC/ZXJZ.png",
+					"/static/images/GXSC/NMJD.png",
+					"/static/images/GXSC/GXZH.png",
+					"/static/images/GXSC/DFTC.png",
+					"/static/images/GXSC/JDMS.png",
+				],
+				street_id: "",
 				price: 0,
 				stock: 0,
 				nows: false,
@@ -233,6 +341,7 @@
 				brandList: [],
 				downKey: 0,
 				downStatus: false,
+				menuList: [],
 				// 下拉菜单
 				downMenu: [{
 						title: '默认',
@@ -283,18 +392,19 @@
 				storeTypeArr: [], //店铺类型
 				merList: [], //商户分类
 				product_type: 0,
-				show:false,
-				image: '' ,//图片,
-				credit_buy:'',//支持先货后款
+				show: false,
+				image: '', //图片,
+				credit_buy: '', //支持先货后款
 			};
 		},
 		onLoad(options) {
-			console.log(options);
+			// console.log(options);
+			this.street_id = options.street_id
 			this.product_type = options.product_type ?? 0
 			if (options.street_id != undefined) {
 				this.sotreParam.street_id = options.street_id
 			}
-			this.credit_buy=options.credit_buy
+			this.credit_buy = options.credit_buy
 			this.sotreParam.type_id = options.type_id
 			this.sotreParam.type_id = options.type_id && options.type_id.split(',').toString() || ''
 			this.sotreParam.category_id = options.cate_id && options.cate_id.split(',').toString() || ''
@@ -305,6 +415,10 @@
 			this.storeMerchantList();
 			this.getClassfication();
 			this.getStoreType();
+			supMenuApi().then(res => {
+				this.menuList = res.data
+			})
+
 		},
 		computed: {
 			downMenus: function() {
@@ -325,6 +439,28 @@
 			}, mapGetters(['viewColor'])),
 		},
 		methods: {
+			test() {
+				if (this.sotreParam.keyword.length > 3) {
+					this.sotreParam.keyword.slice(0, 3)
+					this.sotreParam.keyword = this.sotreParam.keyword.slice(0, 3) + "..."
+					console.log(this.sotreParam.keyword)
+				}
+				// console.log(this.sotreParam.keyword.length)
+			},
+			hotSerchFn(keywords) {
+				this.sotreParam.keyword = keywords
+				this.searchSubmit()
+			},
+			goMap(url) {
+				uni.navigateTo({
+					url
+				})
+			},
+			navGo(id) {
+				uni.navigateTo({
+					url: `/pages/nongKe/supply_chain/supplierA?type_id=10&merchant_category_id=${id}&street_id=${this.street_id}`
+				})
+			},
 			go_details: function(product_type, product_id) {
 				if (product_type == 98) {
 					uni.navigateTo({
@@ -494,7 +630,7 @@
 					category_id: this.sotreParam.category_id,
 					type_id: this.sotreParam.type_id,
 					street_id: this.sotreParam.street_id,
-					credit_buy:this.credit_buy
+					credit_buy: this.credit_buy
 				}
 				if (this.latitude) {
 					rqData.location = this.latitude + ',' + this.longitude
@@ -521,9 +657,9 @@
 					}
 				}
 			},
-			searchSubmit: function(e) {
+			searchSubmit: function() {
 				let that = this;
-				that.$set(that.sotreParam, 'keyword', e.detail.value);
+				that.$set(that.sotreParam, 'keyword', this.sotreParam.keyword);
 				this.set_where(this.firstKey)
 			},
 			// 右侧切换
@@ -611,55 +747,118 @@
 				this.storeMerchantList()
 			}
 		}
-		
+
 	}
 </script>
 
 <style lang="scss" scoped>
-	.productList .search {
-		width: 100%;
-		height: 146rpx;
-		padding: 0 20rpx;
-		box-sizing: border-box;
-		position: fixed;
-		left: 0;
-		top: 0;
-		z-index: 9;
-		display: flex;
-		flex-wrap: nowrap;
-		background-color: #fff;
-		padding-top: 80rpx;
-        padding-bottom: 20rpx;
-		&.styleType1 {
-			background-color: var(--view-theme);
+	* {
+		margin: 0;
+		padding: 0;
+	}
+
+	.com_name {
+		font-size: 33.29rpx;
+		// background-color: red;
+		max-width: 45vw;
+		white-space: nowrap;
+		/* 防止文字换行 */
+		overflow: hidden;
+		/* 超出部分隐藏 */
+		text-overflow: ellipsis;
+		/* 使用省略号表示溢出的内容 */
+		// width: 200px;
+		/* 可根据实际情况调整容器宽度 */
+	}
+
+	.productList {
+		// padding-top: 50rpx;
+		// padding: 0 20rpx 0;
+
+		.top {
+			padding-top: var(--status-bar-height);
+			/* #ifdef H5 */
+			padding-top: 30rpx;
+			/* #endif */
+			// padding-top: 80rpx;
+			background-color: #F0F2F5;
+			position: fixed;
+			z-index: 999;
+			width: 100%;
+			// margin-top: 10px;
 		}
 
-		.search-right {
-			display: flex;
-			align-items: center;
-			justify-content: space-between;
-			max-width: max-content;
-			flex: 1;
-			padding-left: 20rpx;
+		.content {
+			padding: 20rpx;
 		}
 
-		.right-text {
+		.menu_cls {
+			background-color: white;
+			// height: 199.77rpx;
+			border-radius: 21.03rpx 21.03rpx 21.03rpx 21.03rpx;
+			padding: 20rpx 20rpx 0 20rpx;
+
+			.menu_li {
+				margin-right: 50rpx;
+				// background-color: red;
+				width: 50vw;
+				// width: 120rpx;
+				// display: inline-block;
+			}
+
+
+		}
+
+		.goods_list {
+			margin-top: 20rpx;
+
+			.goods_card {
+				margin-top: 20rpx;
+				height: auto;
+				background-color: white;
+				padding: 20rpx;
+				border-radius: 20rpx;
+				display: flex;
+				// align-items: center;
+
+				.left {
+					margin-right: 20rpx;
+					width: 158rpx;
+					height: 158rpx;
+					border-radius: 20rpx;
+					overflow: hidden;
+				}
+
+				.right {
+					.head {
+						font-weight: bold;
+						// color: red;
+
+					}
+
+					.li {
+						display: flex;
+						font-size: 26.29rpx;
+						margin-bottom: 10rpx;
+						align-items: center;
+
+						text {
+							margin: 0 20rpx 0 5rpx;
+						}
+					}
+				}
+			}
+		}
+
+		.address {
+			white-space: nowrap;
 			overflow: hidden;
 			text-overflow: ellipsis;
-			white-space: nowrap;
-			font-size: 28rpx;
-			width: max-content;
-			color: #fff;
-			padding: 0 10rpx;
-		}
-
-		.icon-xiangyou,
-		.icon-dingwei {
-			font-size: 30rpx;
-			color: #fff;
+			width: 200px;
 		}
 	}
 
+
 	.search-right.styleType2 .right-text,
 	.search-right.styleType3 .right-text {
 		color: #282828;
@@ -687,6 +886,27 @@
 		}
 	}
 
+	.hot_serch {
+		color: #B3B3B3;
+		display: flex;
+		justify-content: space-around;
+		margin-top: 40rpx;
+
+		flex-wrap: wrap;
+		// margin-top: 50rpx;
+		// padding-top: 100rpx;
+		padding-top: var(--status-bar-height);
+		// margin-top: 10px;
+		/* #ifdef H5 */
+		padding-top: 50rpx;
+		/* #endif */
+		// margin-top: 200rpx;
+
+		text {
+			margin: 10rpx;
+		}
+	}
+
 	.productList .search .input {
 		flex: 1;
 		height: 60rpx;
@@ -730,7 +950,7 @@
 		z-index: 9;
 		position: fixed;
 		left: 0;
-	    top: 25px;
+		top: 25px;
 		width: 100%;
 		margin-top: 86rpx;
 		background-color: #fff;
@@ -1109,7 +1329,7 @@
 
 	.no-shop {
 		background-color: #fff;
-		padding-bottom: calc(100% - 176rpx);
+		// padding-bottom: calc(100% - 176rpx);
 
 		.pictrue {
 			display: flex;
@@ -1123,12 +1343,13 @@
 			}
 		}
 	}
+
 	.guanbi {
 		width: 20px;
 		height: 20px;
 		margin: 30px auto;
 	}
-	
+
 	.pop {
 		z-index: 1;
 	}
diff --git a/pages/nongKe/supply_chain/supplierA.vue b/pages/nongKe/supply_chain/supplierA.vue
new file mode 100644
index 0000000..946383a
--- /dev/null
+++ b/pages/nongKe/supply_chain/supplierA.vue
@@ -0,0 +1,1319 @@
+<template>
+	<view style="background-color: #F0F2F5;min-height: 100vh">
+		<view style="height: var(--status-bar-height);"></view>
+		<view class='productList' :style="viewColor">
+			<!-- 顶部 -->
+			<view class="top">
+				<view style="height: 10px;">
+				</view>
+				<view style="display: flex;justify-content: space-around; align-items: center;">
+					<view class="back" @click='backjJump()'>
+						<view class="iconfont icon-xiangzuo" style="color: #333333;"></view>
+					</view>
+					<view style="font-size: 40rpx;font-weight: 700;transform: skewX(-10deg);">
+						{{titName}}
+					</view>
+					<view style="position: relative;">
+						<!-- <text class='iconfont icon-sousuo'></text>
+			<input placeholder='搜索店铺名称' placeholder-class='placeholder' confirm-type='search' name="search"
+				:value='sotreParam.keyword' @confirm="searchSubmit"></input> -->
+						<u-search borderColor="#FF6D20" bgColor="white" :showAction="false" placeholder="搜索店铺名称"
+							v-model="sotreParam.keyword" class="serch_cls"></u-search>
+						<u--image @tap="searchSubmit" class="img_cls" style="position: absolute; top: 3px;right: 3px;"
+							:showLoading="true" src="/static/images/GXSC/SS.png" width="115.65rpx"
+							height="56.82rpx"></u--image>
+					</view>
+
+				</view>
+			</view>
+			<view class="content">
+				<view class="hot_serch">
+					<!-- <text>热搜:</text> <text>热a搜商品</text> <text>热搜商品</text>
+					<text>热搜sasas商品</text> -->
+				</view>
+
+				<!-- <view class="menu_cls">
+					<u-scroll-list>
+						<view class="menu_li" @click="navGo(item.merchant_category_id)" v-for="item,index in menuList"
+							:key="index">
+							<u--image :showLoading="true" :src="imgList[index]" width="94.63rpx" height="99.63rpx"
+								style="margin-bottom: 20rpx;"></u--image>
+							<text style="display: block;    width: 15vw;">{{item.category_name}}</text>
+						</view>
+					</u-scroll-list>
+				</view> -->
+
+				<view class="goods_list">
+					<view class="goods_card" @click="goStore(item.mer_id)" v-for="(item,index) in storeList"
+						:key="index">
+						<view class="left">
+							<u--image :showLoading="true" :src="item.mer_avatar" width="157.71rpx"
+								height="157.71rpx"></u--image>
+						</view>
+						<view class="right">
+							<view class="li head" style="display: flex;">
+								<text class="com_name">{{item.mer_name}}</text>
+								<text
+									style="font-weight: normal; font-size: 10rpx;color: red;padding:0 10rpx; border-radius: 10rpx; border: 1px solid red;">{{item.type_name}}</text>
+							</view>
+							<view class="li">
+								<u--image v-for="item,index in [1,1,,1,1,1]" :key="index" :showLoading="true"
+									src="/static/images/GXSC/PF.png" width="20.85rpx" height="19.85rpx"></u--image>
+								<text style="margin-left: 20rpx;color: #FF6D20; ">5.0</text>
+								<text>月销2000+</text>
+							</view>
+							<view class="li" style="align-items: center;">
+								<u--image :showLoading="true" src="/static/images/GXSC/DH.png" width="33.85rpx"
+									height="33.85rpx"></u--image>
+								<text> {{item.service_phone}}</text>
+							</view>
+							<view class="li" style="align-items: center;">
+								<u--image :showLoading="true" src="/static/images/GXSC/SJ.png" width="33.85rpx"
+									height="33.85rpx"></u--image>
+								<text>{{item.mer_take_time[0]}}-{{item.mer_take_time[1]}}</text>
+							</view>
+							<view class="li" style="align-items: center;">
+								<u--image :showLoading="true" src="/static/images/GXSC/DW.png" width="33.85rpx"
+									height="33.85rpx"></u--image>
+								<text class="address">{{item.mer_address}}</text>
+							</view>
+						</view>
+
+					</view>
+
+				</view>
+
+
+			</view>
+
+			<!-- 热搜 -->
+
+
+
+			<!-- <view class="nav-wrapper" :class="'styleType'+store_street_theme">
+				<view class='nav acea-row row-middle' :class="'styleType'+store_street_theme">
+					<view v-for="item in downMenus" :key="item.key" class='item'
+						:class="{'font-colors':firstKey == item.key}" @click='set_where(item.key)'>
+						<view class="">
+							{{item.title}}
+						</view>
+						<view class="line" :class="{'font-line':firstKey == item.key}">
+						</view>
+					</view>
+
+				</view>
+			</view>
+			
+			 -->
+
+			<!-- 店铺 -->
+			<!-- 
+			<block>
+				<view class="store-wrapper">
+					<view class="store-item" v-for="(item,index) in storeList" :key="index">
+						<view class="head">
+							<view class="bgc_img" :style="{ backgroundImage: `url(${item.mini_banner})`}">
+							</view>
+							<view class="zhezhao">
+							</view>
+							<view class="zhezhao1" @click="goStore(item.mer_id)">
+								<view class="title">
+									<view>{{item.mer_name}}
+									</view>
+									<span>
+										{{item.type_name}}
+									</span>
+								</view>
+								<view class="coent">
+									<view class="avater">
+										<image :src="item.mer_avatar" mode=""></image>
+									</view>
+									<view class=" text">
+										<view class="text_one">
+											<view class="">
+												<image src="@/static/images/phone.png" mode=""></image>
+												{{item.service_phone}}
+											</view>
+											<view class="text_one_r">
+												<image src="@/static/images/clock.png" mode=""></image>
+												{{item.mer_take_time[0]}}-{{item.mer_take_time[1]}}
+											</view>
+										</view>
+										<view class="text_two">
+											<image src="@/static/images/shangpu.png" mode=""></image>
+											{{item.mer_info}}
+										</view>
+										<view class="text_three">
+											<image src="@/static/images/dingwei.png" mode=""></image>
+											{{item.mer_address}}
+										</view>
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</block>
+			<block v-if="store_street_theme == 2">
+				<view class="mer-item2" v-for="(item,index) in storeList" :key='index'>
+					<view class="mer-hd mer-shop-count" @click="goStore(item.mer_id)">
+						<image class="mer-avatar" :src="item.mer_avatar"></image>
+						<view class="mer-shop-right">
+							<view class="mer-count">
+								<view class="mer-top">
+									<view class="txt line1">{{item.mer_name}}</view>
+									<text v-if="item.type_name" class="font-bg-red ml8">{{item.type_name}}</text>
+									<text v-else-if="item.is_trader" class="font-bg-red ml8">自营</text>
+								</view>
+								<view class="mer-btn">
+									<view class="">
+										{{item.care_count<10000 ? item.care_count : (item.care_count/10000).toFixed(2)+'万'}}人关注
+									</view>
+									<view class="line" v-if="item.distance"></view>
+									<view class="distance" v-if="item.distance" @click.stop="showStoreLocation(item)">
+										<view class="">
+											{{item.distance}}
+										</view>
+										<view class="iconfont icon-xiangyou"></view>
+									</view>
+								</view>
+							</view>
+							<view class="pro-box">
+								<navigator :url="`/pages/goods_details/index?id=${itemn.product_id}`" hover-class="none"
+									class="pro-item" v-for="(itemn,indexn) in item.recommend" :key='indexn'>
+									<view class="picture">
+										<easy-loadimage mode="widthFix" :image-src="itemn.image"></easy-loadimage>
+										<view v-if="itemn.border_pic"
+											:style="{ backgroundImage: `url(${itemn.border_pic})` }"
+											class="border-picture"></view>
+									</view>
+									<view class="price">
+										<text>￥</text>{{itemn.price}}
+									</view>
+								</navigator>
+							</view>
+						</view>
+					</view>
+				</view>
+			</block>
+			<block v-if="store_street_theme == 3">
+				<view class="mer-item mer-item3" v-for="(item,index) in storeList" :key='index'
+					:style="'background-image:url('+item.mini_banner+')'">
+					<view class="mer-hd" @click="goStore(item.mer_id)">
+						<view class="mer-name">
+							<image :src="item.mer_avatar"></image>
+							<view class="">
+								<view class="mer-top">
+									<view class="txt line1">{{item.mer_name}}</view>
+									<text v-if="item.type_name" class="font-bg-red ml8">{{item.type_name}}</text>
+									<text v-else-if="item.is_trader" class="font-bg-red ml8">自营</text>
+								</view>
+								<view class="mer-btn">
+									<view class="">
+										{{item.care_count<10000 ? item.care_count : (item.care_count/10000).toFixed(2)+'万'}}人关注
+									</view>
+									<view class="line" v-if="item.distance"></view>
+									<view class="distance" v-if="item.distance" @click.stop="showStoreLocation(item)">
+										<view class="">
+											{{item.distance}}
+										</view>
+										<view class="iconfont icon-xiangyou"></view>
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+					<view class="pro-box" :class="'styleType'+store_street_theme">
+						<view class="pro-item" v-for="(itemn,indexn) in item.recommend" :key='indexn' v-if="indexn<=2">
+							<view @click="go_details(itemn.product_type,itemn.product_id)">
+								<view class="picture">
+									<image :src="itemn.image"></image>
+									<view v-if="itemn.border_pic"
+										:style="{ backgroundImage: `url(${itemn.border_pic})` }" class="border-picture">
+									</view>
+								</view>
+								<view class="price">
+									<text>￥</text>{{itemn.price}}
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</block>
+			<view class='loadingicon acea-row row-center-wrapper' v-if="loading">
+				<text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>{{loadTitle}}
+			</view>
+		 -->
+
+
+		</view>
+		<view class='no-shop' v-if="!storeList.length && !loading && !loadingIcon" v-cloak>
+			<view class='pictrue' style="margin: 0 auto;background-color: #F0F2F5;">
+				<image src='../../../static/images/noCart.png'></image>
+				<text>暂无店铺，快去搜索其他店铺吧</text>
+			</view>
+		</view>
+		</block>
+		<u-popup class="pop" :show="show" @close="close" mode="center" bgColor='transparent'>
+			<image :src="image"></image>
+			<image src="@/static/images/guanbi.png" class="guanbi" @click="close"></image>
+		</u-popup>
+	</view>
+
+	</view>
+</template>
+
+<script>
+	import {
+		storeMerchantList,
+		getGeocoder,
+		supMenuApi,
+		supAgoodsApi
+	} from '@/api/store.js';
+	import recommend from './component/recommend';
+	import rightSlider from './component/rightSlider';
+	import {
+		merClassifly,
+		getStoreTypeApi
+	} from '@/api/store.js';
+	import {
+		mapGetters
+	} from "vuex";
+	import {
+		goShopDetail
+	} from '@/libs/order.js'
+	import {
+		configMap
+	} from '@/utils';
+	import easyLoadimage from '@/components/easy-loadimage/easy-loadimage.vue';
+	const app = getApp();
+	export default {
+		components: {
+			recommend,
+			rightSlider,
+			easyLoadimage
+		},
+		data() {
+			return {
+
+				titName: "坝坝宴",
+				price: 0,
+				stock: 0,
+				nows: false,
+				loading: false,
+				loadingIcon: true,
+				loadTitle: '加载更多',
+				title: '',
+				hotPage: 1,
+				hotLimit: 10,
+				hotScroll: false,
+				// 筛选框
+				rightBox: false,
+				//品牌列表
+				brandList: [],
+				downKey: 0,
+				downStatus: false,
+				menuList: [],
+				// 下拉菜单
+				downMenu: [{
+						title: '默认',
+						key: 0,
+						order: ""
+					},
+					{
+						title: '销量',
+						key: 1,
+						order: 'sales'
+					},
+					{
+						title: '好评',
+						key: 2,
+						order: 'rate'
+					},
+					{
+						title: '距离',
+						key: 3,
+						order: 'location'
+					}
+				],
+				// 是否第一个
+				firstKey: 0,
+				// 商铺列表
+				storeList: [],
+				sotreParam: {
+					keyword: '',
+					page: 1,
+					limit: 10,
+					order: '',
+					category_id: '',
+					type_id: '',
+					street_id: ''
+				},
+				storeKey: 0,
+				storeScroll: true,
+				mer_id: '',
+				sortId: '',
+				price_on: '',
+				price_off: '',
+				detaile_address: "",
+				recommend_address: "",
+				location_address: "",
+				latitude: "",
+				longitude: "",
+				count: 0,
+				storeTypeArr: [], //店铺类型
+				merList: [], //商户分类
+				product_type: 0,
+				show: false,
+				image: '', //图片,
+				credit_buy: '', //支持先货后款
+			};
+		},
+		onLoad(options) {
+			this.product_type = options.product_type ?? 0
+			if (options.street_id != undefined) {
+				this.sotreParam.street_id = options.street_id
+			}
+			this.credit_buy = options.credit_buy
+			this.sotreParam.type_id = options.type_id
+			this.sotreParam.type_id = options.type_id && options.type_id.split(',').toString() || ''
+			this.sotreParam.category_id = options.merchant_category_id || ''
+			this.storeList = [];
+
+			if (this.mer_location == 1) {
+				this.selfLocation()
+			}
+			this.storeMerchantList();
+			this.getClassfication();
+			this.getStoreType();
+			supMenuApi().then(res => {
+				this.menuList = res.data
+				let index = this.menuList.findIndex((item) => {
+					return item.merchant_category_id == options.merchant_category_id;
+				});
+				this.titName = this.menuList[index].category_name
+				// console.log(this.menuList)
+			})
+			// console.log(this.menuList)
+
+		},
+		computed: {
+			downMenus: function() {
+				return this.downMenu.filter((item) => {
+					if (this.mer_location) {
+						return item
+					} else {
+						return item.key < 3
+					}
+				})
+			},
+			...configMap({
+				margin_ico_switch: 0,
+				margin_ico: '',
+				mer_location: 0,
+				store_street_theme: 1,
+				hide_mer_status: '',
+			}, mapGetters(['viewColor'])),
+		},
+		methods: {
+			navGo(id) {
+				uni.navigateTo({
+					url: `/pages/nongKe/supply_chain/supplierA?type_id=10&?merchant_category_id=${id}`
+				})
+			},
+			go_details: function(product_type, product_id) {
+				if (product_type == 98) {
+					uni.navigateTo({
+						url: `/pages/admin/goods_details/index?product_id=${product_id}&product_type=${product_type}`
+					})
+				}
+				if (product_type == 0) {
+					uni.navigateTo({
+						url: `/pages/goods_details/index?id=${product_id}`
+					})
+				}
+			},
+			// 获取商户分类
+			getClassfication: function() {
+				let temp = []
+				merClassifly()
+					.then(res => {
+						temp = res.data.map(item => {
+							return {
+								...item,
+								check: false
+							}
+						})
+						if (this.sotreParam.category_id.length > 0) {
+							this.sotreParam.category_id.forEach((ids, index) => {
+								temp.forEach(el => {
+									if (ids == el.merchant_category_id) {
+										el.check = true
+									}
+								})
+							})
+						}
+						this.merList = temp
+					})
+					.catch(res => {
+						this.$util.Tips({
+							title: res
+						});
+					});
+			},
+			// 获取店铺类型
+			getStoreType: function() {
+				let temp = []
+				getStoreTypeApi().then(res => {
+						res.data.forEach(item => {
+							if (item.mer_type_id == this.sotreParam.type_id) {
+								temp.push({
+									...item,
+									check: true
+								})
+							}
+						})
+						this.storeTypeArr = temp
+					})
+					.catch(res => {
+						this.$util.Tips({
+							title: res
+						});
+					});
+			},
+			/** 打开地图**/
+			showMaoLocation(lat, long) {
+				if (!lat || !long) return this.$util.Tips({
+					title: '请设置允许商城访问您的位置！'
+				});
+				//#ifdef H5
+				if (this.$wechat.isWeixin() === true) {
+					this.$wechat.seeLocation({
+						latitude: Number(lat),
+						longitude: Number(long),
+						name: '当前位置',
+						address: this.location_address
+					}).then(res => {
+						// console.log('success');
+					})
+				} else {
+					//#endif
+					uni.openLocation({
+						latitude: parseFloat(lat),
+						longitude: parseFloat(long),
+						name: '当前位置',
+						address: this.location_address,
+						scale: 8,
+						success: function(res) {
+							// console.log(res)
+						},
+					});
+					// #ifdef H5
+				}
+				//#endif	
+			},
+			showStoreLocation(item) {
+				if (!item.lat || !item.long) return this.$util.Tips({
+					title: '请设置允许商城访问您的位置！'
+				});
+				//#ifdef H5
+				if (this.$wechat.isWeixin() === true) {
+					this.$wechat.seeLocation({
+						latitude: Number(item.lat),
+						longitude: Number(item.long),
+						name: item.mer_name,
+						address: item.mer_address ? item.mer_address : '',
+					}).then(res => {
+						// console.log('success');
+					})
+				} else {
+					//#endif
+					uni.openLocation({
+						latitude: parseFloat(item.lat),
+						longitude: parseFloat(item.long),
+						scale: 8,
+						name: item.mer_name,
+						address: item.mer_address ? item.mer_address : '',
+						success: function(res) {
+							// console.log(res)
+						},
+					});
+					// #ifdef H5
+				}
+				//#endif	
+			},
+			selfLocation() {
+				let self = this
+				uni.getLocation({
+					type: 'gcj02',
+					success: (res) => {
+						let latitude, longitude;
+						latitude = res.latitude.toString();
+						longitude = res.longitude.toString();
+						this.latitude = res.latitude
+						this.longitude = res.longitude
+						getGeocoder({
+							lat: latitude,
+							long: longitude
+						}).then(res => {
+							// console.log(res)
+							this.detaile_address = res.data.address;
+							this.location_address = res.data.address;
+							this.recommend_address = res.data.address.length > 4 ? res.data.address
+								.slice(0, 4) + '...' :
+								res.data.address
+						}).catch(err => {
+							uni.showToast({
+								title: err,
+								icon: 'none'
+							})
+						})
+					},
+					fail: (res) => {
+						uni.showToast({
+							title: res,
+							icon: 'none',
+							duration: 1000
+						});
+					},
+				});
+			},
+			// 查找店铺
+			storeMerchantList() {
+				if (this.loading) return
+				this.loading = true
+				let rqData = {
+					keyword: this.sotreParam.keyword,
+					page: this.sotreParam.page,
+					limit: 10,
+					order: this.sotreParam.order,
+					category_id: this.sotreParam.category_id,
+					type_id: this.sotreParam.type_id,
+					street_id: this.sotreParam.street_id,
+					credit_buy: this.credit_buy
+				}
+				if (this.latitude) {
+					rqData.location = this.latitude + ',' + this.longitude
+				}
+				// console.log(rqData)
+				storeMerchantList(rqData).then(res => {
+					this.count = res.data.count
+					this.storeList = this.storeList.concat(res.data.list)
+					this.loading = false
+					this.loadingIcon = false
+					// this.titName = this.storeList[0].mer_info
+				})
+			},
+			// 进店
+			goStore(id) {
+				if (this.sotreParam.type_id == 12) {
+					uni.navigateTo({
+						url: `/pages/nongKe/supply_chain/merchant?id=${id}`
+					})
+				} else {
+					if (this.hide_mer_status != 1) {
+						uni.navigateTo({
+							url: `/pages/store/home/index?id=${id}&type=7`
+						})
+					}
+				}
+			},
+			searchSubmit: function() {
+				let that = this;
+				that.$set(that.sotreParam, 'keyword', this.sotreParam.keyword);
+				this.set_where(this.firstKey)
+			},
+			// 右侧切换
+			bindRight() {
+				this.sotreParam.page = 1
+				this.rightBox = true
+			},
+			// 组件确定
+			confirm(data) {
+				let arr1 = [],
+					arr2 = []
+				if (data.storeTypeArr.length == 0) {
+					// this.sotreParam.type_id = ''
+				} else {
+					data.storeTypeArr.forEach(item => {
+						arr1.push(item.mer_type_id)
+					})
+					this.sotreParam.type_id = arr1.toString();
+				}
+				if (data.merList.length == 0) {
+					this.sotreParam.category_id = ''
+				} else {
+					data.merList.forEach(item => {
+						arr2.push(item.merchant_category_id)
+					})
+					this.sotreParam.category_id = arr2.toString();
+				}
+				this.rightBox = data.status
+				this.loadend = false;
+				this.$set(this.sotreParam, 'page', 1)
+				this.storeList = [];
+				this.storeMerchantList();
+			},
+			// 组件关闭
+			close() {
+				this.rightBox = false
+				this.show = false
+			},
+			//点击事件处理
+			set_where: function(e) {
+				if (this.loading) return
+				this.storeList = []
+				this.firstKey = e
+				this.sotreParam.page = 1
+				this.sotreParam.order = this.downMenu[e].order
+				this.storeMerchantList();
+			},
+			backjJump() {
+				uni.navigateBack({
+					delta: 1
+				})
+			},
+			// 滚动监听
+			onPageScroll(e) {
+				// 传入scrollTop值并触发所有easy-loadimage组件下的滚动监听事件
+				uni.$emit('scroll');
+			},
+			qctail(item) {
+				// console.log(item);
+				if (item.mer_certificate == '') {
+					return
+				}
+				this.show = true
+				this.image = item.mer_certificate[0]
+				// console.log(this.show);
+			},
+		},
+		//刷新
+		onPullDownRefresh() {
+			uni.stopPullDownRefresh()
+		},
+		//上划加载更多
+		onReachBottom() {
+			if (this.count === this.storeList.length) {
+				if (this.count === 0) {
+					return
+				}
+				uni.showToast({
+					title: '已加载全部',
+					icon: 'none',
+					duration: 1000
+				});
+			} else {
+				this.sotreParam.page += 1
+				this.storeMerchantList()
+			}
+		}
+
+	}
+</script>
+
+<style lang="scss" scoped>
+	* {
+		margin: 0;
+		padding: 0;
+	}
+
+	.com_name {
+		font-size: 32rpx;
+		// background-color: red;
+
+		white-space: nowrap;
+		/* 防止文字换行 */
+		overflow: hidden;
+		/* 超出部分隐藏 */
+		text-overflow: ellipsis;
+		max-width: 45vw;
+		/* 使用省略号表示溢出的内容 */
+
+		/* 可根据实际情况调整容器宽度 */
+	}
+
+	.serch_cls {
+		// padding-right: 200rpx;
+	}
+
+	.productList {
+		// padding-top: 50rpx;
+		// padding: 0 20rpx 0;
+
+		.top {
+			padding-top: var(--status-bar-height);
+			/* #ifdef H5 */
+			padding-top: 30rpx;
+			/* #endif */
+			background-color: #F0F2F5;
+			position: fixed;
+			z-index: 999;
+			width: 100%;
+			top: 0;
+		}
+
+		.content {
+			padding: 20rpx;
+		}
+
+		.menu_cls {
+			background-color: white;
+			// height: 199.77rpx;
+			border-radius: 21.03rpx 21.03rpx 21.03rpx 21.03rpx;
+			padding: 20rpx;
+
+			.menu_li {
+				margin-right: 50rpx;
+				// background-color: red;
+				width: 50vw;
+				// width: 120rpx;
+				// display: inline-block;
+			}
+
+
+		}
+
+		.goods_list {
+			margin-top: 20rpx;
+
+			.goods_card {
+				margin-top: 20rpx;
+				height: auto;
+				background-color: white;
+				padding: 20rpx;
+				border-radius: 20rpx;
+				display: flex;
+				// align-items: center;
+
+				.left {
+					margin-right: 20rpx;
+					width: 158rpx;
+					height: 158rpx;
+					border-radius: 20rpx;
+					overflow: hidden;
+				}
+
+				.right {
+					.head {
+						font-weight: bold;
+						// color: red;
+
+					}
+
+					.li {
+						display: flex;
+						font-size: 26.29rpx;
+						margin-bottom: 10rpx;
+						align-items: center;
+
+						text {
+							margin: 0 20rpx 0 5rpx;
+						}
+					}
+				}
+			}
+		}
+
+		.address {
+			white-space: nowrap;
+			overflow: hidden;
+			text-overflow: ellipsis;
+			width: 200px;
+		}
+
+
+	}
+
+
+	.search-right.styleType2 .right-text,
+	.search-right.styleType3 .right-text {
+		color: #282828;
+	}
+
+	.search-right.styleType2 .icon-xiangyou,
+	.search-right.styleType3 .icon-xiangyou {
+		color: #999999;
+	}
+
+	.search-right.styleType2 .icon-dingwei,
+	.search-right.styleType3 .icon-dingwei {
+		color: #8A8A8A;
+	}
+
+	.productList .search .back {
+		display: flex;
+		align-items: center;
+		width: 40rpx;
+		height: 60rpx;
+
+		.iconfont {
+			color: #fff;
+			font-size: 36rpx;
+		}
+	}
+
+	.hot_serch {
+		color: #B3B3B3;
+		display: flex;
+		justify-content: space-around;
+		margin: 20rpx 0;
+		flex-wrap: wrap;
+		// margin-top: 50rpx;
+		padding-top: 50rpx;
+		/* #ifdef H5 */
+		padding-top: 100rpx;
+		/* #endif */
+
+		text {
+			margin: 10rpx;
+		}
+	}
+
+	.productList .search .input {
+		flex: 1;
+		height: 60rpx;
+		background-color: #fff;
+		border-radius: 50rpx;
+		padding: 0 20rpx;
+		box-sizing: border-box;
+	}
+
+	.productList .search.styleType2 .input,
+	.productList .search.styleType3 .input {
+		background: #EDEDED;
+	}
+
+	.productList .search .input input {
+		flex: 1;
+		height: 100%;
+		font-size: 26rpx;
+		margin-left: 10rpx;
+	}
+
+	.productList .search .input .placeholder {
+		color: #999;
+	}
+
+	.productList .search .input .iconfont {
+		font-size: 35rpx;
+		color: #555;
+	}
+
+	.productList .search .icon-pailie,
+	.productList .search .icon-tupianpailie {
+		color: #fff;
+		width: 62rpx;
+		font-size: 40rpx;
+		height: 86rpx;
+		line-height: 86rpx;
+	}
+
+	.productList .nav-wrapper {
+		z-index: 9;
+		position: fixed;
+		left: 0;
+		top: 25px;
+		width: 100%;
+		margin-top: 86rpx;
+		background-color: #fff;
+
+		&.styleType1 {
+			background-color: var(--view-theme);
+		}
+
+		.tab-bar {
+			display: flex;
+			align-items: center;
+
+			.tab-item {
+				position: relative;
+				flex: 1;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				padding: 8rpx 0 20rpx;
+				color: #fff;
+				font-size: 28rpx;
+				font-weight: bold;
+
+				&::after {
+					content: ' ';
+					position: absolute;
+					left: 50%;
+					bottom: 18rpx;
+					width: 30rpx;
+					height: 3rpx;
+					background: transparent;
+					transform: translateX(-50%);
+				}
+
+				&.on {
+					&::after {
+						background: #fff;
+					}
+				}
+			}
+		}
+	}
+
+	.border-picture {
+		position: absolute;
+		top: 0;
+		left: 0;
+		width: 100%;
+		height: 100%;
+		background: center/cover no-repeat;
+	}
+
+	.productList .nav {
+		height: 86rpx;
+		color: #454545;
+		font-size: 28rpx;
+		display: flex;
+		justify-content: space-between;
+		padding: 0 28rpx;
+	}
+
+	.productList .nav .item {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		flex-direction: column;
+		color: #FFFFFF;
+		flex: 1;
+	}
+
+	.productList .nav.styleType2 .item,
+	.productList .nav.styleType3 .item {
+		color: #282828;
+	}
+
+	.productList .nav .item.font-colors {
+		font-weight: 500;
+		color: #FFFFFF;
+	}
+
+	.productList .nav.styleType2 .item.font-colors,
+	.productList .nav.styleType3 .item.font-colors {
+		color: var(--view-theme);
+	}
+
+	.productList .nav .item .font-line {
+		height: 4rpx;
+		background-color: #fff;
+		margin-top: 3rpx;
+		width: 28rpx;
+		animation: line 0.3s;
+		-moz-animation: line 0.3s;
+		/* Firefox */
+		-webkit-animation: line 0.3s;
+		/* Safari 和 Chrome */
+		-o-animation: line 0.3s;
+		/* Opera */
+	}
+
+	.productList .nav.styleType2 .item .font-line,
+	.productList .nav.styleType3 .item .font-line {
+		background-color: var(--view-theme);
+	}
+
+	@keyframes line {
+		from {
+			width: 0rpx;
+		}
+
+		to {
+			width: 28rpx;
+		}
+	}
+
+	.productList .nav .item image {
+		width: 15rpx;
+		height: 19rpx;
+		margin-left: 10rpx;
+	}
+
+	.store-wrapper {
+		margin-top: 235rpx;
+		border-top: 1px solid #F6F6F6;
+
+		.store-item {
+			margin: 20rpx auto;
+
+			.head {
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				color: #fff;
+
+				.zhezhao {
+					position: absolute;
+					width: 95%;
+					height: 150px;
+					border-radius: 20rpx;
+					z-index: 0;
+					opacity: 0.5;
+					background-color: #999;
+				}
+
+				.bgc_img {
+					position: absolute;
+					width: 95%;
+					height: 150px;
+					background-size: cover;
+					border-radius: 20rpx;
+					z-index: 0;
+				}
+
+				.zhezhao1 {
+					width: 100%;
+					height: 150px;
+					border-radius: 20rpx;
+					z-index: 1;
+
+					.title {
+						display: flex;
+						height: 50px;
+						align-items: center;
+						margin-left: 20px;
+						z-index: 1;
+
+						span {
+							background-color: #F84221;
+							color: white;
+							font-size: 12px;
+							padding: 3px;
+							border-radius: 5px;
+							margin-left: 5px;
+						}
+					}
+
+					.coent {
+						display: flex;
+						margin-left: 20px;
+
+						.avater {
+							width: 60px;
+							height: 80px;
+
+							image {
+								width: 60px;
+								height: 80px;
+							}
+						}
+
+						.text {
+							.text_one {
+								display: flex;
+								height: 30px;
+								line-height: 30px;
+								padding-left: 10px;
+
+								image {
+									width: 20px;
+									height: 20px;
+									margin-right: 10px;
+								}
+
+								.text_one_r {
+									margin-left: 10px;
+								}
+							}
+
+							.text_two {
+								width: 270px;
+								height: 30px;
+								line-height: 30px;
+								padding-left: 10px;
+								white-space: nowrap;
+								overflow: hidden;
+								text-overflow: ellipsis;
+
+								image {
+									width: 20px;
+									height: 20px;
+									margin-right: 10px;
+								}
+							}
+
+							.text_three {
+								width: 270px;
+								height: 30px;
+								line-height: 30px;
+								padding-left: 10px;
+								white-space: nowrap;
+								overflow: hidden;
+								text-overflow: ellipsis;
+
+								image {
+									width: 20px;
+									height: 20px;
+									margin-right: 10px;
+								}
+							}
+						}
+
+					}
+				}
+
+
+			}
+
+			.pro-box {
+				white-space: nowrap;
+				display: flex;
+				align-items: center;
+				padding: 20rpx 20rpx 30rpx;
+
+				.pro-item {
+					display: inline-block;
+					width: 218rpx;
+					margin-right: 14rpx;
+
+					.picture,
+					/deep/image,
+					uni-image {
+						width: 100%;
+						height: 214rpx;
+						border-radius: 8rpx;
+						position: relative;
+					}
+
+					.price {
+						margin-top: 5rpx;
+						font-size: 28rpx;
+						color: var(--view-priceColor);
+						font-weight: bold;
+
+						text {
+							font-size: 28rpx;
+						}
+					}
+
+					&:last-child {
+						margin-right: 0;
+					}
+				}
+
+				&.styleType3 {
+					padding: 20rpx;
+
+					.pro-item {
+						display: inline-block;
+						background-color: #fff;
+						border-radius: 16rpx;
+						text-align: center;
+						padding: 10rpx 0 20rpx;
+
+						.picture,
+						/deep/image,
+						uni-image {
+							width: 194rpx;
+							height: 194rpx;
+							text-align: center;
+							border-radius: 8rpx;
+							position: relative;
+							margin: 0 auto;
+						}
+					}
+				}
+			}
+		}
+	}
+
+	.mer-item2 {
+		padding: 20rpx;
+		background: #fff;
+		margin-bottom: 20rpx;
+		border-radius: 16rpx;
+
+		.mer-shop-count {
+			display: flex;
+
+			.mer-avatar {
+				width: 100rpx;
+				height: 100rpx;
+			}
+
+			.mer-top {
+				color: #282828;
+			}
+
+			.mer-shop-right {
+				margin-left: 20rpx;
+
+				.mer-btn {
+					color: #666666;
+				}
+
+			}
+
+			.pro-box {
+				white-space: nowrap;
+				display: flex;
+				align-items: center;
+				margin-top: 20rpx;
+
+				.pro-item {
+					display: inline-block;
+					width: 170rpx;
+					margin-right: 20rpx;
+
+					.picture,
+					/deep/image,
+					uni-image,
+					/deep/.easy-loadimage {
+						width: 100%;
+						height: 170rpx;
+						border-radius: 8rpx;
+						position: relative;
+					}
+
+					.price {
+						margin-top: 5rpx;
+						font-size: 28rpx;
+						color: var(--view-priceColor);
+						font-weight: bold;
+
+						text {
+							font-size: 28rpx;
+						}
+					}
+
+					&:last-child {
+						margin-right: 0;
+					}
+				}
+			}
+		}
+
+	}
+
+	.no-shop {
+		background-color: #fff;
+		// padding-bottom: calc(100% - 176rpx);
+
+		.pictrue {
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			color: $uni-nothing-text;
+
+			image {
+				width: 414rpx;
+				height: 380rpx;
+			}
+		}
+	}
+
+	.guanbi {
+		width: 20px;
+		height: 20px;
+		margin: 30px auto;
+	}
+
+	.pop {
+		z-index: 1;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/nongKe/supply_chain/suppliers.vue b/pages/nongKe/supply_chain/suppliers.vue
new file mode 100644
index 0000000..d6dc7e4
--- /dev/null
+++ b/pages/nongKe/supply_chain/suppliers.vue
@@ -0,0 +1,1144 @@
+<template>
+	<view>
+		<view class='productList' :style="viewColor">
+			<view class='search acea-row row-between-wrapper' :class="'styleType'+store_street_theme">
+			
+				<view class="back" @click='backjJump()'>
+					<view class="iconfont icon-xiangzuo"></view>
+				</view>
+				
+				<view class='input acea-row row-between-wrapper'><text class='iconfont icon-sousuo'></text>
+					<input placeholder='搜索店铺名称' placeholder-class='placeholder' confirm-type='search' name="search"
+						:value='sotreParam.keyword' @confirm="searchSubmit"></input>
+				</view>
+				<!-- <view v-if="mer_location == 1" :class="'styleType'+store_street_theme" style="text-align: right;"
+					class='iconfont search-right' @click='showMaoLocation(latitude,longitude)'>
+					<view class="iconfont icon-dingwei"></view>
+					<view class="right-text" v-if="recommend_address">
+						{{recommend_address}}
+					</view>
+					<view class="iconfont icon-xiangyou" v-if="recommend_address"></view>
+				</view> -->
+			</view>
+			<view class="nav-wrapper" :class="'styleType'+store_street_theme">
+				<view class='nav acea-row row-middle' :class="'styleType'+store_street_theme">
+					<view v-for="item in downMenus" :key="item.key" class='item'
+						:class="{'font-colors':firstKey == item.key}" @click='set_where(item.key)'>
+						<view class="">
+							{{item.title}}
+						</view>
+						<view class="line" :class="{'font-line':firstKey == item.key}">
+						</view>
+					</view>
+					<view class="item" @click="bindRight">
+						<view>筛选
+							<!-- <text class="iconfont icon-shaixuan"></text> -->
+						</view>
+						<view class="line">
+						</view>
+					</view>
+				</view>
+			</view>
+			<!-- 店铺 -->
+			<block>
+				<view class="store-wrapper">
+					<view class="store-item" v-for="(item,index) in storeList" :key="index">
+						<view class="head">
+							<view class="bgc_img" :style="{ backgroundImage: `url(${item.mini_banner})`}">
+							</view>
+							<view class="zhezhao">
+							</view>
+							<view class="zhezhao1" @click="goStore(item.mer_id)">
+								<view class="title">
+									<view>{{item.mer_name}}
+									</view>
+									<span>
+										{{item.type_name}}
+									</span>
+								</view>
+								<view class="coent">
+									<view class="avater">
+										<image :src="item.mer_avatar" mode=""></image>
+									</view>
+									<view class=" text">
+										<view class="text_one">
+											<view class="">
+												<image src="@/static/images/phone.png" mode=""></image>
+												{{item.service_phone}}
+											</view>
+											<view class="text_one_r">
+												<image src="@/static/images/clock.png" mode=""></image>
+												{{item.mer_take_time[0]}}-{{item.mer_take_time[1]}}
+											</view>
+										</view>
+										<view class="text_two">
+											<image src="@/static/images/shangpu.png" mode=""></image>
+											{{item.mer_info}}
+										</view>
+										<view class="text_three">
+											<image src="@/static/images/dingwei.png" mode=""></image>
+											{{item.mer_address}}
+										</view>
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</block>
+			<block v-if="store_street_theme == 2">
+				<view class="mer-item2" v-for="(item,index) in storeList" :key='index'>
+					<view class="mer-hd mer-shop-count" @click="goStore(item.mer_id)">
+						<image class="mer-avatar" :src="item.mer_avatar"></image>
+						<view class="mer-shop-right">
+							<view class="mer-count">
+								<view class="mer-top">
+									<view class="txt line1">{{item.mer_name}}</view>
+									<text v-if="item.type_name" class="font-bg-red ml8">{{item.type_name}}</text>
+									<text v-else-if="item.is_trader" class="font-bg-red ml8">自营</text>
+								</view>
+								<view class="mer-btn">
+									<view class="">
+										{{item.care_count<10000 ? item.care_count : (item.care_count/10000).toFixed(2)+'万'}}人关注
+									</view>
+									<view class="line" v-if="item.distance"></view>
+									<view class="distance" v-if="item.distance" @click.stop="showStoreLocation(item)">
+										<view class="">
+											{{item.distance}}
+										</view>
+										<view class="iconfont icon-xiangyou"></view>
+									</view>
+								</view>
+							</view>
+							<view class="pro-box">
+								<navigator :url="`/pages/goods_details/index?id=${itemn.product_id}`" hover-class="none"
+									class="pro-item" v-for="(itemn,indexn) in item.recommend" :key='indexn'>
+									<view class="picture">
+										<easy-loadimage mode="widthFix" :image-src="itemn.image"></easy-loadimage>
+										<view v-if="itemn.border_pic"
+											:style="{ backgroundImage: `url(${itemn.border_pic})` }"
+											class="border-picture"></view>
+									</view>
+									<view class="price">
+										<text>￥</text>{{itemn.price}}
+									</view>
+								</navigator>
+							</view>
+						</view>
+					</view>
+				</view>
+			</block>
+			<block v-if="store_street_theme == 3">
+				<view class="mer-item mer-item3" v-for="(item,index) in storeList" :key='index'
+					:style="'background-image:url('+item.mini_banner+')'">
+					<view class="mer-hd" @click="goStore(item.mer_id)">
+						<view class="mer-name">
+							<image :src="item.mer_avatar"></image>
+							<view class="">
+								<view class="mer-top">
+									<view class="txt line1">{{item.mer_name}}</view>
+									<text v-if="item.type_name" class="font-bg-red ml8">{{item.type_name}}</text>
+									<text v-else-if="item.is_trader" class="font-bg-red ml8">自营</text>
+								</view>
+								<view class="mer-btn">
+									<view class="">
+										{{item.care_count<10000 ? item.care_count : (item.care_count/10000).toFixed(2)+'万'}}人关注
+									</view>
+									<view class="line" v-if="item.distance"></view>
+									<view class="distance" v-if="item.distance" @click.stop="showStoreLocation(item)">
+										<view class="">
+											{{item.distance}}
+										</view>
+										<view class="iconfont icon-xiangyou"></view>
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+					<view class="pro-box" :class="'styleType'+store_street_theme">
+						<view class="pro-item" v-for="(itemn,indexn) in item.recommend" :key='indexn' v-if="indexn<=2">
+							<view @click="go_details(itemn.product_type,itemn.product_id)">
+								<view class="picture">
+									<image :src="itemn.image"></image>
+									<view v-if="itemn.border_pic"
+										:style="{ backgroundImage: `url(${itemn.border_pic})` }" class="border-picture">
+									</view>
+								</view>
+								<view class="price">
+									<text>￥</text>{{itemn.price}}
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</block>
+			<view class='loadingicon acea-row row-center-wrapper' v-if="loading">
+				<text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>{{loadTitle}}
+			</view>
+		</view>
+		<view class='no-shop' v-if="!storeList.length && !loading && !loadingIcon" v-cloak>
+			<view class='pictrue' style="margin: 0 auto;">
+				<image src='../../../static/images/noCart.png'></image>
+				<text>暂无店铺，快去搜索其他店铺吧</text>
+			</view>
+		</view>
+		</block>
+		<u-popup class="pop" :show="show" @close="close" mode="center" bgColor='transparent'>
+			<image :src="image"></image>
+			<image src="@/static/images/guanbi.png" class="guanbi" @click="close"></image>
+		</u-popup>
+	</view>
+
+	</view>
+</template>
+
+<script>
+	import {
+		storeMerchantList,
+		getGeocoder
+	} from '@/api/store.js';
+	import recommend from './component/recommend';
+	import rightSlider from './component/rightSlider';
+	import {
+		merClassifly,
+		getStoreTypeApi
+	} from '@/api/store.js';
+	import {
+		mapGetters
+	} from "vuex";
+	import {
+		goShopDetail
+	} from '@/libs/order.js'
+	import {
+		configMap
+	} from '@/utils';
+	import easyLoadimage from '@/components/easy-loadimage/easy-loadimage.vue';
+	const app = getApp();
+	export default {
+		components: {
+			recommend,
+			rightSlider,
+			easyLoadimage
+		},
+		data() {
+			return {
+				price: 0,
+				stock: 0,
+				nows: false,
+				loading: false,
+				loadingIcon: true,
+				loadTitle: '加载更多',
+				title: '',
+				hotPage: 1,
+				hotLimit: 10,
+				hotScroll: false,
+				// 筛选框
+				rightBox: false,
+				//品牌列表
+				brandList: [],
+				downKey: 0,
+				downStatus: false,
+				// 下拉菜单
+				downMenu: [{
+						title: '默认',
+						key: 0,
+						order: ""
+					},
+					{
+						title: '销量',
+						key: 1,
+						order: 'sales'
+					},
+					{
+						title: '好评',
+						key: 2,
+						order: 'rate'
+					},
+					{
+						title: '距离',
+						key: 3,
+						order: 'location'
+					}
+				],
+				// 是否第一个
+				firstKey: 0,
+				// 商铺列表
+				storeList: [],
+				sotreParam: {
+					keyword: '',
+					page: 1,
+					limit: 10,
+					order: '',
+					category_id: '',
+					type_id: '',
+					street_id: ''
+				},
+				storeKey: 0,
+				storeScroll: true,
+				mer_id: '',
+				sortId: '',
+				price_on: '',
+				price_off: '',
+				detaile_address: "",
+				recommend_address: "",
+				location_address: "",
+				latitude: "",
+				longitude: "",
+				count: 0,
+				storeTypeArr: [], //店铺类型
+				merList: [], //商户分类
+				product_type: 0,
+				show: false,
+				image: '', //图片
+				id: 0,
+				arrlist: [{
+					type_code: 'TypeFamousSpecialties'
+				}, {
+					type_code: 'TypeLocalCuisine'
+				}, {
+					type_code: 'TypeFeaturedCultural'
+				}]
+			};
+		},
+		onLoad(options) {
+			this.id = options.id
+			this.product_type = options.product_type ?? 0
+			if (options.street_id != undefined) {
+				this.sotreParam.street_id = options.street_id
+			}
+			this.sotreParam.type_id = options.type_id
+			this.sotreParam.type_id = options.type_id && options.type_id.split(',').toString() || ''
+			this.sotreParam.category_id = options.cate_id && options.cate_id.split(',').toString() || ''
+			this.storeList = [];
+			if (this.mer_location == 1) {
+				this.selfLocation()
+			}
+			this.storeMerchantList();
+			this.getClassfication();
+			this.getStoreType();
+		},
+		computed: {
+			downMenus: function() {
+				return this.downMenu.filter((item) => {
+					if (this.mer_location) {
+						return item
+					} else {
+						return item.key < 3
+					}
+				})
+			},
+			...configMap({
+				margin_ico_switch: 0,
+				margin_ico: '',
+				mer_location: 0,
+				store_street_theme: 1,
+				hide_mer_status: '',
+			}, mapGetters(['viewColor'])),
+		},
+		methods: {
+			go_details: function(product_type, product_id) {
+				if (product_type == 98) {
+					uni.navigateTo({
+						url: `/pages/admin/goods_details/index?product_id=${product_id}&product_type=${product_type}`
+					})
+				}
+				if (product_type == 0) {
+					uni.navigateTo({
+						url: `/pages/goods_details/index?id=${product_id}`
+					})
+				}
+			},
+			// 获取商户分类
+			getClassfication: function() {
+				let temp = []
+				merClassifly()
+					.then(res => {
+						temp = res.data.map(item => {
+							return {
+								...item,
+								check: false
+							}
+						})
+						if (this.sotreParam.category_id.length > 0) {
+							this.sotreParam.category_id.forEach((ids, index) => {
+								temp.forEach(el => {
+									if (ids == el.merchant_category_id) {
+										el.check = true
+									}
+								})
+							})
+						}
+						this.merList = temp
+					})
+					.catch(res => {
+						this.$util.Tips({
+							title: res
+						});
+					});
+			},
+			// 获取店铺类型
+			getStoreType: function() {
+				let temp = []
+				getStoreTypeApi().then(res => {
+						res.data.forEach(item => {
+							if (item.mer_type_id == this.sotreParam.type_id) {
+								temp.push({
+									...item,
+									check: true
+								})
+							}
+						})
+						this.storeTypeArr = temp
+					})
+					.catch(res => {
+						this.$util.Tips({
+							title: res
+						});
+					});
+			},
+			/** 打开地图**/
+			showMaoLocation(lat, long) {
+				if (!lat || !long) return this.$util.Tips({
+					title: '请设置允许商城访问您的位置！'
+				});
+				//#ifdef H5
+				if (this.$wechat.isWeixin() === true) {
+					this.$wechat.seeLocation({
+						latitude: Number(lat),
+						longitude: Number(long),
+						name: '当前位置',
+						address: this.location_address
+					}).then(res => {
+						// console.log('success');
+					})
+				} else {
+					//#endif
+					uni.openLocation({
+						latitude: parseFloat(lat),
+						longitude: parseFloat(long),
+						name: '当前位置',
+						address: this.location_address,
+						scale: 8,
+						success: function(res) {
+							// console.log(res)
+						},
+					});
+					// #ifdef H5
+				}
+				//#endif	
+			},
+			showStoreLocation(item) {
+				if (!item.lat || !item.long) return this.$util.Tips({
+					title: '请设置允许商城访问您的位置！'
+				});
+				//#ifdef H5
+				if (this.$wechat.isWeixin() === true) {
+					this.$wechat.seeLocation({
+						latitude: Number(item.lat),
+						longitude: Number(item.long),
+						name: item.mer_name,
+						address: item.mer_address ? item.mer_address : '',
+					}).then(res => {
+						// console.log('success');
+					})
+				} else {
+					//#endif
+					uni.openLocation({
+						latitude: parseFloat(item.lat),
+						longitude: parseFloat(item.long),
+						scale: 8,
+						name: item.mer_name,
+						address: item.mer_address ? item.mer_address : '',
+						success: function(res) {
+							// console.log(res)
+						},
+					});
+					// #ifdef H5
+				}
+				//#endif	
+			},
+			selfLocation() {
+				let self = this
+				uni.getLocation({
+					type: 'gcj02',
+					success: (res) => {
+						let latitude, longitude;
+						latitude = res.latitude.toString();
+						longitude = res.longitude.toString();
+						this.latitude = res.latitude
+						this.longitude = res.longitude
+						getGeocoder({
+							lat: latitude,
+							long: longitude
+						}).then(res => {
+							// console.log(res)
+							this.detaile_address = res.data.address;
+							this.location_address = res.data.address;
+							this.recommend_address = res.data.address.length > 4 ? res.data.address
+								.slice(0, 4) + '...' :
+								res.data.address
+						}).catch(err => {
+							uni.showToast({
+								title: err,
+								icon: 'none'
+							})
+						})
+					},
+					fail: (res) => {
+						uni.showToast({
+							title: res,
+							icon: 'none',
+							duration: 1000
+						});
+					},
+				});
+			},
+			// 查找店铺
+			storeMerchantList() {
+				if (this.loading) return
+				this.loading = true
+				
+				let rqData = {
+					keyword: this.sotreParam.keyword,
+					page: this.sotreParam.page,
+					limit: 10,
+					type_code: this.arrlist[this.id].type_code,
+
+				}
+				if (this.latitude) {
+					rqData.location = this.latitude + ',' + this.longitude
+				}
+		
+				storeMerchantList(rqData).then(res => {
+					this.count = res.data.count
+					this.storeList = this.storeList.concat(res.data.list)
+					this.loading = false
+					this.loadingIcon = false
+				})
+			},
+			// 进店
+			goStore(id) {
+				if (this.sotreParam.type_id == 12) {
+					uni.navigateTo({
+						url: `/pages/nongKe/supply_chain/merchant?id=${id}`
+					})
+				} else {
+					if (this.hide_mer_status != 1) {
+						uni.navigateTo({
+							url: `/pages/store/home/index?id=${id}&type=7`
+						})
+					}
+				}
+			},
+			searchSubmit: function(e) {
+				let that = this;
+				that.$set(that.sotreParam, 'keyword', e.detail.value);
+				this.set_where(this.firstKey)
+			},
+			// 右侧切换
+			bindRight() {
+				this.sotreParam.page = 1
+				this.rightBox = true
+			},
+			// 组件确定
+			confirm(data) {
+				let arr1 = [],
+					arr2 = []
+				if (data.storeTypeArr.length == 0) {
+					// this.sotreParam.type_id = ''
+				} else {
+					data.storeTypeArr.forEach(item => {
+						arr1.push(item.mer_type_id)
+					})
+					this.sotreParam.type_id = arr1.toString();
+				}
+				if (data.merList.length == 0) {
+					this.sotreParam.category_id = ''
+				} else {
+					data.merList.forEach(item => {
+						arr2.push(item.merchant_category_id)
+					})
+					this.sotreParam.category_id = arr2.toString();
+				}
+				this.rightBox = data.status
+				this.loadend = false;
+				this.$set(this.sotreParam, 'page', 1)
+				this.storeList = [];
+				this.storeMerchantList();
+			},
+			// 组件关闭
+			close() {
+				this.rightBox = false
+				this.show = false
+			},
+			//点击事件处理
+			set_where: function(e) {
+				if (this.loading) return
+				this.storeList = []
+				this.firstKey = e
+				this.sotreParam.page = 1
+				this.sotreParam.order = this.downMenu[e].order
+				this.storeMerchantList();
+			},
+			backjJump() {
+				uni.navigateBack({
+					delta: 1
+				})
+			},
+			// 滚动监听
+			onPageScroll(e) {
+				// 传入scrollTop值并触发所有easy-loadimage组件下的滚动监听事件
+				uni.$emit('scroll');
+			},
+			qctail(item) {
+				// console.log(item);
+				if (item.mer_certificate == '') {
+					return
+				}
+				this.show = true
+				this.image = item.mer_certificate[0]
+				// console.log(this.show);
+			},
+		},
+		//刷新
+		onPullDownRefresh() {
+			uni.stopPullDownRefresh()
+		},
+		//上划加载更多
+		onReachBottom() {
+			if (this.count === this.storeList.length) {
+				if (this.count === 0) {
+					return
+				}
+				uni.showToast({
+					title: '已加载全部',
+					icon: 'none',
+					duration: 1000
+				});
+			} else {
+				this.sotreParam.page += 1
+				this.storeMerchantList()
+			}
+		}
+
+	}
+</script>
+
+<style lang="scss" scoped>
+	.productList .search {
+		width: 100%;
+		height: 170rpx;
+		padding: 0 20rpx;
+		box-sizing: border-box;
+		position: fixed;
+		left: 0;
+		top: 0;
+		z-index: 9;
+		display: flex;
+		flex-wrap: nowrap;
+		background-color: #fff;
+
+		&.styleType1 {
+			background-color: var(--view-theme);
+		}
+
+		.search-right {
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			max-width: max-content;
+			flex: 1;
+			padding-left: 20rpx;
+		}
+
+		.right-text {
+			overflow: hidden;
+			text-overflow: ellipsis;
+			white-space: nowrap;
+			font-size: 28rpx;
+			width: max-content;
+			color: #fff;
+			padding: 0 10rpx;
+		}
+
+		.icon-xiangyou,
+		.icon-dingwei {
+			font-size: 30rpx;
+			color: #fff;
+		}
+	}
+
+	.search-right.styleType2 .right-text,
+	.search-right.styleType3 .right-text {
+		color: #282828;
+	}
+
+	.search-right.styleType2 .icon-xiangyou,
+	.search-right.styleType3 .icon-xiangyou {
+		color: #999999;
+	}
+
+	.search-right.styleType2 .icon-dingwei,
+	.search-right.styleType3 .icon-dingwei {
+		color: #8A8A8A;
+	}
+
+	.productList .search .back {
+		display: flex;
+		align-items: center;
+		width: 40rpx;
+		height: 60rpx;
+
+		.iconfont {
+			color: #fff;
+			font-size: 36rpx;
+		}
+	}
+
+	.productList .search .input {
+		flex: 1;
+		height: 60rpx;
+		background-color: #fff;
+		border-radius: 50rpx;
+		padding: 0 20rpx;
+		box-sizing: border-box;
+	}
+
+	.productList .search.styleType2 .input,
+	.productList .search.styleType3 .input {
+		background: #EDEDED;
+	}
+
+	.productList .search .input input {
+		flex: 1;
+		height: 100%;
+		font-size: 26rpx;
+		margin-left: 10rpx;
+	}
+
+	.productList .search .input .placeholder {
+		color: #999;
+	}
+
+	.productList .search .input .iconfont {
+		font-size: 35rpx;
+		color: #555;
+	}
+
+	.productList .search .icon-pailie,
+	.productList .search .icon-tupianpailie {
+		color: #fff;
+		width: 62rpx;
+		font-size: 40rpx;
+		height: 86rpx;
+		line-height: 86rpx;
+	}
+
+	.productList .nav-wrapper {
+		z-index: 9;
+		position: fixed;
+		left: 0;
+		top: 80rpx;
+		width: 100%;
+		margin-top: 86rpx;
+		background-color: #fff;
+
+		&.styleType1 {
+			background-color: var(--view-theme);
+		}
+
+		.tab-bar {
+			display: flex;
+			align-items: center;
+
+			.tab-item {
+				position: relative;
+				flex: 1;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				padding: 8rpx 0 20rpx;
+				color: #fff;
+				font-size: 28rpx;
+				font-weight: bold;
+
+				&::after {
+					content: ' ';
+					position: absolute;
+					left: 50%;
+					bottom: 18rpx;
+					width: 30rpx;
+					height: 3rpx;
+					background: transparent;
+					transform: translateX(-50%);
+				}
+
+				&.on {
+					&::after {
+						background: #fff;
+					}
+				}
+			}
+		}
+	}
+
+	.border-picture {
+		position: absolute;
+		top: 0;
+		left: 0;
+		width: 100%;
+		height: 100%;
+		background: center/cover no-repeat;
+	}
+
+	.productList .nav {
+		height: 86rpx;
+		color: #454545;
+		font-size: 28rpx;
+		display: flex;
+		justify-content: space-between;
+		padding: 0 28rpx;
+	}
+
+	.productList .nav .item {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		flex-direction: column;
+		color: #FFFFFF;
+		flex: 1;
+	}
+
+	.productList .nav.styleType2 .item,
+	.productList .nav.styleType3 .item {
+		color: #282828;
+	}
+
+	.productList .nav .item.font-colors {
+		font-weight: 500;
+		color: #FFFFFF;
+	}
+
+	.productList .nav.styleType2 .item.font-colors,
+	.productList .nav.styleType3 .item.font-colors {
+		color: var(--view-theme);
+	}
+
+	.productList .nav .item .font-line {
+		height: 4rpx;
+		background-color: #fff;
+		margin-top: 3rpx;
+		width: 28rpx;
+		animation: line 0.3s;
+		-moz-animation: line 0.3s;
+		/* Firefox */
+		-webkit-animation: line 0.3s;
+		/* Safari 和 Chrome */
+		-o-animation: line 0.3s;
+		/* Opera */
+	}
+
+	.productList .nav.styleType2 .item .font-line,
+	.productList .nav.styleType3 .item .font-line {
+		background-color: var(--view-theme);
+	}
+
+	@keyframes line {
+		from {
+			width: 0rpx;
+		}
+
+		to {
+			width: 28rpx;
+		}
+	}
+
+	.productList .nav .item image {
+		width: 15rpx;
+		height: 19rpx;
+		margin-left: 10rpx;
+	}
+
+	.store-wrapper {
+		margin-top: 260rpx;
+		border-top: 1px solid #F6F6F6;
+
+		.store-item {
+			margin: 20rpx auto;
+
+			.head {
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				color: #fff;
+
+				.zhezhao {
+					position: absolute;
+					width: 95%;
+					height: 150px;
+					border-radius: 20rpx;
+					z-index: 0;
+					opacity: 0.5;
+					background-color: #999;
+				}
+
+				.bgc_img {
+					position: absolute;
+					width: 95%;
+					height: 150px;
+					background-size: cover;
+					border-radius: 20rpx;
+					z-index: 0;
+				}
+
+				.zhezhao1 {
+					width: 100%;
+					height: 150px;
+					border-radius: 20rpx;
+					z-index: 1;
+
+					.title {
+						display: flex;
+						height: 50px;
+						align-items: center;
+						margin-left: 20px;
+						z-index: 1;
+
+						span {
+							background-color: #F84221;
+							color: white;
+							font-size: 12px;
+							padding: 3px;
+							border-radius: 5px;
+							margin-left: 5px;
+						}
+					}
+
+					.coent {
+						display: flex;
+						margin-left: 20px;
+
+						.avater {
+							width: 60px;
+							height: 80px;
+
+							image {
+								width: 60px;
+								height: 80px;
+							}
+						}
+
+						.text {
+							.text_one {
+								display: flex;
+								height: 30px;
+								line-height: 30px;
+								padding-left: 10px;
+
+								image {
+									width: 20px;
+									height: 20px;
+									margin-right: 10px;
+								}
+
+								.text_one_r {
+									margin-left: 10px;
+								}
+							}
+
+							.text_two {
+								width: 270px;
+								height: 30px;
+								line-height: 30px;
+								padding-left: 10px;
+								white-space: nowrap;
+								overflow: hidden;
+								text-overflow: ellipsis;
+
+								image {
+									width: 20px;
+									height: 20px;
+									margin-right: 10px;
+								}
+							}
+
+							.text_three {
+								width: 270px;
+								height: 30px;
+								line-height: 30px;
+								padding-left: 10px;
+								white-space: nowrap;
+								overflow: hidden;
+								text-overflow: ellipsis;
+
+								image {
+									width: 20px;
+									height: 20px;
+									margin-right: 10px;
+								}
+							}
+						}
+
+					}
+				}
+
+
+			}
+
+			.pro-box {
+				white-space: nowrap;
+				display: flex;
+				align-items: center;
+				padding: 20rpx 20rpx 30rpx;
+
+				.pro-item {
+					display: inline-block;
+					width: 218rpx;
+					margin-right: 14rpx;
+
+					.picture,
+					/deep/image,
+					uni-image {
+						width: 100%;
+						height: 214rpx;
+						border-radius: 8rpx;
+						position: relative;
+					}
+
+					.price {
+						margin-top: 5rpx;
+						font-size: 28rpx;
+						color: var(--view-priceColor);
+						font-weight: bold;
+
+						text {
+							font-size: 28rpx;
+						}
+					}
+
+					&:last-child {
+						margin-right: 0;
+					}
+				}
+
+				&.styleType3 {
+					padding: 20rpx;
+
+					.pro-item {
+						display: inline-block;
+						background-color: #fff;
+						border-radius: 16rpx;
+						text-align: center;
+						padding: 10rpx 0 20rpx;
+
+						.picture,
+						/deep/image,
+						uni-image {
+							width: 194rpx;
+							height: 194rpx;
+							text-align: center;
+							border-radius: 8rpx;
+							position: relative;
+							margin: 0 auto;
+						}
+					}
+				}
+			}
+		}
+	}
+
+	.mer-item2 {
+		padding: 20rpx;
+		background: #fff;
+		margin-bottom: 20rpx;
+		border-radius: 16rpx;
+
+		.mer-shop-count {
+			display: flex;
+
+			.mer-avatar {
+				width: 100rpx;
+				height: 100rpx;
+			}
+
+			.mer-top {
+				color: #282828;
+			}
+
+			.mer-shop-right {
+				margin-left: 20rpx;
+
+				.mer-btn {
+					color: #666666;
+				}
+
+			}
+
+			.pro-box {
+				white-space: nowrap;
+				display: flex;
+				align-items: center;
+				margin-top: 20rpx;
+
+				.pro-item {
+					display: inline-block;
+					width: 170rpx;
+					margin-right: 20rpx;
+
+					.picture,
+					/deep/image,
+					uni-image,
+					/deep/.easy-loadimage {
+						width: 100%;
+						height: 170rpx;
+						border-radius: 8rpx;
+						position: relative;
+					}
+
+					.price {
+						margin-top: 5rpx;
+						font-size: 28rpx;
+						color: var(--view-priceColor);
+						font-weight: bold;
+
+						text {
+							font-size: 28rpx;
+						}
+					}
+
+					&:last-child {
+						margin-right: 0;
+					}
+				}
+			}
+		}
+
+	}
+
+	.no-shop {
+		background-color: #fff;
+		padding-bottom: calc(100% - 176rpx);
+
+		.pictrue {
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			color: $uni-nothing-text;
+
+			image {
+				width: 414rpx;
+				height: 380rpx;
+			}
+		}
+	}
+
+	.guanbi {
+		width: 20px;
+		height: 20px;
+		margin: 30px auto;
+	}
+
+	.pop {
+		z-index: 1;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/product/basicSet.vue b/pages/product/basicSet.vue
index 7823fe0..aba5372 100644
--- a/pages/product/basicSet.vue
+++ b/pages/product/basicSet.vue
@@ -8,7 +8,7 @@
 				<view class="text flex_a_c"><i class="iconfont icon-xinghao"></i>上传店铺背景图</view>
 				<block v-if="images[0].img">
 					<u--image :showLoading="true" :src="images[0].img" width="388px" height="210.53rpx" radius="4px"
-						@click="delImg(0)" mode="aspectFill"></u--image>
+						@click="delImg(0)" mode="aspectFit"></u--image>
 				</block>
 				<view v-else class="upload" @click="seleckImage(0)">
 					<view class="iconfont icon-tupian1"></view>
@@ -20,7 +20,7 @@
 					<view class="text flex_a_c"><i class="iconfont icon-xinghao"></i>上传店铺头像</view>
 					<block v-if="images[1].img">
 						<u--image :showLoading="true" :src="images[1].img" width="210.53rpx" height="210.53rpx"
-							radius="4px" @click="delImg(1)" mode="aspectFill"></u--image>
+							radius="4px" @click="delImg(1)" mode="aspectFit"></u--image>
 					</block>
 					<view v-else class="avatar_img" @click="seleckImage(1)">
 						<view class="iconfont icon-tupian1"></view>
diff --git a/pages/short_video/appSwiper/index.nvue b/pages/short_video/appSwiper/index.nvue
index e18d577..952185d 100644
--- a/pages/short_video/appSwiper/index.nvue
+++ b/pages/short_video/appSwiper/index.nvue
@@ -1,6 +1,7 @@
 <template>
-  <view class="container">
-    <!--
+	<view class="container">
+	
+		<!--
 		注意：这是 App 所用页面，请勿引入微信小程序或浏览器运行，最好运行在真机
 		 
 		1. new_index.nvue、index.nvue这两个是App页面
@@ -19,9 +20,9 @@
 			App、小程序、H5评论请参考插件：https://ext.dcloud.net.cn/plugin?id=7875
 		】
 		 -->
-    <!-- 头部导航 -->
-    <view v-if="!isUser" class="header" :style="{backgroundColor:currentNav==1?'':'#fff'}" >
-   <!--   <view class="items" @click.stop="navTap(2)">
+		<!-- 头部导航 -->
+		<!--    <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>
       <view class="items" @click.stop="navTap(1)">
@@ -29,16 +30,16 @@
       </view>
       <view class="items" @click.stop="navTap(3)">
         <text class="tName" :class="currentNav==3?'on':''">列表</text>
-      </view> -->
-    </view>
-    <view class="noVideo acea-row row-center-wrapper" v-if="!dataList.length && !loadVideo">
+      </view> 
+    </view> -->
+		<!--  <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> -->
+		<view v-if="currentNav !== 3" :style="'width: '+ windowWidth +'px; height: '+ boxStyle.height +'px;'">
+			<!-- 
 			 1.这里的 swiper 不是用来控制视频滑动的，而是用来控制左右滑动的，如果不需要的可以改成 view
 			 
 			 2.为了 视频无限加载，已经把 21 行的 appear 去掉了，加上了 loadmore 方法（第10行）
@@ -47,25 +48,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="max > i">
-              <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,1545 +95,1629 @@
 									（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="aspectFit">
+									</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="aspectFit"
+								: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="aspectFit"></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="aspectFit"
+								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: 'contain', //视频样式默认包含🌟💗
-        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 {
+		deoList,
+		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) {
+			
+			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
 
-      },
-      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');
-    },
-  }
+				deoList(that.videoID).then(res => {
+					that.loadVideo = false
+					that.getVideoData([res.data]);
+				}).catch(err => {
+					return uni.showToast({
+						title: err,
+						icon: 'none',
+						duration: 2000
+					});
+				})
+				// 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) {
+					console.log(list,'111111')
+				if (list.length == 0) return
+				let that = this;
+				that.loadVideo = list.length == that.limit
+				// that.page = that.page + 1;
+				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])
+				}
+				console.log(that.dataList)
+				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) {
+
+			},
+			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
+				// 这个方法主要就是用来第一次进入视频播放时用来处理
+				deoList(this.videoID).then(async (res) => {
+					this.loadVideo = false
+					this.page = 1;
+					var msg = [res.data];
+                    console.log(res.data)
+					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;
+					console.log(this.dataList)
+					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
+					});
+				})
+
+
+
+				// 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');
+		},
+	}
 </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..20e5574 100644
--- a/pages/short_video/nvueSwiper/index.nvue
+++ b/pages/short_video/nvueSwiper/index.nvue
@@ -15,7 +15,7 @@
 		<!-- 头部导航 -->
 
 
-		<view v-if="!isUser" class="header" :style="{backgroundColor:currentNav==1?'':'#ffffff'}">
+	<!-- 	<view v-if="!isUser" class="header" :style="{backgroundColor:currentNav==1?'':'#ffffff'}">
 
 			<view class="tool-bar">
 				<view class='iconfont icon-xiangzuo' @tap='goBack'></view>
@@ -29,7 +29,7 @@
 			<view class="items" @click.stop="navTap(3)">
 				<text class="tName" :class="currentNav==3?'on':''">列表</text>
 			</view>
-		</view>
+		</view> -->
 		<swiper v-show="currentNav !== 3" :style="'width: '+ windowWidth +'px; height: '+ windowHeight +'px;'"
 			:vertical="true" @animationfinish="animationfinish" @change="change" :current="k" :indicator-dots="false">
 			<swiper-item v-for="(list,index) in dataList">
@@ -54,6 +54,7 @@
 						5.show-loading：这里默认去掉播放转圈的标志
 						v-if="Math.abs(k-index)<=1"
 						 -->
+						 
 						<video :id="list.community_id+''+index" :loop="true" :muted="list.isplay"
 							:autoplay="index == k && isRoutine" :controls="false" :http-cache="true"
 							:page-gesture="false" :show-fullscreen-btn="false" :show-loading="false"
@@ -161,7 +162,7 @@
 							<navigator v-if="list.author && userInfo.uid != list.author.uid" hover-class="none"
 								:url="'/pages/plantGrass/plant_user/index?id='+list.uid" class="pictrue">
 								<image class="userAvatar"
-									:src="list.author&&list.author.avatar || '/static/images/f.png'" mode="aspectFill">
+									:src="list.author&&list.author.avatar || '/static/images/f.png'" mode="aspectFit">
 								</image>
 								<view v-if="!list.is_fans || !userInfo.uid" class="guanzhu"
 									@click.stop="followAuthor(list)"><text
@@ -226,13 +227,13 @@
 			@scrolltolower="getGoods()">
 			<block v-for="(item,index) in cateGoods" :key="index">
 				<view class="goods_item" @click="gogogo(item)">
-					<image class="goods_img" :src="item.image[0]" mode="aspectFill"></image>
+					<image class="goods_img" :src="item.image[0]" mode="aspectFit"></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>
+									mode="aspectFit" class="g_img"></image>
 								<view class="g_name">{{item.author && item.author.nickname}}</view>
 							</view>
 							<view class="nice_box flex_a_c" @click.stop="giveStart(item)">
@@ -293,7 +294,7 @@
 			<!-- #endif -->
 		</view>
 		<canvas class="canvas" canvas-id='myCanvas' v-if="canvasStatus"></canvas>
-		<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
+		<!-- <authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize> -->
 	</view>
 </template>
 
@@ -314,6 +315,7 @@
 		HTTP_REQUEST_URL
 	} from '@/config/app';
 	import {
+		deoList,
 		videoList,
 		myVideoList,
 		graphicStartApi,
@@ -350,7 +352,7 @@
 				deleteHeight: 0,
 				dataList: [],
 				k: 0,
-				max: 2,
+				max: 1,
 				oldVideo: "",
 				voice: "",
 				timeout: "",
@@ -418,6 +420,7 @@
 		watch: {
 			k(new_k, old_k) {
 				const max = new_k + 2;
+					
 				if (this.max < max) {
 					this.max = max;
 				}
@@ -425,6 +428,7 @@
 					this.oldCurrent = this.currentNav
 					return false
 				}
+			
 				this.dataList[old_k].playIng = false //如果视频暂停，就加载封面
 				this.dataList[old_k].isplay = true
 				this.dataList[old_k].state = 'pause'
@@ -447,6 +451,7 @@
 			}
 		},
 		onLoad(options) {
+			console.log(options)
 			this.getOptions(options);
 			this.videoID = options.id;
 			this.isUser = options.user == 1 ? true : false;
@@ -731,42 +736,56 @@
 			},
 			get() {
 				let that = this
-				// 1.这里引入后端请求数据
-				that.isUser ?
-					myVideoList(that.userUid, {
-						page: that.page,
-						limit: that.limit,
-						is_star: that.isSatrt,
-						community_id: that.videoID
-					}).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
-						});
-					}) :
-					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
+			   that.loadVideo = true
+				deoList(that.videoID).then(res => {
+					// console.log(res.data)
+					that.videoData([res.data])
+					if (res.data.list.length < that.limit) {
+						this.loadMore = false;
+					}
+				}).catch(err => {
+					return uni.showToast({
+						title: err,
+						icon: 'none',
+						duration: 2000
+					});
+				})
+				
+					// myVideoList(that.userUid, {
+					// 	page: that.page,
+					// 	limit: that.limit,
+					// 	is_star: that.isSatrt,
+					// 	community_id: that.videoID
+					// }).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
+					// 	});
+					// }) 
+					// :
+					// 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
+					// 	});
+					// })
+				
 			},
 			getFocusList() {
 				let that = this;
@@ -802,16 +821,21 @@
 					msg[i]['isplay'] = true
 					msg[i]['loading'] = false
 					that.dataList.push(msg[i])
+					{console.log(i,that.k)}
 					//#ifndef H5
+					
 					if (i == 0 && that.k == 0) {
+							
 						this.dataList[0].isplay = false
 						this.dataList[0].playIng = true
 						this.dataList[0].state = 'play'
 						this.dataList[0].loading = false
+						console.log('32')
 						uni.createVideoContext(that.dataList[0].community_id + '' + 0, that).play()
 					}
 					//#endif
 				}
+				
 				//#ifdef MP
 				if (this.k == 0) {
 					this.videoShare(this.dataList[0]);
@@ -1258,8 +1282,8 @@
 		z-index: 9;
 		width: 750rpx;
 		height: 120rpx;
-		
-		
+
+
 		flex-direction: row;
 		justify-content: center;
 		align-items: center;
@@ -1371,7 +1395,7 @@
 
 	.userInfo {
 		position: absolute;
-		bottom: 60rpx;
+		bottom: 120px;
 		right: 20rpx;
 		flex-direction: column;
 		text-align: center;
diff --git a/pages/store/home/index.vue b/pages/store/home/index.vue
index 6b02ff0..072b5da 100644
--- a/pages/store/home/index.vue
+++ b/pages/store/home/index.vue
@@ -1198,7 +1198,7 @@
 	  	this.isTriggered = true;
 		const newList = this.goods.reverse();
 		this.goods = newList;
-		this.getProductSpu()
+		// this.getProductSpu()
 	  	setTimeout(() => {
 	  		this.isTriggered = false;
 	  	}, 500)
@@ -1210,7 +1210,7 @@
       // 模拟触底刷新
       if (this.tabActive == 0) {
         setTimeout(() => {
-          this.goods.push(...this.goods);
+          // this.goods.push(...this.goods);
         }, 500)
       }
     },
@@ -1220,7 +1220,8 @@
       setTimeout(() => {
         const newList = this.goods.reverse();
         this.goods = newList;
-		this.getProductSpu()
+		// this.getGoods()
+		// this.getProductSpu()
 		// uni.startPullDownRefresh();
         // uni.stopPullDownRefresh();
       }, 500)
diff --git a/pages/supply_chains/supply_chains.vue b/pages/supply_chains/supply_chains.vue
index be14c93..de5301f 100644
--- a/pages/supply_chains/supply_chains.vue
+++ b/pages/supply_chains/supply_chains.vue
@@ -1,699 +1,977 @@
 <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">
+  <view class="Circle_friends">
+    <view class="circle_friends_wrapper">
+      <view @click="selectLocation" v-if="isFshow">
+        <view
+          class="site-box flex_a_c_j_sb"
+          :style="{ 'background-color': backColor }"
+        >
+          <view
+            :class="['place_wrapper', 'flex_a_c', isFshow ? 'sitebox' : '']"
+          >
+            <view
+              :class="['iconfont', 'icon-weizhi', isFshow ? 'sitebox' : '']"
+              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', isFshow ? 'sitebox' : '']"
+              style="color: #fff"
+            ></view>
+          </navigator>
+        </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>
 
-			<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>
-				</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>
-				</block>
-			</view>
+      <zbpSwiper
+        :isSelectPlace="true"
+        :town="street"
+        :streetname="street"
+        :location_Arr="locationArr"
+        @change="dchange"
+      >
+      </zbpSwiper>
 
-			<view class="tabs_wrapper">
-				<u-tabs :list="tabsData.list" @click="tabsChange" keyName="title" lineColor="#F84221"></u-tabs>
-			</view>
+      <view class="list">
+        <navigator
+          hover-class="none"
+          :url="`/pages/nongKe/supply_chain/supplier?type_id=10&street_id=${street_id}`"
+        >
+          <view class="list-m">
+            <image src="@/static/images/f6.png" mode="aspectFit"></image>
+            <view class="list-title">
+              <view class="list-titlea">
+                <image src="@/static/images/p9.png" mode="aspectFit"></image>
+                <view class="titlea-con">
+                  <view class="titlea">september</view>
+                  <view class="titleb"> 9月 </view>
+                </view>
+              </view>
+              <view class="list-titleb">
+                <view class="titlea">
+                  {{ town }}
+                </view>
+                <view class="titleb"> 综合供销云市场 </view>
+              </view>
+            </view>
+            <view class="list-title-info" style="color: #3a7331">
+              <view class=""> 点击查看 </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>
-								</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>
-				</block>
-			</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> columnData: [],
-		<!-- <view class="bg_color"></view> -->
+              <view class="title-infoimg">
+                <image src="@/static/images/pj.png" mode="aspectFit"></image>
+              </view>
+            </view>
+          </view>
+        </navigator>
 
-		<!-- <m-tabbar native>
-      <template v-slot:tabbar_index_2>
-        <view class="custom_style">
-          <view class="custom_style_icon"></view>
+        <view class="list-m" @click="go_shop">
+          <image src="@/static/images/f1.png" mode="aspectFit"></image>
+          <view class="list-title">
+            <view class="list-titlea">
+              <image src="@/static/images/p8.png" mode="aspectFit"></image>
+            </view>
+            <view class="list-titleb">
+              <view class="titlea"> 里海云仓 </view>
+              <view class="titleb"> 行业分类市场 </view>
+            </view>
+          </view>
+          <view class="list-title-info" style="color: #ff6b00">
+            <view class=""> 点击查看 </view>
+            <view class="title-infoimg">
+              <image src="@/static/images/pj1.png" mode="aspectFit"></image>
+            </view>
+          </view>
         </view>
-      </template>
-    </m-tabbar> -->
-	</view>
+      </view>
+
+      <view class="list-con">
+        <view
+          class="list-con-left"
+          @tap="navgo('/pages/nongKe/specialty/index')"
+        >
+          <!-- <view class="list-con-title">
+						<view class="con-titlea">
+							名优特产
+						</view>
+						<view class="con-titleb">
+							精选当地特色特产
+						</view>
+					</view> -->
+          <image src="@/static/images/f5.png" mode="aspectFit"></image>
+        </view>
+        <view class="list-con-right">
+          <view
+            class="con-right"
+            style="margin-bottom: 20rpx"
+            @click="navaction(1)"
+          >
+            <!-- <view class="list-con-title">
+							<view class="con-titlea">
+								当地美食
+							</view>
+							<view class="con-titleb">
+								美食线上一条街
+							</view>
+						</view> -->
+            <image src="@/static/images/f7.png" mode="aspectFit"></image>
+          </view>
+          <view class="con-right" @click="navaction(2)">
+            <!-- <view class="list-con-title">
+							<view class="con-titlea">
+								特色文旅
+							</view>
+							<view class="con-titleb">
+								热门景区，当地文化
+							</view>
+						</view> -->
+            <image src="@/static/images/f2.png" mode="aspectFit"></image>
+          </view>
+        </view>
+      </view>
+      <view class="list-bon">
+        <image src="@/static/images/f4.png" mode="aspectFit"></image>
+      </view>
+      <view class="goodslist">
+        <WaterfallsFlow :wfList="cateGoods" />
+      </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="[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 zbpSwiper from '@/components/zbpSwiper'
-	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
-		},
-		data() {
-			return {
-				defaInd: [0, 0],
-				tabsData: {
-					list: [],
-					tabsActive: 0
-				},
-				town: '',
-				street_id: '',
-				emptyShow: false,
-				articleList: [],
-				recoList: [],
-				columnData: [],
-				bgData: [{
-					pic: ''
-				}, {
-					pic: ''
-				}],
-				store_id: '',
-				locationArr: ({}),
-				setrecommend_address: "",
-				isYunCang: 0,
-				bgColor: '',
-				isFshow: false,
-				street: '',
-				showPicker: false,
-			}
-		},
-		onLoad() {
-			this.Area()
-			this.appLocation()
-			getHotBanner('good').then(res => {
-				// console.log(res);
-				this.bgData = res.data
-			})
-			this.getArticle()
-			getArticleList(19).then(res => {
-				this.recoList = res.data.list
-			})
-			// this.getTownAndStoreId()
+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,
 
-		},
-		onShow() {},
-		// computed: mapGetters(['location']),
-		mounted() {
-			// #ifdef  H5
-			// 监听页面滚动事件
-			window.addEventListener("scroll", this.scrolling);
-			// #endif
+} from '@/api/api.js'
+
+import {
+	spuInfo
+} from '@/api/product.js';
+import {
+	getGeocoder,
+	merClassifly,
+	getProductHot
+} from '@/api/store.js';
+import {
+	getArea,
+	getStreet
+} from '@/api/article.js';
+import {
+	Toast
+} from '@/libs/uniApi'
+export default {
+	components: {
+		mTabbar,
+		zbpSwiper,
+		easyLoadimage,
+		WaterfallsFlow
+	},
+	data() {
+		return {
+			activeStyle: {
+
+				color: '#333333',
+				fontWeight: 'bold',
+				transform: 'scale(1.04)'
+			},
+			isshow: false,
+			locationArr: ({}),
+			status: 'loadmore',
+			bgColor: '',
+			showPicker: false,
+			columnData: [],
+			show: false,
+			tabsData: {
+				list: [],
+				tabsActive: 0
+			},
+			tabsData1: {
+				list: [],
+				tabsActive: 0
+			},
+			where: {
+				category_id: 0,
+				page: 1,
+				limit: 6
+			},
+			where1: {
+
+				page: 1,
+				limit: 6
+			},
+			currentItemId: 69, // 默认获取 社区的数据 0 表示推荐 || 69 社区
+			keyword: '',
+			location: '',
+			emptyShow: false,
+			town: '',
+			cateGoods: [],
+			recoList: [],
+			articleList: [],
+			street_id: '',
+			street: '',
+			bgColor: '',
+			isFshow: false,
+			backColor: 'rgba(248, 66, 33, 0)'
+		}
+	},
+
+	onPullDownRefresh() {
+		this.cateGoods = []
+		this.list()
+		this.Area()
+		uni.stopPullDownRefresh()
+	},
+
+	onLoad() {
+		this.list()
+
+		this.Area()
 
 
-		},
-		// #ifdef APP-PLUS
-		onPageScroll(e) {
-			// this.scrollTop = e.scrollTop;
-			console.log(e.scrollTop)
-			if (e.scrollTop > 0) {
-				this.isFshow = true
+		// this.openTongZhi()
+		uni.$on('connectstatusChange', (connectstatus) => {
+			var connectstr = ''
+			if (connectstatus == true) {
+				connectstr = '已连接'
+				this.getRegistrationID()
 			} else {
-				this.isFshow = false
+				connectstr = '未连接'
 			}
+			this.connectstatus = connectStr
+		})
+
+	},
+
+	onReachBottom() {
+		if (this.status == 'nomore') return;
+		this.status = 'loading';
+
+		this.where.page = ++this.where.page;
+		this.list()
+	},
+	mounted() {
+
+		// #ifdef  H5
+		// 监听页面滚动事件
+		window.addEventListener("scroll", this.scrolling);
+		// #endif
+
+		this.$bus.$on('value-updated', (newValue) => {
+			// 更新父组件的值
+			this.street = newValue.split(',')[0]
+			this.town = newValue.split(',')[0]
+			this.street_id = newValue.split(',')[1]
+		});
+
+
+
+		if (this.street.length <= 0) {
+			this.selfLocation()
+		}
+
+	},
+
+	// #ifdef APP-PLUS
+	onPageScroll(e) {
+
+		const scrollTop = e.scrollTop;
+		if (scrollTop <= 20) {
+			this.backColor = 'rgba(248, 66, 33, 0)'
+			this.isFshow = false
+		} else if (20 < scrollTop && scrollTop <= 100) {
+			this.backColor = 'rgba(248, 66, 33, .5)'
+			this.isFshow = true
+		} else if (scrollTop > 100) {
+			this.backColor = 'rgba(248, 66, 33, 1)'
+			this.isFshow = true
+
+
+		}
+	},
+	// #endif
+
+	methods: {
+		navaction(val) {
+			uni.navigateTo({
+				url: '/pages/nongKe/supply_chain/suppliers?id=' + val
+			})
 
 		},
-		// #endif
-		methods: {
-			confirm(e) {
-				this.street = e.value[1].name
-				this.town= e.value[1].name
-				this.showPicker = false
-			   	this.street_id = e.value[1].id
-			   	this.getCloudShopMerId(e.value[1].id)
-				
-			},
-			changeHandler(e) {
-				const {
-					columnIndex,
-					value,
-					values,
-					index,
-					picker = this.$refs.uPicker
-				} = e;
-				if (columnIndex === 0) {
-					getStreet({
-						area_code: value[0]['code']
-					}).then(res => {
-						picker.setColumnValues(1, res.data);
-					});
-				}
-			},
-			Area() {
-				getArea({
-					city_code: 510500
-				}).then(res => {
-					this.$refs.uPicker.setColumnValues(0, res.data);
-					this.Street(res.data[0]['code']);
-				});
-			},
-			Street(code) {
+		//获取商品列表
+		list(id) {
+			if (id) {
+				spuInfo(id, this.where1).then(res => {
+					// console.log(res)
+					this.cateGoods = res.data.list
+				})
+			} else {
+				getProductHot(1, 10).then(res => {
+					// console.log(res)
+					this.cateGoods = res.data.list
+				})
+			}
+
+
+		},
+		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 (scrollTop <= 20) {
+				this.backColor = 'rgba(248, 66, 33, 0)'
+				this.isFshow = false
+			} else if (20 < scrollTop && scrollTop <= 100) {
+				this.backColor = 'rgba(248, 66, 33, .5)'
+				this.isFshow = true
+			} else if (scrollTop > 100) {
+				this.backColor = 'rgba(248, 66, 33, 1)'
+				this.isFshow = true
+
+
+			}
+
+
+		},
+
+
+
+
+
+
+		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.street_id = e.value[1].code
+			this.town = e.value[1].name
+
+			this.$nextTick(() => {
+				this.$bus.$emit('value-updated', e.value[1].name + ',' + e.value[1].code);
+
+			})
+			this.showPicker = false
+		},
+		changeHandler(e) {
+			const {
+				columnIndex,
+				value,
+				values,
+				index,
+				picker = this.$refs.uPicker
+			} = e;
+			if (columnIndex === 0) {
 				getStreet({
-					area_code: code
+					area_code: value[0]['code']
 				}).then(res => {
 					this.$refs.uPicker.setColumnValues(1, res.data);
 				});
-			},
-
-			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)
-				}
-			},
-
-			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 到了最顶部")
-				}
-			},
-			kkchange(e) {
-				this.bgColor = e
-			},
-
-			async appLocation() {
-
-				uni.getLocation({
-					type: 'wgs84',
-					timeout: '10',
-					success: (res) => {
-
-						let latitude, longitude;
-						latitude = res.latitude.toString();
-						longitude = res.longitude.toString();
-						getGeocoder({
-							lat: latitude,
-							long: longitude
-						}).then(res => {
-						    this.street = res.data.address_component.street
-							this.town = res.data.address_reference.town.title
-							this.street_id = res.data.address_reference.town.id
-							this.getCloudShopMerId(this.street_id)
-						}).catch(err => {
-							uni.showToast({
-								title: err,
-								icon: 'none'
-							})
-						})
-					},
-					fail: (err) => {
-
-						uni.showToast({
-							title: "获取定位超时",
-							icon: 'none',
-							duration: 2000
-						});
-					}
-				});
-			},
-		
-			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)
-					}
-				})
-				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()
-		}
+		Area() {
+			getArea({
+				city_code: 510500
+			}).then(res => {
+				this.$refs.uPicker.setColumnValues(0, res.data);
+				this.Street(res.data[0]['code']);
+			});
+		},
+		Street(code) {
+			getStreet({
+				area_code: code
+			}).then(res => {
+				this.$refs.uPicker.setColumnValues(1, res.data);
+			});
+		},
+		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}`
+				})
+			}
+		},
+		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
+				}
+			})
+		},
+		go_shop() {
+			if (this.isYunCang == 0) {
+				return Toast('当前区域没有云仓库')
+			}
+			uni.navigateTo({
+				url: `/pages/nongKe/cloud_entrepot/index?street=${this.street_id}&town=${this.town}`
+			})
+
+		},
+		navgo(url) {
+			uni.navigateTo({
+				url
+			})
+		},
+		dchange(e) {
+			this.street = e.value[1].name
+			this.street_id = e.value[1].code
+			this.town = e.value[1].name
+		},
+		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) => {
+
+					this.isshow = false
+					let latitude, longitude;
+					latitude = res.latitude.toString();
+					longitude = res.longitude.toString();
+					getGeocoder({
+						lat: latitude,
+						long: longitude
+					}).then(res => {
+						this.town = res.data.address_reference.town.title
+						this.street_id = res.data.address_reference.town.id
+						this.street = res.data.address_component.street
+						this.$nextTick(() => {
+							this.$bus.$emit('value-updated', this.street + ',' + this
+								.street_id);
+
+						})
+						this.list(this.street_id)
+					}).catch(err => {
+						uni.showToast({
+							title: err,
+							icon: 'none'
+						})
+					})
+				},
+				fail: (err) => {
+					this.isshow = false
+					// uni.showToast({
+					// 	title: "获取定位超时",
+					// 	icon: 'none',
+					// 	duration: 2000
+					// });
+				}
+			});
+		},
+
+
+
 	}
+}
 </script>
 
 <style lang="scss" scoped>
-	.Circle_friends {
-		background: linear-gradient(180deg, #FFFFFF 0%, #F6F6F6 100%);
-	}
+/deep/.color-lump {
+  display: none;
+}
 
-	.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;
+page {
+  background: #f4f7fe;
 
+  // background: linear-gradient(180deg, #FFFFFF 0%, #F6F6F6 100%);
+}
 
-		img {
-			width: 100%;
-			height: 100%;
-			filter: blur(30rpx);
-			transform: scale(1.5);
-		}
-	}
+.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;
 
-	.site-box {
-		width: 100%;
-		height: 120rpx;
-		margin-bottom: 26.32rpx;
-		position: absolute;
-		top: 0rpx;
-		position: fixed;
-		z-index: 999;
-		padding-top: 30rpx;
-		padding-right: 20rpx;
+  .locationa {
+    font-size: 28rpx;
+    color: #000;
+    font-weight: 500;
+    margin-top: 30rpx;
+    margin-bottom: 15rpx;
+  }
 
-		// 位置
-		.place_wrapper {
-			color: #fff;
-			margin-right: 24.56rpx;
-			font-size: 30rpx;
+  .locationb {
+    font-size: 20rpx;
+    color: #5a5a5a;
+  }
+}
 
-			.town_name {
-				margin-left: 21rpx;
-			}
-		}
+.Circle_friends {
+  position: relative;
+  padding: 0 0 87.72rpx 0;
+}
 
-		.iconfont {
-			font-size: 35.09rpx;
-		}
-	}
+.sitebox {
+  animation-name: fadeIn;
+  animation-duration: 3s;
+  animation-fill-mode: forwards;
+}
 
-	.shop_wrapper {
-		height: 192.98rpx;
-		width: 694.74rpx;
-		margin: 0 auto;
-		display: flex;
-		justify-content: space-between;
-		margin-top: 0;
+@keyframes fadeIn {
+  from {
+    opacity: 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;
+  to {
+    opacity: 1;
+  }
+}
 
-			.text-name {
-				margin-top: 14.04rpx;
-				text-align: center;
-				color: #fff;
-				font-weight: bold;
-				font-size: 29.82rpx;
+.site-box {
+  width: 100%;
+  /* #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;
+  /* #ifdef MP || APP-PLUS */
+  padding-top: 75rpx;
+  /* #endif */
+  /* #ifdef H5 */
+  padding-top: 25rpx;
+  /* #endif */
+  // background-color: #e5e5e5;
 
-				text {
-					font-size: 40.35rpx;
-				}
-			}
+  padding-right: 20rpx;
 
-			.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;
+  // 位置
+  .place_wrapper {
+    color: #fff;
+    margin-right: 24.56rpx;
+    font-size: 30rpx;
 
-				.iconlihai {
-					font-size: 24.56rpx;
-					margin-left: 16rpx;
-				}
-			}
+    opacity: 0;
 
-			.text_cont {
-				position: absolute;
-				left: 21.05rpx;
-				bottom: 47.37rpx;
-				color: #7F1616;
-				font-weight: 700;
-				font-size: 31.58rpx;
+    .town_name {
+      margin-left: 21rpx;
+    }
+  }
 
-				.name_town {
-					font-size: 49.12rpx;
-				}
-			}
-		}
+  .iconfont {
+    opacity: 0;
+    font-size: 30rpx;
+    font-size: 35.09rpx;
+  }
+}
 
-		.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;
+.circle_friends_wrapper {
+  position: relative;
 
-			.title {
-				margin-top: 105.26rpx;
-			}
-		}
-	}
+  z-index: 2;
+}
 
-	.tabs_wrapper {
-		width: 694.74rpx;
-		margin: 38.6rpx auto;
-		margin-bottom: 21.05rpx;
+/deep/.u-tabs__wrapper__nav__line {
+  width: 46rpx;
+}
 
-		.title {
-			font-size: 31.58rpx;
-			font-weight: bold;
+/deep/.u-tabs__wrapper__nav__item {
+  padding: 0 0px;
+  padding-right: 10rpx;
+}
 
-			&::before {
-				content: '';
-				display: inline-block;
-				width: 3px;
-				height: 31.58rpx;
-				background-color: #F84221;
-				margin-right: 7.02rpx;
-			}
-		}
-	}
+.search_wrapper {
+  width: 694.74rpx;
+  margin: 0 auto;
+}
 
-	.article_box {
-		height: 100%;
-		width: 694.74rpx;
-		margin: 0 auto;
-		background-color: #fff;
-		border-radius: 16rpx;
-		padding: 0 24.56rpx;
-		box-sizing: border-box;
+.tabs_wrapper {
+  width: 720rpx;
+  margin: 0 auto;
+  margin-bottom: 21.05rpx;
+  // margin-left: -20rpx;
+}
 
-		.title-box {
-			height: 87.72rpx;
+.empty_wrapper {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
 
-			text {
-				font-size: 28.07rpx;
-			}
-		}
+.article_box {
+  height: 100%;
+  width: 694.74rpx;
+  margin: 0 auto;
+  background-color: #fff;
+  border-radius: 16rpx;
+  padding: 0 24.56rpx;
+  box-sizing: border-box;
 
-		.article-item {
-			display: flex;
-			// height: 175.44rpx;
-			justify-content: space-between;
-			border-bottom: 1px solid #f0f0f0;
-			padding: 21.05rpx 0;
+  .title-box {
+    height: 87.72rpx;
 
-			.text {
-				flex: 1;
-				height: 122.81rpx;
-				margin-right: 17.54rpx;
-				font-size: 24rpx;
-				color: #999;
-				display: flex;
-				flex-direction: column;
-				justify-content: space-between;
+    text {
+      font-size: 28.07rpx;
+    }
+  }
 
-				.name {
-					font-size: 26.32rpx;
-					color: #282828;
-				}
-			}
+  .article-item {
+    display: flex;
+    // height: 175.44rpx;
+    justify-content: space-between;
+    border-bottom: 1px solid #f0f0f0;
+    padding: 21.05rpx 0;
 
-			.pictrue {
-				width: 175.44rpx;
-				height: 122.81rpx;
+    .text {
+      flex: 1;
+      height: 122.81rpx;
+      margin-right: 17.54rpx;
+      font-size: 24rpx;
+      color: #999;
+      display: flex;
+      flex-direction: column;
+      justify-content: space-between;
 
-				image {
-					width: 100%;
-					height: 100%;
-					border-radius: 8px;
-				}
-			}
-		}
-	}
+      .name {
+        font-size: 26.32rpx;
+        color: #282828;
+      }
+    }
 
-	.goods {
-		margin: 0 auto;
-		width: 694.74rpx;
-		display: flex;
-		flex-wrap: wrap;
-		justify-content: space-between;
+    .pictrue {
+      width: 175.44rpx;
+      height: 122.81rpx;
 
-		.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;
+      image {
+        width: 100%;
+        height: 100%;
+        border-radius: 8px;
+      }
+    }
+  }
+}
 
-			.goods_img {
-				width: 100%;
-				height: 294.74rpx;
-			}
+.tabs_wrapper {
+  width: 723rpx;
+  margin: 0rpx auto;
+  margin-bottom: 21.05rpx;
 
-			.botm {
-				flex: 1;
-				padding: 0 14.04rpx;
-				padding-bottom: 21.05rpx;
-				display: flex;
-				flex-direction: column;
-				justify-content: space-between;
+  .title {
+    font-size: 31.58rpx;
+    font-weight: bold;
 
-				.title {
-					margin: 12px 0;
-					width: 100%;
-					overflow: hidden;
-					text-overflow: ellipsis;
-					display: -webkit-box;
-					-webkit-line-clamp: 2;
-					-webkit-box-orient: vertical;
-				}
+    &::before {
+      content: "";
+      display: inline-block;
+      width: 3px;
+      height: 31.58rpx;
+      background-color: #f84221;
+      margin-right: 7.02rpx;
+    }
+  }
+}
 
-				.goods_info {
-					justify-content: space-between;
+.list {
+  display: flex;
+  padding: 12rpx;
+  justify-content: space-between;
 
-					.g_img {
-						width: 60rpx;
-						height: 60rpx;
-						border-radius: 50%;
-					}
+  .list-m {
+    width: 356rpx;
+    height: 235rpx;
+    position: relative;
 
-					.g_name {
-						margin-left: 8.77rpx;
-						width: 100.63rpx;
-						text-overflow: ellipsis;
-						/* 溢出显示省略号 */
-						overflow: hidden;
-						/* 溢出隐藏 */
-						white-space: nowrap;
-						/* 强制不换行 */
-					}
+    .list-title {
+      display: flex;
+      position: absolute;
+      top: 20rpx;
 
-					.nice_box {
-						display: flex;
-						align-items: center;
+      .list-titlea {
+        margin-left: 14rpx;
+        width: 96rpx;
+        height: 117rpx;
+        margin-right: 11rpx;
+        position: relative;
 
-						.isshow {
-							color: #FE3530 !important;
-						}
+        .titlea-con {
+          position: absolute;
+          top: 20rpx;
+          color: #f4f7fe;
 
-						.iconfont {
-							font-size: 30rpx;
-						}
+          .titlea {
+            margin-top: 12rpx;
+            margin-left: 12rpx;
+            font-size: 16rpx;
+            font-family: PingFang SC-Semibold, PingFang SC;
+          }
 
-						.icon-shoucang1 {
-							color: #F84221;
-						}
+          .titleb {
+            margin-top: 6rpx;
+            font-size: 37rpx;
+            font-family: PingFang SC-Semibold, PingFang SC;
+            font-weight: 600;
+            color: #ffffff;
+            margin-left: 20rpx;
+          }
+        }
 
-						.collect {
-							font-size: 24rpx;
-							margin-left: 5rpx;
-						}
-					}
-				}
-			}
+        image {
+          width: 100%;
+          height: 100%;
+        }
+      }
 
-		}
-	}
-</style>
\ No newline at end of file
+      .list-titleb {
+        .titlea {
+          font-size: 37rpx;
+          font-family: PingFang SC-Semibold, PingFang SC;
+          font-weight: 600;
+          color: #ffffff;
+          margin-top: 10rpx;
+        }
+
+        .titleb {
+          font-size: 33rpx;
+          font-family: PingFang SC-Medium, PingFang SC;
+          font-weight: 500;
+          color: #ffffff;
+        }
+      }
+    }
+
+    .list-title-info {
+      // width: 98rpx;
+      height: 30rpx;
+      background: #ffffff;
+      padding: 2rpx 2rpx;
+      display: flex;
+      font-size: 10rpx;
+      font-size: 18rpx;
+      font-family: PingFang SC-Medium, PingFang SC;
+      font-weight: 500;
+      color: #ff6b00;
+      border-radius: 19rpx 19rpx 19rpx 19rpx;
+      position: absolute;
+      bottom: 14rpx;
+      left: 50%;
+      margin-left: -49rpx;
+      padding-left: 15rpx;
+
+      .title-infoimg {
+        width: 18rpx;
+        height: 18rpx;
+        margin: auto 0;
+
+        image {
+          width: 100%;
+          height: 100%;
+        }
+      }
+    }
+
+    image {
+      width: 100%;
+      height: 100%;
+    }
+  }
+}
+
+.list-con {
+  display: flex;
+  justify-content: space-between;
+  margin-top: -10rpx;
+  padding: 12rpx;
+
+  .list-con-left {
+    width: 357rpx;
+    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>
diff --git a/pages/user/index.vue b/pages/user/index.vue
index e4e9787..f2e4aa6 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -1,157 +1,160 @@
 <template>
-  <view :style="viewColor">
-    <skeleton :show="showSkeleton" :isNodes="isNodes" ref="skeleton" loading="chiaroscuro" selector="skeleton"
-      bgcolor="transparent"></skeleton>
-    <!-- 自定义顶部背景颜色 -->
-    <view class="top">
-      <!-- #ifdef MP || APP-PLUS -->
-      <view class="sys-head">
-        <view class="sys-bar" :style="{height:sysHeight}"></view>
-        <!-- #ifdef MP -->
-        <view class="sys-title">个人中心</view>
-        <!-- #endif -->
-        <view class="bg"></view>
-      </view>
-      <!-- #endif -->
-    </view>
-    <!-- 自定义顶部背景颜色 -->
-    <view class="new-users skeleton" :style="{visibility: showSkeleton ? 'hidden' : 'visible'}">
-      <view class="head">
-        <view class="user-card" :class="userInfo.svip_open && svip_switch_status == 1 ? 'svip-card' : ''">
-          <view class="bg"></view>
-          <view class="user-info">
-            <view class="avatar-box" :class="{on:userInfo.is_svip > 0 && svip_switch_status == 1}">
-              <image class="avatar skeleton-radius" :src="userInfo.avatar ? userInfo.avatar : '/static/images/f.png'"
-                @click="goEdit"></image>
-              <view class="headwear" v-if="userInfo.is_svip > 0 && svip_switch_status == 1">
-                <image src="/static/images/headwear.png"></image>
-              </view>
-            </view>
-            <view class="info">
-              <!--#ifdef MP-->
-              <view class="name" v-if="!userInfo.uid" @click="openAuto">
-                请点击授权
-              </view>
-              <!--#endif-->
-              <!--#ifdef APP-PLUS-->
-              <view class="name" v-if="!userInfo.uid" @click="openAuto">
-                请点击登录
-              </view>
-              <!--#endif-->
-              <!--#ifdef H5-->
-              <view class="name" v-if="!userInfo.uid" @click="openAuto">
-                <text v-if="isWeixin">请点击授权</text>
-                <text v-else>请点击登录</text>
-              </view>
-              <!--#endif-->
-              <view class="name" v-if="userInfo.uid">
-                {{userInfo.nickname}}
-                <image v-if="member_status" class="level_icon" :src="userInfo.member_icon" alt="">
-                  <view class="vip" v-if="userInfo.is_svip > 0 && svip_switch_status == 1">
-                    <image src="/static/images/svip.png"></image>
-                  </view>
-              </view>
-              <view class="num" v-if="userInfo.phone" @click="goEdit()">
-                <view class="num-txt">ID：{{userInfo.uid}}</view>
-                <view class="icon">
-                  <image src="/static/images/edit.png" mode=""></image>
-                </view>
-              </view>
-              <view class="phone" v-if="!userInfo.phone && isLogin" @tap="bindPhone">绑定手机号</view>
-            </view>
-          </view>
-          <view class="num-wrapper skeleton-rect">
-            <view class="num-item" @click="goMenuPage('/pages/users/user_goods_collection/index')">
-              <text class="num">{{userInfo.total_collect_product || 0}}</text>
-              <view class="txt">我的收藏</view>
-            </view>
-            <view v-if="hide_mer_status == 0" class="num-item"
-              @click="goMenuPage('/pages/users/user_goods_collection/index?tab=2')">
-              <text class="num">{{userInfo.total_collect_store || 0}}</text>
-              <view class="txt">关注店铺</view>
-            </view>
-            <view class="num-item" @click="goMenuPage('/pages/users/browsingHistory/index')">
-              <text class="num">{{userInfo.total_visit_product || 0}}</text>
-              <view class="txt">浏览记录</view>
-            </view>
-            <view class="num-item" @click="goMenuPage('/pages/users/user_coupon/index')">
-              <text class="num">{{userInfo.total_coupon || 0}}</text>
-              <view class="txt">优惠券</view>
-            </view>
-          </view>
-          <navigator hover-class="none"
-            :url="userInfo.is_svip > 0 ? '/pages/annex/vip_center/index' : '/pages/annex/vip_paid/index'"
-            class="cardVipA acea-row row-between-wrapper" v-if="userInfo.svip_open && svip_switch_status == 1">
-            <image class="svip_user" src="/static/images/svip_user.png"></image>
-            <view class="left-box">
-              <view v-if="userInfo.is_svip > 0" class="small">累计为您节省{{userInfo.svip_save_money}}元</view>
-              <view v-else-if="userInfo.is_svip <= 0" class="small">开通享六大特权，省钱又省心
-              </view>
-            </view>
-            <view class="acea-row row-middle">
-              <view class="btn-open">{{userInfo.is_svip > 0 ? '立即续费' : '立即开通'}}</view>
-            </view>
-          </navigator>
-          <view class="right-btn">
-            <view class="iconfont icon-shezhi" v-if="isLogin" @click="goSetting()"></view>
-            <view class="btn" @click="authTo('/pages/chat/customer_list/index?type=0')" hover-class="none">
-              <view class="iconfont icon-xiaoxi"></view>
-              <text class="iconnum" v-if="userInfo.total_unread">{{userInfo.total_unread}}</text>
-            </view>
-          </view>
-        </view>
-      </view>
-      <view class="wrapper">
-        <view class="order-wrapper">
-          <view class="order-hd flex skeleton-rect">
-            <view class="left">我的订单</view>
-            <view class="right flex" @click="authTo('/pages/users/order_list/index?status=-1&product_type=0')" hover-class="none"
-              open-type="navigate">
-              全部订单
-              <text class="iconfont icon-xiangyou"></text>
-            </view>
-          </view>
-          <view class="order-bd">
-            <block v-for="(item,index) in orderMenu" :key="index">
-              <view class="order-item" @click="authTo(item.url)" hover-class="none">
-                <view class="pic">
-                  <text class="iconfont" :class="item.icon"></text>
-                  <text class="order-status-num" v-if="item.num > 0">{{ item.num }}</text>
-                </view>
-                <view class="txt skeleton-rect">{{item.title}}</view>
-              </view>
-            </block>
-          </view>
-        </view>
-        <!-- 轮播 -->
-        <view class="slider-wrapper skeleton-rect" v-if="imgUrls.length>0">
-          <swiper indicator-dots="true" :autoplay="autoplay" :circular="circular" :interval="interval"
-            :duration="duration" indicator-color="rgba(255,255,255,0.6)" indicator-active-color="#fff">
-            <block v-for="(item,index) in imgUrls" :key="index">
-              <swiper-item>
-                <view @click="goUrl(item.url)" class='slide-navigator acea-row row-between-wrapper'>
-                  <image :src="item.pic" class="slide-image"></image>
-                </view>
-              </swiper-item>
-            </block>
-          </swiper>
-        </view>
-        <!-- 会员菜单 -->
-        <view class="user-menus" style="margin-top: 20rpx;">
-          <view class="title skeleton-rect">我的服务</view>
-          <view class="menu-box">
-            <block v-for="(item,index) in personalMenu" :key="index">
-              <view v-if="item.isShow" class="item">
-                <view @click="authTo(item.url)" class="item-count">
-                  <image v-if="showSkeleton" class="skeleton_image skeleton-radius"></image>
-                  <image v-else :src="item.pic"></image>
-                  <text>{{item.name}}</text>
-                </view>
-              </view>
-            </block>
-          </view>
-        </view>
-        <!-- <view class="menus-list-item" v-if="!userInfo.topService && userInfo.service" @click="toService(0)">
+	<view :style="viewColor">
+		<skeleton :show="showSkeleton" :isNodes="isNodes" ref="skeleton" loading="chiaroscuro" selector="skeleton"
+			bgcolor="transparent"></skeleton>
+		<!-- 自定义顶部背景颜色 -->
+		<view class="top">
+			<!-- #ifdef MP || APP-PLUS -->
+			<view class="sys-head">
+				<view class="sys-bar" :style="{height:sysHeight}"></view>
+				<!-- #ifdef MP -->
+				<view class="sys-title">个人中心</view>
+				<!-- #endif -->
+				<view class="bg"></view>
+			</view>
+			<!-- #endif -->
+		</view>
+		<!-- 自定义顶部背景颜色 -->
+		<view class="new-users skeleton" :style="{visibility: showSkeleton ? 'hidden' : 'visible'}">
+			<view class="head">
+				<view class="user-card" :class="userInfo.svip_open && svip_switch_status == 1 ? 'svip-card' : ''">
+					<view class="bg"></view>
+					<view class="user-info">
+						<view class="avatar-box" :class="{on:userInfo.is_svip > 0 && svip_switch_status == 1}">
+							<image class="avatar skeleton-radius"
+								:src="userInfo.avatar ? userInfo.avatar : '/static/images/f.png'" @click="goEdit">
+							</image>
+							<view class="headwear" v-if="userInfo.is_svip > 0 && svip_switch_status == 1">
+								<image src="/static/images/headwear.png"></image>
+							</view>
+						</view>
+						<view class="info">
+							<!--#ifdef MP-->
+							<view class="name" v-if="!userInfo.uid" @click="openAuto">
+								请点击授权
+							</view>
+							<!--#endif-->
+							<!--#ifdef APP-PLUS-->
+							<view class="name" v-if="!userInfo.uid" @click="openAuto">
+								请点击登录
+							</view>
+							<!--#endif-->
+							<!--#ifdef H5-->
+							<view class="name" v-if="!userInfo.uid" @click="openAuto">
+								<text v-if="isWeixin">请点击授权</text>
+								<text v-else>请点击登录</text>
+							</view>
+							<!--#endif-->
+							<view class="name" v-if="userInfo.uid">
+								{{userInfo.nickname}}
+								<image v-if="member_status" class="level_icon" :src="userInfo.member_icon" alt="">
+									<view class="vip" v-if="userInfo.is_svip > 0 && svip_switch_status == 1">
+										<image src="/static/images/svip.png"></image>
+									</view>
+							</view>
+							<view class="num" v-if="userInfo.phone" @click="goEdit()">
+								<view class="num-txt">ID：{{userInfo.uid}}</view>
+								<view class="icon">
+									<image src="/static/images/edit.png" mode=""></image>
+								</view>
+							</view>
+							<view class="phone" v-if="!userInfo.phone && isLogin" @tap="bindPhone">绑定手机号</view>
+						</view>
+					</view>
+					<view class="num-wrapper skeleton-rect">
+						<view class="num-item" @click="goMenuPage('/pages/users/user_goods_collection/index')">
+							<text class="num">{{userInfo.total_collect_product || 0}}</text>
+							<view class="txt">我的收藏</view>
+						</view>
+						<view v-if="hide_mer_status == 0" class="num-item"
+							@click="goMenuPage('/pages/users/user_goods_collection/index?tab=2')">
+							<text class="num">{{userInfo.total_collect_store || 0}}</text>
+							<view class="txt">关注店铺</view>
+						</view>
+						<view class="num-item" @click="goMenuPage('/pages/users/browsingHistory/index')">
+							<text class="num">{{userInfo.total_visit_product || 0}}</text>
+							<view class="txt">浏览记录</view>
+						</view>
+						<view class="num-item" @click="goMenuPage('/pages/users/user_coupon/index')">
+							<text class="num">{{userInfo.total_coupon || 0}}</text>
+							<view class="txt">优惠券</view>
+						</view>
+					</view>
+					<navigator hover-class="none"
+						:url="userInfo.is_svip > 0 ? '/pages/annex/vip_center/index' : '/pages/annex/vip_paid/index'"
+						class="cardVipA acea-row row-between-wrapper"
+						v-if="userInfo.svip_open && svip_switch_status == 1">
+						<image class="svip_user" src="/static/images/svip_user.png"></image>
+						<view class="left-box">
+							<view v-if="userInfo.is_svip > 0" class="small">累计为您节省{{userInfo.svip_save_money}}元</view>
+							<view v-else-if="userInfo.is_svip <= 0" class="small">开通享六大特权，省钱又省心
+							</view>
+						</view>
+						<view class="acea-row row-middle">
+							<view class="btn-open">{{userInfo.is_svip > 0 ? '立即续费' : '立即开通'}}</view>
+						</view>
+					</navigator>
+					<view class="right-btn">
+						<view class="iconfont icon-shezhi" v-if="isLogin" @click="goSetting()"></view>
+						<view class="btn" @click="authTo('/pages/chat/customer_list/index?type=0')" hover-class="none">
+							<view class="iconfont icon-xiaoxi"></view>
+							<text class="iconnum" v-if="userInfo.total_unread">{{userInfo.total_unread}}</text>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="wrapper">
+				<view class="order-wrapper">
+					<view class="order-hd flex skeleton-rect">
+						<view class="left">我的订单</view>
+						<view class="right flex"
+							@click="authTo('/pages/users/order_list/index?status=-1&product_type=0')" hover-class="none"
+							open-type="navigate">
+							全部订单
+							<text class="iconfont icon-xiangyou"></text>
+						</view>
+					</view>
+					<view class="order-bd">
+						<block v-for="(item,index) in orderMenu" :key="index">
+							<view class="order-item" @click="authTo(item.url)" hover-class="none">
+								<view class="pic">
+									<text class="iconfont" :class="item.icon"></text>
+									<text class="order-status-num" v-if="item.num > 0">{{ item.num }}</text>
+								</view>
+								<view class="txt skeleton-rect">{{item.title}}</view>
+							</view>
+						</block>
+					</view>
+				</view>
+				<!-- 轮播 -->
+				<view class="slider-wrapper skeleton-rect" v-if="imgUrls.length>0">
+					<swiper indicator-dots="true" :autoplay="autoplay" :circular="circular" :interval="interval"
+						:duration="duration" indicator-color="rgba(255,255,255,0.6)" indicator-active-color="#fff">
+						<block v-for="(item,index) in imgUrls" :key="index">
+							<swiper-item>
+								<view @click="goUrl(item.url)" class='slide-navigator acea-row row-between-wrapper'>
+									<image :src="item.pic" class="slide-image"></image>
+								</view>
+							</swiper-item>
+						</block>
+					</swiper>
+				</view>
+				<!-- 会员菜单 -->
+				<view class="user-menus" style="margin-top: 20rpx;">
+					<view class="title skeleton-rect">我的服务</view>
+					<view class="menu-box">
+						<block v-for="(item,index) in personalMenu" :key="index">
+							<view v-if="item.isShow" class="item">
+								<view @click="authTo(item.url)" class="item-count">
+									<image v-if="showSkeleton" class="skeleton_image skeleton-radius"></image>
+									<image v-else :src="item.pic"></image>
+									<text>{{item.name}}</text>
+								</view>
+							</view>
+						</block>
+					</view>
+				</view>
+				<!-- <view class="menus-list-item" v-if="!userInfo.topService && userInfo.service" @click="toService(0)">
           <view class="item-text">
             <view class="title">
               <text class="merchant">商家</text>管理
@@ -160,1073 +163,1138 @@
           </view>
           <view class="image merchant-image"></view>
         </view> -->
-        <view class="menus-list-item" v-if="!userInfo.service && userInfo.topService" @click="toService(1)">
-          <view class="item-text">
-            <view class="title">
-              <text class="plantform">平台</text>管理
-            </view>
-            <view class="info">进入平台客服中心</view>
-          </view>
-          <view class="image plantform-image"></view>
-        </view>
-        <view class="menu-list-count" v-if="userInfo.topService && userInfo.service">
-          <view class="menu-item" @click="toService(0)">
-            <view class="image merchant-image"></view>
-            <view class="menu-text">
-              <view class="title">
-                <text class="merchant">商家</text>管理
-              </view>
-              <view class="info">进入商家管理中心</view>
-            </view>
-          </view>
-          <view class="menu-item" @click="toService(1)">
-            <view class="menu-text">
-              <view class="title">
-                <text class="plantform">平台</text>管理
-              </view>
-              <view class="info">进入平台客服中心</view>
-            </view>
-            <view class="image plantform-image"></view>
-          </view>
-        </view>
-      </view>
-      <view v-if="copyright.status !== -1" class="copy-right">
-        <image class="img-copyright" :src="copyright.image" mode="widthFix"></image>
-        <view class="text">{{copyright.Copyright}}</view>
-      </view>
-      <view v-else class="copy-right">
-        <view class="iconfont icon-crmeb"></view>
-        <view class="text">众邦科技提供技术支持</view>
-      </view>
-      <view style="height: 50rpx;"></view>
-      <authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"
-        :isGoIndex="false"></authorize>
-      <!-- #ifndef H5 -->
-      <passwordPopup></passwordPopup>
-      <!-- #endif -->
-    </view>
-    <view class="foot" v-if="newData.status && newData.status.status">
-      <view class="page-footer" id="target" :style="{'background-color':newData.bgColor.color[0].item}">
-        <view class="foot-item" v-for="(item,index) in newData.menuList" :key="index" @click="goRouter(item)">
-          <block v-if="item.link == activeRouter">
-            <image :src="item.imgList[0]"></image>
-            <view class="txt" :style="{color:newData.activeTxtColor.color[0].item}">{{item.name}}
-            </view>
-          </block>
-          <block v-else>
-            <image :src="item.imgList[1]"></image>
-            <view class="txt" :style="{color:newData.txtColor.color[0].item}">{{item.name}}</view>
-          </block>
-        </view>
-      </view>
-    </view>
+				<view class="menus-list-item" v-if="!userInfo.service && userInfo.topService" @click="toService(1)">
+					<view class="item-text">
+						<view class="title">
+							<text class="plantform">平台</text>管理
+						</view>
+						<view class="info">进入平台客服中心</view>
+					</view>
+					<view class="image plantform-image"></view>
+				</view>
+				<view class="menu-list-count" v-if="userInfo.topService && userInfo.service">
+					<view class="menu-item" @click="toService(0)">
+						<view class="image merchant-image"></view>
+						<view class="menu-text">
+							<view class="title">
+								<text class="merchant">商家</text>管理
+							</view>
+							<view class="info">进入商家管理中心</view>
+						</view>
+					</view>
+					<view class="menu-item" @click="toService(1)">
+						<view class="menu-text">
+							<view class="title">
+								<text class="plantform">平台</text>管理
+							</view>
+							<view class="info">进入平台客服中心</view>
+						</view>
+						<view class="image plantform-image"></view>
+					</view>
+				</view>
+			</view>
+			<view v-if="copyright.status !== -1" class="copy-right">
+				<image class="img-copyright" :src="copyright.image" mode="widthFix"></image>
+				<view class="text">{{copyright.Copyright}}</view>
+			</view>
+			<view v-else class="copy-right">
+				<view class="iconfont icon-crmeb"></view>
+				<view class="text">众邦科技提供技术支持</view>
+			</view>
+			<view style="height: 50rpx;"></view>
+			<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"
+				:isGoIndex="false"></authorize>
+			<!-- #ifndef H5 -->
+			<passwordPopup></passwordPopup>
+			<!-- #endif -->
+		</view>
+		<view class="foot" v-if="newData.status && newData.status.status">
+			<view class="page-footer" id="target" :style="{'background-color':newData.bgColor.color[0].item}">
+				<view class="foot-item" v-for="(item,index) in newData.menuList" :key="index" @click="goRouter(item)">
+					<block v-if="item.link == activeRouter">
+						<image :src="item.imgList[0]"></image>
+						<view class="txt" :style="{color:newData.activeTxtColor.color[0].item}">{{item.name}}
+						</view>
+					</block>
+					<block v-else>
+						<image :src="item.imgList[1]"></image>
+						<view class="txt" :style="{color:newData.txtColor.color[0].item}">{{item.name}}</view>
+					</block>
+				</view>
+			</view>
+		</view>
 
-    <!-- <m-tabbar native>
+		<!-- <m-tabbar native>
       <template v-slot:tabbar_index_2>
         <view class="custom_style">
           <view class="custom_style_icon"></view>
         </view>
       </template>
     </m-tabbar> -->
-  </view>
+	</view>
 </template>
 <script>
-  let sysHeight = uni.getSystemInfoSync().statusBarHeight + 'px';
-  import mTabbar from '@/components/m-tabbar/m-tabbar.vue'
-  import { getMenuList, getUserInfo, setVisit } from '@/api/user.js';
-  import { getVersion } from "@/api/public";
-  import { orderData } from '@/api/order.js'
-  import { mapGetters } from "vuex";
-  import authorize from '@/components/Authorize';
-  import dayjs from '@/plugin/dayjs/dayjs.min.js';
-  import Cache from '@/utils/cache';
-  // #ifndef H5
-  import passwordPopup from '@/components/passwordPopup';
-  // #endif
-  import { configMap } from '@/utils';
-  import Auth from '../../libs/wechat';
-  import { HTTP_REQUEST_URL } from '@/config/app';
-  const app = getApp();
-  export default {
-    components: {
-      // #ifndef H5
-      passwordPopup,
-      // #endif
-      authorize,
-      mTabbar
-    },
-    computed: configMap({
-      mer_intention_open: 0,
-      hide_mer_status: 1,
-      recharge_switch: 0,
-      integral_status: 0,
-      member_status: 0,
-      balance_func_status: 0,
-      svip_switch_status: 0,
-      navigation: {}
-    }, mapGetters(['isLogin', 'viewColor', 'keyColor'])),
-    filters: {
-      dateFormat: function(value) {
-        return dayjs(value * 1000).format('YYYY-MM-DD');
-      }
-    },
-    data() {
-      return {
-        //#ifdef H5
-        isWeixin: this.$wechat.isWeixin(),
-        //#endif
-        domain: HTTP_REQUEST_URL,
-        showSkeleton: true, //骨架屏显示隐藏
-        isNodes: 0, //控制什么时候开始抓取元素节点,只要数值改变就重新抓取
-        orderMenu: [{
-            icon: 'icon-daifukuan1',
-            title: '待付款',
-            url: '/pages/users/order_list/index?status=0',
-            num: 0
-          },
-          {
-            icon: 'icon-daifahuo1',
-            title: '待发货',
-            url: '/pages/users/order_list/index?status=2',
-            num: 0
-          },
-          {
-            icon: 'icon-daishouhuo1',
-            title: '待收货',
-            url: '/pages/users/order_list/index?status=3',
-            num: 0
-          },
-          {
-            icon: 'icon-daipingjia1',
-            title: '待评价',
-            url: '/pages/users/order_list/index?status=4',
-            num: 0
-          },
-          {
-            icon: 'icon-a-shouhoutuikuan1',
-            title: '售后/退款',
-            url: '/pages/users/refund/list',
-            num: 0
-          },
-        ],
-        imgUrls: [{ url: '', pic: '' }],
-        userMenu: [],
-        skeletonMenu: [],
-        personalMenu: [
-          { pic: '', name: '', isShow: true },
-          { pic: '', name: '', isShow: true },
-          { pic: '', name: '', isShow: true },
-          { pic: '', name: '', isShow: true },
-          { pic: '', name: '', isShow: true },
-          { pic: '', name: '', isShow: true },
-          { pic: '', name: '', isShow: true },
-          { pic: '', name: '', isShow: true },
-          { pic: '', name: '', isShow: true },
-          { pic: '', name: '', isShow: true },
-          { pic: '', name: '', isShow: true },
-          { pic: '', name: '', isShow: true }
-        ],
-        autoplay: true,
-        circular: true,
-        interval: 3000,
-        duration: 500,
-        isAuto: false, //没有授权的不会自动授权
-        isShowAuth: false, //是否隐藏授权
-        orderStatusNum: {},
-        userInfo: { aratar: '/static/f.png' },
-        MyMenus: [],
-        is_promoter: 0, //推广人开关  1开
-        extension_status: 0,
-        copyright: {
-          copyright_status: 1
-        },
-        newData: {},
-        activeRouter: '',
-        sysHeight: sysHeight,
+	let sysHeight = uni.getSystemInfoSync().statusBarHeight + 'px';
+	import mTabbar from '@/components/m-tabbar/m-tabbar.vue'
+	import {
+		getMenuList,
+		getUserInfo,
+		setVisit
+	} from '@/api/user.js';
+	import {
+		getVersion
+	} from "@/api/public";
+	import {
+		orderData
+	} from '@/api/order.js'
+	import {
+		mapGetters
+	} from "vuex";
+	import authorize from '@/components/Authorize';
+	import dayjs from '@/plugin/dayjs/dayjs.min.js';
+	import Cache from '@/utils/cache';
+	// #ifndef H5
+	import passwordPopup from '@/components/passwordPopup';
+	// #endif
+	import {
+		configMap
+	} from '@/utils';
+	import Auth from '../../libs/wechat';
+	import {
+		HTTP_REQUEST_URL
+	} from '@/config/app';
+	const app = getApp();
+	export default {
+		components: {
+			// #ifndef H5
+			passwordPopup,
+			// #endif
+			authorize,
+			mTabbar
+		},
+		computed: configMap({
+			mer_intention_open: 0,
+			hide_mer_status: 1,
+			recharge_switch: 0,
+			integral_status: 0,
+			member_status: 0,
+			balance_func_status: 0,
+			svip_switch_status: 0,
+			navigation: {}
+		}, mapGetters(['isLogin', 'viewColor', 'keyColor'])),
+		filters: {
+			dateFormat: function(value) {
+				return dayjs(value * 1000).format('YYYY-MM-DD');
+			}
+		},
+		data() {
+			return {
+				//#ifdef H5
+				isWeixin: this.$wechat.isWeixin(),
+				//#endif
+				domain: HTTP_REQUEST_URL,
+				showSkeleton: true, //骨架屏显示隐藏
+				isNodes: 0, //控制什么时候开始抓取元素节点,只要数值改变就重新抓取
+				orderMenu: [{
+						icon: 'icon-daifukuan1',
+						title: '待付款',
+						url: '/pages/users/order_list/index?status=0',
+						num: 0
+					},
+					{
+						icon: 'icon-daifahuo1',
+						title: '待发货',
+						url: '/pages/users/order_list/index?status=2',
+						num: 0
+					},
+					{
+						icon: 'icon-daishouhuo1',
+						title: '待收货',
+						url: '/pages/users/order_list/index?status=3',
+						num: 0
+					},
+					{
+						icon: 'icon-daipingjia1',
+						title: '待评价',
+						url: '/pages/users/order_list/index?status=4',
+						num: 0
+					},
+					{
+						icon: 'icon-a-shouhoutuikuan1',
+						title: '售后/退款',
+						url: '/pages/users/refund/list',
+						num: 0
+					},
+				],
+				imgUrls: [{
+					url: '',
+					pic: ''
+				}],
+				userMenu: [],
+				skeletonMenu: [],
+				personalMenu: [{
+						pic: '',
+						name: '',
+						isShow: true
+					},
+					{
+						pic: '',
+						name: '',
+						isShow: true
+					},
+					{
+						pic: '',
+						name: '',
+						isShow: true
+					},
+					{
+						pic: '',
+						name: '',
+						isShow: true
+					},
+					{
+						pic: '',
+						name: '',
+						isShow: true
+					},
+					{
+						pic: '',
+						name: '',
+						isShow: true
+					},
+					{
+						pic: '',
+						name: '',
+						isShow: true
+					},
+					{
+						pic: '',
+						name: '',
+						isShow: true
+					},
+					{
+						pic: '',
+						name: '',
+						isShow: true
+					},
+					{
+						pic: '',
+						name: '',
+						isShow: true
+					},
+					{
+						pic: '',
+						name: '',
+						isShow: true
+					},
+					{
+						pic: '',
+						name: '',
+						isShow: true
+					}
+				],
+				autoplay: true,
+				circular: true,
+				interval: 3000,
+				duration: 500,
+				isAuto: false, //没有授权的不会自动授权
+				isShowAuth: false, //是否隐藏授权
+				orderStatusNum: {},
+				userInfo: {
+					aratar: '/static/f.png'
+				},
+				MyMenus: [],
+				is_promoter: 0, //推广人开关  1开
+				extension_status: 0,
+				copyright: {
+					copyright_status: 1
+				},
+				newData: {},
+				activeRouter: '',
+				sysHeight: sysHeight,
 
-      }
-    },
-    onLoad() {
+			}
+		},
+		onLoad() {
 
-    },
-    onReady() {
-      this.isNodes++;
-    },
-    mounted: function() {
-      this.getVersion()
-    },
-    onShow: function() {
-      let that = this;
-      let routes = getCurrentPages();
-      let curRoute = routes[routes.length - 1].route
-      this.activeRouter = '/' + curRoute
-      this.getNav();
-      if (that.isLogin) {
-        this.getUserInfo();
-        this.orderNum();
-      } else {
-        this.userInfo = {}
-        this.orderMenu.forEach(v => {
-          v.num = 0
-        })
-        this.getMyMenus();
-      }
-      setTimeout(() => {
-        this.showSkeleton = false
-      }, 500)
-    },
-    methods: {
-      authTo(url) {
-        if (this.isLogin) {
-          uni.navigateTo({
-            url
-          })
-        } else {
-          this.openAuto()
-        }
-      },
-      goRouter(item) {
-        var pages = getCurrentPages();
-        var page = (pages[pages.length - 1]).$page.fullPath;
-        if (item.link == page) return
-        uni.switchTab({
-          url: item.link,
-          fail(err) {
-            uni.redirectTo({
-              url: item.link
-            })
-          }
-        })
-      },
-      getNav() {
-        this.newData = this.navigation
-        // if (this.newData.status && this.newData.status.status) {
-        //   uni.hideTabBar()
-        // } else {
-        //   uni.showTabBar()
-        // }
-      },
-      toService(is_sys) {
-        uni.navigateTo({
-          url: '/pages/admin/business/index?is_sys=' + is_sys
-        })
-      },
-      getVersion() {
-        getVersion().then(data => {
-          this.copyright = data.data;
-        });
-      },
+		},
+		onReady() {
+			this.isNodes++;
+		},
+		mounted: function() {
+			this.getVersion()
+		},
+		onShow: function() {
+			let that = this;
+			let routes = getCurrentPages();
+			let curRoute = routes[routes.length - 1].route
+			this.activeRouter = '/' + curRoute
+			this.getNav();
+			if (that.isLogin) {
+				this.getUserInfo();
+				this.orderNum();
+			} else {
+				this.userInfo = {}
+				this.orderMenu.forEach(v => {
+					v.num = 0
+				})
+				this.getMyMenus();
+			}
+			setTimeout(() => {
+				this.showSkeleton = false
+			}, 500)
+		},
+		methods: {
+			authTo(url) {
+				if (this.isLogin) {
+					uni.navigateTo({
+						url
+					})
+				} else {
+					this.openAuto()
+				}
+			},
+			goRouter(item) {
+				var pages = getCurrentPages();
+				var page = (pages[pages.length - 1]).$page.fullPath;
+				if (item.link == page) return
+				uni.switchTab({
+					url: item.link,
+					fail(err) {
+						uni.redirectTo({
+							url: item.link
+						})
+					}
+				})
+			},
+			getNav() {
+				this.newData = this.navigation
+				// if (this.newData.status && this.newData.status.status) {
+				//   uni.hideTabBar()
+				// } else {
+				//   uni.showTabBar()
+				// }
+			},
+			toService(is_sys) {
+				uni.navigateTo({
+					url: '/pages/admin/business/index?is_sys=' + is_sys
+				})
+			},
+			getVersion() {
+				getVersion().then(data => {
+					this.copyright = data.data;
+				});
+			},
 
-      // 菜单显示
-      filterMenus: function(item) {
-        let that = this;
-        if (item.url == '/pages/users/user_money/index') {
-			// item.isShow = that.balance_func_status == 1
-			item.isShow = true
+			// 菜单显示
+			filterMenus: function(item) {
+				let that = this;
+				if (item.url == '/pages/users/user_money/index') {
+					// item.isShow = that.balance_func_status == 1
+					item.isShow = true
+				} else if (item.url == '/pages/users/user_spread_user/index') {
+					if (that.extension_status == 0) {
+						item.isShow = false
+					} else if (that.extension_status == 1) {
+						if (that.is_promoter == 1) {
+							item.isShow = that.is_promoter == 1 && that.extension_status == 1
+						} else if (that.is_promoter == 0) {
+							item.isShow = that.is_promoter == 0 && that.extension_status == 1
+							item.url = "/pages/users/distributor/index"
+						}
+					}
+				} else if (item.url == '/pages/store/settled/index') item.isShow = that.mer_intention_open == 1
+				else if (item.url == '/pages/users/user_grade/index') item.isShow = that.member_status == 1
+				else if (item.url == '/pages/users/user_integral/index') item.isShow = that.integral_status == 1
+				else item.isShow = true
+
+
+			},
+			showMenu(menu) {
+				return !menu || ['integral', 'service', 'admin_order', 'verify_order', 'intention', 'promoter', 'balance']
+					.indexOf(menu) === -1;
+			},
+			goUrl(url) {
+				if (url.indexOf("http") != -1) {
+					// #ifdef H5
+					location.href = url
+					// #endif
+				} else {
+					if (['/pages/goods_cate/goods_cate', '/pages/order_addcart/order_addcart', '/pages/user/index',
+							'/pages/plant_grass/index'
+						].indexOf(url) == -1) {
+						uni.navigateTo({
+							url: url
+						})
+					} else {
+						uni.switchTab({
+							url: url
+						})
+					}
+				}
+			},
+			// 去聊天列表
+			goChat() {
+				let type = this.userInfo.service ? 1 : 0
+				uni.navigateTo({
+					url: `/pages/chat/customer_list/index?type=${type}`
+				})
+			},
+			// 记录会员访问
+			setVisit() {
+				setVisit({
+					url: '/pages/user/index'
+				}).then(res => {})
+			},
+			// 打开授权
+			openAuto() {
+				// console.log('hajhcdsohjcosvjco')
+				this.isAuto = true;
+				this.isShowAuth = true
+			},
+			// 授权回调
+			onLoadFun(data) {
+				this.getUserInfo();
+				this.getMyMenus();
+				this.orderNum();
+				this.isShowAuth = false;
+
+			},
+			Setting: function() {
+				uni.openSetting({
+					success: function(res) {}
+				});
+			},
+			// 授权关闭
+			authColse: function(e) {
+				this.isShowAuth = e
+			},
+			// 绑定手机
+			bindPhone() {
+				uni.navigateTo({
+					url: '/pages/users/user_phone/index'
+				})
+			},
+			/**
+			 * 获取个人用户信息
+			 */
+			getUserInfo: function() {
+				let that = this;
+				getUserInfo().then(res => {
+					that.userInfo = res.data;
+					that.userInfo.svip_open = true;
+					that.userInfo.vip_status = 2;
+					that.is_promoter = res.data.is_promoter;
+					that.extension_status = res.data.extension_status;
+					that.getMyMenus();
+				});
+			},
+			// 订单数字
+			orderNum() {
+				orderData().then(({
+					data
+				}) => {
+					this.orderMenu.forEach((item, index) => {
+						// console.log('item')
+						switch (item.title) {
+							case '待付款':
+								item.num = data.noPay
+								break
+							case '待发货':
+								item.num = data.noPostage
+								break
+							case '待收货':
+								item.num = data.noDeliver
+								break
+							case '待评价':
+								item.num = data.noComment
+								break
+							case '售后/退款':
+								item.num = data.refund
+								break
+						}
+					})
+				})
+			},
+			/**
+			 *
+			 * 获取个人中心图标
+			 */
+			getMyMenus: function() {
+				let that = this;
+				if (this.MyMenus.length) return;
+				getMenuList().then(res => {
+					that.personalMenu = []
+					res.data.menu.forEach((item, index) => {
+						that.filterMenus(item)
+						that.personalMenu.push(item)
+					})
+
+					that.imgUrls = res.data.banner
+				});
+			},
+			// 编辑页面
+			goEdit() {
+				if (this.isLogin) {
+					uni.navigateTo({
+						url: '/pages/users/user_info/index'
+					})
+				} else {
+					this.openAuto()
+				}
+			},
+			goSetting() {
+				if (this.isLogin) {
+					uni.navigateTo({
+						url: '/pages/users/user_setting/index'
+					})
+				} else {
+					this.openAuto()
+				}
+			},
+			// 签到
+			goSignIn() {
+				uni.navigateTo({
+					url: '/pages/users/user_sgin/index'
+				})
+			},
+			// goMenuPage
+			goMenuPage(url) {
+				if (this.isLogin) {
+					uni.navigateTo({
+						url
+					})
+				} else {
+					this.openAuto()
+				}
+			},
 		}
-        else if (item.url == '/pages/users/user_spread_user/index') {
-          if (that.extension_status == 0) {
-            item.isShow = false
-          } else if (that.extension_status == 1) {
-            if (that.is_promoter == 1) {
-              item.isShow = that.is_promoter == 1 && that.extension_status == 1
-            } else if (that.is_promoter == 0) {
-              item.isShow = that.is_promoter == 0 && that.extension_status == 1
-              item.url = "/pages/users/distributor/index"
-            }
-          }
-        } else if (item.url == '/pages/store/settled/index') item.isShow = that.mer_intention_open == 1
-        else if (item.url == '/pages/users/user_grade/index') item.isShow = that.member_status == 1
-        else if (item.url == '/pages/users/user_integral/index') item.isShow = that.integral_status == 1
-        else item.isShow = true
-		
-	
-      },
-      showMenu(menu) {
-        return !menu || ['integral', 'service', 'admin_order', 'verify_order', 'intention', 'promoter', 'balance']
-          .indexOf(menu) === -1;
-      },
-      goUrl(url) {
-        if (url.indexOf("http") != -1) {
-          // #ifdef H5
-          location.href = url
-          // #endif
-        } else {
-          if (['/pages/goods_cate/goods_cate', '/pages/order_addcart/order_addcart', '/pages/user/index',
-              '/pages/plant_grass/index'
-            ].indexOf(url) == -1) {
-            uni.navigateTo({
-              url: url
-            })
-          } else {
-            uni.switchTab({
-              url: url
-            })
-          }
-        }
-      },
-      // 去聊天列表
-      goChat() {
-        let type = this.userInfo.service ? 1 : 0
-        uni.navigateTo({
-          url: `/pages/chat/customer_list/index?type=${type}`
-        })
-      },
-      // 记录会员访问
-      setVisit() {
-        setVisit({
-          url: '/pages/user/index'
-        }).then(res => {})
-      },
-      // 打开授权
-      openAuto() {
-        // console.log('hajhcdsohjcosvjco')
-        this.isAuto = true;
-        this.isShowAuth = true
-      },
-      // 授权回调
-      onLoadFun(data) {
-        this.getUserInfo();
-        this.getMyMenus();
-        this.orderNum();
-        this.isShowAuth = false;
-
-      },
-      Setting: function() {
-        uni.openSetting({
-          success: function(res) {}
-        });
-      },
-      // 授权关闭
-      authColse: function(e) {
-        this.isShowAuth = e
-      },
-      // 绑定手机
-      bindPhone() {
-        uni.navigateTo({
-          url: '/pages/users/user_phone/index'
-        })
-      },
-      /**
-       * 获取个人用户信息
-       */
-      getUserInfo: function() {
-        let that = this;
-        getUserInfo().then(res => {
-          that.userInfo = res.data;
-          that.userInfo.svip_open = true;
-          that.userInfo.vip_status = 2;
-          that.is_promoter = res.data.is_promoter;
-          that.extension_status = res.data.extension_status;
-          that.getMyMenus();
-        });
-      },
-      // 订单数字
-      orderNum() {
-        orderData().then(({
-          data
-        }) => {
-          this.orderMenu.forEach((item, index) => {
-            // console.log('item')
-            switch (item.title) {
-              case '待付款':
-                item.num = data.noPay
-                break
-              case '待发货':
-                item.num = data.noPostage
-                break
-              case '待收货':
-                item.num = data.noDeliver
-                break
-              case '待评价':
-                item.num = data.noComment
-                break
-              case '售后/退款':
-                item.num = data.refund
-                break
-            }
-          })
-        })
-      },
-      /**
-       *
-       * 获取个人中心图标
-       */
-      getMyMenus: function() {
-        let that = this;
-        if (this.MyMenus.length) return;
-        getMenuList().then(res => {
-          that.personalMenu = []
-          res.data.menu.forEach((item, index) => {
-            that.filterMenus(item)
-            that.personalMenu.push(item)
-          })
-		 
-          that.imgUrls = res.data.banner
-        });
-      },
-      // 编辑页面
-      goEdit() {
-        if (this.isLogin) {
-          uni.navigateTo({
-            url: '/pages/users/user_info/index'
-          })
-        } else {
-          this.openAuto()
-        }
-      },
-      goSetting() {
-        if (this.isLogin) {
-          uni.navigateTo({
-            url: '/pages/users/user_setting/index'
-          })
-        } else {
-          this.openAuto()
-        }
-      },
-      // 签到
-      goSignIn() {
-        uni.navigateTo({
-          url: '/pages/users/user_sgin/index'
-        })
-      },
-      // goMenuPage
-      goMenuPage(url) {
-        if (this.isLogin) {
-          uni.navigateTo({
-            url
-          })
-        } else {
-          this.openAuto()
-        }
-      },
-    }
-  }
+	}
 </script>
 
 <style lang="scss">
-  .cardVipA {
-    position: absolute;
-    background: linear-gradient(145deg, #F8E3A8 0%, #E8C077 100%);
-    background-size: 100% 100%;
-    width: 710rpx;
-    height: 84rpx;
-    bottom: -2rpx;
-    left: 20rpx;
-    padding: 0 30rpx 0 105rpx;
-    border-radius: 16rpx 16rpx 0 0;
-    box-sizing: border-box;
-
-    .svip_user {
-      width: 52rpx;
-      height: 52rpx;
-      border-radius: 100%;
-      position: absolute;
-      left: 30rpx;
-      top: 17rpx;
-    }
-
-    .left-box {
-      font-size: 26rpx;
-      color: #905100;
-      font-weight: 400;
-    }
-
-    .btn {
-      color: #905100;
-      font-weight: 400;
-      font-size: 24rpx;
-    }
-
-    .btn-open {
-      background: #282828;
-      border-radius: 40rpx;
-      color: #F7E1A6;
-      font-size: 24rpx;
-      width: 140rpx;
-      height: 50rpx;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-    }
-  }
-
-  .new-users {
-    .head {
-      background: #fff;
-
-      .user-card {
-        position: relative;
-        width: 100%;
-        padding: 35rpx 0 50rpx;
-        background-image: linear-gradient(90deg, var(--view-bntColor21) 0%, var(--view-bntColor22) 100%);
-
-        &.svip-card {
-          padding: 35rpx 0 120rpx;
-        }
-
-        .bg {
-          position: absolute;
-          left: 0;
-          top: 0;
-          width: 100%;
-          height: 100%;
-          background-size: 100% 100%;
-        }
-
-        .user-info {
-          z-index: 20;
-          position: relative;
-          display: flex;
-          padding: 0 28rpx;
-
-          .level_icon {
-            width: 34rpx;
-            height: 32rpx;
-            margin: 4rpx 0 0 6rpx;
-            border: none;
-          }
-
-          .avatar-box {
-            width: 120rpx;
-            height: 120rpx;
-            border-radius: 50%;
-            position: relative;
-
-            .avatar,
-            image {
-              width: 120rpx;
-              height: 120rpx;
-              border-radius: 50%;
-            }
-
-            &.on {
-              .avatar {
-                border: 2px solid #FFAC65;
-                border-radius: 50%;
-                box-sizing: border-box;
-              }
-            }
-          }
-
-          .headwear {
-            position: absolute;
-            right: -4rpx;
-            top: -14rpx;
-            width: 44rpx;
-            height: 44rpx;
-            z-index: -1;
-
-            image {
-              width: 100%;
-              height: 100%;
-            }
-          }
-
-          .info {
-            flex: 1;
-            display: flex;
-            flex-direction: column;
-            justify-content: space-between;
-            margin-left: 20rpx;
-            padding: 15rpx 0;
-
-            .name {
-              display: flex;
-              align-items: center;
-              color: #fff;
-              font-size: 31rpx;
-
-              .vip {
-                width: 82rpx;
-                height: 36rpx;
-                margin-left: 12rpx;
-
-                image {
-                  width: 82rpx;
-                  height: 36rpx;
-                }
-              }
-            }
-
-            .num {
-              display: flex;
-              align-items: center;
-              font-size: 26rpx;
-              color: rgba(255, 255, 255, 0.6);
-
-              image {
-                width: 22rpx;
-                height: 23rpx;
-                margin-left: 20rpx;
-              }
-            }
-          }
-        }
-
-        .num-wrapper {
-          z-index: 30;
-          position: relative;
-          display: flex;
-          align-items: center;
-          justify-content: space-between;
-          margin: 30rpx 20rpx 0;
-          color: #fff;
-
-          .num-item {
-            width: 25%;
-            text-align: center;
-
-            .num {
-              font-size: 42rpx;
-              font-weight: bold;
-            }
-
-            .txt {
-              margin-top: 8rpx;
-              font-size: 22rpx;
-              color: rgba(255, 255, 255, 0.6);
-            }
-          }
-        }
-
-        .sign {
-          z-index: 200;
-          position: absolute;
-          right: -12rpx;
-          top: 80rpx;
-          display: flex;
-          align-items: center;
-          justify-content: center;
-          width: 120rpx;
-          height: 60rpx;
-          background: linear-gradient(90deg, rgba(255, 225, 87, 1) 0%, rgba(238, 193, 15, 1) 100%);
-          border-radius: 29rpx 4rpx 4rpx 29rpx;
-          color: #282828;
-          font-size: 28rpx;
-          font-weight: bold;
-        }
-      }
-    }
-
-    .wrapper {
-      position: relative;
-      padding: 0 20rpx;
-      margin-top: 20rpx;
-    }
-
-    .order-wrapper {
-      background-color: #fff;
-      border-radius: 16rpx;
-
-      .order-hd {
-        height: 80rpx;
-        align-items: center;
-        justify-content: space-between;
-        border-bottom: 1px dashed #DDDDDD;
-        padding: 0 30rpx;
-        color: #282828;
-
-        .left {
-          font-weight: bold;
-        }
-
-        .right {
-          align-items: center;
-          color: #666666;
-          font-size: 26rpx;
-
-          .icon-xiangyou {
-            margin-left: 5rpx;
-            margin-top: 6rpx;
-            font-size: 26rpx;
-          }
-        }
-      }
-
-      .order-bd {
-        display: flex;
-
-        .order-item {
-          display: flex;
-          flex-direction: column;
-          justify-content: center;
-          align-items: center;
-          width: 20%;
-          height: 160rpx;
-
-          .pic {
-            position: relative;
-            text-align: center;
-
-            .iconfont {
-              font-size: 62rpx;
-              color: var(--view-theme);
-            }
-          }
-
-          .txt {
-            margin-top: 8rpx;
-            font-size: 26rpx;
-            color: #454545;
-          }
-        }
-      }
-    }
-
-    .slider-wrapper {
-      margin: 20rpx 0;
-      height: 130rpx;
-
-      swiper,
-      swiper-item {
-        height: 100%;
-      }
-
-      image {
-        width: 100%;
-        height: 130rpx;
-      }
-    }
-
-    .user-menus {
-      padding-bottom: 30rpx;
-      background-color: #fff;
-      border-radius: 16rpx;
-
-      .title {
-        height: 80rpx;
-        line-height: 80rpx;
-        padding: 0 30rpx;
-        border-bottom: 1px dashed #DDDDDD;
-        font-weight: bold;
-      }
-
-      .item {
-        position: relative;
-        display: flex;
-        flex-direction: column;
-        align-items: center;
-        justify-content: space-between;
-        width: 25%;
-        line-height: 28rpx;
-        height: 90rpx;
-        margin-top: 40rpx;
-        text-align: center;
-
-        .item-count {
-          display: flex;
-          flex-direction: column;
-          align-items: center;
-          width: 100%;
-        }
-
-        image {
-          width: 52rpx;
-          height: 52rpx;
-        }
-
-        .skeleton_image {
-          width: 80rpx;
-          height: 80rpx;
-        }
-
-        text {
-          margin-top: 10rpx;
-          font-size: 26rpx;
-          color: #282828;
-          text-overflow: ellipsis;
-          overflow: hidden;
-          white-space: nowrap;
-          width: 78%;
-        }
-
-        &:last-child::before {
-          display: none;
-        }
-      }
-
-      button {
-        font-size: 28rpx;
-      }
-    }
-
-    .phone {
-      color: #fff;
-    }
-
-    .order-status-num {
-      background-color: #fff;
-      color: var(--view-theme);
-      border-radius: 200rpx;
-      position: absolute;
-      right: -12rpx;
-      top: -12rpx;
-      font-size: 20rpx;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      min-width: 30rpx;
-      height: 30rpx;
-      padding: 0 8rpx;
-      box-sizing: border-box;
-      border: 1px solid var(--view-theme);
-    }
-  }
-
-  .sys-head {
-    position: relative;
-    width: 100%;
-    // background: linear-gradient(90deg, $bg-star1 0%, $bg-end1 100%);
-
-    .bg {
-      position: absolute;
-      left: 0;
-      top: 0;
-      width: 100%;
-      height: 100%;
-      background-image: linear-gradient(90deg, var(--view-bntColor21) 0%, var(--view-bntColor22) 100%);
-      background-size: 100% auto;
-      background-position: left bottom;
-    }
-
-    .sys-title {
-      z-index: 10;
-      position: relative;
-      height: 43px;
-      text-align: center;
-      line-height: 43px;
-      font-size: 32rpx;
-      color: #FFFFFF;
-    }
-  }
-
-  .menus-list-item {
-    background: #fff;
-    border-radius: 12rpx;
-    padding: 30rpx 50rpx 30rpx 40rpx;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    margin-top: 20rpx;
-
-    .title {
-      font-size: 34rpx;
-      color: #282828;
-      font-weight: bold;
-
-      .merchant {
-        color: #E93323;
-      }
-
-      .plantform {
-        color: #FFC552;
-      }
-    }
-
-    .info {
-      margin-top: 15rpx;
-      color: #666666;
-      font-size: 22rpx;
-    }
-
-    .image {
-      width: 180rpx;
-      height: 108rpx;
-      background-size: 100%;
-      background-repeat: no-repeat;
-
-    }
-  }
-
-  .merchant-image {
-    background-image: url('data:image/png;base64,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');
-  }
-
-  .plantform-image {
-    background-image: url('data:image/png;base64,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');
-  }
-
-  .copy-right {
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    align-items: center;
-    color: #CCCCCC;
-    font-size: 22rpx;
-    margin-top: 40rpx;
-    margin-bottom: 98rpx;
-    margin-bottom: calc(98rpx+ constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/
-    margin-bottom: calc(98rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/
-
-    .iconfont {
-      font-size: 60rpx;
-    }
-
-    .img-copyright {
-      width: 60rpx;
-      height: 60rpx;
-    }
-  }
-
-  .menu-box {
-    display: flex;
-    flex-wrap: wrap;
-  }
-
-  .right-btn {
-    z-index: 99;
-    position: absolute;
-    right: 30rpx;
-    top: 40rpx;
-    display: flex;
-    align-items: center;
-    color: #fff;
-
-    .iconfont {
-      font-size: 40rpx;
-      margin-left: 33rpx;
-    }
-
-    .btn {
-      position: relative;
-    }
-
-    .iconnum {
-      min-width: 6px;
-      background-color: #fff;
-      color: var(--view-theme);
-      border-radius: 15rpx;
-      position: absolute;
-      right: -10rpx;
-      top: -10rpx;
-      font-size: 10px;
-      padding: 0 4px;
-    }
-  }
-
-  .menu-list-count {
-    background-color: #fff;
-    margin-top: 20rpx;
-    border-radius: 12rpx;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-
-    .menu-item {
-      width: 50%;
-      padding: 25rpx 15rpx;
-      display: flex;
-      align-items: center;
-      position: relative;
-
-      &:first-child {
-        &::after {
-          content: "";
-          display: block;
-          border-right: 1rpx solid #E2E2E2;
-          height: 56%;
-          position: absolute;
-          right: 0;
-        }
-      }
-
-      .image {
-        width: 106rpx;
-        height: 64rpx;
-        background-size: 100%;
-        background-repeat: no-repeat;
-
-        &.merchant-image {
-          margin-right: 15rpx;
-        }
-
-        &.plantform-image {
-          margin-left: 15rpx;
-        }
-      }
-
-      .menu-text {
-        margin-left: 10rpx;
-
-        .title {
-          color: #333333;
-          font-weight: bold;
-          font-size: 26rpx;
-
-          .merchant {
-            color: #E93323;
-          }
-
-          .plantform {
-            color: #FFC552;
-          }
-        }
-
-        .info {
-          color: #999999;
-          font-size: 22rpx;
-          margin-top: 5rpx;
-        }
-      }
-    }
-  }
-
-  .page-footer {
-    position: fixed;
-    bottom: 0;
-    z-index: 30;
-    display: flex;
-    align-items: center;
-    justify-content: space-around;
-    width: 100%;
-    height: calc(98rpx+ constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/
-    height: calc(98rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/
-    box-sizing: border-box;
-    border-top: solid 1rpx #F3F3F3;
-    background-color: #fff;
-    box-shadow: 0px 0px 17rpx 1rpx rgba(206, 206, 206, 0.32);
-    padding-bottom: constant(safe-area-inset-bottom); ///兼容 IOS<11.2/
-    padding-bottom: env(safe-area-inset-bottom); ///兼容 IOS>11.2/
-
-    &.filter {
-      filter: blur(2rpx);
-    }
-
-    .foot-item {
-      display: flex;
-      width: max-content;
-      align-items: center;
-      justify-content: center;
-      flex-direction: column;
-      position: relative;
-
-      .count-num {
-        position: absolute;
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        width: 40rpx;
-        height: 40rpx;
-        top: 0rpx;
-        right: -15rpx;
-        color: #fff;
-        font-size: 20rpx;
-        background-color: #FD502F;
-        border-radius: 50%;
-        padding: 4rpx;
-      }
-    }
-
-    .foot-item image {
-      height: 50rpx;
-      width: 50rpx;
-      text-align: center;
-      margin: 0 auto;
-    }
-
-    .foot-item .txt {
-      font-size: 24rpx;
-    }
-  }
+	.cardVipA {
+		position: absolute;
+		background: linear-gradient(145deg, #F8E3A8 0%, #E8C077 100%);
+		background-size: 100% 100%;
+		width: 710rpx;
+		height: 84rpx;
+		bottom: -2rpx;
+		left: 20rpx;
+		padding: 0 30rpx 0 105rpx;
+		border-radius: 16rpx 16rpx 0 0;
+		box-sizing: border-box;
+
+		.svip_user {
+			width: 52rpx;
+			height: 52rpx;
+			border-radius: 100%;
+			position: absolute;
+			left: 30rpx;
+			top: 17rpx;
+		}
+
+		.left-box {
+			font-size: 26rpx;
+			color: #905100;
+			font-weight: 400;
+		}
+
+		.btn {
+			color: #905100;
+			font-weight: 400;
+			font-size: 24rpx;
+		}
+
+		.btn-open {
+			background: #282828;
+			border-radius: 40rpx;
+			color: #F7E1A6;
+			font-size: 24rpx;
+			width: 140rpx;
+			height: 50rpx;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+		}
+	}
+
+	.new-users {
+		.head {
+			background: #fff;
+
+			.user-card {
+				position: relative;
+				width: 100%;
+				padding: 35rpx 0 50rpx;
+				background-image: linear-gradient(90deg, var(--view-bntColor21) 0%, var(--view-bntColor22) 100%);
+
+				&.svip-card {
+					padding: 35rpx 0 120rpx;
+				}
+
+				.bg {
+					position: absolute;
+					left: 0;
+					top: 0;
+					width: 100%;
+					height: 100%;
+					background-size: 100% 100%;
+				}
+
+				.user-info {
+					z-index: 20;
+					position: relative;
+					display: flex;
+					padding: 0 28rpx;
+
+					.level_icon {
+						width: 34rpx;
+						height: 32rpx;
+						margin: 4rpx 0 0 6rpx;
+						border: none;
+					}
+
+					.avatar-box {
+						width: 120rpx;
+						height: 120rpx;
+						border-radius: 50%;
+						position: relative;
+
+						.avatar,
+						image {
+							width: 120rpx;
+							height: 120rpx;
+							border-radius: 50%;
+						}
+
+						&.on {
+							.avatar {
+								border: 2px solid #FFAC65;
+								border-radius: 50%;
+								box-sizing: border-box;
+							}
+						}
+					}
+
+					.headwear {
+						position: absolute;
+						right: -4rpx;
+						top: -14rpx;
+						width: 44rpx;
+						height: 44rpx;
+						z-index: -1;
+
+						image {
+							width: 100%;
+							height: 100%;
+						}
+					}
+
+					.info {
+						flex: 1;
+						display: flex;
+						flex-direction: column;
+						justify-content: space-between;
+						margin-left: 20rpx;
+						padding: 15rpx 0;
+
+						.name {
+							display: flex;
+							align-items: center;
+							color: #fff;
+							font-size: 31rpx;
+
+							.vip {
+								width: 82rpx;
+								height: 36rpx;
+								margin-left: 12rpx;
+
+								image {
+									width: 82rpx;
+									height: 36rpx;
+								}
+							}
+						}
+
+						.num {
+							display: flex;
+							align-items: center;
+							font-size: 26rpx;
+							color: rgba(255, 255, 255, 0.6);
+
+							image {
+								width: 22rpx;
+								height: 23rpx;
+								margin-left: 20rpx;
+							}
+						}
+					}
+				}
+
+				.num-wrapper {
+					z-index: 30;
+					position: relative;
+					display: flex;
+					align-items: center;
+					justify-content: space-between;
+					margin: 30rpx 20rpx 0;
+					color: #fff;
+
+					.num-item {
+						width: 25%;
+						text-align: center;
+
+						.num {
+							font-size: 42rpx;
+							font-weight: bold;
+						}
+
+						.txt {
+							margin-top: 8rpx;
+							font-size: 22rpx;
+							color: rgba(255, 255, 255, 0.6);
+						}
+					}
+				}
+
+				.sign {
+					z-index: 200;
+					position: absolute;
+					right: -12rpx;
+					top: 80rpx;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					width: 120rpx;
+					height: 60rpx;
+					background: linear-gradient(90deg, rgba(255, 225, 87, 1) 0%, rgba(238, 193, 15, 1) 100%);
+					border-radius: 29rpx 4rpx 4rpx 29rpx;
+					color: #282828;
+					font-size: 28rpx;
+					font-weight: bold;
+				}
+			}
+		}
+
+		.wrapper {
+			position: relative;
+			padding: 0 20rpx;
+			margin-top: 20rpx;
+		}
+
+		.order-wrapper {
+			background-color: #fff;
+			border-radius: 16rpx;
+
+			.order-hd {
+				height: 80rpx;
+				align-items: center;
+				justify-content: space-between;
+				border-bottom: 1px dashed #DDDDDD;
+				padding: 0 30rpx;
+				color: #282828;
+
+				.left {
+					font-weight: bold;
+				}
+
+				.right {
+					align-items: center;
+					color: #666666;
+					font-size: 26rpx;
+
+					.icon-xiangyou {
+						margin-left: 5rpx;
+						margin-top: 6rpx;
+						font-size: 26rpx;
+					}
+				}
+			}
+
+			.order-bd {
+				display: flex;
+
+				.order-item {
+					display: flex;
+					flex-direction: column;
+					justify-content: center;
+					align-items: center;
+					width: 20%;
+					height: 160rpx;
+
+					.pic {
+						position: relative;
+						text-align: center;
+
+						.iconfont {
+							font-size: 62rpx;
+							color: var(--view-theme);
+						}
+					}
+
+					.txt {
+						margin-top: 8rpx;
+						font-size: 26rpx;
+						color: #454545;
+					}
+				}
+			}
+		}
+
+		.slider-wrapper {
+			margin: 20rpx 0;
+			height: 130rpx;
+
+			swiper,
+			swiper-item {
+				height: 100%;
+			}
+
+			image {
+				width: 100%;
+				height: 130rpx;
+			}
+		}
+
+		.user-menus {
+			padding-bottom: 30rpx;
+			background-color: #fff;
+			border-radius: 16rpx;
+
+			.title {
+				height: 80rpx;
+				line-height: 80rpx;
+				padding: 0 30rpx;
+				border-bottom: 1px dashed #DDDDDD;
+				font-weight: bold;
+			}
+
+			.item {
+				position: relative;
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+				justify-content: space-between;
+				width: 25%;
+				line-height: 28rpx;
+				height: 90rpx;
+				margin-top: 40rpx;
+				text-align: center;
+
+				.item-count {
+					display: flex;
+					flex-direction: column;
+					align-items: center;
+					width: 100%;
+				}
+
+				image {
+					width: 52rpx;
+					height: 52rpx;
+				}
+
+				.skeleton_image {
+					width: 80rpx;
+					height: 80rpx;
+				}
+
+				text {
+					margin-top: 10rpx;
+					font-size: 26rpx;
+					color: #282828;
+					text-overflow: ellipsis;
+					overflow: hidden;
+					white-space: nowrap;
+					width: 78%;
+				}
+
+				&:last-child::before {
+					display: none;
+				}
+			}
+
+			button {
+				font-size: 28rpx;
+			}
+		}
+
+		.phone {
+			color: #fff;
+		}
+
+		.order-status-num {
+			background-color: #fff;
+			color: var(--view-theme);
+			border-radius: 200rpx;
+			position: absolute;
+			right: -12rpx;
+			top: -12rpx;
+			font-size: 20rpx;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			min-width: 30rpx;
+			height: 30rpx;
+			padding: 0 8rpx;
+			box-sizing: border-box;
+			border: 1px solid var(--view-theme);
+		}
+	}
+
+	.sys-head {
+		position: relative;
+		width: 100%;
+		// background: linear-gradient(90deg, $bg-star1 0%, $bg-end1 100%);
+
+		.bg {
+			position: absolute;
+			left: 0;
+			top: 0;
+			width: 100%;
+			height: 100%;
+			background-image: linear-gradient(90deg, var(--view-bntColor21) 0%, var(--view-bntColor22) 100%);
+			background-size: 100% auto;
+			background-position: left bottom;
+		}
+
+		.sys-title {
+			z-index: 10;
+			position: relative;
+			height: 43px;
+			text-align: center;
+			line-height: 43px;
+			font-size: 32rpx;
+			color: #FFFFFF;
+		}
+	}
+
+	.menus-list-item {
+		background: #fff;
+		border-radius: 12rpx;
+		padding: 30rpx 50rpx 30rpx 40rpx;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		margin-top: 20rpx;
+
+		.title {
+			font-size: 34rpx;
+			color: #282828;
+			font-weight: bold;
+
+			.merchant {
+				color: #E93323;
+			}
+
+			.plantform {
+				color: #FFC552;
+			}
+		}
+
+		.info {
+			margin-top: 15rpx;
+			color: #666666;
+			font-size: 22rpx;
+		}
+
+		.image {
+			width: 180rpx;
+			height: 108rpx;
+			background-size: 100%;
+			background-repeat: no-repeat;
+
+		}
+	}
+
+	.merchant-image {
+		background-image: url('data:image/png;base64,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');
+	}
+
+	.plantform-image {
+		background-image: url('data:image/png;base64,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');
+	}
+
+	.copy-right {
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		color: #CCCCCC;
+		font-size: 22rpx;
+		margin-top: 40rpx;
+		margin-bottom: 98rpx;
+		margin-bottom: calc(98rpx+ constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/
+		margin-bottom: calc(98rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/
+
+		.iconfont {
+			font-size: 60rpx;
+		}
+
+		.img-copyright {
+			width: 60rpx;
+			height: 60rpx;
+		}
+	}
+
+	.menu-box {
+		display: flex;
+		flex-wrap: wrap;
+	}
+
+	.right-btn {
+		z-index: 99;
+		position: absolute;
+		right: 30rpx;
+		top: 40rpx;
+		display: flex;
+		align-items: center;
+		color: #fff;
+
+		.iconfont {
+			font-size: 40rpx;
+			margin-left: 33rpx;
+		}
+
+		.btn {
+			position: relative;
+		}
+
+		.iconnum {
+			min-width: 6px;
+			background-color: #fff;
+			color: var(--view-theme);
+			border-radius: 15rpx;
+			position: absolute;
+			right: -10rpx;
+			top: -10rpx;
+			font-size: 10px;
+			padding: 0 4px;
+		}
+	}
+
+	.menu-list-count {
+		background-color: #fff;
+		margin-top: 20rpx;
+		border-radius: 12rpx;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+
+		.menu-item {
+			width: 50%;
+			padding: 25rpx 15rpx;
+			display: flex;
+			align-items: center;
+			position: relative;
+
+			&:first-child {
+				&::after {
+					content: "";
+					display: block;
+					border-right: 1rpx solid #E2E2E2;
+					height: 56%;
+					position: absolute;
+					right: 0;
+				}
+			}
+
+			.image {
+				width: 106rpx;
+				height: 64rpx;
+				background-size: 100%;
+				background-repeat: no-repeat;
+
+				&.merchant-image {
+					margin-right: 15rpx;
+				}
+
+				&.plantform-image {
+					margin-left: 15rpx;
+				}
+			}
+
+			.menu-text {
+				margin-left: 10rpx;
+
+				.title {
+					color: #333333;
+					font-weight: bold;
+					font-size: 26rpx;
+
+					.merchant {
+						color: #E93323;
+					}
+
+					.plantform {
+						color: #FFC552;
+					}
+				}
+
+				.info {
+					color: #999999;
+					font-size: 22rpx;
+					margin-top: 5rpx;
+				}
+			}
+		}
+	}
+
+	.page-footer {
+		position: fixed;
+		bottom: 0;
+		z-index: 30;
+		display: flex;
+		align-items: center;
+		justify-content: space-around;
+		width: 100%;
+		height: calc(98rpx+ constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/
+		height: calc(98rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/
+		box-sizing: border-box;
+		border-top: solid 1rpx #F3F3F3;
+		background-color: #fff;
+		box-shadow: 0px 0px 17rpx 1rpx rgba(206, 206, 206, 0.32);
+		padding-bottom: constant(safe-area-inset-bottom); ///兼容 IOS<11.2/
+		padding-bottom: env(safe-area-inset-bottom); ///兼容 IOS>11.2/
+
+		&.filter {
+			filter: blur(2rpx);
+		}
+
+		.foot-item {
+			display: flex;
+			width: max-content;
+			align-items: center;
+			justify-content: center;
+			flex-direction: column;
+			position: relative;
+
+			.count-num {
+				position: absolute;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				width: 40rpx;
+				height: 40rpx;
+				top: 0rpx;
+				right: -15rpx;
+				color: #fff;
+				font-size: 20rpx;
+				background-color: #FD502F;
+				border-radius: 50%;
+				padding: 4rpx;
+			}
+		}
+
+		.foot-item image {
+			height: 50rpx;
+			width: 50rpx;
+			text-align: center;
+			margin: 0 auto;
+		}
+
+		.foot-item .txt {
+			font-size: 24rpx;
+		}
+	}
 </style>
\ No newline at end of file
diff --git a/pages/users/online_warehousing/index.vue b/pages/users/online_warehousing/index.vue
index b6a02bc..8e4b81b 100644
--- a/pages/users/online_warehousing/index.vue
+++ b/pages/users/online_warehousing/index.vue
@@ -49,17 +49,27 @@
 												<view class='name'>￥{{items.cart_info.productAttr.price}}</view>
 												<view class='name'>x {{items.product_num}}</view>
 											</view>
-											<!-- <view class="totalfooter">
+						<!-- 					<view class="totalfooter">
                         <view class='bnt b-color' v-if="items.is_imported == 0 && item.orderProduct.length > 1"
                           @click="importshop(items.order_id,items.product_id,items.product_sku)">
                           立即导入</view>
                       </view> -->
 										</view>
-										<view class="totalfooter">
-											<view class='bnt b-color' v-if="!item.orderProduct[indexs]"
+										
+										<view class="totalfooter" v-if="items.is_imported == 1 ">
+											<view class='bnt b-color'>
+												已导入</view>
+										</view>
+										<view class="totalfooter" v-else>
+												<view class='bnt b-color' 
+													@click="importshop(item.order_id,item.orderProduct[indexs].product_id,item.orderProduct[indexs].product_sku)">
+													立即导入</view>
+											</view>
+									<!-- 	<view class="totalfooter">
+											<view class='bnt b-color' 
 												@click="importshop(item.order_id,item.orderProduct[indexs].product_id,item.orderProduct[indexs].product_sku)">
 												立即导入</view>
-										</view>
+										</view> -->
 									</view>
 								</block>
 							</view>
diff --git a/pages/users/trading_hall/index.vue b/pages/users/trading_hall/index.vue
index dbfe411..727e975 100644
--- a/pages/users/trading_hall/index.vue
+++ b/pages/users/trading_hall/index.vue
@@ -8,7 +8,7 @@
 							<text class="iconfont icon-sousuo"></text>
 							<input v-model="where.keyword" confirm-type="search" placeholder="请输入关键字" class="input" />
 							<view class="search_btn">
-								<image src="@/static/images/serchbtn.png" mode="aspectFill" @click="handleSearch">
+								<image src="@/static/images/serchbtn.png" mode="aspectFit" @click="handleSearch">
 								</image>
 
 							</view>
diff --git a/pages/users/user_money/index.vue b/pages/users/user_money/index.vue
index 276b7cb..5596e55 100644
--- a/pages/users/user_money/index.vue
+++ b/pages/users/user_money/index.vue
@@ -10,10 +10,10 @@
 								<view class='money'>{{userInfo.now_money || 0}}</view>
 							</view>
 							<!-- #ifdef APP-PLUS || H5 -->
-							<navigator v-if="recharge_switch == 1" url="/pages/users/user_payment/index" hover-class="none" class='recharge t-color'>充值</navigator>
+							<navigator  url="/pages/users/user_payment/index" hover-class="none" class='recharge t-color'>充值</navigator>
 							<!-- #endif -->
 							<!-- #ifdef MP -->
-							<view v-if="recharge_switch == 1" @click="openSubscribe('/pages/users/user_payment/index')" class='recharge t-color'>充值</view>
+							<view  @click="openSubscribe('/pages/users/user_payment/index')" class='recharge t-color'>充值</view>
 							<!-- #endif -->
 						</view>
 						<view class='cumulative acea-row row-top'>
@@ -52,7 +52,7 @@
 					</navigator>
 				</view>
 			</view>
-			<recommend v-if="recommend_switch == 1" :hostProduct="hostProduct" :isLogin="isLogin"></recommend>
+			<recommend  :hostProduct="hostProduct" :isLogin="isLogin"></recommend>
 		</view>
 		<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
 	</view>
diff --git a/static/images/GXSC/BBY.png b/static/images/GXSC/BBY.png
new file mode 100644
index 0000000..96afa8b
Binary files /dev/null and b/static/images/GXSC/BBY.png differ
diff --git a/static/images/GXSC/DH.png b/static/images/GXSC/DH.png
new file mode 100644
index 0000000..40e5775
Binary files /dev/null and b/static/images/GXSC/DH.png differ
diff --git a/static/images/GXSC/DW.png b/static/images/GXSC/DW.png
new file mode 100644
index 0000000..9642609
Binary files /dev/null and b/static/images/GXSC/DW.png differ
diff --git a/static/images/GXSC/GXZH.png b/static/images/GXSC/GXZH.png
new file mode 100644
index 0000000..a372322
Binary files /dev/null and b/static/images/GXSC/GXZH.png differ
diff --git a/static/images/GXSC/JDMS.png b/static/images/GXSC/JDMS.png
new file mode 100644
index 0000000..5c5dc5a
Binary files /dev/null and b/static/images/GXSC/JDMS.png differ
diff --git a/static/images/GXSC/JJRB.png b/static/images/GXSC/JJRB.png
new file mode 100644
index 0000000..ed30330
Binary files /dev/null and b/static/images/GXSC/JJRB.png differ
diff --git a/static/images/GXSC/JYPX.png b/static/images/GXSC/JYPX.png
new file mode 100644
index 0000000..e11270d
Binary files /dev/null and b/static/images/GXSC/JYPX.png differ
diff --git a/static/images/GXSC/MSGY.png b/static/images/GXSC/MSGY.png
new file mode 100644
index 0000000..2a36c7f
Binary files /dev/null and b/static/images/GXSC/MSGY.png differ
diff --git a/static/images/GXSC/NFCP.png b/static/images/GXSC/NFCP.png
new file mode 100644
index 0000000..347323e
Binary files /dev/null and b/static/images/GXSC/NFCP.png differ
diff --git a/static/images/GXSC/NMJD.png b/static/images/GXSC/NMJD.png
new file mode 100644
index 0000000..97930a6
Binary files /dev/null and b/static/images/GXSC/NMJD.png differ
diff --git a/static/images/GXSC/NYSC.png b/static/images/GXSC/NYSC.png
new file mode 100644
index 0000000..bda55f5
Binary files /dev/null and b/static/images/GXSC/NYSC.png differ
diff --git a/static/images/GXSC/PF.png b/static/images/GXSC/PF.png
new file mode 100644
index 0000000..17eddea
Binary files /dev/null and b/static/images/GXSC/PF.png differ
diff --git a/static/images/GXSC/SCFW.png b/static/images/GXSC/SCFW.png
new file mode 100644
index 0000000..37bc246
Binary files /dev/null and b/static/images/GXSC/SCFW.png differ
diff --git a/static/images/GXSC/SHFW.png b/static/images/GXSC/SHFW.png
new file mode 100644
index 0000000..0683d47
Binary files /dev/null and b/static/images/GXSC/SHFW.png differ
diff --git a/static/images/GXSC/SJ.png b/static/images/GXSC/SJ.png
new file mode 100644
index 0000000..690ee58
Binary files /dev/null and b/static/images/GXSC/SJ.png differ
diff --git a/static/images/GXSC/SJicon.png b/static/images/GXSC/SJicon.png
new file mode 100644
index 0000000..2dc4691
Binary files /dev/null and b/static/images/GXSC/SJicon.png differ
diff --git a/static/images/GXSC/SS.png b/static/images/GXSC/SS.png
new file mode 100644
index 0000000..3c02ebb
Binary files /dev/null and b/static/images/GXSC/SS.png differ
diff --git a/static/images/GXSC/WLSY.png b/static/images/GXSC/WLSY.png
new file mode 100644
index 0000000..a227e3c
Binary files /dev/null and b/static/images/GXSC/WLSY.png differ
diff --git a/static/images/GXSC/WYLY.png b/static/images/GXSC/WYLY.png
new file mode 100644
index 0000000..1fc137b
Binary files /dev/null and b/static/images/GXSC/WYLY.png differ
diff --git a/static/images/GXSC/YLBJ.png b/static/images/GXSC/YLBJ.png
new file mode 100644
index 0000000..5d6ae23
Binary files /dev/null and b/static/images/GXSC/YLBJ.png differ
diff --git a/static/images/GXSC/ZXJZ.png b/static/images/GXSC/ZXJZ.png
new file mode 100644
index 0000000..3f218d4
Binary files /dev/null and b/static/images/GXSC/ZXJZ.png differ
diff --git a/static/images/MYTC/BG.png b/static/images/MYTC/BG.png
new file mode 100644
index 0000000..de535b1
Binary files /dev/null and b/static/images/MYTC/BG.png differ
diff --git a/static/images/MYTC/PF.png b/static/images/MYTC/PF.png
new file mode 100644
index 0000000..17eddea
Binary files /dev/null and b/static/images/MYTC/PF.png differ
diff --git a/static/images/MYTC/SCFW.png b/static/images/MYTC/SCFW.png
new file mode 100644
index 0000000..37bc246
Binary files /dev/null and b/static/images/MYTC/SCFW.png differ
diff --git a/static/images/MYTC/SHFW.png b/static/images/MYTC/SHFW.png
new file mode 100644
index 0000000..0683d47
Binary files /dev/null and b/static/images/MYTC/SHFW.png differ
diff --git a/static/images/MYTC/SJ.png b/static/images/MYTC/SJ.png
new file mode 100644
index 0000000..690ee58
Binary files /dev/null and b/static/images/MYTC/SJ.png differ
diff --git a/static/images/MYTC/SJicon.png b/static/images/MYTC/SJicon.png
new file mode 100644
index 0000000..2dc4691
Binary files /dev/null and b/static/images/MYTC/SJicon.png differ
diff --git a/static/images/MYTC/SS.png b/static/images/MYTC/SS.png
new file mode 100644
index 0000000..c1e77dc
Binary files /dev/null and b/static/images/MYTC/SS.png differ
diff --git a/static/images/f1.png b/static/images/f1.png
new file mode 100644
index 0000000..e0c77a8
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..5e12ffc
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..2e84ae3
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..c5c3f2a
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..5f2f760
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/pj.png b/static/images/pj.png
new file mode 100644
index 0000000..b190b23
Binary files /dev/null and b/static/images/pj.png differ
diff --git a/static/images/pj1.png b/static/images/pj1.png
new file mode 100644
index 0000000..4f84af6
Binary files /dev/null and b/static/images/pj1.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