diff --git a/api/store.js b/api/store.js
index 59a5c06..8ced6c6 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,98 @@ 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
-  });
-}
\ No newline at end of file
+	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 =
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 471efbf..357c9ce 100644
--- a/pages.json
+++ b/pages.json
@@ -200,6 +200,15 @@
 						"navigationStyle": "custom"
 					}
 
+				}, {
+					"path": "supply_chain/supplierA",
+					"style": {
+						"enablePullDownRefresh": true,
+						"navigationBarTitleText": "",
+						"navigationBarBackgroundColor": "#e93323",
+						"navigationStyle": "custom"
+					}
+
 				}, {
 					"path": "supply_chain/merchant",
 					"style": {
@@ -705,13 +714,13 @@
 			"root": "pages/releaseManagement",
 			"name": "releaseManagement",
 			"pages": [{
-				"path": "index",
-				"style": {
-					"navigationBarTitleText": "发布管理",
-					"enablePullDownRefresh": false
-				}
+					"path": "index",
+					"style": {
+						"navigationBarTitleText": "发布管理",
+						"enablePullDownRefresh": false
+					}
 
-			},
+				},
 				{
 					"path": "details/index",
 					"style": {
@@ -719,7 +728,8 @@
 						"enablePullDownRefresh": false
 					}
 
-				}]
+				}
+			]
 		},
 		{
 			"root": "pages/commissionedSales",
diff --git a/pages/nongKe/supply_chain/supplier.vue b/pages/nongKe/supply_chain/supplier.vue
index dff372f..2a574ea 100644
--- a/pages/nongKe/supply_chain/supplier.vue
+++ b/pages/nongKe/supply_chain/supplier.vue
@@ -1,27 +1,99 @@
 <template>
-	<view>
-	
+	<view style="background-color: #F0F2F5;min-height: 100vh">
+		<view style="height: var(--status-bar-height);"></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 class="top">
+				<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="">
+						供销综合云市场
+					</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" :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='showMaoLocation(latitude,longitude)'>
+						<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 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">
+							<!-- {{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;    width: 15vw;">{{item.category_name}}</text>
+						</view>
+					</u-scroll-list>
+				</view>
+				</u-scroll-list>
+				<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: 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)'>
@@ -31,10 +103,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 +119,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 +246,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 +262,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 +297,15 @@
 		},
 		data() {
 			return {
+				imgList: [
+					"/static/images/GXSC/BBY.png",
+					"/static/images/GXSC/JYPX.png",
+					"/static/images/GXSC/NFCP.png",
+					"/static/images/GXSC/SCFW.png",
+					"/static/images/GXSC/BBY.png",
+
+
+				],
 				price: 0,
 				stock: 0,
 				nows: false,
@@ -233,6 +322,7 @@
 				brandList: [],
 				downKey: 0,
 				downStatus: false,
+				menuList: [],
 				// 下拉菜单
 				downMenu: [{
 						title: '默认',
@@ -283,18 +373,18 @@
 				storeTypeArr: [], //店铺类型
 				merList: [], //商户分类
 				product_type: 0,
-				show:false,
-				image: '' ,//图片,
-				credit_buy:'',//支持先货后款
+				show: false,
+				image: '', //图片,
+				credit_buy: '', //支持先货后款
 			};
 		},
 		onLoad(options) {
-			console.log(options);
+			// console.log(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.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 +395,9 @@
 			this.storeMerchantList();
 			this.getClassfication();
 			this.getStoreType();
+			supMenuApi().then(res => {
+				this.menuList = res.data
+			})
 		},
 		computed: {
 			downMenus: function() {
@@ -325,6 +418,11 @@
 			}, 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({
@@ -494,7 +592,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 +619,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 +709,113 @@
 				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: 32rpx;
+		// background-color: red;
+		max-width: 40vw;
+		white-space: nowrap;
+		/* 防止文字换行 */
+		overflow: hidden;
+		/* 超出部分隐藏 */
+		text-overflow: ellipsis;
+		/* 使用省略号表示溢出的内容 */
+		width: 200px;
+		/* 可根据实际情况调整容器宽度 */
+	}
+
+	.productList {
+		// padding-top: 50rpx;
+		// padding: 0 20rpx 0;
+
+		.top {
+			padding-top: 20rpx;
+			background-color: white;
+			position: fixed;
+			z-index: 999;
+			width: 100%;
+			top: 0;
 		}
 
-		.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;
+
+			.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;
+
+					}
+
+					.li {
+						display: flex;
+						font-size: 22rpx;
+						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 +843,20 @@
 		}
 	}
 
+	.hot_serch {
+		color: #B3B3B3;
+		display: flex;
+		justify-content: space-around;
+		margin: 20rpx 0;
+		flex-wrap: wrap;
+		// margin-top: 50rpx;
+		padding-top: 50rpx;
+
+		text {
+			margin: 10rpx;
+		}
+	}
+
 	.productList .search .input {
 		flex: 1;
 		height: 60rpx;
@@ -730,7 +900,7 @@
 		z-index: 9;
 		position: fixed;
 		left: 0;
-	    top: 25px;
+		top: 25px;
 		width: 100%;
 		margin-top: 86rpx;
 		background-color: #fff;
@@ -1109,7 +1279,7 @@
 
 	.no-shop {
 		background-color: #fff;
-		padding-bottom: calc(100% - 176rpx);
+		// padding-bottom: calc(100% - 176rpx);
 
 		.pictrue {
 			display: flex;
@@ -1123,12 +1293,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..40e9b29
--- /dev/null
+++ b/pages/nongKe/supply_chain/supplierA.vue
@@ -0,0 +1,1309 @@
+<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="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="">
+						{{storeList[0].mer_info}}
+					</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>
+				</u-scroll-list>
+				<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: #F5F5F5;">
+				<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 {
+				imgList: [
+					"/static/images/GXSC/BBY.png",
+					"/static/images/GXSC/JYPX.png",
+					"/static/images/GXSC/NFCP.png",
+					"/static/images/GXSC/SCFW.png",
+					"/static/images/GXSC/BBY.png",
+
+
+				],
+				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) {
+			console.log(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
+				})
+				.then(res => {
+					console.log(res)
+				})
+		},
+		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
+				})
+			},
+			// 进店
+			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;
+		max-width: 40vw;
+		white-space: nowrap;
+		/* 防止文字换行 */
+		overflow: hidden;
+		/* 超出部分隐藏 */
+		text-overflow: ellipsis;
+		/* 使用省略号表示溢出的内容 */
+		width: 200px;
+		/* 可根据实际情况调整容器宽度 */
+	}
+
+	.serch_cls {
+		// padding-right: 200rpx;
+	}
+
+	.productList {
+		// padding-top: 50rpx;
+		// padding: 0 20rpx 0;
+
+		.top {
+			padding-top: 20rpx;
+			background-color: white;
+			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;
+
+					}
+
+					.li {
+						display: flex;
+						font-size: 22rpx;
+						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;
+
+		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/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/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..690be8f
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..6fa6cc0
Binary files /dev/null and b/static/images/GXSC/JYPX.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/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/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/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