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}}易币
- ¥{{item.original_price}}
+ ¥{{item.price.price_min}}
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
})