From 011eeedcc4743c1fdff23d2696821d6c107b7857 Mon Sep 17 00:00:00 2001
From: zhangdongxue <zhangdongxue@uz.cn>
Date: Wed, 27 Oct 2021 15:00:08 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=95=86=E5=93=81=E5=88=97=E8=A1=A8=E5=88=B7?=
 =?UTF-8?q?=E9=80=89=E4=B8=80=E7=BA=A7=E5=88=86=E7=B1=BB=E5=92=8C=E4=BA=8C?=
 =?UTF-8?q?=E7=BA=A7=E5=88=86=E7=B1=BB=E8=A6=81=E5=88=86=E5=88=AB=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=EF=BC=81]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/goods-list/goods-list.vue |  2 +-
 pages/equity/index.vue               |  2 +-
 pages/goods/lists.vue                | 11 ++++++++---
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/components/goods-list/goods-list.vue b/components/goods-list/goods-list.vue
index 0c8950c..0f052ca 100644
--- a/components/goods-list/goods-list.vue
+++ b/components/goods-list/goods-list.vue
@@ -13,7 +13,7 @@
 							{{item.price}}<text>易币</text>
 						</view>
 						<view class="price cny" v-if="priceType === 'CNY'">
-							<text>￥</text>{{item.original_price}}
+							<text>￥</text>{{item.price.price_min}}
 						</view>
 						<view class="sales">
 							<slot name="statistics" :value="item">
diff --git a/pages/equity/index.vue b/pages/equity/index.vue
index 802477c..1131c16 100644
--- a/pages/equity/index.vue
+++ b/pages/equity/index.vue
@@ -374,7 +374,7 @@
 				// 	name: 'goodsList'
 				// })
 				uni.navigateTo({
-					url:`/pages/goods/lists?id=${id}`
+					url:`/pages/goods/lists?type=id&id=${id}`
 				})
 			},
 			// 打开微信小程序
diff --git a/pages/goods/lists.vue b/pages/goods/lists.vue
index 4748789..e069561 100644
--- a/pages/goods/lists.vue
+++ b/pages/goods/lists.vue
@@ -68,11 +68,16 @@
 				// })
 			},
 			getList() {
-				list({
-					category_cid: this.$Route.query.id,
+				let data = {
 					order_by: this.tabIndex == 1 ? this.marketType : '',
 					page: this.page
-				}).then(res => {
+				}
+				if (this.$Route.query.type) {
+					data.category_id = this.$Route.query.id
+				} else {
+					data.category_cid = this.$Route.query.id
+				}
+				list(data).then(res => {
 					this.goods = this.goods.concat(res.data)
 					this.has_more = res.page.has_more
 				})