From b8245eb162589a6c7fe26b6f58a533aaa5c6f060 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Fri, 27 Oct 2023 20:25:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BE=9B=E9=94=80=E7=BB=BC=E5=90=88=E4=BA=91?=
 =?UTF-8?q?=E5=B8=82=E5=9C=BA=E6=96=B0=E5=A2=9E=E9=95=87=E4=BE=9B=E5=BA=94?=
 =?UTF-8?q?=E9=93=BE,=E5=8F=96=E6=B6=88=E9=95=87=E5=BA=97=E9=93=BA?=
 =?UTF-8?q?=E6=A1=86=E6=A1=86=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/nongKe/supply_chain/supplier.vue  | 4 ++--
 pages/nongKe/supply_chain/supplierA.vue | 2 +-
 pages/supply_chains/supply_chains.vue   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pages/nongKe/supply_chain/supplier.vue b/pages/nongKe/supply_chain/supplier.vue
index 395eebe..53f0a58 100644
--- a/pages/nongKe/supply_chain/supplier.vue
+++ b/pages/nongKe/supply_chain/supplier.vue
@@ -112,7 +112,7 @@
 						<view class="right">
 							<view class="li head">
 								<text class="com_name">{{item.mer_name}}</text>
-								<text
+								<text v-if="item.type_id==17"
 									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">
@@ -643,7 +643,7 @@
 			},
 			navGo(id) {
 				uni.navigateTo({
-					url: `/pages/nongKe/supply_chain/supplierA?type_id=10&merchant_category_id=${id}&street_id=${this.street_id}`
+					url: `/pages/nongKe/supply_chain/supplierA?type_id=10,17&merchant_category_id=${id}&street_id=${this.street_id}`
 				})
 			},
 			go_details: function(product_type, product_id) {
diff --git a/pages/nongKe/supply_chain/supplierA.vue b/pages/nongKe/supply_chain/supplierA.vue
index 86d913c..028538e 100644
--- a/pages/nongKe/supply_chain/supplierA.vue
+++ b/pages/nongKe/supply_chain/supplierA.vue
@@ -59,7 +59,7 @@
 							<view class="right">
 								<view class="li head" style="display: flex;">
 									<text class="com_name">{{item.mer_name}}</text>
-									<text
+									<text v-if="item.type_id==17"
 										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">
diff --git a/pages/supply_chains/supply_chains.vue b/pages/supply_chains/supply_chains.vue
index e0e05c5..6109390 100644
--- a/pages/supply_chains/supply_chains.vue
+++ b/pages/supply_chains/supply_chains.vue
@@ -36,7 +36,7 @@
 
 			<view class="list">
 				<navigator hover-class="none"
-					:url="`/pages/nongKe/supply_chain/supplier?type_id=10&street_id=${street_id}&townName=${town}`">
+					:url="`/pages/nongKe/supply_chain/supplier?type_id=10,17&street_id=${street_id}&townName=${town}`">
 					<view class="list-m">
 						<image src="@/static/images/f6.png" mode="aspectFit"></image>
 						<view class="list-title">