From 23f8445e5643a72cc2444ffb2c9ee2f333b38113 Mon Sep 17 00:00:00 2001
From: dy-hu <dy-hu@haihangyun.com>
Date: Tue, 14 May 2024 15:28:44 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=B8=BB=E9=A1=B5=E6=9B=B4=E5=A4=9A=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=E5=B8=83=E5=B1=80=E8=B0=83=E6=95=B4=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=202.=E4=B8=BB=E9=A1=B5=E5=88=86=E7=B1=BB=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E5=B8=83=E5=B1=80=E8=B0=83=E6=95=B4=E4=BF=AE=E6=94=B9=203.?=
 =?UTF-8?q?=E4=B8=BB=E9=A1=B5=E5=A4=B4=E9=83=A8=E5=8C=BA=E5=9F=9F=E5=B8=83?=
 =?UTF-8?q?=E5=B1=80=E8=B0=83=E6=95=B4=E4=BF=AE=E6=94=B9=204.=E4=B8=BB?=
 =?UTF-8?q?=E9=A1=B5=E5=88=86=E7=B1=BB=E5=95=86=E5=93=81=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=94=B6=E8=97=8F=E4=B8=9A=E5=8A=A1=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../canvasShow/basics/classifyHeader/app/index.vue | 45 ++++++++++++++++++++--
 components/canvasShow/basics/text.vue              |  4 +-
 components/canvasShow/canvasShowPage.vue           |  6 +++
 pages/tabbar/index/component/FixedHead.vue         |  8 ++--
 4 files changed, 55 insertions(+), 8 deletions(-)

diff --git a/components/canvasShow/basics/classifyHeader/app/index.vue b/components/canvasShow/basics/classifyHeader/app/index.vue
index 0cea243..feb3f9c 100644
--- a/components/canvasShow/basics/classifyHeader/app/index.vue
+++ b/components/canvasShow/basics/classifyHeader/app/index.vue
@@ -23,14 +23,16 @@
 								<img class="img pic-img default-img" :src="item.image"
 									onerror="this.src='url(http://36.138.125.206:8081/ceres-local-file/image/default.png) no-repeat center';this.οnerrοr=null">
 							</div>
+              <image v-if="item.ifCollect === 1" class="collect-img" src="http://36.138.125.206:8081/ceres-local-file/image/prod_collect_active.png" @click.stop="onCollect(item, 0)"/>
+              <image v-else class="collect-img" src="http://36.138.125.206:8081/ceres-local-file/image/prod_collect_normal.png" @click.stop="onCollect(item, 1)"/>
 							<div class="product-swiper-info">
 								<div class="product-info-content">
 									<div class="product-name-row">
 										<label class="product-name">{{item.productName}}</label>
-										<image class="product-star"
+<!--										<image class="product-star"
 											src="http://36.138.125.206:8081/ceres-local-file/image/icon_star.png">
 										</image>
-										<label class="product-star-text">3.5</label>
+										<label class="product-star-text">3.5</label>-->
 									</div>
 									<div class="product-sku-row" v-if="false">
 										<label class="product-sku-name">规格</label>
@@ -98,6 +100,8 @@
 </template>
 
 <script>
+const NET = require('../../../../../utils/request')
+const API = require('../../../../../config/api')
 	import {
 		commonMixin
 	} from '../mixin'
@@ -112,7 +116,33 @@
 
 		},
 		methods: {
-
+      //state：1收藏，0取消收藏
+      onCollect(item, state){
+        let _this = this;
+        if (state === 1){
+          NET.request(API.collect, {
+            productId: parseInt(item.productId)
+          }, 'POST').then(res => {
+            // item.ifCollect = 1;
+            _this.$set(item, 'ifCollect', 1);
+            uni.showToast({
+              title: this.$t('common.collectsuccess'),
+              icon: "success"
+            })
+          })
+        }else {
+          NET.request(API.cancelCollect, {
+            ids: [item.productId]
+          }, 'PUT').then(res => {
+            // item.ifCollect = 0;
+            _this.$set(item, 'ifCollect', 0);
+            uni.showToast({
+              title: this.$t('common.cancelcollectsuccess'),
+              icon: "success"
+            })
+          })
+        }
+      }
 		}
 	}
 </script>
