diff --git a/components/shortPopup.vue b/components/shortPopup.vue
index 6c7103c..1aa138a 100644
--- a/components/shortPopup.vue
+++ b/components/shortPopup.vue
@@ -62,7 +62,10 @@
           <view class="b_icon" @click="navgo(source==12 ? '/pages/nongKe/supply_chain/shopping_trolley_other?source='+source : '/pages/nongKe/supply_chain/shopping_trolley_a')">
             <image src="@/static/images/icon/car.png"></image>
             <view>采购车</view>
-            <view class="badge" v-if="goodsNum">{{goodsNum}}</view>
+            <view class="badge" v-if="goodsNum">
+              <text v-if="goodsNum<100">{{goodsNum}}</text>
+              <text v-else>99+</text>
+            </view>
           </view>
           <view class="btn" @click.stop="$u.throttle(addcart, 1500)">加入采购清单</view>
         </view>
diff --git a/pages.json b/pages.json
index e37a73d..61c5ac6 100644
--- a/pages.json
+++ b/pages.json
@@ -414,6 +414,15 @@
             "navigationStyle": "custom"
           }
 
+        },{
+          "path": "supply_chain/supplierOther",
+          "style": {
+            "enablePullDownRefresh": true,
+            "navigationBarTitleText": "",
+            "navigationBarBackgroundColor": "#e93323",
+            "navigationStyle": "custom"
+          }
+
         },
         {
           "path": "supply_chain/suppliers",
diff --git a/pages/nongKe/cloud_entrepot/indexOther.vue b/pages/nongKe/cloud_entrepot/indexOther.vue
index e5240ec..592a741 100644
--- a/pages/nongKe/cloud_entrepot/indexOther.vue
+++ b/pages/nongKe/cloud_entrepot/indexOther.vue
@@ -14,11 +14,11 @@
                 style="font-size: 31.54rpx;font-weight: 700;margin-left: 20rpx;color: #F84221;">
                 {{nav_title}}
               </view>
-              <!-- <view class=""
-                @click="navGoto(`/pages/nongKe/supply_chain/supplierA?tit=1&type_id=12&isDetail=1&product_type=98&cate_id=${userInfoData.mer_info.category_id}`)"
+              <view class=""
+                @click="navGoto(`/pages/nongKe/supply_chain/supplierOther?tit=1&type_id=12&value=12&isDetail=1&product_type=98&cate_id=${userInfoData.mer_info.category_id}`)"
                 style="font-size: 31.54rpx;font-weight: 700;margin-left: 22rpx;">
-                供货采购市场
-              </view> -->
+                线下支付商户
+              </view>
             </view>
           </view>
         </view>
@@ -227,7 +227,7 @@
     data() {
       return {
         domain: HTTP_REQUEST_URL,
-        nav_title: '供货采购商品',
+        nav_title: '线下支付商品',
         defaInd: [0, 0],
         columnData: [],
         showSerch: false,
@@ -328,7 +328,7 @@
     async onLoad(options) {
       // console.log(options);
       this.storeParam.sys_labels = options.value;
-      if(options.value==12)this.nav_title = '线下支付'
+      if(options.value==12)this.nav_title = '线下支付商品'
       this.tips = options.tips;
       let userInfo = this.$store.state.app.userInfo;
       if(typeof userInfo == 'string') this.userInfoData = JSON.parse(userInfo);
diff --git a/pages/nongKe/supply_chain/merchant.vue b/pages/nongKe/supply_chain/merchant.vue
index f2f5616..2556be0 100644
--- a/pages/nongKe/supply_chain/merchant.vue
+++ b/pages/nongKe/supply_chain/merchant.vue
@@ -32,7 +32,7 @@
         </view>
         <view class="right_goods_msg">
           <view class="num">
-            <text style="margin-right: 10rpx;">订货价:</text>
+            <text style="margin-right: 5rpx;">¥</text>
             <text>{{$procure_price(item)}}</text>
           </view>
           <!-- <view class="add_goods" @click="getGoodsDetails(item)">加入购物单</view> -->
@@ -41,10 +41,10 @@
     </block>
     <u-loadmore :status="status" :loading-text="loadingText" :loadmore-text="loadmoreText" :nomore-text="nomoreText" />
 
-    <navigator class="bottom_purchase" url="./shopping_trolley_a" open-type="navigate">采购清单<text v-if="goodsNum">{{goodsNum}}</text></navigator>
+    <navigator class="bottom_purchase" :url="source==12?'./shopping_trolley_other?source=12':'./shopping_trolley_a' " open-type="navigate">采购清单<text v-if="goodsNum">{{ ` (${goodsNum}) ` }}</text></navigator>
 
     <goodsPopup :goodsStatu="isPopupShow" @colses="isPopupShow=false" :goods_info="goodsInfo"></goodsPopup>
-    <shortPopup ref="shortPopupRef"></shortPopup>
+    <shortPopup ref="shortPopupRef" :source="source" @addCart="cartFn"></shortPopup>
     <u-popup :show="show" @close="close">
       <view>
         <h3 style=" margin: 15px 5px 5px 24px;">颜色规格</h3>
@@ -140,10 +140,12 @@
         }],
         goodsLite: {},
         goodsindexL: '',
-        goodsNum: 0
+        goodsNum: 0,
+        source: 11
       }
     },
     onLoad(e) {
+      this.source = e.value || 11;
       this.id = e.id
       this.initStore()
       this.getStoreGoodsList()
@@ -167,7 +169,7 @@
       cartFn() {
         getCartCounts({
           product_type: 98,
-          source: 11
+          source: this.source
         }).then(res => {
           this.goodsNum = res.data[0].count
         })
diff --git a/pages/nongKe/supply_chain/supplierOther.vue b/pages/nongKe/supply_chain/supplierOther.vue
new file mode 100644
index 0000000..048f5fe
--- /dev/null
+++ b/pages/nongKe/supply_chain/supplierOther.vue
@@ -0,0 +1,1393 @@
+<template>
+	<view style="background-color: #F0F2F5;min-height: 100vh">
+
+
+		<view class="">
+
+			<view style="height: var(--status-bar-height);"></view>
+			<view class='productList' :style="viewColor">
+				<!-- 顶部 -->
+				<view class="top">
+					<view class="head_tit">
+						<!--< view class="" style="display: flex;align-items: center;">
+							<view class="back" @click='backjJump()' style="margin-right: 17rpx;">
+								<view class="iconfont icon-xiangzuo" style="color: #333333;"></view>
+							</view>
+							<view class="" style="font-size: 40rpx;font-weight: 700;transform: skewX(-10deg);">
+                供货采购
+							</view>
+						</view> -->
+						<view class="" style="display: flex;align-items: center;width: 100%;justify-content: space-between;">
+						  <!-- 	<u--image :showLoading="true" src="/static/images/LHYC/PFH.png" width="50.82rpx"
+								height="50.82rpx" @click='backjJump'></u--image> -->
+						  <view style="display: flex;align-items: center;">
+						    <i class="iconfont icon-xiangzuo" style="font-size: 31.54rpx;text-align: left;" @click='backjJump'></i>
+						    <view class=""
+                  @click="navGoto(`/pages/nongKe/cloud_entrepot/indexOther?type_id=12&value=${value}&tips=手续费0`)"
+						      style="font-size: 31.54rpx;font-weight: 700;margin-left: 20rpx;">
+						      线下支付商品
+						    </view>
+						    <view class=""
+						      style="font-size: 31.54rpx;font-weight: 700;margin-left: 22rpx;color: #F84221;">
+						      线下支付商户
+						    </view>
+						  </view>
+						</view>
+					</view>
+          <view style="position: relative;" class="search-box">
+          	<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" :showLoading="true"
+          		src="/static/images/GXSC/SSBT.png" width="115.65rpx" height="56.82rpx"></u--image>
+          </view>
+          <u-tabs v-if="no_prod" :list="[{name: '先款后货'},{name: '先货后款'}]" :scrollable="false" lineColor="#ff6d20" lineWidth="30" :itemStyle="{height: '88rpx'}" @change="changeTabs">
+          </u-tabs>
+				</view>
+				<view class="content">
+          <view class="search-input"></view>
+					<view v-if="no_prod" class="hot_serch">
+					</view>
+          <view v-else class="hot_serch2">
+          </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: 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>月销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>
+									<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='https://lihai001.oss-cn-chengdu.aliyuncs.com/def/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>
+
+	</view>
+</template>
+
+<script>
+	import {
+		storeMerchantList,
+		getGeocoder,
+
+		supAgoodsApi
+	} from '@/api/store.js';
+	import {
+		supMenuApi,
+	} from '@/api/requesta.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 {
+        no_prod: false,
+				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: '', //支持先货后款
+        value: 0
+			};
+		},
+		onLoad(options) {
+      this.value = options.value || 0;
+      if (options.tit) {
+      	options.tit == 1 ? this.titName = "先款后货" : this.titName = "先货后款"
+      }else this.titName = "坝坝宴";
+			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.cate_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;
+				});
+				if (options.tit) {
+					options.tit == 1 ? this.titName = "先款后货" : this.titName = "先货后款"
+					return
+				}
+				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: {
+      // 切换状态
+      changeTabs(e){
+        if(e.index==0){
+          this.credit_buy = ''
+          this.sotreParam.page = 1;
+        }else if(e.index==1){
+          this.credit_buy = 1
+          this.sotreParam.page = 1;
+        }
+        this.storeList = [];
+        this.storeMerchantList();
+      },
+			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}&value=${this.value}`
+					})
+				} 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)
+			},
+      navGoto(url) {
+        uni.redirectTo({
+          url
+        })
+      },
+			// 右侧切换
+			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: 40vw;
+		/* 使用省略号表示溢出的内容 */
+
+		/* 可根据实际情况调整容器宽度 */
+	}
+
+	.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;
+		}
+	}
+  
+  .search-box{
+    margin-top: 10rpx;
+    padding: 0 20rpx;
+  }
+  
+  .search-input{
+    padding-top: 42rpx;
+    /* #ifdef H5 */
+    padding-top: 50rpx;
+    /* #endif */
+  }
+
+	.hot_serch {
+		color: #B3B3B3;
+		display: flex;
+		justify-content: space-around;
+		margin: 20rpx 0;
+		flex-wrap: wrap;
+		// margin-top: 50rpx;
+		padding-top: 142rpx;
+		/* #ifdef H5 */
+		padding-top: 180rpx;
+		/* #endif */
+
+		text {
+			margin: 10rpx;
+		}
+	}
+  
+  .hot_serch2{
+    padding-top: 72rpx;
+    /* #ifdef H5 */
+    padding-top: 90rpx;
+    /* #endif */
+  }
+
+	.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;
+	}
+
+	.head_tit {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		box-sizing: border-box;
+		padding: 0 20rpx;
+	}
+
+	.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;
+			}
+		}
+	}
+
+	.img_cls {
+		position: absolute;
+		top: 50%;
+		// right: 7rpx;
+    right: 27rpx;
+		transform: translateY(-50%);
+
+	}
+</style>
\ No newline at end of file