diff --git a/pages/activity/GroupDetails/index.vue b/pages/activity/GroupDetails/index.vue
index 5dbd472..56d02ca 100644
--- a/pages/activity/GroupDetails/index.vue
+++ b/pages/activity/GroupDetails/index.vue
@@ -123,7 +123,7 @@
-
+
@@ -288,13 +288,14 @@ export default {
setCollect: function() {
let that = this,
id = that.storeInfo.id,
- category = 'product'
+ category = 'combination',
+ type = 'collect'
if (that.userCollect) {
- getCollectDel(id, category).then(function() {
+ getCollectDel(id, category,type).then(function() {
that.userCollect = !that.userCollect
})
} else {
- getCollectAdd(id, category).then(function() {
+ getCollectAdd(id, category,type).then(function() {
that.userCollect = !that.userCollect
})
}
@@ -970,7 +971,7 @@ export default {
.tui-operation {
width: 100%;
- height: 100rpx;
+ height: 160rpx;
background: rgba(255, 255, 255, 0.98);
position: fixed;
display: flex;
diff --git a/pages/activity/SeckillDetails/index.vue b/pages/activity/SeckillDetails/index.vue
index 699f41b..d8f05e4 100644
--- a/pages/activity/SeckillDetails/index.vue
+++ b/pages/activity/SeckillDetails/index.vue
@@ -52,7 +52,7 @@
-
+
@@ -215,13 +215,14 @@ export default {
setCollect: function() {
let that = this,
id = that.storeInfo.id,
- category = 'product'
+ category = 'seckill',
+ type = 'collect'
if (that.userCollect) {
- getCollectDel(id, category).then(function() {
+ getCollectDel(id, category,type).then(function() {
that.userCollect = !that.userCollect
})
} else {
- getCollectAdd(id, category).then(function() {
+ getCollectAdd(id, category,type).then(function() {
that.userCollect = !that.userCollect
})
}
@@ -727,7 +728,7 @@ export default {
.tui-operation {
width: 100%;
- height: 100rpx;
+ height: 160rpx;
background: rgba(255, 255, 255, 0.98);
position: fixed;
display: flex;
diff --git a/pages/shop/GoodsCollection/index.vue b/pages/shop/GoodsCollection/index.vue
index c9f5f44..3398f81 100644
--- a/pages/shop/GoodsCollection/index.vue
+++ b/pages/shop/GoodsCollection/index.vue
@@ -8,8 +8,8 @@
{{ item.storeName }}
- {{ item.costPrice }}积分
- ¥{{ item.price }}
+
+ ¥{{ item.price }}
删除
@@ -54,15 +54,20 @@ export default {
},
methods: {
goGoodsCon(item) {
- if (item.isIntegral == 1) {
+ if (item.category == 'combination') {
this.$yrouter.push({
- path: '/pages/shop/GoodsCon/index',
- query: { id: item.pid },
+ path: '/pages/activity/GroupDetails/index',
+ query: { id: item.productId },
})
- } else {
+ } else if (item.category == 'seckill') {
+ this.$yrouter.push({
+ path: '/pages/activity/SeckillDetails/index',
+ query: { id: item.productId },
+ })
+ }else {
this.$yrouter.push({
path: '/pages/shop/GoodsCon/index',
- query: { id: item.pid },
+ query: { id: item.productId },
})
}
},
diff --git a/pages/shop/GoodsCon/index.vue b/pages/shop/GoodsCon/index.vue
index 9d45a5f..6c2ac56 100644
--- a/pages/shop/GoodsCon/index.vue
+++ b/pages/shop/GoodsCon/index.vue
@@ -612,13 +612,14 @@ export default {
setCollect: function() {
let that = this,
id = that.storeInfo.id,
- category = 'collect'
+ category = 'product',
+ type = 'collect'
if (that.storeInfo.userCollect) {
- getCollectDel(id, category).then(function() {
+ getCollectDel(id, category,type).then(function() {
that.storeInfo.userCollect = !that.storeInfo.userCollect
})
} else {
- getCollectAdd(id, category).then(function() {
+ getCollectAdd(id, category,type).then(function() {
that.storeInfo.userCollect = !that.storeInfo.userCollect
})
}