From 49d7079d6cded0efbfe655da7faac57f8a14b1db Mon Sep 17 00:00:00 2001
From: hupeng <guchengwuyue@163.com>
Date: Fri, 29 Dec 2023 15:47:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8B=BC=E5=9B=A2=E4=B8=8E?=
 =?UTF-8?q?=E7=A7=92=E6=9D=80=E5=95=86=E5=93=81=E8=AF=A6=E6=83=85tab=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=94=B6=E8=97=8F=E4=B8=8D=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/activity/GroupDetails/index.vue   | 11 ++++++-----
 pages/activity/SeckillDetails/index.vue | 11 ++++++-----
 pages/shop/GoodsCollection/index.vue    | 19 ++++++++++++-------
 pages/shop/GoodsCon/index.vue           |  7 ++++---
 4 files changed, 28 insertions(+), 20 deletions(-)

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 @@
     </view>
 
     <!-- 操作栏 -->
-    <view style="height: 100rpx"></view>
+    <view style="height: 160rpx"></view>
 
     <!--底部操作栏-->
     <view class="tui-operation">
@@ -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 @@
     </view>
 
     <!-- 操作栏 -->
-    <view style="height: 100rpx"></view>
+    <view style="height: 160rpx"></view>
 
     <!--底部操作栏-->
     <view class="tui-operation">
@@ -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 @@
         <view class="text acea-row row-column-between">
           <view class="infor line1">{{ item.storeName }}</view>
           <view class="acea-row row-between-wrapper">
-            <view class="money font-color-red" v-if="isIntegral == 1">{{ item.costPrice }}积分</view>
-            <view class="money font-color-red" v-else>￥{{ item.price }}</view>
+     <!--       <view class="money font-color-red" v-if="isIntegral == 1">{{ item.costPrice }}积分</view> -->
+            <view class="money font-color-red">￥{{ item.price }}</view>
             <view class="delete" @tap.stop="delCollection(collectProductListIndex)">删除</view>
           </view>
         </view>
@@ -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
         })
       }