diff --git a/App.vue b/App.vue
index 4819380..f82f146 100644
--- a/App.vue
+++ b/App.vue
@@ -1,36 +1,44 @@
diff --git a/components/goods-list/goods-list.vue b/components/goods-list/goods-list.vue
index 0f052ca..02ce89a 100644
--- a/components/goods-list/goods-list.vue
+++ b/components/goods-list/goods-list.vue
@@ -1,4 +1,3 @@
-
@@ -6,8 +5,18 @@
+
+ {{item.specal_tags.is_self}}
+
- {{item.name}}
+
+
+ {{item.specal_tags.is_allow_values}}
+
+ {{item.name}}
+
{{item.price}}易币
@@ -34,52 +43,73 @@
diff --git a/pages/goods/lists.vue b/pages/goods/lists.vue
index e069561..2f4faaf 100644
--- a/pages/goods/lists.vue
+++ b/pages/goods/lists.vue
@@ -1,5 +1,6 @@
+
最新
@@ -19,6 +20,9 @@
list
} from '@/apis/interfaces/goods'
import goodsList from '@/components/goods-list/goods-list'
+ import {
+ config
+ } from '@/apis/index.js'
export default {
name: 'Goods-LISTS',
data() {
@@ -28,6 +32,7 @@
goods: [],
page: 1,
has_more: true,
+ isBaoDan: false, // 是否是报单,默认有id不是报单,无id是报单
};
},
onReachBottom() {
@@ -44,6 +49,14 @@
created() {
this.getList()
},
+ onShow() {
+ if (this.$Route.query.type === 'baodan') {
+ this.isBaoDan = true
+ uni.setNavigationBarTitle({
+ title: '报单商品'
+ })
+ }
+ },
methods: {
onTabs(e) {
let index = e.target.dataset.index
@@ -58,7 +71,7 @@
onGoods(e) {
uni.navigateTo({
- url:'/pages/goods/details?id='+e.goods_id
+ url: '/pages/goods/details?id=' + e.goods_id
})
// this.$Router.push({
// name: 'goodsDetails',
@@ -72,8 +85,11 @@
order_by: this.tabIndex == 1 ? this.marketType : '',
page: this.page
}
- if (this.$Route.query.type) {
+ if (this.$Route.query.type === 'id') {
data.category_id = this.$Route.query.id
+ } else if (this.$Route.query.type === 'baodan') {
+ // 报单加个条件筛选
+ data.is_allow_values = 1
} else {
data.category_cid = this.$Route.query.id
}
diff --git a/pages/goods/management.vue b/pages/goods/management.vue
index 3a5f795..38f4f10 100644
--- a/pages/goods/management.vue
+++ b/pages/goods/management.vue
@@ -8,7 +8,7 @@
已驳回
-
+
库存{{goods.value.stock}}