@@ -250,6 +280,15 @@
 				position: relative;
 			}
 
+      .collect-img {
+        width: 56rpx;
+        height: 56rpx;
+        position: absolute;
+        right: 35rpx;
+        top: 15rpx;
+        z-index: 999;
+      }
+
 			&-img {
 				width: 286upx;
 				height: 306upx;
diff --git a/components/canvasShow/basics/text.vue b/components/canvasShow/basics/text.vue
index e49b720..5ced305 100644
--- a/components/canvasShow/basics/text.vue
+++ b/components/canvasShow/basics/text.vue
@@ -65,7 +65,9 @@
         .btn-more{
           position: absolute;
           right: 0;
-          top: 10upx;
+          top: 30rpx;
+          margin-right: 30rpx;
+          color: #90919C;
         }
       }
     }
diff --git a/components/canvasShow/canvasShowPage.vue b/components/canvasShow/canvasShowPage.vue
index fd85cde..107c36c 100644
--- a/components/canvasShow/canvasShowPage.vue
+++ b/components/canvasShow/canvasShowPage.vue
@@ -8,6 +8,8 @@
 		           :terminal="terminal"
 		           :typeId="typeId"
 		           :shopId="shopId"></com-header>
+
+      <!--类别分组-->
 		<com-classify-header v-if="item.type==='classify-header'"
 		          :componentContent="item.componentContent"
 		          :terminal="terminal"
@@ -39,6 +41,7 @@
                          :terminal="terminal"
                          :typeId="typeId"
                          :shopId="shopId"></com-category-list>
+      <!--艺术风格-->
 	 <com-product-group-list v-if="item.type==='productGroupList'"
 						:componentContent="item.componentContent"
 						:terminal="terminal"
@@ -59,6 +62,7 @@
                           :terminal="terminal"
                           :typeId="typeId"
                           :shopId="shopId"></com-image-text-nav>
+      <!--新品推荐，热销排行-->
       <com-product v-if="item.type==='productList'"
                    ref="productPage"
                    :componentContent="item.componentContent"
@@ -75,6 +79,8 @@
                   :terminal="terminal"
                   :typeId="typeId"
                   :shopId="shopId"></com-coupon>
+
+      <!--定制服务-->
       <com-custom v-if="item.type==='custom'"
                   :componentContent="item.componentContent"
                   :terminal="terminal"
diff --git a/pages/tabbar/index/component/FixedHead.vue b/pages/tabbar/index/component/FixedHead.vue
index 9fb4a77..411fc8a 100644
--- a/pages/tabbar/index/component/FixedHead.vue
+++ b/pages/tabbar/index/component/FixedHead.vue
@@ -37,7 +37,7 @@
               class="search_box"
               @click="flyToService"
           >
-            <image src="http://36.138.125.206:8081/ceres-local-file/image/service.png" />
+            <image src="http://36.138.125.206:8081/ceres-local-file/image/home_service.png" />
           </view>
           <!-- #endif -->
           <!-- #ifdef MP-WEIXIN || MP-BAIDU || MP-TOUTIAO || MP-QQ -->
@@ -50,7 +50,7 @@
             }"
               @click="flyToService"
           >
-            <image src="http://36.138.125.206:8081/ceres-local-file/image/service.png" />
+            <image src="http://36.138.125.206:8081/ceres-local-file/image/home_service.png" />
           </view>
           <!-- #endif -->
         </template>
@@ -175,8 +175,8 @@ export default {
       }
 
       .search_box {
-        width: 60rpx;
-        height: 60rpx;
+        width: 48rpx;
+        height: 48rpx;
       }
     }
   }